Merge branch 'beta7' into 'master'

Beta7

See merge request !11

src/main/java/de/stuttgart/hft/ade/energy2/importer/ImportManager.java → src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java

-package de.stuttgart.hft.ade.energy2.importer;
+package de.stuttgart.hft.ade.energy3.importer;
 
 
-import de.stuttgart.hft.ade.energy2.schema.ADETable;
-import de.stuttgart.hft.ade.energy2.schema.SchemaMapper;
+import de.stuttgart.hft.ade.energy3.schema.ADETable;
+import de.stuttgart.hft.ade.energy3.schema.SchemaMapper;
 import org.citydb.core.ade.ADEExtension;
 import org.citydb.core.ade.importer.*;
 import org.citydb.core.database.schema.mapping.AbstractObjectType;

src/main/java/de/stuttgart/hft/ade/energy2/importer/RefurbishmentMeasureImporter.java → src/main/java/de/stuttgart/hft/ade/energy3/importer/RefurbishmentMeasureImporter.java

-package de.stuttgart.hft.ade.energy2.importer;
+package de.stuttgart.hft.ade.energy3.importer;
 
-import de.stuttgart.hft.ade.energy2.schema.ADESequence;
-import de.stuttgart.hft.ade.energy2.schema.ADETable;
-import de.stuttgart.hft.ade.energy2.schema.SchemaMapper;
+import de.stuttgart.hft.ade.energy3.schema.ADETable;
+import de.stuttgart.hft.ade.energy3.schema.SchemaMapper;
 import org.citydb.core.ade.importer.ADEImporter;
 import org.citydb.core.ade.importer.CityGMLImportHelper;
 import org.citydb.core.ade.importer.ForeignKeys;

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

-package de.stuttgart.hft.ade.energy2.importer;
+package de.stuttgart.hft.ade.energy3.importer;
 
-import de.stuttgart.hft.ade.energy2.schema.ADETable;
+import de.stuttgart.hft.ade.energy3.schema.ADETable;
 import org.citydb.core.ade.importer.ADEImporter;
 import org.citydb.core.ade.importer.CityGMLImportHelper;
 import org.citydb.core.ade.importer.ForeignKeys;

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

-package de.stuttgart.hft.ade.energy2.importer;
+package de.stuttgart.hft.ade.energy3.importer;
 
-import de.stuttgart.hft.ade.energy2.schema.ADETable;
+import de.stuttgart.hft.ade.energy3.schema.ADETable;
 import org.citydb.core.ade.importer.ADEImporter;
 import org.citydb.core.ade.importer.CityGMLImportHelper;
 import org.citydb.core.ade.importer.ForeignKeys;

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

-package de.stuttgart.hft.ade.energy2.importer;
+package de.stuttgart.hft.ade.energy3.importer;
 
-import de.stuttgart.hft.ade.energy2.schema.ADETable;
-import org.citydb.config.geometry.GeometryObject;
+import de.stuttgart.hft.ade.energy3.schema.ADETable;
 import org.citydb.core.ade.importer.ADEImporter;
 import org.citydb.core.ade.importer.CityGMLImportHelper;
 import org.citydb.core.ade.importer.ForeignKeys;

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

-package de.stuttgart.hft.ade.energy2.importer;
+package de.stuttgart.hft.ade.energy3.importer;
 
-import de.stuttgart.hft.ade.energy2.schema.ADETable;
+import de.stuttgart.hft.ade.energy3.schema.ADETable;
 import org.citydb.core.ade.importer.ADEImporter;
 import org.citydb.core.ade.importer.CityGMLImportHelper;
 import org.citydb.core.ade.importer.ForeignKeys;

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

-package de.stuttgart.hft.ade.energy2.importer;
+package de.stuttgart.hft.ade.energy3.importer;
 
-import de.stuttgart.hft.ade.energy2.schema.ADETable;
+import de.stuttgart.hft.ade.energy3.schema.ADETable;
 
 import org.citydb.config.geometry.GeometryObject;
 import org.citydb.core.ade.importer.ADEImporter;
@@ -11,8 +11,6 @@ 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.energy.model.supportingClasses.AbstractTimeSeries;
-import org.citygml4j.ade.energy.model.supportingClasses.AbstractTimeSeriesProperty;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

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

-package de.stuttgart.hft.ade.energy2.importer;
+package de.stuttgart.hft.ade.energy3.importer;
 
-import de.stuttgart.hft.ade.energy2.schema.ADETable;
+import de.stuttgart.hft.ade.energy3.schema.ADETable;
 import org.citydb.config.geometry.GeometryObject;
 import org.citydb.core.ade.importer.ADEImporter;
 import org.citydb.core.ade.importer.CityGMLImportHelper;

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

+package de.stuttgart.hft.ade.energy3.schema;
+
+public enum ADESequence {
+    //VOLUMETYPE_SEQ,
+    //FLOORAREA_SEQ,
+    QUALIFIED_ATTRIBUTE_SEQ,
+    //HEATEXCHANGETYPE_SEQ,
+    //TRANSMITTANCE_SEQ,
+    //OPTICALPROPERTIES_SEQ,
+    //REFLECTANCE_SEQ,
+    //TIMEVALUESPROPERTI_SEQ,
+    //PERIODOFYEAR_SEQ,
+    //DAILYSCHEDULE_SEQ,
+    //REFURBISHMENT_MEASURE_SEQ
+}

src/main/java/de/stuttgart/hft/ade/energy2/schema/ADETable.java → src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java

-package de.stuttgart.hft.ade.energy2.schema;
+package de.stuttgart.hft.ade.energy3.schema;
 
-import de.stuttgart.hft.ade.energy2.importer.*;
+import de.stuttgart.hft.ade.energy3.importer.*;
 import org.citydb.core.ade.importer.ADEImporter;
-import org.citygml4j.ade.energy.model.core.AbstractQualifiedAttribute;
 
 public enum ADETable {
     ADDRESS_TO_BUILDING_UNIT(null),
@@ -13,38 +12,38 @@ public enum ADETable {
     DEVICE(AbstractDeviceImporter.class),
     DEVICE_OPERATION(DeviceOperationImporter.class),
     ENERGY_PERF_CERT(EnergyPerformanceCertificateImporter.class),
-    FACILITIES(null),
-    HEAT_EXCHANGE_TYPE(null),
-    IMAGE_TEXTURE(null),
+    //FACILITIES(null),
+    //HEAT_EXCHANGE_TYPE(null),
+    //IMAGE_TEXTURE(null),
     LAYERED_CONSTRUCTION(null),
-    LAYER_COMPONENT(null),
+    //LAYER_COMPONENT(null),
     LAYER(null),
     LIBRARY(null),
     MATERIAL(null),
     OCCUPANTS(null),
     OPENING(null),
     OPTICAL_PROPERTY(null),
-    PERIOD_OF_YEAR(null),
+    //PERIOD_OF_YEAR(null),
     QUALIFIED_ATTRIBUTE(AbstractQualifiedAttributeImporter.class),
     RESOURCE(ResourceImporter.class),
     REFURBISHMENT_MEASURE(RefurbishmentMeasureImporter.class),
     SCHEDULE(null),
-    SYSTEM_OPERATION(null),
+    SCHEDULE_COMPONENT(null),
+    //SYSTEM_OPERATION(null),
     SOLAR_COLLECTOR(null),
-    STORAGE_SYSTEM(null),
+    //STORAGE_SYSTEM(null),
     STORAGE_DEVICE(null),
-    SENSOR_CONNECTION(null),
-    SOLAR_ENERGY_SYSTEM(null),
+    //SENSOR_CONNECTION(null),
+    //SOLAR_ENERGY_SYSTEM(null),
     SUITABILITY(null),
-    SCHEDULE_COMPONENT(null),
-    THERMAL_BOUNDARY(null),
-    THERMAL_OPENING(null),
+    //THERMAL_BOUNDARY(null),
+    //THERMAL_OPENING(null),
     THEM_SURF_TO_THERMAL_ZONE(null),
     THEMATIC_SURFACE(null),
-    THERMAL_ZONE(null),
+    //THERMAL_ZONE(null),
     TIME_SERIES(TimeSeriesImporter.class),
     URBAN_FUNCTION_AREA(UrbanFunctionAreaImporter.class),
-    USAGE_ZONE(null),
+    //USAGE_ZONE(null),
     UTL_NTW_CONNECTION(UtilityNetworkConnectionImporter.class),
     WEATHER_DATA(WeatherDataImporter.class);
 

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

 
 
-package de.stuttgart.hft.ade.energy2.schema;
+package de.stuttgart.hft.ade.energy3.schema;
 
 import org.citydb.core.ade.ADEExtensionException;
 import org.citydb.core.ade.ADEObjectMapper;

src/main/java/de/stuttgart/hft/ade/energy2/schema/SchemaMapper.java → src/main/java/de/stuttgart/hft/ade/energy3/schema/SchemaMapper.java

-package de.stuttgart.hft.ade.energy2.schema;
+package de.stuttgart.hft.ade.energy3.schema;
 
 import java.util.EnumMap;
 import java.util.Map;

src/main/resources/META-INF/services/org.citydb.core.ade.ADEExtension

-de.stuttgart.hft.EnergyADEExtension
+de.stuttgart.hft.EnergyADE3Extension
\ No newline at end of file