Merge branch 'beta7' into 'master'

Beta7

See merge request !10

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;

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

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

src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollector.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollector.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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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