From 40a7f27953516cd1241bf9bb2744f500c92c5ad1 Mon Sep 17 00:00:00 2001 From: Rushi Date: Tue, 14 Oct 2025 16:58:51 +0200 Subject: [PATCH 1/2] refactored to ade.energy3 and code clean up --- ...DEExtension.java => EnergyADE3Extension.java} | 12 ++++++------ .../hft/ade/energy2/schema/ADESequence.java | 15 --------------- .../AbstractQualifiedAttributeExporter.java | 10 ++++------ .../exporter/BuildingPropertiesExporter.java | 4 ++-- .../exporter/CityObjectPropertiesExporter.java | 4 ++-- .../exporter/ExportManager.java | 9 ++++----- .../exporter/RefurbishmentMeasureExporter.java | 4 ++-- .../exporter/ResourceExporter.java | 4 ++-- .../exporter/TimeSeriesExporter.java | 4 ++-- .../exporter/UrbanFunctionAreaExporter.java | 4 ++-- .../exporter/WeatherDataExporter.java | 5 ++--- .../exporter/WeatherStationExporter.java | 4 ++-- .../importer/AbstractBuildingImporter.java | 6 +++--- .../importer/AbstractDeviceImporter.java | 6 +++--- .../AbstractQualifiedAttributeImporter.java | 16 ++++------------ .../importer/BuildingPropertiesImporter.java | 6 +++--- .../importer/CityObjectPropertiesImporter.java | 6 +++--- .../importer/CityObjectRelationImporter.java | 4 ++-- .../importer/DeviceOperationImporter.java | 6 +++--- .../EnergyPerformanceCertificateImporter.java | 5 ++--- .../importer/ImportManager.java | 6 +++--- .../importer/RefurbishmentMeasureImporter.java | 7 +++---- .../importer/ResourceImporter.java | 4 ++-- .../importer/TimeSeriesImporter.java | 4 ++-- .../importer/UrbanFunctionAreaImporter.java | 5 ++--- .../UtilityNetworkConnectionImporter.java | 4 ++-- .../importer/WeatherDataImporter.java | 6 ++---- .../importer/WeatherStationImporter.java | 4 ++-- .../hft/ade/energy3/schema/ADESequence.java | 15 +++++++++++++++ .../{energy2 => energy3}/schema/ADETable.java | 5 ++--- .../schema/ObjectMapper.java | 2 +- .../schema/SchemaMapper.java | 2 +- .../services/org.citydb.core.ade.ADEExtension | 2 +- 33 files changed, 91 insertions(+), 109 deletions(-) rename src/main/java/de/stuttgart/hft/{EnergyADEExtension.java => EnergyADE3Extension.java} (83%) delete mode 100644 src/main/java/de/stuttgart/hft/ade/energy2/schema/ADESequence.java rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/exporter/AbstractQualifiedAttributeExporter.java (94%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/exporter/BuildingPropertiesExporter.java (98%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/exporter/CityObjectPropertiesExporter.java (97%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/exporter/ExportManager.java (95%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/exporter/RefurbishmentMeasureExporter.java (98%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/exporter/ResourceExporter.java (99%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/exporter/TimeSeriesExporter.java (99%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/exporter/UrbanFunctionAreaExporter.java (97%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/exporter/WeatherDataExporter.java (98%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/exporter/WeatherStationExporter.java (97%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/AbstractBuildingImporter.java (95%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/AbstractDeviceImporter.java (97%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/AbstractQualifiedAttributeImporter.java (89%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/BuildingPropertiesImporter.java (98%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/CityObjectPropertiesImporter.java (97%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/CityObjectRelationImporter.java (96%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/DeviceOperationImporter.java (93%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/EnergyPerformanceCertificateImporter.java (96%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/ImportManager.java (97%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/RefurbishmentMeasureImporter.java (94%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/ResourceImporter.java (99%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/TimeSeriesImporter.java (99%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/UrbanFunctionAreaImporter.java (94%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/UtilityNetworkConnectionImporter.java (97%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/WeatherDataImporter.java (94%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/importer/WeatherStationImporter.java (96%) create mode 100644 src/main/java/de/stuttgart/hft/ade/energy3/schema/ADESequence.java rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/schema/ADETable.java (91%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/schema/ObjectMapper.java (99%) rename src/main/java/de/stuttgart/hft/ade/{energy2 => energy3}/schema/SchemaMapper.java (96%) diff --git a/src/main/java/de/stuttgart/hft/EnergyADEExtension.java b/src/main/java/de/stuttgart/hft/EnergyADE3Extension.java similarity index 83% rename from src/main/java/de/stuttgart/hft/EnergyADEExtension.java rename to src/main/java/de/stuttgart/hft/EnergyADE3Extension.java index 3d7fcab..ca32e45 100644 --- a/src/main/java/de/stuttgart/hft/EnergyADEExtension.java +++ b/src/main/java/de/stuttgart/hft/EnergyADE3Extension.java @@ -1,9 +1,9 @@ package de.stuttgart.hft; -import de.stuttgart.hft.ade.energy2.exporter.ExportManager; -import de.stuttgart.hft.ade.energy2.importer.ImportManager; -import de.stuttgart.hft.ade.energy2.schema.ObjectMapper; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.exporter.ExportManager; +import de.stuttgart.hft.ade.energy3.importer.ImportManager; +import de.stuttgart.hft.ade.energy3.schema.ObjectMapper; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.core.ade.ADEExtension; import org.citydb.core.ade.ADEExtensionException; import org.citydb.core.ade.ADEObjectMapper; @@ -18,13 +18,13 @@ import java.nio.file.Paths; import java.util.Collections; import java.util.List; -public class EnergyADEExtension extends ADEExtension { +public class EnergyADE3Extension extends ADEExtension { private final ObjectMapper objectMapper = new ObjectMapper(); private final SchemaMapper schemaMapper = new SchemaMapper(); private final EnergyADEContext context = new EnergyADEContext(); public static void main(String[] args) { - EnergyADEExtension adeExtension = new EnergyADEExtension(); + EnergyADE3Extension adeExtension = new EnergyADE3Extension(); adeExtension.setBasePath(Paths.get("resources/database").toAbsolutePath()); new ImpExpLauncher().withArgs(args) .withADEExtension(adeExtension) diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ADESequence.java b/src/main/java/de/stuttgart/hft/ade/energy2/schema/ADESequence.java deleted file mode 100644 index 5ce8290..0000000 --- a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ADESequence.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.stuttgart.hft.ade.energy2.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 -} diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/AbstractQualifiedAttributeExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java similarity index 94% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/AbstractQualifiedAttributeExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java index db9a778..b8331b7 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/AbstractQualifiedAttributeExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java @@ -1,13 +1,11 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; -import org.citydb.core.database.schema.mapping.AbstractType; import org.citydb.core.database.schema.mapping.ComplexType; import org.citydb.core.database.schema.mapping.SchemaMapping; import org.citydb.core.operation.exporter.CityGMLExportException; -import org.citydb.core.query.filter.projection.ProjectionFilter; import org.citydb.core.registry.ObjectRegistry; import org.citygml4j.ade.energy.model.core.*; import org.citygml4j.ade.energy.model.module.EnergyADEModule; @@ -31,8 +29,8 @@ public class AbstractQualifiedAttributeExporter implements ADEExporter { private final CityGMLExportHelper helper; private final ExportManager manager; private final Connection connection; - private WeatherDataExporter weatherDataExporter; - private ResourceExporter resourceExporter; + //private WeatherDataExporter weatherDataExporter; + //private ResourceExporter resourceExporter; private String module; private Map> attributeClassMap; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/BuildingPropertiesExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java similarity index 98% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/BuildingPropertiesExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java index 3c33d64..bbcf76f 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/BuildingPropertiesExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import net.opengis.gml.CodeType; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/CityObjectPropertiesExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/CityObjectPropertiesExporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/CityObjectPropertiesExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/CityObjectPropertiesExporter.java index 5809304..982dc11 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/CityObjectPropertiesExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/CityObjectPropertiesExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -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.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/ExportManager.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ExportManager.java similarity index 95% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/ExportManager.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/ExportManager.java index 2bdf387..e2c6c1e 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/ExportManager.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ExportManager.java @@ -1,9 +1,9 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import de.stuttgart.hft.ade.energy2.schema.ObjectMapper; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ObjectMapper; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.core.ade.exporter.ADEExportManager; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; @@ -12,7 +12,6 @@ import org.citydb.core.database.schema.mapping.FeatureType; import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.query.filter.projection.ProjectionFilter; import org.citygml4j.ade.energy.model.core.AbstractResource; -import org.citygml4j.ade.energy.model.core.QualifiedHeight; import org.citygml4j.ade.energy.model.core.WeatherData; import org.citygml4j.ade.energy.model.supportingClasses.*; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/RefurbishmentMeasureExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/RefurbishmentMeasureExporter.java similarity index 98% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/RefurbishmentMeasureExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/RefurbishmentMeasureExporter.java index b1306ce..cce9512 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/RefurbishmentMeasureExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/RefurbishmentMeasureExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.AbstractType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/ResourceExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java similarity index 99% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/ResourceExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java index 2a8d838..877ee25 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/ResourceExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.ObjectType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/TimeSeriesExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java similarity index 99% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/TimeSeriesExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java index 3d79a6c..768a8ba 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/TimeSeriesExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.operation.exporter.CityGMLExportException; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/UrbanFunctionAreaExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/UrbanFunctionAreaExporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/UrbanFunctionAreaExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/UrbanFunctionAreaExporter.java index 3853f7d..be8c221 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/UrbanFunctionAreaExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/UrbanFunctionAreaExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.AbstractType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherDataExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherDataExporter.java similarity index 98% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherDataExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherDataExporter.java index 7e4dbac..c4bfa4f 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherDataExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherDataExporter.java @@ -1,10 +1,9 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -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.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; -import org.citydb.core.database.schema.mapping.AbstractType; import org.citydb.core.database.schema.mapping.ObjectType; import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.operation.exporter.database.content.GMLConverter; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherStationExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherStationExporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherStationExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherStationExporter.java index 9d29db3..ce18c92 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherStationExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherStationExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.AbstractType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractBuildingImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractBuildingImporter.java similarity index 95% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractBuildingImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractBuildingImporter.java index 5233a49..54b4772 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractBuildingImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractBuildingImporter.java @@ -1,7 +1,7 @@ -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.config.geometry.GeometryObject; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.ADEPropertyCollection; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractDeviceImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractDeviceImporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractDeviceImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractDeviceImporter.java index 0d6af28..d21fdd8 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractDeviceImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractDeviceImporter.java @@ -1,7 +1,7 @@ -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.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractQualifiedAttributeImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractQualifiedAttributeImporter.java similarity index 89% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractQualifiedAttributeImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractQualifiedAttributeImporter.java index 6091a22..30a684f 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractQualifiedAttributeImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractQualifiedAttributeImporter.java @@ -1,23 +1,15 @@ -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.ADESequence; +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; -import org.citydb.core.database.schema.mapping.AbstractObjectType; import org.citydb.core.database.schema.mapping.ComplexType; -import org.citydb.core.database.schema.mapping.ObjectType; import org.citydb.core.database.schema.mapping.SchemaMapping; import org.citydb.core.operation.importer.CityGMLImportException; import org.citydb.core.operation.importer.util.GeometryConverter; import org.citydb.core.registry.ObjectRegistry; -import org.citydb.core.util.Util; -import org.citygml4j.ade.energy.model.core.AbstractQualifiedAttribute; -import org.citygml4j.ade.energy.model.core.QualifiedArea; -import org.citygml4j.ade.energy.model.core.QualifiedHeight; -import org.citygml4j.ade.energy.model.core.QualifiedVolume; import org.sig3d.citygml.energyADE2beta7.AbstractQualifiedAttributeType; import org.sig3d.citygml.energyADE2beta7.QualifiedAreaType; import org.sig3d.citygml.energyADE2beta7.QualifiedHeightType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/BuildingPropertiesImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java similarity index 98% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/BuildingPropertiesImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java index b29b7f7..69cff68 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/BuildingPropertiesImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java @@ -1,7 +1,7 @@ -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.importer.ADEImporter; import org.citydb.core.ade.importer.ADEPropertyCollection; import org.citydb.core.ade.importer.CityGMLImportHelper; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectPropertiesImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectPropertiesImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java index 82198ca..1be4a09 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectPropertiesImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java @@ -1,7 +1,7 @@ -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.config.geometry.GeometryObject; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.ADEPropertyCollection; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectRelationImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectRelationImporter.java similarity index 96% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectRelationImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectRelationImporter.java index 0d1945b..0903bf2 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectRelationImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectRelationImporter.java @@ -1,6 +1,6 @@ -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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/DeviceOperationImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/DeviceOperationImporter.java similarity index 93% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/DeviceOperationImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/DeviceOperationImporter.java index cc0aca4..bbf8016 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/DeviceOperationImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/DeviceOperationImporter.java @@ -1,7 +1,7 @@ -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.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/EnergyPerformanceCertificateImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/EnergyPerformanceCertificateImporter.java similarity index 96% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/EnergyPerformanceCertificateImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/EnergyPerformanceCertificateImporter.java index 015f572..10203aa 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/EnergyPerformanceCertificateImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/EnergyPerformanceCertificateImporter.java @@ -1,7 +1,6 @@ -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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/ImportManager.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/ImportManager.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java index 0df0053..297d748 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/ImportManager.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java @@ -1,8 +1,8 @@ -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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/RefurbishmentMeasureImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/RefurbishmentMeasureImporter.java similarity index 94% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/RefurbishmentMeasureImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/RefurbishmentMeasureImporter.java index 45564cb..0bf8296 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/RefurbishmentMeasureImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/RefurbishmentMeasureImporter.java @@ -1,8 +1,7 @@ -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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/ResourceImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ResourceImporter.java similarity index 99% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/ResourceImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/ResourceImporter.java index 4661db3..59908ca 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/ResourceImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ResourceImporter.java @@ -1,6 +1,6 @@ -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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/TimeSeriesImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java similarity index 99% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/TimeSeriesImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java index 120ac59..ed5ef62 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/TimeSeriesImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java @@ -1,6 +1,6 @@ -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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/UrbanFunctionAreaImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/UrbanFunctionAreaImporter.java similarity index 94% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/UrbanFunctionAreaImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/UrbanFunctionAreaImporter.java index 571a0b7..4d10b5b 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/UrbanFunctionAreaImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/UrbanFunctionAreaImporter.java @@ -1,7 +1,6 @@ -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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/UtilityNetworkConnectionImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/UtilityNetworkConnectionImporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/UtilityNetworkConnectionImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/UtilityNetworkConnectionImporter.java index aeff048..5145198 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/UtilityNetworkConnectionImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/UtilityNetworkConnectionImporter.java @@ -1,6 +1,6 @@ -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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherDataImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java similarity index 94% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherDataImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java index ddf69cd..d5978b1 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherDataImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java @@ -1,6 +1,6 @@ -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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherStationImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherStationImporter.java similarity index 96% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherStationImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherStationImporter.java index 0ac9779..8e25ed7 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherStationImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherStationImporter.java @@ -1,6 +1,6 @@ -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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADESequence.java b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADESequence.java new file mode 100644 index 0000000..5249bd3 --- /dev/null +++ b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADESequence.java @@ -0,0 +1,15 @@ +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 +} diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ADETable.java b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java similarity index 91% rename from src/main/java/de/stuttgart/hft/ade/energy2/schema/ADETable.java rename to src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java index 86fa286..fed3aa8 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ADETable.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java @@ -1,8 +1,7 @@ -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), diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ObjectMapper.java b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ObjectMapper.java similarity index 99% rename from src/main/java/de/stuttgart/hft/ade/energy2/schema/ObjectMapper.java rename to src/main/java/de/stuttgart/hft/ade/energy3/schema/ObjectMapper.java index 8cc39c7..dc34d1e 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ObjectMapper.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ObjectMapper.java @@ -1,6 +1,6 @@ -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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/schema/SchemaMapper.java b/src/main/java/de/stuttgart/hft/ade/energy3/schema/SchemaMapper.java similarity index 96% rename from src/main/java/de/stuttgart/hft/ade/energy2/schema/SchemaMapper.java rename to src/main/java/de/stuttgart/hft/ade/energy3/schema/SchemaMapper.java index 6af9fff..f376043 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/schema/SchemaMapper.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/schema/SchemaMapper.java @@ -1,4 +1,4 @@ -package de.stuttgart.hft.ade.energy2.schema; +package de.stuttgart.hft.ade.energy3.schema; import java.util.EnumMap; import java.util.Map; diff --git a/src/main/resources/META-INF/services/org.citydb.core.ade.ADEExtension b/src/main/resources/META-INF/services/org.citydb.core.ade.ADEExtension index 70ec670..829ecba 100644 --- a/src/main/resources/META-INF/services/org.citydb.core.ade.ADEExtension +++ b/src/main/resources/META-INF/services/org.citydb.core.ade.ADEExtension @@ -1 +1 @@ -de.stuttgart.hft.EnergyADEExtension \ No newline at end of file +de.stuttgart.hft.EnergyADE3Extension \ No newline at end of file -- GitLab From ec015961223ad6d36f184b0e8aed9cc1395e4232 Mon Sep 17 00:00:00 2001 From: Rushi Date: Tue, 14 Oct 2025 17:31:51 +0200 Subject: [PATCH 2/2] commented non-required ADE tables --- .../hft/ade/energy3/schema/ADETable.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java index fed3aa8..5bcd84c 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java @@ -12,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); -- GitLab