Merge branch 'beta7' into 'master'

Beta7

See merge request !10

src/main/java/org/citygml4j/ade/energy/model/supportingClasses/EnergyProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/EnergyProperty.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/Food.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Food.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 Food extends AbstractResource implements ADEModelObject {

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

-package org.citygml4j.ade.energy.model.supportingClasses;
+package org.citygml4j.ade.energy3.model.supportingClasses;
 
 public class GenericElectricalDevice {
 }

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

-package org.citygml4j.ade.energy.model.supportingClasses;
+package org.citygml4j.ade.energy3.model.supportingClasses;
 
 public class GenericSolarCollector {
 }

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

-package org.citygml4j.ade.energy.model.supportingClasses;
+package org.citygml4j.ade.energy3.model.supportingClasses;
 
 public enum InterpolationTypeValue {
     MAVERAGE_IN_PRECEDING_INTERVAL("averageInPrecedingInterval"),

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

-package org.citygml4j.ade.energy.model.supportingClasses;
+package org.citygml4j.ade.energy3.model.supportingClasses;
 
 public class LightingDevice {
 }

src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDevice.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDevice.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/MovableShadingDeviceProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDeviceProperty.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/OtherResource.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResource.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 OtherResource extends AbstractResource implements ADEModelObject {

src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResourceProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResourceProperty.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/PhotovoltaicCollector.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollector.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/PhotovoltaicCollectorProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollectorProperty.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/PhotovoltaicThermalCollector.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollector.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/PhotovoltaicThermalCollectorProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollectorProperty.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/RegularTimeSeries.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeries.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.common.visitor.FeatureFunctor;

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