From 33ee9ce543a1eec8f81960a8c4c4a6eec63b8d47 Mon Sep 17 00:00:00 2001 From: Rushi Date: Tue, 14 Oct 2025 18:16:38 +0200 Subject: [PATCH] Updated to Energy ADE 3 --- .../java/de/stuttgart/hft/EnergyADE3Extension.java | 2 +- .../exporter/AbstractQualifiedAttributeExporter.java | 6 +++--- .../energy3/exporter/BuildingPropertiesExporter.java | 6 +++--- .../exporter/CityObjectPropertiesExporter.java | 6 +++--- .../hft/ade/energy3/exporter/ExportManager.java | 6 +++--- .../exporter/RefurbishmentMeasureExporter.java | 8 ++++---- .../hft/ade/energy3/exporter/ResourceExporter.java | 4 ++-- .../hft/ade/energy3/exporter/TimeSeriesExporter.java | 2 +- .../energy3/exporter/UrbanFunctionAreaExporter.java | 10 +++++----- .../ade/energy3/exporter/WeatherDataExporter.java | 12 ++++++------ .../ade/energy3/exporter/WeatherStationExporter.java | 8 ++++---- .../energy3/importer/AbstractBuildingImporter.java | 2 +- .../ade/energy3/importer/AbstractDeviceImporter.java | 2 +- .../energy3/importer/BuildingPropertiesImporter.java | 2 +- .../importer/CityObjectPropertiesImporter.java | 4 ++-- .../energy3/importer/CityObjectRelationImporter.java | 2 +- .../energy3/importer/DeviceOperationImporter.java | 2 +- .../EnergyPerformanceCertificateImporter.java | 2 +- .../hft/ade/energy3/importer/ImportManager.java | 4 ++-- .../importer/RefurbishmentMeasureImporter.java | 2 +- .../hft/ade/energy3/importer/ResourceImporter.java | 4 ++-- .../hft/ade/energy3/importer/TimeSeriesImporter.java | 2 +- .../energy3/importer/UrbanFunctionAreaImporter.java | 2 +- .../importer/UtilityNetworkConnectionImporter.java | 2 +- .../ade/energy3/importer/WeatherDataImporter.java | 4 ++-- .../ade/energy3/importer/WeatherStationImporter.java | 2 +- .../hft/ade/energy3/schema/ObjectMapper.java | 4 ++-- 27 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/main/java/de/stuttgart/hft/EnergyADE3Extension.java b/src/main/java/de/stuttgart/hft/EnergyADE3Extension.java index ca32e45..df1c7a0 100644 --- a/src/main/java/de/stuttgart/hft/EnergyADE3Extension.java +++ b/src/main/java/de/stuttgart/hft/EnergyADE3Extension.java @@ -11,7 +11,7 @@ import org.citydb.core.ade.exporter.ADEExportManager; import org.citydb.core.ade.importer.ADEImportManager; import org.citydb.core.database.schema.mapping.SchemaMapping; import org.citydb.gui.ImpExpLauncher; -import org.citygml4j.ade.energy.EnergyADEContext; +import org.citygml4j.ade.energy3.EnergyADEContext; import org.citygml4j.model.citygml.ade.binding.ADEContext; import java.nio.file.Paths; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java index b8331b7..ff8b15b 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java @@ -7,8 +7,8 @@ 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.registry.ObjectRegistry; -import org.citygml4j.ade.energy.model.core.*; -import org.citygml4j.ade.energy.model.module.EnergyADEModule; +import org.citygml4j.ade.energy3.model.core.*; +import org.citygml4j.ade.energy3.model.module.EnergyADEModule; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.basicTypes.Measure; import org.citygml4j.model.gml.base.StringOrRef; @@ -59,7 +59,7 @@ public class AbstractQualifiedAttributeExporter implements ADEExporter { String select = "SELECT id, objectclass_id, type, type_codespace, \"value\", value_uom, description, source, building_id, building_partition_id " + "FROM " + tableName + " WHERE building_id = ?"; - module = EnergyADEModule.v2_0.getNamespaceURI(); + module = EnergyADEModule.v3_0.getNamespaceURI(); ps = connection.prepareStatement(select); } diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java index bbcf76f..1f17a0d 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java @@ -7,8 +7,8 @@ import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.AbstractType; import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.query.filter.projection.ProjectionFilter; -import org.citygml4j.ade.energy.model.core.*; -import org.citygml4j.ade.energy.model.module.EnergyADEModule; +import org.citygml4j.ade.energy3.model.core.*; +import org.citygml4j.ade.energy3.model.module.EnergyADEModule; import org.citygml4j.model.citygml.building.AbstractBuilding; import org.sig3d.citygml.energyADE2beta7.ThermalStatusValueType; @@ -36,7 +36,7 @@ public class BuildingPropertiesExporter implements ADEExporter { helper.getTableNameWithSchema(manager.getSchemaMapper().getTableName(ADETable.BUILDING)) + " where id = ?"; - module = EnergyADEModule.v2_0.getNamespaceURI(); + module = EnergyADEModule.v3_0.getNamespaceURI(); ps = connection.prepareStatement(select); abstractQualifiedAttributeExporter = manager.getExporter(AbstractQualifiedAttributeExporter.class); refurbishmentMeasureExporter = manager.getExporter(RefurbishmentMeasureExporter.class); diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/CityObjectPropertiesExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/CityObjectPropertiesExporter.java index 982dc11..310c46e 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/CityObjectPropertiesExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/CityObjectPropertiesExporter.java @@ -7,8 +7,8 @@ import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.AbstractType; import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.query.filter.projection.ProjectionFilter; -import org.citygml4j.ade.energy.model.core.*; -import org.citygml4j.ade.energy.model.module.EnergyADEModule; +import org.citygml4j.ade.energy3.model.core.*; +import org.citygml4j.ade.energy3.model.module.EnergyADEModule; import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.model.gml.geometry.primitives.PointProperty; @@ -38,7 +38,7 @@ public class CityObjectPropertiesExporter implements ADEExporter { helper.getTableNameWithSchema(manager.getSchemaMapper().getTableName(ADETable.CITYOBJECT)) + " where id = ?"; - module = EnergyADEModule.v2_0.getNamespaceURI(); + module = EnergyADEModule.v3_0.getNamespaceURI(); ps = connection.prepareStatement(select); weatherDataExporter = manager.getExporter(WeatherDataExporter.class); diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ExportManager.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ExportManager.java index e2c6c1e..4266700 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ExportManager.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ExportManager.java @@ -11,9 +11,9 @@ import org.citydb.core.database.schema.mapping.AbstractObjectType; 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.WeatherData; -import org.citygml4j.ade.energy.model.supportingClasses.*; +import org.citygml4j.ade.energy3.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.WeatherData; +import org.citygml4j.ade.energy3.model.supportingClasses.*; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.citygml.building.AbstractBuilding; import org.citygml4j.model.citygml.core.AbstractCityObject; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/RefurbishmentMeasureExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/RefurbishmentMeasureExporter.java index cce9512..13a00f6 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/RefurbishmentMeasureExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/RefurbishmentMeasureExporter.java @@ -6,9 +6,9 @@ import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.AbstractType; import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.query.filter.projection.ProjectionFilter; -import org.citygml4j.ade.energy.model.core.RefurbishmentMeasure; -import org.citygml4j.ade.energy.model.core.RefurbishmentMeasureProperty; -import org.citygml4j.ade.energy.model.module.EnergyADEModule; +import org.citygml4j.ade.energy3.model.core.RefurbishmentMeasure; +import org.citygml4j.ade.energy3.model.core.RefurbishmentMeasureProperty; +import org.citygml4j.ade.energy3.model.module.EnergyADEModule; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.base.StringOrRef; import javax.xml.datatype.DatatypeConfigurationException; @@ -39,7 +39,7 @@ public class RefurbishmentMeasureExporter implements ADEExporter { String select = "SELECT id, type, type_codespace, start_date, end_date, library_code, library_code_codespace, building_id, building_partition_id FROM " + helper.getTableNameWithSchema(manager.getSchemaMapper().getTableName(ADETable.REFURBISHMENT_MEASURE)) + " WHERE building_id = ?"; - module = EnergyADEModule.v2_0.getNamespaceURI(); + module = EnergyADEModule.v3_0.getNamespaceURI(); ps = connection.prepareStatement(select); // Prepare statement for cityobject table diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java index 877ee25..e915e54 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java @@ -6,8 +6,8 @@ import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.ObjectType; 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.supportingClasses.*; +import org.citygml4j.ade.energy3.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.supportingClasses.*; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.basicTypes.Measure; import org.sig3d.citygml.energyADE2beta7.ResourceStatusValueType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java index 768a8ba..968d9b2 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java @@ -4,7 +4,7 @@ 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; -import org.citygml4j.ade.energy.model.supportingClasses.*; +import org.citygml4j.ade.energy3.model.supportingClasses.*; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.basicTypes.MeasureList; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/UrbanFunctionAreaExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/UrbanFunctionAreaExporter.java index be8c221..edc7d15 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/UrbanFunctionAreaExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/UrbanFunctionAreaExporter.java @@ -6,10 +6,10 @@ import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.AbstractType; import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.query.filter.projection.ProjectionFilter; -import org.citygml4j.ade.energy.model.module.EnergyADEModule; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractTimeSeries; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractTimeSeriesProperty; -import org.citygml4j.ade.energy.model.supportingClasses.UrbanFunctionArea; +import org.citygml4j.ade.energy3.model.module.EnergyADEModule; +import org.citygml4j.ade.energy3.model.supportingClasses.AbstractTimeSeries; +import org.citygml4j.ade.energy3.model.supportingClasses.AbstractTimeSeriesProperty; +import org.citygml4j.ade.energy3.model.supportingClasses.UrbanFunctionArea; import org.citygml4j.model.gml.basicTypes.Code; import java.sql.Connection; @@ -30,7 +30,7 @@ public class UrbanFunctionAreaExporter implements ADEExporter { helper.getTableNameWithSchema(manager.getSchemaMapper().getTableName(ADETable.URBAN_FUNCTION_AREA)) + " where "; - module = EnergyADEModule.v2_0.getNamespaceURI(); + module = EnergyADEModule.v3_0.getNamespaceURI(); ps = connection.prepareStatement(select + "id = ?"); cityObjectPropertiesExporter = manager.getExporter(CityObjectPropertiesExporter.class); timeSeriesExporter = manager.getExporter(TimeSeriesExporter.class); diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherDataExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherDataExporter.java index c4bfa4f..1f31412 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherDataExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherDataExporter.java @@ -13,11 +13,11 @@ import org.citydb.sqlbuilder.expression.PlaceHolder; import org.citydb.sqlbuilder.schema.Table; import org.citydb.sqlbuilder.select.Select; import org.citydb.sqlbuilder.select.operator.comparison.ComparisonFactory; -import org.citygml4j.ade.energy.model.core.ReferencePointProperty; -import org.citygml4j.ade.energy.model.core.WeatherData; -import org.citygml4j.ade.energy.model.module.EnergyADEModule; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractTimeSeries; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractTimeSeriesProperty; +import org.citygml4j.ade.energy3.model.core.ReferencePointProperty; +import org.citygml4j.ade.energy3.model.core.WeatherData; +import org.citygml4j.ade.energy3.model.module.EnergyADEModule; +import org.citygml4j.ade.energy3.model.supportingClasses.AbstractTimeSeries; +import org.citygml4j.ade.energy3.model.supportingClasses.AbstractTimeSeriesProperty; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.basicTypes.Measure; import org.citygml4j.model.gml.geometry.primitives.Point; @@ -46,7 +46,7 @@ public class WeatherDataExporter implements ADEExporter { String tableName = manager.getSchemaMapper().getTableName(ADETable.WEATHER_DATA); CombinedProjectionFilter projectionFilter = helper.getCombinedProjectionFilter(tableName); - module = EnergyADEModule.v2_0.getNamespaceURI(); + module = EnergyADEModule.v3_0.getNamespaceURI(); Table table = new Table(helper.getTableNameWithSchema(tableName)); diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherStationExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherStationExporter.java index ce18c92..f3109b4 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherStationExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherStationExporter.java @@ -11,9 +11,9 @@ import org.citydb.sqlbuilder.expression.PlaceHolder; import org.citydb.sqlbuilder.schema.Table; import org.citydb.sqlbuilder.select.Select; import org.citydb.sqlbuilder.select.operator.comparison.ComparisonFactory; -import org.citygml4j.ade.energy.model.core.*; -import org.citygml4j.ade.energy.model.module.EnergyADEModule; -import org.citygml4j.ade.energy.model.supportingClasses.WeatherStation; +import org.citygml4j.ade.energy3.model.core.*; +import org.citygml4j.ade.energy3.model.module.EnergyADEModule; +import org.citygml4j.ade.energy3.model.supportingClasses.WeatherStation; import java.sql.Connection; import java.sql.PreparedStatement; @@ -34,7 +34,7 @@ public class WeatherStationExporter implements ADEExporter { weatherDataObjectClassId = manager.getObjectMapper().getObjectClassId(WeatherData.class); String tableName = manager.getSchemaMapper().getTableName(ADETable.CITYOBJECT); - module = EnergyADEModule.v2_0.getNamespaceURI(); + module = EnergyADEModule.v3_0.getNamespaceURI(); Table table = new Table(helper.getTableNameWithSchema(tableName)); Select select = new Select().addProjection(table.getColumn("id")); diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractBuildingImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractBuildingImporter.java index 54b4772..74e0358 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractBuildingImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractBuildingImporter.java @@ -9,7 +9,7 @@ import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.database.schema.mapping.FeatureType; import org.citydb.core.operation.importer.CityGMLImportException; import org.citydb.core.operation.importer.util.GeometryConverter; -import org.citygml4j.ade.energy.model.core.AbstractBuilding; +import org.citygml4j.ade.energy3.model.core.AbstractBuilding; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractDeviceImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractDeviceImporter.java index d21fdd8..976dcae 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractDeviceImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractDeviceImporter.java @@ -7,7 +7,7 @@ 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.operation.importer.CityGMLImportException; -import org.citygml4j.ade.energy.model.core.AbstractDevice; +import org.citygml4j.ade.energy3.model.core.AbstractDevice; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java index 69cff68..ac73c1c 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java @@ -9,7 +9,7 @@ import org.citydb.core.ade.importer.ForeignKeys; import org.citydb.core.database.schema.mapping.FeatureType; import org.citydb.core.operation.importer.CityGMLImportException; import org.citydb.core.operation.importer.util.GeometryConverter; -import org.citygml4j.ade.energy.model.core.*; +import org.citygml4j.ade.energy3.model.core.*; import org.citygml4j.model.citygml.building.AbstractBuilding; import org.sig3d.citygml.energyADE2beta7.QualifiedAreaType; import org.sig3d.citygml.energyADE2beta7.QualifiedHeightType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java index 1be4a09..dfc8192 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java @@ -9,8 +9,8 @@ import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; import org.citydb.core.database.schema.mapping.FeatureType; import org.citydb.core.operation.importer.CityGMLImportException; -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.core.AbstractCityObject; import java.sql.Connection; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectRelationImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectRelationImporter.java index 0903bf2..d0d237f 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectRelationImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectRelationImporter.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.CityObjectRelation; +import org.citygml4j.ade.energy3.model.core.CityObjectRelation; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/DeviceOperationImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/DeviceOperationImporter.java index bbf8016..77d6582 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/DeviceOperationImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/DeviceOperationImporter.java @@ -7,7 +7,7 @@ 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.operation.importer.CityGMLImportException; -import org.citygml4j.ade.energy.model.core.DeviceOperation; +import org.citygml4j.ade.energy3.model.core.DeviceOperation; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/EnergyPerformanceCertificateImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/EnergyPerformanceCertificateImporter.java index 10203aa..e817d4e 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/EnergyPerformanceCertificateImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/EnergyPerformanceCertificateImporter.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.EnergyPerformanceCertificate; +import org.citygml4j.ade.energy3.model.core.EnergyPerformanceCertificate; import javax.xml.datatype.XMLGregorianCalendar; import java.sql.Connection; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java index 297d748..ae1b87b 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java @@ -8,8 +8,8 @@ import org.citydb.core.ade.importer.*; import org.citydb.core.database.schema.mapping.AbstractObjectType; import org.citydb.core.database.schema.mapping.FeatureType; import org.citydb.core.operation.importer.CityGMLImportException; -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.ADEModelObject; import org.citygml4j.model.citygml.building.AbstractBuilding; import org.citygml4j.model.citygml.core.AbstractCityObject; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/RefurbishmentMeasureImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/RefurbishmentMeasureImporter.java index 0bf8296..325cd2e 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/RefurbishmentMeasureImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/RefurbishmentMeasureImporter.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.core.RefurbishmentMeasure; +import org.citygml4j.ade.energy3.model.core.RefurbishmentMeasure; import javax.xml.datatype.XMLGregorianCalendar; import java.sql.*; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/ResourceImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ResourceImporter.java index 59908ca..cf1e6d1 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/ResourceImporter.java +++ b/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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java index ed5ef62..c38e69b 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java +++ b/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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/UrbanFunctionAreaImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/UrbanFunctionAreaImporter.java index 4d10b5b..e5c3fb8 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/UrbanFunctionAreaImporter.java +++ b/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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/UtilityNetworkConnectionImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/UtilityNetworkConnectionImporter.java index 5145198..bcb648d 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/UtilityNetworkConnectionImporter.java +++ b/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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java index d5978b1..6da2289 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java +++ b/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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherStationImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherStationImporter.java index 8e25ed7..8860077 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherStationImporter.java +++ b/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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/schema/ObjectMapper.java b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ObjectMapper.java index dc34d1e..5cf47f8 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/schema/ObjectMapper.java +++ b/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; -- GitLab