Merge branch 'beta7' into 'master'

Updated to Energy ADE 3

See merge request !12

src/main/java/de/stuttgart/hft/ade/energy3/importer/ResourceImporter.java

@@ -7,8 +7,8 @@ import org.citydb.core.ade.importer.ForeignKeys;
 import org.citydb.core.database.schema.mapping.AbstractObjectType;
 import org.citydb.core.operation.importer.CityGMLImportException;
 import org.citydb.core.operation.importer.util.GeometryConverter;
-import org.citygml4j.ade.energy.model.core.AbstractResource;
-import org.citygml4j.ade.energy.model.supportingClasses.*;
+import org.citygml4j.ade.energy3.model.core.AbstractResource;
+import org.citygml4j.ade.energy3.model.supportingClasses.*;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java

@@ -7,7 +7,7 @@ import org.citydb.core.ade.importer.ForeignKeys;
 import org.citydb.core.database.schema.mapping.AbstractObjectType;
 import org.citydb.core.operation.importer.CityGMLImportException;
 import org.citydb.core.operation.importer.util.AttributeValueJoiner;
-import org.citygml4j.ade.energy.model.supportingClasses.*;
+import org.citygml4j.ade.energy3.model.supportingClasses.*;
 
 import java.sql.*;
 import java.time.LocalTime;

src/main/java/de/stuttgart/hft/ade/energy3/importer/UrbanFunctionAreaImporter.java

@@ -7,7 +7,7 @@ import org.citydb.core.ade.importer.ForeignKeys;
 import org.citydb.core.database.schema.mapping.AbstractObjectType;
 import org.citydb.core.operation.importer.CityGMLImportException;
 import org.citydb.core.operation.importer.util.GeometryConverter;
-import org.citygml4j.ade.energy.model.supportingClasses.UrbanFunctionArea;
+import org.citygml4j.ade.energy3.model.supportingClasses.UrbanFunctionArea;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

src/main/java/de/stuttgart/hft/ade/energy3/importer/UtilityNetworkConnectionImporter.java

@@ -7,7 +7,7 @@ import org.citydb.core.ade.importer.ForeignKeys;
 import org.citydb.core.database.schema.mapping.AbstractObjectType;
 import org.citydb.core.operation.importer.CityGMLImportException;
 import org.citydb.core.operation.importer.util.GeometryConverter;
-import org.citygml4j.ade.energy.model.core.UtilityNetworkConnection;
+import org.citygml4j.ade.energy3.model.core.UtilityNetworkConnection;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java

@@ -9,8 +9,8 @@ import org.citydb.core.ade.importer.ForeignKeys;
 import org.citydb.core.database.schema.mapping.AbstractObjectType;
 import org.citydb.core.operation.importer.CityGMLImportException;
 import org.citydb.core.operation.importer.util.GeometryConverter;
-import org.citygml4j.ade.energy.model.core.ReferencePointProperty;
-import org.citygml4j.ade.energy.model.core.WeatherData;
+import org.citygml4j.ade.energy3.model.core.ReferencePointProperty;
+import org.citygml4j.ade.energy3.model.core.WeatherData;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherStationImporter.java

@@ -8,7 +8,7 @@ import org.citydb.core.ade.importer.ForeignKeys;
 import org.citydb.core.database.schema.mapping.AbstractObjectType;
 import org.citydb.core.operation.importer.CityGMLImportException;
 import org.citydb.core.operation.importer.util.GeometryConverter;
-import org.citygml4j.ade.energy.model.supportingClasses.WeatherStation;
+import org.citygml4j.ade.energy3.model.supportingClasses.WeatherStation;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

src/main/java/de/stuttgart/hft/ade/energy3/schema/ObjectMapper.java

@@ -6,8 +6,8 @@ import org.citydb.core.ade.ADEExtensionException;
 import org.citydb.core.ade.ADEObjectMapper;
 import org.citydb.core.database.schema.mapping.AbstractObjectType;
 import org.citydb.core.database.schema.mapping.SchemaMapping;
-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.gml.base.AbstractGML;
 import org.citygml4j.model.module.citygml.CityGMLVersion;