Updated to Energy ADE 3

src/main/java/org/citygml4j/ade/energy/model/core/QualifiedAreaProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.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/QualifiedHeight.java → src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeight.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.common.visitor.GMLFunctor;

src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeightProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.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/QualifiedVolume.java → src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolume.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.common.visitor.GMLFunctor;

src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolumeProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.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/ReferencePointProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/ReferencePointProperty.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/RefurbishmentMeasure.java → src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasure.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;
-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;

src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasureProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasureProperty.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/RelatedToProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/RelatedToProperty.java

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

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

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

src/main/java/org/citygml4j/ade/energy/model/core/SuitabilityProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.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;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
 import org.sig3d.citygml.energyADE2beta7.SuitabilityPropertyType;

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

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 public enum ThermalStatusValue {
 

src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnection.java → src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnection.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/UtilityNetworkConnectionProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnectionProperty.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/WeatherData.java → src/main/java/org/citygml4j/ade/energy3/model/core/WeatherData.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;
 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;

src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataProperty.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/WeatherDataPropertyElement.java → src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataPropertyElement.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/WeatherDataTypeValue.java → src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataTypeValue.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 public enum WeatherDataTypeValue {
     AIR_TEMPERATURE("airTemperature"),

src/main/java/org/citygml4j/ade/energy/model/module/EnergyADEModule.java → src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java

-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<String, Class<? extends AbstractFeature>> features;
     private HashSet<String> featureProperties;

src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSchedule.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSchedule.java

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