Merge branch 'beta7' into 'master'

Beta7

See merge request !10

src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttribute.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttribute.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttributeProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttributeProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractResource.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractResourceProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResourceProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/BuildingAtticThermalStatusProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/BuildingBasementThermalStatusProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/BuildingConstructionWeightProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/BuildingConstructionWeightProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/BuildingFloorAreaProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightAboveGroundProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java

-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<QualifiedHeightPropertyType> {

src/main/java/org/citygml4j/ade/energy/model/core/BuildingIsProtectedProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/BuildingIsProtectedProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/BuildingTypeProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/BuildingTypeProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/BuildingVolumeProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelation.java → src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelation.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationPropertyElement.java → src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationPropertyElement.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperation.java → src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperation.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperationProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperationProperty.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificate.java → src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificate.java

-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;

src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificateProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificateProperty.java

-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;