Merge branch 'beta7' into 'master'

Beta7

See merge request !10

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

-package org.citygml4j.ade.energy.model.supportingClasses;
+package org.citygml4j.ade.energy3.model.supportingClasses;
 
-import org.citygml4j.ade.energy.model.core.DeviceOperation;
 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/ScheduleComponentProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponentProperty.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/ScheduleLibrary.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibrary.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/ScheduleLibraryProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibraryProperty.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/SensorConnection.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnection.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/SensorConnectionProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnectionProperty.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/SolarThermalCollector.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollector.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/SolarThermalCollectorProperty.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollectorProperty.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/SurfaceSide.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SurfaceSide.java

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

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

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

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

-package org.citygml4j.ade.energy.model.supportingClasses;
+package org.citygml4j.ade.energy3.model.supportingClasses;
 
-import net.opengis.gml.TimeInstantPropertyType;
-import net.opengis.gml.TimeIntervalLengthType;
-import net.opengis.gml.TimePositionType;
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
 import org.citygml4j.model.common.association.Associable;
 import org.citygml4j.model.common.base.ModelObject;
 
-import javax.xml.datatype.Duration;
 import java.time.ZonedDateTime;
 
 public class TimePeriod implements Associable, ADEModelObject {

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

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

src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeries.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeries.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;
 import org.citygml4j.model.common.visitor.FeatureVisitor;
 import org.citygml4j.model.gml.basicTypes.MeasureList;
 
-import java.sql.Timestamp;
 import java.time.LocalTime;
 
 public class TypicalValuesTimeSeries extends AbstractTimeSeries {

src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFile.java → src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFile.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;
 import org.citygml4j.model.common.visitor.FeatureVisitor;
-import org.citygml4j.model.gml.measures.Time;
 
 import java.net.URI;
 import java.time.ZonedDateTime;

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