Merge branch 'beta7' into 'master'

Updated to Energy ADE 3

See merge request !12

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;

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);
     }
 

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);

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);

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;

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

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;

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;
 

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);

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));
 

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"));

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;

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;

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;

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;

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;

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;

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;

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;

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.*;