diff --git a/src/main/java/de/stuttgart/hft/EnergyADE3Extension.java b/src/main/java/de/stuttgart/hft/EnergyADE3Extension.java index ca32e45889684fa9b284cd0574ea0eed426313ac..df1c7a09b86d40ea9f39f72d75d8114e40f05414 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 b8331b7534fe39412ef88ea4f7c2966979a5a343..ff8b15b142a73ef7796312a7256b80949ad1cf49 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 bbcf76f309a6289c0809a185a950b58b6159b922..1f17a0df488218bede2b3805c3ecab8a97a53454 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 982dc11e35ef3b64b049bdbf3e359d2c84074b37..310c46e7fa7f0ddb55bec763494d27c21fc9bb01 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 e2c6c1e1325be0cd31d0db08698c71b7711b8480..42667008d6dcddbc56b907a03bc649cbd7a00de5 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 cce9512f23812d8948ac34a8572682d17a99589f..13a00f6e460edd6960f46d2ec82ac4fad38fe841 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 877ee25f2a59b53fd10448c6c0817b9611e66c3c..e915e5455e8a6a26996453bf6f8d5e368559b138 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 768a8bad307033855ef076b7b428d054826a86d2..968d9b2dbee63cc098ab7d3e462c9fe56173a3a0 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 be8c2214c4fa26026ec2826c7701ab52950c654d..edc7d15025b002bc02ef4cc4bfa4b01aea35b016 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 c4bfa4f6e1b4b50dc12e96e18b2c1fa2633d6249..1f31412af0c8a4307e516488bb303270867946c3 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 ce18c92cfe023f5b3e0ecf73ecacc5d73335c099..f3109b4e40004dfc6d73011c3e220a56487eeced 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 54b4772de4d21228c60500c44cc27428b91e680c..74e03587246a3ced81d4f37fc1302ce210c9b0f2 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 d21fdd82a4044c7010175a043928a6827655d286..976dcae16038c0225b6f776c934bc48f7757984e 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 69cff680c9d32a7a2afeb4d772111dac95338ab5..ac73c1c7b356ba833f418278b1b53c1dd8128ffb 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 1be4a09bb5d07303b909c8a255417ad4767d0bed..dfc81922d382ec0a78b447fe946409d6d741e673 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 0903bf27eafdc543aa6b0dabc8412b9a78eabfa5..d0d237f3c7fa174b367e304c059afdeb5e594485 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 bbf801649ed7d9dbffddb6d72e7a07f911b684ff..77d658217fbc1e3f757158715a2efaa9af855813 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 10203aa3eb3bdaa28bfa78bce5582edf38805905..e817d4e0d5a17a21fbac5b9c0efcbe7525d85b66 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 297d748d40724165e416c9aff8c0c63707653366..ae1b87b2ca043535462d09c1046dca7c26c44352 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 0bf8296ec86d07e16cb06b37f93c3014060e4784..325cd2e306db37507c4421b6e6dc4653bcce49fc 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 59908cae2b14cb7ef57c35b7ba0e6ae57e301064..cf1e6d108206c02308c6601a6e022e5d02c21118 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 ed5ef6265262b667ce523d4df924c817ff304de0..c38e69b919aefc21d024ff956afd7ba835bf04bf 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 4d10b5befec07cf8cbc213362872909c8237b3c8..e5c3fb876a9f36c94712f6e940209d20dcd84334 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 51451986bd21ff067e85542f63df4d47354e6f6b..bcb648dcfa3b689ed767361184154b566c32983c 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 d5978b159e74a627f28647171e63292515c10a91..6da2289b58699bec30d621ce992955106d4375d3 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 8e25ed7a85c52a25c586e2d4ef89bf6fcf1ff258..886007799bd7a94fbc8de2822be2d978053bc47d 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 dc34d1ea94e2ef740b3093dcf409edeeb39ab2f2..5cf47f82e536cc7b621e3f917a1abc5ec9549007 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;