Merge branch 'beta7' into 'master'

Beta7

See merge request !10

src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesProperty.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/UrbanFunctionArea.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionArea.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.citygml.cityobjectgroup.CityObjectGroup;

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

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

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

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

-package org.citygml4j.ade.energy.model.supportingClasses;
+package org.citygml4j.ade.energy3.model.supportingClasses;
 
 public enum WavelengthRange {
 

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

-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

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

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

src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureWalker.java → src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureWalker.java

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

src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLFunctionWalker.java → src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLFunctionWalker.java

-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<T> implements ADEWalker<GMLFunctionWalker<T>> {

src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLWalker.java → src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLWalker.java

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

src/main/resources/META-INF/services/org.citygml4j.model.citygml.ade.binding.ADEContext

-org.citygml4j.ade.energy.EnergyADEContext
\ No newline at end of file
+org.citygml4j.ade.energy3.EnergyADEContext
\ No newline at end of file