diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin index d50ba28a39be0798828fdd360390abd2f88fa2e2..11adc51d680b277910716c97a92444a858af26e6 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.bin and b/.gradle/8.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock index af73e7c68c00dcf164cbed6511c56a4ee8e5692c..f75c070b6c74aadd9ca309410379ba2931dbcd46 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.lock and b/.gradle/8.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a2040ca1598319e5e184694d78b51663e68a6c28..f9e84cedadfdbfe51035b6d011510a000d670f32 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 43120fa6636e61c59df17af25bbd9cac7b94abd1..6d2c76ed19474362a2b5542c2f592f1fb7d15b59 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 7b46b34a37464941556e45d348aea763eb144513..985b68b270d049400be53d9528c8323bf14a5145 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/build.gradle b/build.gradle index b2deac0b2d8f2f6bf98b3bf2b373448126788f30..88f4bb56ac07743a4e61fae06e9d999c728b0ce4 100644 --- a/build.gradle +++ b/build.gradle @@ -116,7 +116,7 @@ publishing { pom { name = project.name description = project.description - url = 'https://github.com/citygml4j' + url = 'https://transfer.hft-stuttgart.de/gitlab/energy-ade/energy-ade-3-citygml4j' licenses { license { name = 'The Apache License, Version 2.0' @@ -126,16 +126,16 @@ publishing { } developers { developer { - id = 'clausnagel' - name = 'Claus Nagel' - email = 'claus.nagel@gmail.com' - roles = ['architect', 'developer'] + id = 'rushipadsala' + name = 'Rushikesh Padsala' + email = 'ruhikesh.padsala@hft-stuttgart.de' + roles = ['manager', 'developer'] timezone = '+1' } } scm { - url = 'https://github.com/citygml4j/energy-ade-citygml4j' - connection = 'scm:git:https://github.com/citygml4j/energy-ade-citygml4j.git' + url = 'https://transfer.hft-stuttgart.de/gitlab/energy-ade/energy-ade-3-citygml4j' + connection = 'scm:git:https://transfer.hft-stuttgart.de/gitlab/energy-ade/energy-ade-3-citygml4j.git' } } } diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericElectricalDevice.java b/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericElectricalDevice.java deleted file mode 100644 index ca656d4ca24edb98835785b1da8fe6b2aca7b234..0000000000000000000000000000000000000000 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericElectricalDevice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.citygml4j.ade.energy.model.supportingClasses; - -public class GenericElectricalDevice { -} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericSolarCollector.java b/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericSolarCollector.java deleted file mode 100644 index 5d6ca112124e158ff9c382bea36cdaaab12a2c32..0000000000000000000000000000000000000000 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericSolarCollector.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.citygml4j.ade.energy.model.supportingClasses; - -public class GenericSolarCollector { -} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/LightingDevice.java b/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/LightingDevice.java deleted file mode 100644 index 4d340a52a1f67532a9a11f1b9db288aaaa6088af..0000000000000000000000000000000000000000 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/LightingDevice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.citygml4j.ade.energy.model.supportingClasses; - -public class LightingDevice { -} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ThermalStorageDevice.java b/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ThermalStorageDevice.java deleted file mode 100644 index a29cfb6f78a013917efc1e271220ddbe508d477d..0000000000000000000000000000000000000000 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ThermalStorageDevice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.citygml4j.ade.energy.model.supportingClasses; - -public class ThermalStorageDevice { -} diff --git a/src/main/java/org/citygml4j/ade/energy/EnergyADEContext.java b/src/main/java/org/citygml4j/ade/energy3/EnergyADEContext.java similarity index 70% rename from src/main/java/org/citygml4j/ade/energy/EnergyADEContext.java rename to src/main/java/org/citygml4j/ade/energy3/EnergyADEContext.java index f87afa7e157afa72d638f42950ebdbe8d8f5d547..8120dc6c7380e4ab44c623972d9f116fb3df022c 100644 --- a/src/main/java/org/citygml4j/ade/energy/EnergyADEContext.java +++ b/src/main/java/org/citygml4j/ade/energy3/EnergyADEContext.java @@ -1,9 +1,9 @@ -package org.citygml4j.ade.energy; +package org.citygml4j.ade.energy3; -import org.citygml4j.ade.energy.bind.EnergyADEMarshaller; -import org.citygml4j.ade.energy.bind.EnergyADEUnmarshaller; -import org.citygml4j.ade.energy.model.module.EnergyADEModule; -import org.citygml4j.ade.energy.walker.EnergyADEFeatureWalker; +import org.citygml4j.ade.energy3.bind.EnergyADEMarshaller; +import org.citygml4j.ade.energy3.bind.EnergyADEUnmarshaller; +import org.citygml4j.ade.energy3.model.module.EnergyADEModule; +import org.citygml4j.ade.energy3.walker.EnergyADEFeatureWalker; import org.citygml4j.model.citygml.ade.binding.ADEContext; import org.citygml4j.model.citygml.ade.binding.ADEMarshaller; import org.citygml4j.model.citygml.ade.binding.ADEUnmarshaller; @@ -16,7 +16,7 @@ import java.util.Collections; import java.util.List; public class EnergyADEContext implements ADEContext { - private final List modules = Collections.singletonList(EnergyADEModule.v2_0); + private final List modules = Collections.singletonList(EnergyADEModule.v3_0); @Override public List getADEModules() { @@ -25,8 +25,8 @@ public class EnergyADEContext implements ADEContext { @Override public List getModelPackageNames() { - return Arrays.asList("org.citygml4j.ade.energy.model.core", - "org.citygml4j.ade.energy.model.supportingClasses"); + return Arrays.asList("org.citygml4j.ade.energy3.model.core", + "org.citygml4j.ade.energy3.model.supportingClasses"); } @Override diff --git a/src/main/java/org/citygml4j/ade/energy/bind/EnergyADEMarshaller.java b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java similarity index 99% rename from src/main/java/org/citygml4j/ade/energy/bind/EnergyADEMarshaller.java rename to src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java index 85098d11b3d8855bd5f5dbc7be632b7715f0ea3e..1be28adf9adc179857d595df19ef9788b944e394 100644 --- a/src/main/java/org/citygml4j/ade/energy/bind/EnergyADEMarshaller.java +++ b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java @@ -1,9 +1,9 @@ -package org.citygml4j.ade.energy.bind; +package org.citygml4j.ade.energy3.bind; import lombok.SneakyThrows; import net.opengis.gml.*; -import org.citygml4j.ade.energy.model.core.*; -import org.citygml4j.ade.energy.model.supportingClasses.*; +import org.citygml4j.ade.energy3.model.core.*; +import org.citygml4j.ade.energy3.model.supportingClasses.*; import org.citygml4j.builder.jaxb.marshal.citygml.ade.ADEMarshallerHelper; import org.citygml4j.model.citygml.ade.binding.ADEMarshaller; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; @@ -21,7 +21,6 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; import java.math.BigDecimal; import java.math.BigInteger; -import java.sql.Timestamp; import java.time.LocalDate; import java.time.LocalTime; import java.time.ZonedDateTime; diff --git a/src/main/java/org/citygml4j/ade/energy/bind/EnergyADEUnmarshaller.java b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java similarity index 99% rename from src/main/java/org/citygml4j/ade/energy/bind/EnergyADEUnmarshaller.java rename to src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java index 3c3a06b31539aa88127ee5720ddabefaa96021f3..0c0f6ba85835a7569b3c92f6aec00562bc78588d 100644 --- a/src/main/java/org/citygml4j/ade/energy/bind/EnergyADEUnmarshaller.java +++ b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java @@ -1,9 +1,9 @@ -package org.citygml4j.ade.energy.bind; +package org.citygml4j.ade.energy3.bind; import lombok.SneakyThrows; import net.opengis.gml.*; -import org.citygml4j.ade.energy.model.core.*; -import org.citygml4j.ade.energy.model.supportingClasses.*; +import org.citygml4j.ade.energy3.model.core.*; +import org.citygml4j.ade.energy3.model.supportingClasses.*; import org.citygml4j.builder.jaxb.unmarshal.citygml.ade.ADEUnmarshallerHelper; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.citygml.ade.binding.ADEUnmarshaller; @@ -23,7 +23,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.sql.Timestamp; import java.time.LocalTime; import java.time.ZonedDateTime; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuilding.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuilding.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuilding.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuilding.java index 9068c351fffdc2eabfa33e5de5357d983033f95f..9189bfd94482ee81169386e4f47a5197cd393942 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuilding.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuilding.java @@ -1,13 +1,11 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; -import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; import org.citygml4j.model.common.visitor.GMLFunctor; import org.citygml4j.model.common.visitor.GMLVisitor; -import org.citygml4j.model.gml.base.AbstractGML; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.feature.AbstractFeature; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartition.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartition.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartition.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartition.java index 1d77ae3fe0d1de8fdf925f02cbf71fb3c3be9e4f..c534b60477750eddbe5ce18d934f20267cc8bffd 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartition.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartition.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import net.opengis.gml.SolidPropertyType; import org.citygml4j.builder.copy.CopyBuilder; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartitionProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartitionProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartitionProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartitionProperty.java index 04efb35cd0fa8931f640321a513954c3bf9042c1..7557042eddacf9a0eadd41960f45f25c919db124 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartitionProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartitionProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingProperty.java index 38a1655cc9ae9f66b48ef2da5eb51219905ea190..34ce5ebca702a76fd1ffa45fd17616b5ed9b4d6a 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDataType.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDataType.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractDataType.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDataType.java index e6ad6e70af425129c022a9775198dfebe293d478..8cf726162a2d9ac77eca2469c46e244b6dbe5852 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDataType.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDataType.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.association.Associable; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDevice.java similarity index 99% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractDevice.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDevice.java index d89d64087453fee843871e028d99fc57ebdb9d61..59a1d4d5cb99983d4f849672cb3cdf3634e9ac8f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDevice.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDevice.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import lombok.Getter; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDeviceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDeviceProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractDeviceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDeviceProperty.java index 71cece8dedf861fcc08cd54e734973551be89062..319b8f344f2b7d95e610a280747ced7f05046523 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDeviceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDeviceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstruction.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstruction.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstruction.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstruction.java index a8c906b7290c9027741b4f016ee17963f5e6acea..e5f06e1c0511aa0401e64809779c29fb6ddb79e1 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstruction.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstruction.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstructionProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstructionProperty.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstructionProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstructionProperty.java index 26d62928f758f60d94be951d7b080bcde4f2d349..8f6dcd857cc01fa98b4da044d34bf2096505258b 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstructionProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstructionProperty.java @@ -1,6 +1,5 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; -import org.citygml4j.ade.energy.model.core.AbstractLayeredConstruction; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.gml.base.AssociationByRepOrRef; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibrary.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibrary.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibrary.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibrary.java index a949434d65c300d80807c1b6b5605b727f00f4af..e3e26175514c2ccd1d828abec649339237c84727 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibrary.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibrary.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibraryProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibraryProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibraryProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibraryProperty.java index b50136504b93606447bd4919385f9b7f78d3c1fd..62cd00a5d8b798e81bc3b99177e235a2912204a5 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibraryProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibraryProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttribute.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttribute.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttribute.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttribute.java index a2b9aacb9a2c71c2ad6f89303ceaaa57536a1bed..4f3157c1f048a3b97c4a2b24193ebb2187c955bb 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttribute.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttribute.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.gml.base.AbstractGML; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttributeProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttributeProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttributeProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttributeProperty.java index 50cacfa4a2ac4d91cc8d8cada21262fb2a78550a..8c0a2244cfc99d2f67492851aeab8300dc441ef2 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttributeProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttributeProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractResource.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractResource.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java index 7120597843167e19778017189c71c78c18809257..f6460112854c8740e3b3e11837f2c077540fefe6 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractResource.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractTimeSeriesProperty; +import org.citygml4j.ade.energy3.model.supportingClasses.AbstractTimeSeriesProperty; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractResourceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResourceProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractResourceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResourceProperty.java index 6d2ba5133225580e2dc004dd9071dd3cf8c7e95b..a82b457e9f8ebe48c84b3ef6c011e8b23e209c07 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractResourceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResourceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingAtticThermalStatusProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingAtticThermalStatusProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java index f8580ade19c738cace7a0656802b449ae68dc2e2..efe8a2e0b4caa0bf85c0f2fb193498dd571e581a 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingAtticThermalStatusProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingBasementThermalStatusProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingBasementThermalStatusProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java index e2902090c24d37062e83e03a8f98c8ae22a2e062..298183f9cbb782bfc98f087420434bb0230768c7 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingBasementThermalStatusProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingConstructionWeightProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingConstructionWeightProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingConstructionWeightProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingConstructionWeightProperty.java index a481a69f28cd370cf2a5ef9c3427a81786818ae6..80faeff93e19c9f7341880c8e8b763dbb971cb64 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingConstructionWeightProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingConstructionWeightProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import net.opengis.gml.CodeType; import org.citygml4j.builder.copy.CopyBuilder; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingFloorAreaProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingFloorAreaProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java index 2b17e28f620e3c2c40d74a6f81731c93986d895a..a2ffcd3e75717c8c772ec3c7180450c6654348c9 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingFloorAreaProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightAboveGroundProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightAboveGroundProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java index b7a058c7599763cb24a122672bd5e113e52b75e5..ae11677df197efa78be3000ed75bf5e8b0c53b7d 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightAboveGroundProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java similarity index 83% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java index 87f4ade613ff067763dca3d374c1ca670c3123a9..9bc923670a03d71b5ce0b86292b4bd4ec553fe84 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java @@ -1,8 +1,7 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; -import org.sig3d.citygml.energyADE2beta7.QualifiedAreaPropertyType; import org.sig3d.citygml.energyADE2beta7.QualifiedHeightPropertyType; public class BuildingHeightProperty extends ADEGenericApplicationProperty { diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingIsProtectedProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingIsProtectedProperty.java similarity index 91% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingIsProtectedProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingIsProtectedProperty.java index a43f7bea31a3a921ea1c5e26efee552364c5f39b..82d5568478d25a835a60049dd6fafd651a9d567b 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingIsProtectedProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingIsProtectedProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingTypeProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingTypeProperty.java similarity index 91% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingTypeProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingTypeProperty.java index 70afe767b8eb764b8241caf4101a2ee5d7c8cf9c..2d49017d11f27ede263d2a374e1730a4c833e773 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingTypeProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingTypeProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import net.opengis.gml.CodeType; import org.citygml4j.builder.copy.CopyBuilder; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingVolumeProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingVolumeProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java index 98624d51cc1dea8953a46f9a4784a550463c2076..4cb6b78ad2c48df6ccae9ebe08ac7cdf3efb45ed 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingVolumeProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelation.java b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelation.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelation.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelation.java index 0bd127e29be42fd106c3eb0d0fe881fb9916d9ee..21afe6dda0f981772abe8b7686f70355541278d7 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelation.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelation.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationProperty.java index 1cca78e834c1b3bce5206d5ebee3a5b5f19412b4..331d59196b8833da24f5365e2a45e5ef4f58da9c 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationPropertyElement.java b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationPropertyElement.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationPropertyElement.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationPropertyElement.java index 2e32be5180de0db255a5e5bf1f231beb925b1d73..2d25d43c6798a99eeaa5eae371ca664a8afd92ef 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationPropertyElement.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationPropertyElement.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperation.java b/src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperation.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperation.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperation.java index 6b7f819abd66743e508919e6fc6640e3bb59ed15..3de9606b283bb2144eceeda95b23bd5f4adefaad 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperation.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperation.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractScheduleProperty; +import org.citygml4j.ade.energy3.model.supportingClasses.AbstractScheduleProperty; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.citygml.core.AbstractCityObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperationProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperationProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperationProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperationProperty.java index 3c93c6a47af36b6d3d3d581518386349a77961e2..8e75b6edbb9edf5afb397e490f216fe5843c7fcf 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperationProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperationProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificate.java b/src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificate.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificate.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificate.java index 89326fe52938a4ea35403123a1442b29d032b178..b0146af34fd62703ad689363147eb2e4a8a25bad 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificate.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificate.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificateProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificateProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificateProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificateProperty.java index 5878bb667d3e1b61012f0d115ae6ca082b4237b5..7dcb8b9b935bbb2733c85ec4974c816974a05291 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificateProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificateProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/NetworkConnectionStatusValue.java b/src/main/java/org/citygml4j/ade/energy3/model/core/NetworkConnectionStatusValue.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/NetworkConnectionStatusValue.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/NetworkConnectionStatusValue.java index 13e19df291f6c8ce7e279b55141061385c1af727..9305edfd46d9ca507b913eb64aa29361fe3d94d5 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/NetworkConnectionStatusValue.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/NetworkConnectionStatusValue.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; public enum NetworkConnectionStatusValue { diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedArea.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedArea.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedArea.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedArea.java index 83c1b2b571f404872c5f8876ada99ba56b4448c2..edbfc48d701fa6633828843f32cd1d05cf1ab1e5 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedArea.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedArea.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedAreaProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedAreaProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java index bd0d6e4ded13acc1104f4010e0ba32edb57a8e13..bef65636fc9dbfbb3c2b88d1c8fd5d3ce0f7a46e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedAreaProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeight.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeight.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeight.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeight.java index 4e1c9a09824708b71f8e0c96da2ca27866c42ba0..85a67605a37b15324d4f4c9ba8f413b3660207df 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeight.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeight.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeightProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeightProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java index 469e5f976b80e39e59a20e42393d5cb1e1b92a78..b310040e75d8ed38136b0652d78ae5b16fdd5ee5 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeightProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolume.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolume.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolume.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolume.java index b9aa3125103228a6e3fe45fc55cde34ce8a56f68..274e500180b13f4566b48d829692a8eff45b328a 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolume.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolume.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolumeProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolumeProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java index 029e20b180e4fbc759ce0324d2bb111531ff6675..578d1ce353c75ae16d46a672b5cf1697181565b1 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolumeProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/ReferencePointProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/ReferencePointProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/ReferencePointProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/ReferencePointProperty.java index 60019a95b78df3407ffad7f04cbd43ded962aa21..b54c1c4eaac8fa602ba14e04214b972ec4949b9d 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/ReferencePointProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/ReferencePointProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasure.java b/src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasure.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasure.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasure.java index fbba2eef7fb9e2a29b747ded4f6c966078059d5e..057ecf890b7fa60c2b500876c9507560f43883c7 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasure.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasure.java @@ -1,8 +1,7 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; -import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasureProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasureProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasureProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasureProperty.java index 10daedf84d1f00e3d7e75fcf096c43b2aa08bd84..3fadf25b817ae471c4a3bd3449529f729fe4bcb9 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasureProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasureProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/RelatedToProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/RelatedToProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/RelatedToProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/RelatedToProperty.java index 7b44a65646076494097ba12fece6203d96633400..8515436c3fd63fd6e8618e170826f408853878a7 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/RelatedToProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/RelatedToProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import net.opengis.citygml._2.AbstractCityObjectType; import org.citygml4j.builder.copy.CopyBuilder; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/Suitability.java b/src/main/java/org/citygml4j/ade/energy3/model/core/Suitability.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/Suitability.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/Suitability.java index 5b0f06881d44f35abb432674a07e4ae18a37e236..bd8aa18c856ab2800f3a4a89ecc0089eeaa47e4e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/Suitability.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/Suitability.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.measures.Scale; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/SuitabilityProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java similarity index 87% rename from src/main/java/org/citygml4j/ade/energy/model/core/SuitabilityProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java index ba91eafc95bef3a7cff456a2675dfe0ea191b77e..cc3ad18cecfa0fcc29ebcda99506aa942f467b5e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/SuitabilityProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java @@ -1,6 +1,5 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; -import net.opengis.gml.CodeType; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.sig3d.citygml.energyADE2beta7.SuitabilityPropertyType; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/ThermalStatusValue.java b/src/main/java/org/citygml4j/ade/energy3/model/core/ThermalStatusValue.java similarity index 76% rename from src/main/java/org/citygml4j/ade/energy/model/core/ThermalStatusValue.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/ThermalStatusValue.java index bc6a8582ae6d6261e852e019a4ce53842c052183..1f92a46097ed02e6d2a8245d374ebbce5a29d96d 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/ThermalStatusValue.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/ThermalStatusValue.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; public enum ThermalStatusValue { diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnection.java b/src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnection.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnection.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnection.java index 6e8c90fe5d7eee04e35d86008fa8e9f83d82b1ef..35174a228bc42cd55c38bd8dac24bfc96d3c9f93 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnection.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnection.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnectionProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnectionProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnectionProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnectionProperty.java index 0e8fb72ce8a4322fde3748e0574db131d985b836..cc81545490abdf117f62fa6a623cd1c22db664a0 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnectionProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnectionProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherData.java b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherData.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/WeatherData.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/WeatherData.java index 7209b75931e632a2680284e26c9ba16205d108b3..4c3d8838ad296001f692071feaaac483f5bf69f3 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherData.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherData.java @@ -1,18 +1,15 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractTimeSeriesProperty; +import org.citygml4j.ade.energy3.model.supportingClasses.AbstractTimeSeriesProperty; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; import org.citygml4j.model.common.visitor.GMLFunctor; import org.citygml4j.model.common.visitor.GMLVisitor; -import org.citygml4j.model.gml.base.AbstractGML; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.basicTypes.Measure; import org.citygml4j.model.gml.feature.AbstractFeature; -import org.citygml4j.model.gml.geometry.primitives.PointProperty; -import org.sig3d.citygml.energyADE2beta7.AbstractTimeSeriesPropertyType; public class WeatherData extends AbstractFeature implements ADEModelObject { private Code libraryCode; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataProperty.java index aa3ac3fdb0821f94811529cda5be436cab12d9c7..67306fce654d1d72ee648edf8ee8e357744723fc 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataPropertyElement.java b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataPropertyElement.java similarity index 91% rename from src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataPropertyElement.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataPropertyElement.java index 2c560e8ad7bb0ca99a0cec0b8b38a5c271466bdb..14c3a7002eeebb05b0058dc68dc0f7564caaea55 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataPropertyElement.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataPropertyElement.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataTypeValue.java b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataTypeValue.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataTypeValue.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataTypeValue.java index bee511fbff2b353bf465243632fcad6dcc825e0e..3c74c3bb200583e41788623e4d12956f42ae5ce1 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataTypeValue.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataTypeValue.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; public enum WeatherDataTypeValue { AIR_TEMPERATURE("airTemperature"), diff --git a/src/main/java/org/citygml4j/ade/energy/model/module/EnergyADEModule.java b/src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/module/EnergyADEModule.java rename to src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java index 2c452b883efa7ade9d62602fa4a0d0d4abe67b83..5a9c447060fba015f28b6a6d1aba88090aaf277b 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/module/EnergyADEModule.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java @@ -1,8 +1,8 @@ -package org.citygml4j.ade.energy.model.module; +package org.citygml4j.ade.energy3.model.module; -import org.citygml4j.ade.energy.EnergyADEContext; -import org.citygml4j.ade.energy.model.core.*; -import org.citygml4j.ade.energy.model.supportingClasses.*; +import org.citygml4j.ade.energy3.EnergyADEContext; +import org.citygml4j.ade.energy3.model.core.*; +import org.citygml4j.ade.energy3.model.supportingClasses.*; import org.citygml4j.model.gml.feature.AbstractFeature; import org.citygml4j.model.module.ade.ADEModule; import org.citygml4j.model.module.citygml.CityGMLVersion; @@ -12,7 +12,7 @@ import java.net.URL; import java.util.*; public class EnergyADEModule extends ADEModule { - public static final EnergyADEModule v2_0 = new EnergyADEModule(); + public static final EnergyADEModule v3_0 = new EnergyADEModule(); private HashMap> features; private HashSet featureProperties; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSchedule.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSchedule.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSchedule.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSchedule.java index 06feae4a260753c9b68d5cfbfcb19414bc85e930..3a31a3d9f03b0cd8ecfe45e8cd8e7e8be83cc8ca 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSchedule.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSchedule.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractScheduleProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractScheduleProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractScheduleProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractScheduleProperty.java index 54e151c53627baea552d8a6e20fc62d6d925e176..ffd1d86e79f533dc2a84a47c95cc736aeb478b23 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractScheduleProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractScheduleProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollector.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollector.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollector.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollector.java index 60f8f680fc0e9bff2727d7cb3ec63e140facf7f7..21be7a65ea17da8ccc219a1778a5b8139acb4962 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollector.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollector.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollectorProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollectorProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollectorProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollectorProperty.java index cecf1ade64130e9fc597fbddf05e61a578ece88c..07280f61724cd0c95329f3f6985b0e765ba1df09 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollectorProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollectorProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeries.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeries.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeries.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeries.java index f1c58405775d207a33253530ab4c9aba8255a9a0..ac0156593c8755633eb33b7abdac7c506cb41330 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeries.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeries.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeriesProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeriesProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeriesProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeriesProperty.java index d057e5903914eda5a4f4f7caddc55d30a540d333..c65648fa17d9816a2341120079fb1a8acf636255 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeriesProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeriesProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicSchedule.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicSchedule.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicSchedule.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicSchedule.java index 5ff589400e924370be0c86dce111aeb22db03a1b..6e1ce2e11b9eb763b51400d02a97645aa551916f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicSchedule.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicSchedule.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicScheduleProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicScheduleProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicScheduleProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicScheduleProperty.java index cbbc4a9852dcc5229a86607d9ddeab1ed2bb60a8..ce197f56018ccf27c0dc280eecb6a5f424fa3e6b 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicScheduleProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicScheduleProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Boiler.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Boiler.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Boiler.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Boiler.java index 8493d83124cdcd10d7533eeaed9d8e849fc88e3d..44db3c4f1d32bb0c97842f1bcf817bb1ba816955 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Boiler.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Boiler.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/BoilerProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/BoilerProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/BoilerProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/BoilerProperty.java index 756eb8b256fc7be9474db6520185dfed34f91165..4e7ddc40e90f2050c76c7e34974cf8a2624cbc7f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/BoilerProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/BoilerProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeSchedule.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeSchedule.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeSchedule.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeSchedule.java index 2ec30314589a3b262b31623fce210593cf19393b..9db8385840937fcaec913f18b7d1834040f3ad90 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeSchedule.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeSchedule.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeScheduleProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeScheduleProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeScheduleProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeScheduleProperty.java index 28c5111290b7ee17328d243e40a8c6ce39407620..102e98c719c30e5352178c54385b2f7efbd5af20 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeScheduleProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeScheduleProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterial.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterial.java similarity index 90% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterial.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterial.java index d1361231356f710e535b8fd0a1a1a56f502ded2d..18cd1e3c5c67e7eb322a265a1db14375a510c701 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterial.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterial.java @@ -1,12 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.common.visitor.GMLFunctor; -import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.basicTypes.Code; public class ConstructionMaterial extends AbstractResource implements ADEModelObject { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterialProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterialProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterialProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterialProperty.java index e1ce99c965e3956ed59978138e9aa0ea567fda33..314e3fbd3602a4d2467915bfc4d519972db00098 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterialProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterialProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueSchedule.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueSchedule.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueSchedule.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueSchedule.java index 791fe8605785a9453d36edc06f2f06c4ee412762..e3384349b5428e3e3f94d488bb2da75b9cee8852 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueSchedule.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueSchedule.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueScheduleProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueScheduleProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueScheduleProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueScheduleProperty.java index 9b4fd92366370ef4d0234291e75db0de678697fe..4c3edc57833db34021ac33aedbfe7381d8fb0c8c 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueScheduleProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueScheduleProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDevice.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDevice.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDevice.java index 218e17358d903b2e2985794a2ff22aba0a66e467..1408b469c5eb32066d139564022a7f9b813e3440 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDevice.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDevice.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDeviceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDeviceProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDeviceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDeviceProperty.java index 5f337c23287d5001e08afe0497eaa9fbef4fb8ef..0097ee0504baf2269d7bdf8a81b1cb2a5d7634e5 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDeviceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDeviceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Energy.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Energy.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Energy.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Energy.java index 5dce4c75fef34bbc94c88f3e7883a0ab17a92d7b..81c2e4129156f9e506f58bd385c98cae8b1496c0 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Energy.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Energy.java @@ -1,12 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.common.visitor.GMLFunctor; -import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.basicTypes.Measure; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/EnergyProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/EnergyProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/EnergyProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/EnergyProperty.java index 981ce300d17b2ea547542dee30cff2fa7b1de4ac..587ab82e581af57bc022acfa1d2828256c99661f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/EnergyProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/EnergyProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Food.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Food.java similarity index 88% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Food.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Food.java index 5875b2ca480fb1d50982839238c4f680324355fd..9d3dc31326c3e1d00bfb5a20cb4ef77c1f3b5e88 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Food.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Food.java @@ -1,12 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.common.visitor.GMLFunctor; -import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.basicTypes.Code; public class Food extends AbstractResource implements ADEModelObject { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/FoodProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/FoodProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/FoodProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/FoodProperty.java index 7e7e77e0e947ea681d1a1fea847db1b8e4043219..9b66b077b27e41200e42113d3fe4efe76c9d9994 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/FoodProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/FoodProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericDevice.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericDevice.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericDevice.java index cbf92ba5108dd4fc6144e0b4aed70a6b06a48e54..c1eba01c12a1a2a88b5cc74587dc6a1ce7df3175 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericDevice.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericDevice.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericElectricalDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericElectricalDevice.java new file mode 100644 index 0000000000000000000000000000000000000000..8767cd67e184c76c7edc788d79a6a167f5e93b75 --- /dev/null +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericElectricalDevice.java @@ -0,0 +1,4 @@ +package org.citygml4j.ade.energy3.model.supportingClasses; + +public class GenericElectricalDevice { +} diff --git a/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericSolarCollector.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericSolarCollector.java new file mode 100644 index 0000000000000000000000000000000000000000..a82fe850518c8d333426226c8011e272268a0fa0 --- /dev/null +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericSolarCollector.java @@ -0,0 +1,4 @@ +package org.citygml4j.ade.energy3.model.supportingClasses; + +public class GenericSolarCollector { +} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPump.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPump.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPump.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPump.java index b9b03fd4061f5f19e80145edc714faaba9fc4ae8..466ec3b15bc0eaf34dc7dc00feda5b832aef2964 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPump.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPump.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPumpProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPumpProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPumpProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPumpProperty.java index c1c2040cb6f27e16f2c49587545c174d5a8fd8fd..a049968f5c476d1159566d48f6b1858d34224677 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPumpProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPumpProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/InterpolationTypeValue.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/InterpolationTypeValue.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/InterpolationTypeValue.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/InterpolationTypeValue.java index 073f8b893d701520e0f283111a6858b24e7cefff..384646e29d45dc17cd66c4d4725eaf9b3015897d 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/InterpolationTypeValue.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/InterpolationTypeValue.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; public enum InterpolationTypeValue { MAVERAGE_IN_PRECEDING_INTERVAL("averageInPrecedingInterval"), diff --git a/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/LightingDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/LightingDevice.java new file mode 100644 index 0000000000000000000000000000000000000000..bd37da3395397edd732606afc07c37cd56abffb1 --- /dev/null +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/LightingDevice.java @@ -0,0 +1,4 @@ +package org.citygml4j.ade.energy3.model.supportingClasses; + +public class LightingDevice { +} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDevice.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDevice.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDevice.java index 2ac516926d2a6fb12f865a628e63a497a8f958b9..efa32f4d5f34db68df2a80533430eaf07a33da55 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDevice.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDevice.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDeviceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDeviceProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDeviceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDeviceProperty.java index 4b90443754074aebde39dbb38a13e7b8145b0259..efc5c8fe80f07241b4483a527a5132a5c8546597 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDeviceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDeviceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResource.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResource.java similarity index 89% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResource.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResource.java index 967d8d319026b6d73e49e71bba1556f7e34c6752..c103a8135d60d3683b45abdd1468b066f22956ec 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResource.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResource.java @@ -1,12 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.common.visitor.GMLFunctor; -import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.basicTypes.Code; public class OtherResource extends AbstractResource implements ADEModelObject { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResourceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResourceProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResourceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResourceProperty.java index ded5f6e0540e44aad50437a96df9a1ad38e96ced..d3952d60709040101a58f7789008d9d7fbe655ae 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResourceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResourceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollector.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollector.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollector.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollector.java index c96c78a0b03825398bbc2d949aa8fffd25de352a..80c1254dcb13c9e4a5f973b1589be88833838501 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollector.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollector.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollectorProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollectorProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollectorProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollectorProperty.java index e3c6c89092d06d24ce33d3a38ab4a00abbd3b36a..48ebd1e07e56c3ce31e8a6333cc778edf352915d 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollectorProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollectorProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollector.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollector.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollector.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollector.java index 741ba370e0a8cb879465e64e3af43765f009c7de..c4bb690e2acbdc8902b93c7f0c204b60ff9a7e9f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollector.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollector.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java index 8ff2bcc6bd591178f0c65885f19677fc051fb681..d00024ecbbce2282bd5ebb1f0a1e8d73a3f66b55 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeries.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeries.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeries.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeries.java index 33d041b7cfa92b1118eb9f5532bc52098631260d..dc3a163772533ae139140254d7ee52ca210a12c7 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeries.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeries.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFile.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFile.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFile.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFile.java index fc7586f4aefefdc68f331977afebb9e9384a7a2d..752362defee1dee3a7a7fec1a09571faf098aac7 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFile.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFile.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFileProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFileProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFileProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFileProperty.java index 2b746a3cc059b9d25556601e1484247c4b84c54f..8bb36ef77b368c1d50e8555472477018fb811503 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFileProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFileProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesProperty.java index a9657dc5b2aee95c90a96a182012ccb9250b3577..7c9cd2f3d7ff29ac1b8a1e0d50b8ea7303bcc710 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponent.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponent.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponent.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponent.java index 9cc7057ffc01f6d073e5ec6b5d0bacd5f26f184d..deb99c1ce7444e4119072094472ff13a56c22833 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponent.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponent.java @@ -1,6 +1,5 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.DeviceOperation; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponentProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponentProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponentProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponentProperty.java index 3a7e4265558bd6a438beb976fc0f04f35fe1234d..a3f24e8ba6dc753429e73469dbac0b7a14d164da 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponentProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponentProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibrary.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibrary.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibrary.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibrary.java index 743e8ac6bcf46eb0cf5cb06566f12cfded21d3fc..cc796191e64602731c5da8557b580288e8e4c985 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibrary.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibrary.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibraryProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibraryProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibraryProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibraryProperty.java index 553ee3495b1aa320947466d34a501a4f1b7a34c8..857ee445f2c36a526f76e37bb7d7635d62a83671 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibraryProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibraryProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnection.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnection.java similarity index 99% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnection.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnection.java index f1929755a2ed045fc200fbcab2bde51f75503a82..538ac58424dbf2a458750aed5407f939ea807a2e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnection.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnection.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnectionProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnectionProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnectionProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnectionProperty.java index 3c5a7e64967519e2747744b12dbce2ad58163ed9..97d8c2bfddf3604cf76ea9b639b76964eeeee425 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnectionProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnectionProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollector.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollector.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollector.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollector.java index cc5c3cb2161b8e056e768a37ef7ce144292b3253..cea10d6d3f3ffe731a5bdd8db23320208e3f8de9 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollector.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollector.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollectorProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollectorProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollectorProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollectorProperty.java index 3ebbf9abcd37d357ba018bef847f29881ad320e4..30d857f6f72c5408ff8bba5418e71f9f284dbf18 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollectorProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollectorProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SurfaceSide.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SurfaceSide.java similarity index 88% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SurfaceSide.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SurfaceSide.java index 924115de71fd6a501e3c4d9fc299b023b5493ff9..5bec29502da053ee8f2e376273a2e555860d79f7 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SurfaceSide.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SurfaceSide.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; public enum SurfaceSide { diff --git a/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ThermalStorageDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ThermalStorageDevice.java new file mode 100644 index 0000000000000000000000000000000000000000..924c0cb603d856ec1529ee33c91747a5234f114b --- /dev/null +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ThermalStorageDevice.java @@ -0,0 +1,4 @@ +package org.citygml4j.ade.energy3.model.supportingClasses; + +public class ThermalStorageDevice { +} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeClock.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeClock.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeClock.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeClock.java index 9f23ffb0b67aa8c2b525faee264c4155501df368..3321189b0e723aa61517ddca6265a0650d2f5386 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeClock.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeClock.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeIntervalLength.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeIntervalLength.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeIntervalLength.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeIntervalLength.java index 9ec4635cfcaea0173259704378c790639126cefc..757d4b4f14e726fa40d6e685a019650329b3a263 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeIntervalLength.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeIntervalLength.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriod.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriod.java similarity index 89% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriod.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriod.java index cfefcfa11f4d11d6ac32c932b2560b86263b0d77..c690051d494bab81660e0d5c6d21a301f5f752f6 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriod.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriod.java @@ -1,14 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import net.opengis.gml.TimeInstantPropertyType; -import net.opengis.gml.TimeIntervalLengthType; -import net.opengis.gml.TimePositionType; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.association.Associable; import org.citygml4j.model.common.base.ModelObject; -import javax.xml.datatype.Duration; import java.time.ZonedDateTime; public class TimePeriod implements Associable, ADEModelObject { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriodProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriodProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriodProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriodProperty.java index 9e7c418f14d7ba2881a876393699e7441a63ee72..0dcc0ef479db7779460987cc205ee2a76ae4e10c 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriodProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriodProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Transmittance.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Transmittance.java similarity index 56% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Transmittance.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Transmittance.java index 5cb25a9beaef47fa3144c2553dc4541a01ed2ab3..a2de2614bc61e8887d66b3fa94393165d55b3387 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Transmittance.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Transmittance.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; public class Transmittance { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeries.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeries.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeries.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeries.java index 32a4a412f929389fad35656dafce22dd244ffa8f..ba3276a12c8e9dc922b89aecfa7a4422a5a490bb 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeries.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeries.java @@ -1,11 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; import org.citygml4j.model.gml.basicTypes.MeasureList; -import java.sql.Timestamp; import java.time.LocalTime; public class TypicalValuesTimeSeries extends AbstractTimeSeries { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFile.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFile.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFile.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFile.java index 59b45d663457a879674ec18dc6fe18db9f2a2fb9..bbc618e2f9bfd26906557e927ae313509efcf4dc 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFile.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFile.java @@ -1,9 +1,8 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.gml.measures.Time; import java.net.URI; import java.time.ZonedDateTime; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java index 10746da7861096a890de24501bd99d3ff640f432..1fac6e6b5636f43cf6b988aaeb3d1ee03f44d8f7 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesProperty.java index ecefe03584168fe531f2fbe0d5c35fc45a2b6b09..2ddc867c80c9d49a24d2daf9e18ca3ad877e4895 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionArea.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionArea.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionArea.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionArea.java index eb6908f82a2a600101a967b97f9e69310b14e218..aa09f9470d4072a74703b1727bd3cd1a8c086ab0 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionArea.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionArea.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.citygml.cityobjectgroup.CityObjectGroup; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionAreaProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionAreaProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionAreaProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionAreaProperty.java index 1aa791a1aebc651d34f3669ceca4245aac91cf7a..6776d03865ad0929388508fb49ace4d3f03aa60f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionAreaProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionAreaProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpace.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpace.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpace.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpace.java index 6ad421ba3b0f25d17b5314d17305d6a0b078d079..48c59f4827fa3f69759b197ac13a790c80403077 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpace.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpace.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpaceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpaceProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpaceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpaceProperty.java index 092cc51631cb1d6ed35b1f0b5a76d05b58f71b30..0193a8f119ffdff67f438d369bc6b15055338536 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpaceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpaceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Waste.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Waste.java similarity index 91% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Waste.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Waste.java index a7a13dc3df3bff3cd986792919bc860ee717c002..3448a846558e566dbe308bed22065707a026170e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Waste.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Waste.java @@ -1,12 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.common.visitor.GMLFunctor; -import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.basicTypes.Code; public class Waste extends AbstractResource implements ADEModelObject { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WasteProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WasteProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WasteProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WasteProperty.java index ebbcf9282de22d7a5bed6bade1d58a6efdde7311..de8e33c96d9f8b0a21c252542dcab7f933a1198c 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WasteProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WasteProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Water.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Water.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Water.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Water.java index 4b674056ab32aff30eede42d546410f952db6539..0a035a20ffbe8d0e58bf057d35709eb5810beb9f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Water.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Water.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WaterProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WaterProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WaterProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WaterProperty.java index 35edb479e5812d9e9a6a979d7e5c029716c1f0b1..41559f22a827d61fa91ec05f7ce74cddc341773a 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WaterProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WaterProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WavelengthRange.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WavelengthRange.java similarity index 89% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WavelengthRange.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WavelengthRange.java index 885c29b8df1306b33973d05eef54bc797b650599..2f3321175fb1625a5aed79d983ac2b1b7232e1af 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WavelengthRange.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WavelengthRange.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; public enum WavelengthRange { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStation.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStation.java similarity index 86% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStation.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStation.java index b098ab21a70125f7932e7bf893e1c8cf7eb416ba..f7a74a153e67a75654e0855f8592e4005bf8a43a 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStation.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStation.java @@ -1,20 +1,15 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.WeatherDataProperty; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.citygml.core.AbstractCityObject; -import org.citygml4j.model.common.child.ChildList; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; import org.citygml4j.model.common.visitor.GMLFunctor; import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.feature.BoundingShape; -import org.citygml4j.model.gml.geometry.primitives.PointProperty; import org.citygml4j.util.bbox.BoundingBoxOptions; -import java.util.List; - public class WeatherStation extends AbstractCityObject implements ADEModelObject { @Override diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStationProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStationProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStationProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStationProperty.java index c07bd0f92c01adcc78e9ac32d337d521e06766eb..32dbe2b1e72090c76ce005188a40b704272646c5 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStationProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStationProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureFunctionWalker.java b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureFunctionWalker.java similarity index 83% rename from src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureFunctionWalker.java rename to src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureFunctionWalker.java index 76e3797ee48418a38e8bc0e97dfd04cdb88395f2..7b4809247273e66a80e494b952a3a971a7ed12dc 100644 --- a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureFunctionWalker.java +++ b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureFunctionWalker.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.walker; +package org.citygml4j.ade.energy3.walker; -import org.citygml4j.ade.energy.model.supportingClasses.WeatherStation; +import org.citygml4j.ade.energy3.model.supportingClasses.WeatherStation; import org.citygml4j.model.citygml.ade.binding.ADEWalker; import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.util.walker.FeatureFunctionWalker; diff --git a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureWalker.java b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureWalker.java similarity index 81% rename from src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureWalker.java rename to src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureWalker.java index 84a6ef7b932d0baa0705adf70bcb96b572b84452..4c3709ffc145698cd50e191cc5f05c1f16396ab6 100644 --- a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureWalker.java +++ b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureWalker.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.walker; +package org.citygml4j.ade.energy3.walker; -import org.citygml4j.ade.energy.model.supportingClasses.WeatherStation; +import org.citygml4j.ade.energy3.model.supportingClasses.WeatherStation; import org.citygml4j.model.citygml.ade.binding.ADEWalker; import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.util.walker.FeatureWalker; diff --git a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLFunctionWalker.java b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLFunctionWalker.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLFunctionWalker.java rename to src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLFunctionWalker.java index cd8bd8bc8a0be5ac52c7fdcf25aa3e947d2f7326..8737d6edc39599baf0fd381e1569936d77ee6043 100644 --- a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLFunctionWalker.java +++ b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLFunctionWalker.java @@ -1,12 +1,11 @@ -package org.citygml4j.ade.energy.walker; +package org.citygml4j.ade.energy3.walker; -import org.citygml4j.ade.energy.model.core.*; -import org.citygml4j.ade.energy.model.supportingClasses.*; +import org.citygml4j.ade.energy3.model.core.*; +import org.citygml4j.ade.energy3.model.supportingClasses.*; import org.citygml4j.model.citygml.ade.binding.ADEWalker; import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.model.gml.base.AbstractGML; import org.citygml4j.model.gml.base.AssociationByRepOrRef; -import org.citygml4j.model.gml.feature.FeatureProperty; import org.citygml4j.util.walker.GMLFunctionWalker; public class EnergyADEGMLFunctionWalker implements ADEWalker> { diff --git a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLWalker.java b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLWalker.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLWalker.java rename to src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLWalker.java index baa8a9601f08c1c08aeb7ef7b2b34c684cfc65b5..19b484263bdad896c1ebe6380304b217ef7dfab3 100644 --- a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLWalker.java +++ b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLWalker.java @@ -1,7 +1,7 @@ -package org.citygml4j.ade.energy.walker; +package org.citygml4j.ade.energy3.walker; -import org.citygml4j.ade.energy.model.core.*; -import org.citygml4j.ade.energy.model.supportingClasses.*; +import org.citygml4j.ade.energy3.model.core.*; +import org.citygml4j.ade.energy3.model.supportingClasses.*; import org.citygml4j.model.citygml.ade.binding.ADEWalker; import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.model.gml.base.AbstractGML; diff --git a/src/main/resources/META-INF/services/org.citygml4j.model.citygml.ade.binding.ADEContext b/src/main/resources/META-INF/services/org.citygml4j.model.citygml.ade.binding.ADEContext index 903bc5ba065f87a53afa2f16d4b7b1f2064aaa3a..18c117a17ea69aed8092c7ec1701221bec0853e7 100644 --- a/src/main/resources/META-INF/services/org.citygml4j.model.citygml.ade.binding.ADEContext +++ b/src/main/resources/META-INF/services/org.citygml4j.model.citygml.ade.binding.ADEContext @@ -1 +1 @@ -org.citygml4j.ade.energy.EnergyADEContext \ No newline at end of file +org.citygml4j.ade.energy3.EnergyADEContext \ No newline at end of file