From 0041673b8ec506262aaf31a8ca490fa6a94a729d Mon Sep 17 00:00:00 2001 From: Rushi Date: Tue, 14 Oct 2025 16:58:50 +0200 Subject: [PATCH 1/2] refactored to ade.energy3 and code clean up --- .../8.5/executionHistory/executionHistory.bin | Bin 382121 -> 448550 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/outputFiles.bin | Bin 19271 -> 19649 bytes .gradle/file-system.probe | Bin 8 -> 8 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin index d50ba28a39be0798828fdd360390abd2f88fa2e2..32d8a95a613f6f4b300470f4d31e631538fe1412 100644 GIT binary patch delta 25265 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 MQ7wVU|1-t^10LBGwg3PC delta 11425 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 diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock index af73e7c68c00dcf164cbed6511c56a4ee8e5692c..e4bb0d1e7f97fe292c9f515c5b1da427de3d08a4 100644 GIT binary patch literal 17 UcmZR6EmlzQU~WVS0|dAL05uf^asU7T literal 17 UcmZR6EmlzQU~WVS0|cl605tamQ~&?~ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a2040ca1598319e5e184694d78b51663e68a6c28..a7f081fe8384eda635932b93a4cb1d505b73b53f 100644 GIT binary patch literal 17 UcmZSPc@mf=`TB7$0|d+g05Pxxy8r+H literal 17 UcmZSPc@mf=`TB7$0|dkZ05Nd{d;kCd diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 43120fa6636e61c59df17af25bbd9cac7b94abd1..6d2c76ed19474362a2b5542c2f592f1fb7d15b59 100644 GIT binary patch delta 521 zcmX>;jq%`2#tkMCj1H4cB|HSC9p=2bbK+bB1~BmHo?I%Cp|R@{^G$V84nc^ZclLiM zIB+Fc%IiAt}6RP+qOz|Dby=!;BT^$bCUnK)H*ckX9o|Tr_0TJ|>3p19TZ{ev)f1-q; ziWg3{mD-@8rPXLSH^g%tRPZHCv36-u`iI_2tx!WkCqI=^(9pg2gXy~1th-Rfkub$( zZ#6!PdUvdZDt4ayS4u&^{&lkxa8#tkMCjM|e;B|Iiil}MPZDw!~Ot7OGwS1FIlOMzHcdd1|g(h`$xWh5r& s${0-EDl=hntgOW3URlG**JQKF#UJ7e4Ma9OdayAA0A6w=RsaA1 diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 7b46b34a37464941556e45d348aea763eb144513..985b68b270d049400be53d9528c8323bf14a5145 100644 GIT binary patch literal 8 PcmZQzV4V3_C{+>w2e1MT literal 8 PcmZQzV4Tq#5qlc|2iF3( -- GitLab From 25f5a94c3be00a64316bcdac99b81d85bec79015 Mon Sep 17 00:00:00 2001 From: Rushi Date: Tue, 14 Oct 2025 18:16:37 +0200 Subject: [PATCH 2/2] Updated to Energy ADE 3 --- .../8.5/executionHistory/executionHistory.bin | Bin 448550 -> 530614 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes build.gradle | 14 +++++++------- .../GenericElectricalDevice.java | 4 ---- .../GenericSolarCollector.java | 4 ---- .../supportingClasses/LightingDevice.java | 4 ---- .../ThermalStorageDevice.java | 4 ---- .../{energy => energy3}/EnergyADEContext.java | 16 ++++++++-------- .../bind/EnergyADEMarshaller.java | 7 +++---- .../bind/EnergyADEUnmarshaller.java | 7 +++---- .../model/core/AbstractBuilding.java | 4 +--- .../model/core/AbstractBuildingPartition.java | 2 +- .../AbstractBuildingPartitionProperty.java | 2 +- .../model/core/AbstractBuildingProperty.java | 2 +- .../model/core/AbstractDataType.java | 2 +- .../model/core/AbstractDevice.java | 2 +- .../model/core/AbstractDeviceProperty.java | 2 +- .../core/AbstractLayeredConstruction.java | 2 +- .../AbstractLayeredConstructionProperty.java | 3 +-- .../model/core/AbstractLibrary.java | 2 +- .../model/core/AbstractLibraryProperty.java | 2 +- .../core/AbstractQualifiedAttribute.java | 2 +- .../AbstractQualifiedAttributeProperty.java | 2 +- .../model/core/AbstractResource.java | 4 ++-- .../model/core/AbstractResourceProperty.java | 2 +- .../BuildingAtticThermalStatusProperty.java | 2 +- ...BuildingBasementThermalStatusProperty.java | 2 +- .../BuildingConstructionWeightProperty.java | 2 +- .../model/core/BuildingFloorAreaProperty.java | 2 +- .../BuildingHeightAboveGroundProperty.java | 2 +- .../model/core/BuildingHeightProperty.java | 3 +-- .../core/BuildingIsProtectedProperty.java | 2 +- .../model/core/BuildingTypeProperty.java | 2 +- .../model/core/BuildingVolumeProperty.java | 2 +- .../model/core/CityObjectRelation.java | 2 +- .../core/CityObjectRelationProperty.java | 2 +- .../CityObjectRelationPropertyElement.java | 2 +- .../model/core/DeviceOperation.java | 4 ++-- .../model/core/DeviceOperationProperty.java | 2 +- .../core/EnergyPerformanceCertificate.java | 2 +- .../EnergyPerformanceCertificateProperty.java | 2 +- .../core/NetworkConnectionStatusValue.java | 2 +- .../model/core/QualifiedArea.java | 2 +- .../model/core/QualifiedAreaProperty.java | 2 +- .../model/core/QualifiedHeight.java | 2 +- .../model/core/QualifiedHeightProperty.java | 2 +- .../model/core/QualifiedVolume.java | 2 +- .../model/core/QualifiedVolumeProperty.java | 2 +- .../model/core/ReferencePointProperty.java | 2 +- .../model/core/RefurbishmentMeasure.java | 3 +-- .../core/RefurbishmentMeasureProperty.java | 2 +- .../model/core/RelatedToProperty.java | 2 +- .../model/core/Suitability.java | 2 +- .../model/core/SuitabilityProperty.java | 3 +-- .../model/core/ThermalStatusValue.java | 2 +- .../model/core/UtilityNetworkConnection.java | 2 +- .../UtilityNetworkConnectionProperty.java | 2 +- .../model/core/WeatherData.java | 7 ++----- .../model/core/WeatherDataProperty.java | 2 +- .../core/WeatherDataPropertyElement.java | 2 +- .../model/core/WeatherDataTypeValue.java | 2 +- .../model/module/EnergyADEModule.java | 10 +++++----- .../supportingClasses/AbstractSchedule.java | 2 +- .../AbstractScheduleProperty.java | 2 +- .../AbstractSolarCollector.java | 2 +- .../AbstractSolarCollectorProperty.java | 2 +- .../supportingClasses/AbstractTimeSeries.java | 2 +- .../AbstractTimeSeriesProperty.java | 2 +- .../supportingClasses/AtomicSchedule.java | 2 +- .../AtomicScheduleProperty.java | 2 +- .../model/supportingClasses/Boiler.java | 2 +- .../supportingClasses/BoilerProperty.java | 2 +- .../supportingClasses/CompositeSchedule.java | 2 +- .../CompositeScheduleProperty.java | 2 +- .../ConstructionMaterial.java | 6 ++---- .../ConstructionMaterialProperty.java | 2 +- .../supportingClasses/DualValueSchedule.java | 2 +- .../DualValueScheduleProperty.java | 2 +- .../ElectricalStorageDevice.java | 2 +- .../ElectricalStorageDeviceProperty.java | 2 +- .../model/supportingClasses/Energy.java | 6 ++---- .../supportingClasses/EnergyProperty.java | 2 +- .../model/supportingClasses/Food.java | 6 ++---- .../model/supportingClasses/FoodProperty.java | 2 +- .../supportingClasses/GenericDevice.java | 2 +- .../GenericElectricalDevice.java | 4 ++++ .../GenericSolarCollector.java | 4 ++++ .../model/supportingClasses/HeatPump.java | 2 +- .../supportingClasses/HeatPumpProperty.java | 2 +- .../InterpolationTypeValue.java | 2 +- .../supportingClasses/LightingDevice.java | 4 ++++ .../MovableShadingDevice.java | 2 +- .../MovableShadingDeviceProperty.java | 2 +- .../supportingClasses/OtherResource.java | 6 ++---- .../OtherResourceProperty.java | 2 +- .../PhotovoltaicCollector.java | 2 +- .../PhotovoltaicCollectorProperty.java | 2 +- .../PhotovoltaicThermalCollector.java | 2 +- .../PhotovoltaicThermalCollectorProperty.java | 2 +- .../supportingClasses/RegularTimeSeries.java | 2 +- .../RegularTimeSeriesFile.java | 2 +- .../RegularTimeSeriesFileProperty.java | 2 +- .../RegularTimeSeriesProperty.java | 2 +- .../supportingClasses/ScheduleComponent.java | 3 +-- .../ScheduleComponentProperty.java | 2 +- .../supportingClasses/ScheduleLibrary.java | 2 +- .../ScheduleLibraryProperty.java | 2 +- .../supportingClasses/SensorConnection.java | 2 +- .../SensorConnectionProperty.java | 2 +- .../SolarThermalCollector.java | 2 +- .../SolarThermalCollectorProperty.java | 2 +- .../model/supportingClasses/SurfaceSide.java | 2 +- .../ThermalStorageDevice.java | 4 ++++ .../model/supportingClasses/TimeClock.java | 2 +- .../supportingClasses/TimeIntervalLength.java | 2 +- .../model/supportingClasses/TimePeriod.java | 6 +----- .../supportingClasses/TimePeriodProperty.java | 2 +- .../supportingClasses/Transmittance.java | 2 +- .../TypicalValuesTimeSeries.java | 3 +-- .../TypicalValuesTimeSeriesFile.java | 3 +-- .../TypicalValuesTimeSeriesFileProperty.java | 2 +- .../TypicalValuesTimeSeriesProperty.java | 2 +- .../supportingClasses/UrbanFunctionArea.java | 2 +- .../UrbanFunctionAreaProperty.java | 2 +- .../model/supportingClasses/UrbanSpace.java | 4 ++-- .../supportingClasses/UrbanSpaceProperty.java | 2 +- .../model/supportingClasses/Waste.java | 6 ++---- .../supportingClasses/WasteProperty.java | 2 +- .../model/supportingClasses/Water.java | 4 ++-- .../supportingClasses/WaterProperty.java | 2 +- .../supportingClasses/WavelengthRange.java | 2 +- .../supportingClasses/WeatherStation.java | 7 +------ .../WeatherStationProperty.java | 2 +- .../EnergyADEFeatureFunctionWalker.java | 4 ++-- .../walker/EnergyADEFeatureWalker.java | 4 ++-- .../walker/EnergyADEGMLFunctionWalker.java | 7 +++---- .../walker/EnergyADEGMLWalker.java | 6 +++--- ...gml4j.model.citygml.ade.binding.ADEContext | 2 +- 139 files changed, 181 insertions(+), 215 deletions(-) delete mode 100644 src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericElectricalDevice.java delete mode 100644 src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericSolarCollector.java delete mode 100644 src/main/java/org/citygml4j/ade/energy/model/supportingClasses/LightingDevice.java delete mode 100644 src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ThermalStorageDevice.java rename src/main/java/org/citygml4j/ade/{energy => energy3}/EnergyADEContext.java (70%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/bind/EnergyADEMarshaller.java (99%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/bind/EnergyADEUnmarshaller.java (99%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractBuilding.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractBuildingPartition.java (98%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractBuildingPartitionProperty.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractBuildingProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractDataType.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractDevice.java (99%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractDeviceProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractLayeredConstruction.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractLayeredConstructionProperty.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractLibrary.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractLibraryProperty.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractQualifiedAttribute.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractQualifiedAttributeProperty.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractResource.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/AbstractResourceProperty.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/BuildingAtticThermalStatusProperty.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/BuildingBasementThermalStatusProperty.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/BuildingConstructionWeightProperty.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/BuildingFloorAreaProperty.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/BuildingHeightAboveGroundProperty.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/BuildingHeightProperty.java (83%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/BuildingIsProtectedProperty.java (91%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/BuildingTypeProperty.java (91%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/BuildingVolumeProperty.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/CityObjectRelation.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/CityObjectRelationProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/CityObjectRelationPropertyElement.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/DeviceOperation.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/DeviceOperationProperty.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/EnergyPerformanceCertificate.java (98%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/EnergyPerformanceCertificateProperty.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/NetworkConnectionStatusValue.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/QualifiedArea.java (94%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/QualifiedAreaProperty.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/QualifiedHeight.java (94%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/QualifiedHeightProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/QualifiedVolume.java (94%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/QualifiedVolumeProperty.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/ReferencePointProperty.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/RefurbishmentMeasure.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/RefurbishmentMeasureProperty.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/RelatedToProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/Suitability.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/SuitabilityProperty.java (87%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/ThermalStatusValue.java (76%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/UtilityNetworkConnection.java (98%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/UtilityNetworkConnectionProperty.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/WeatherData.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/WeatherDataProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/WeatherDataPropertyElement.java (91%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/core/WeatherDataTypeValue.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/module/EnergyADEModule.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/AbstractSchedule.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/AbstractScheduleProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/AbstractSolarCollector.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/AbstractSolarCollectorProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/AbstractTimeSeries.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/AbstractTimeSeriesProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/AtomicSchedule.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/AtomicScheduleProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/Boiler.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/BoilerProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/CompositeSchedule.java (94%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/CompositeScheduleProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/ConstructionMaterial.java (90%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/ConstructionMaterialProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/DualValueSchedule.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/DualValueScheduleProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/ElectricalStorageDevice.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/ElectricalStorageDeviceProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/Energy.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/EnergyProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/Food.java (88%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/FoodProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/GenericDevice.java (94%) create mode 100644 src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericElectricalDevice.java create mode 100644 src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericSolarCollector.java rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/HeatPump.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/HeatPumpProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/InterpolationTypeValue.java (95%) create mode 100644 src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/LightingDevice.java rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/MovableShadingDevice.java (98%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/MovableShadingDeviceProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/OtherResource.java (89%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/OtherResourceProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/PhotovoltaicCollector.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/PhotovoltaicCollectorProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/PhotovoltaicThermalCollector.java (98%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/RegularTimeSeries.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/RegularTimeSeriesFile.java (98%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/RegularTimeSeriesFileProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/RegularTimeSeriesProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/ScheduleComponent.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/ScheduleComponentProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/ScheduleLibrary.java (94%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/ScheduleLibraryProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/SensorConnection.java (99%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/SensorConnectionProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/SolarThermalCollector.java (98%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/SolarThermalCollectorProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/SurfaceSide.java (88%) create mode 100644 src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ThermalStorageDevice.java rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/TimeClock.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/TimeIntervalLength.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/TimePeriod.java (89%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/TimePeriodProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/Transmittance.java (56%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/TypicalValuesTimeSeries.java (97%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/TypicalValuesTimeSeriesFile.java (98%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/TypicalValuesTimeSeriesProperty.java (96%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/UrbanFunctionArea.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/UrbanFunctionAreaProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/UrbanSpace.java (92%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/UrbanSpaceProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/Waste.java (91%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/WasteProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/Water.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/WaterProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/WavelengthRange.java (89%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/WeatherStation.java (86%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/model/supportingClasses/WeatherStationProperty.java (95%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/walker/EnergyADEFeatureFunctionWalker.java (83%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/walker/EnergyADEFeatureWalker.java (81%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/walker/EnergyADEGMLFunctionWalker.java (93%) rename src/main/java/org/citygml4j/ade/{energy => energy3}/walker/EnergyADEGMLWalker.java (94%) diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin index 32d8a95a613f6f4b300470f4d31e631538fe1412..11adc51d680b277910716c97a92444a858af26e6 100644 GIT binary patch delta 25491 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 delta 8137 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 Jq#ohs{132Rz%~E? diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock index e4bb0d1e7f97fe292c9f515c5b1da427de3d08a4..f75c070b6c74aadd9ca309410379ba2931dbcd46 100644 GIT binary patch literal 17 UcmZR6EmlzQU~WVS0|dkZ05vWIivR!s literal 17 UcmZR6EmlzQU~WVS0|dAL05uf^asU7T diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a7f081fe8384eda635932b93a4cb1d505b73b53f..f9e84cedadfdbfe51035b6d011510a000d670f32 100644 GIT binary patch literal 17 UcmZSPc@mf=`TB7$0|Xoa05RAE;{X5v literal 17 UcmZSPc@mf=`TB7$0|d+g05Pxxy8r+H diff --git a/build.gradle b/build.gradle index b2deac0..88f4bb5 100644 --- a/build.gradle +++ b/build.gradle @@ -116,7 +116,7 @@ publishing { pom { name = project.name description = project.description - url = 'https://github.com/citygml4j' + url = 'https://transfer.hft-stuttgart.de/gitlab/energy-ade/energy-ade-3-citygml4j' licenses { license { name = 'The Apache License, Version 2.0' @@ -126,16 +126,16 @@ publishing { } developers { developer { - id = 'clausnagel' - name = 'Claus Nagel' - email = 'claus.nagel@gmail.com' - roles = ['architect', 'developer'] + id = 'rushipadsala' + name = 'Rushikesh Padsala' + email = 'ruhikesh.padsala@hft-stuttgart.de' + roles = ['manager', 'developer'] timezone = '+1' } } scm { - url = 'https://github.com/citygml4j/energy-ade-citygml4j' - connection = 'scm:git:https://github.com/citygml4j/energy-ade-citygml4j.git' + url = 'https://transfer.hft-stuttgart.de/gitlab/energy-ade/energy-ade-3-citygml4j' + connection = 'scm:git:https://transfer.hft-stuttgart.de/gitlab/energy-ade/energy-ade-3-citygml4j.git' } } } diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericElectricalDevice.java b/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericElectricalDevice.java deleted file mode 100644 index ca656d4..0000000 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericElectricalDevice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.citygml4j.ade.energy.model.supportingClasses; - -public class GenericElectricalDevice { -} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericSolarCollector.java b/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericSolarCollector.java deleted file mode 100644 index 5d6ca11..0000000 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericSolarCollector.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.citygml4j.ade.energy.model.supportingClasses; - -public class GenericSolarCollector { -} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/LightingDevice.java b/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/LightingDevice.java deleted file mode 100644 index 4d340a5..0000000 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/LightingDevice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.citygml4j.ade.energy.model.supportingClasses; - -public class LightingDevice { -} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ThermalStorageDevice.java b/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ThermalStorageDevice.java deleted file mode 100644 index a29cfb6..0000000 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ThermalStorageDevice.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.citygml4j.ade.energy.model.supportingClasses; - -public class ThermalStorageDevice { -} diff --git a/src/main/java/org/citygml4j/ade/energy/EnergyADEContext.java b/src/main/java/org/citygml4j/ade/energy3/EnergyADEContext.java similarity index 70% rename from src/main/java/org/citygml4j/ade/energy/EnergyADEContext.java rename to src/main/java/org/citygml4j/ade/energy3/EnergyADEContext.java index f87afa7..8120dc6 100644 --- a/src/main/java/org/citygml4j/ade/energy/EnergyADEContext.java +++ b/src/main/java/org/citygml4j/ade/energy3/EnergyADEContext.java @@ -1,9 +1,9 @@ -package org.citygml4j.ade.energy; +package org.citygml4j.ade.energy3; -import org.citygml4j.ade.energy.bind.EnergyADEMarshaller; -import org.citygml4j.ade.energy.bind.EnergyADEUnmarshaller; -import org.citygml4j.ade.energy.model.module.EnergyADEModule; -import org.citygml4j.ade.energy.walker.EnergyADEFeatureWalker; +import org.citygml4j.ade.energy3.bind.EnergyADEMarshaller; +import org.citygml4j.ade.energy3.bind.EnergyADEUnmarshaller; +import org.citygml4j.ade.energy3.model.module.EnergyADEModule; +import org.citygml4j.ade.energy3.walker.EnergyADEFeatureWalker; import org.citygml4j.model.citygml.ade.binding.ADEContext; import org.citygml4j.model.citygml.ade.binding.ADEMarshaller; import org.citygml4j.model.citygml.ade.binding.ADEUnmarshaller; @@ -16,7 +16,7 @@ import java.util.Collections; import java.util.List; public class EnergyADEContext implements ADEContext { - private final List modules = Collections.singletonList(EnergyADEModule.v2_0); + private final List modules = Collections.singletonList(EnergyADEModule.v3_0); @Override public List getADEModules() { @@ -25,8 +25,8 @@ public class EnergyADEContext implements ADEContext { @Override public List getModelPackageNames() { - return Arrays.asList("org.citygml4j.ade.energy.model.core", - "org.citygml4j.ade.energy.model.supportingClasses"); + return Arrays.asList("org.citygml4j.ade.energy3.model.core", + "org.citygml4j.ade.energy3.model.supportingClasses"); } @Override diff --git a/src/main/java/org/citygml4j/ade/energy/bind/EnergyADEMarshaller.java b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java similarity index 99% rename from src/main/java/org/citygml4j/ade/energy/bind/EnergyADEMarshaller.java rename to src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java index 85098d1..1be28ad 100644 --- a/src/main/java/org/citygml4j/ade/energy/bind/EnergyADEMarshaller.java +++ b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java @@ -1,9 +1,9 @@ -package org.citygml4j.ade.energy.bind; +package org.citygml4j.ade.energy3.bind; import lombok.SneakyThrows; import net.opengis.gml.*; -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.builder.jaxb.marshal.citygml.ade.ADEMarshallerHelper; import org.citygml4j.model.citygml.ade.binding.ADEMarshaller; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; @@ -21,7 +21,6 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; import java.math.BigDecimal; import java.math.BigInteger; -import java.sql.Timestamp; import java.time.LocalDate; import java.time.LocalTime; import java.time.ZonedDateTime; diff --git a/src/main/java/org/citygml4j/ade/energy/bind/EnergyADEUnmarshaller.java b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java similarity index 99% rename from src/main/java/org/citygml4j/ade/energy/bind/EnergyADEUnmarshaller.java rename to src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java index 3c3a06b..0c0f6ba 100644 --- a/src/main/java/org/citygml4j/ade/energy/bind/EnergyADEUnmarshaller.java +++ b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java @@ -1,9 +1,9 @@ -package org.citygml4j.ade.energy.bind; +package org.citygml4j.ade.energy3.bind; import lombok.SneakyThrows; import net.opengis.gml.*; -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.builder.jaxb.unmarshal.citygml.ade.ADEUnmarshallerHelper; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.citygml.ade.binding.ADEUnmarshaller; @@ -23,7 +23,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.sql.Timestamp; import java.time.LocalTime; import java.time.ZonedDateTime; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuilding.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuilding.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuilding.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuilding.java index 9068c35..9189bfd 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuilding.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuilding.java @@ -1,13 +1,11 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; -import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; import org.citygml4j.model.common.visitor.GMLFunctor; import org.citygml4j.model.common.visitor.GMLVisitor; -import org.citygml4j.model.gml.base.AbstractGML; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.feature.AbstractFeature; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartition.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartition.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartition.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartition.java index 1d77ae3..c534b60 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartition.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartition.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import net.opengis.gml.SolidPropertyType; import org.citygml4j.builder.copy.CopyBuilder; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartitionProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartitionProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartitionProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartitionProperty.java index 04efb35..7557042 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartitionProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartitionProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingProperty.java index 38a1655..34ce5eb 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDataType.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDataType.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractDataType.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDataType.java index e6ad6e7..8cf7261 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDataType.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDataType.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.association.Associable; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDevice.java similarity index 99% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractDevice.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDevice.java index d89d640..59a1d4d 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDevice.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDevice.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import lombok.Getter; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDeviceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDeviceProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractDeviceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDeviceProperty.java index 71cece8..319b8f3 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractDeviceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDeviceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstruction.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstruction.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstruction.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstruction.java index a8c906b..e5f06e1 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstruction.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstruction.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstructionProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstructionProperty.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstructionProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstructionProperty.java index 26d6292..8f6dcd8 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstructionProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstructionProperty.java @@ -1,6 +1,5 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; -import org.citygml4j.ade.energy.model.core.AbstractLayeredConstruction; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.gml.base.AssociationByRepOrRef; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibrary.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibrary.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibrary.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibrary.java index a949434..e3e2617 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibrary.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibrary.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibraryProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibraryProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibraryProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibraryProperty.java index b501365..62cd00a 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibraryProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibraryProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttribute.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttribute.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttribute.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttribute.java index a2b9aac..4f3157c 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttribute.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttribute.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.gml.base.AbstractGML; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttributeProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttributeProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttributeProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttributeProperty.java index 50cacfa..8c0a224 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttributeProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttributeProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractResource.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractResource.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java index 7120597..f646011 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractResource.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractTimeSeriesProperty; +import org.citygml4j.ade.energy3.model.supportingClasses.AbstractTimeSeriesProperty; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractResourceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResourceProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/AbstractResourceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResourceProperty.java index 6d2ba51..a82b457 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/AbstractResourceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResourceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingAtticThermalStatusProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingAtticThermalStatusProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java index f8580ad..efe8a2e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingAtticThermalStatusProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingBasementThermalStatusProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingBasementThermalStatusProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java index e290209..298183f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingBasementThermalStatusProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingConstructionWeightProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingConstructionWeightProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingConstructionWeightProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingConstructionWeightProperty.java index a481a69..80faeff 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingConstructionWeightProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingConstructionWeightProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import net.opengis.gml.CodeType; import org.citygml4j.builder.copy.CopyBuilder; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingFloorAreaProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingFloorAreaProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java index 2b17e28..a2ffcd3 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingFloorAreaProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightAboveGroundProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightAboveGroundProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java index b7a058c..ae11677 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightAboveGroundProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java similarity index 83% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java index 87f4ade..9bc9236 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingHeightProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java @@ -1,8 +1,7 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; -import org.sig3d.citygml.energyADE2beta7.QualifiedAreaPropertyType; import org.sig3d.citygml.energyADE2beta7.QualifiedHeightPropertyType; public class BuildingHeightProperty extends ADEGenericApplicationProperty { diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingIsProtectedProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingIsProtectedProperty.java similarity index 91% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingIsProtectedProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingIsProtectedProperty.java index a43f7be..82d5568 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingIsProtectedProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingIsProtectedProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingTypeProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingTypeProperty.java similarity index 91% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingTypeProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingTypeProperty.java index 70afe76..2d49017 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingTypeProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingTypeProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import net.opengis.gml.CodeType; import org.citygml4j.builder.copy.CopyBuilder; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingVolumeProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/BuildingVolumeProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java index 98624d5..4cb6b78 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/BuildingVolumeProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelation.java b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelation.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelation.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelation.java index 0bd127e..21afe6d 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelation.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelation.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationProperty.java index 1cca78e..331d591 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationPropertyElement.java b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationPropertyElement.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationPropertyElement.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationPropertyElement.java index 2e32be5..2d25d43 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/CityObjectRelationPropertyElement.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/CityObjectRelationPropertyElement.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperation.java b/src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperation.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperation.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperation.java index 6b7f819..3de9606 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperation.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperation.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractScheduleProperty; +import org.citygml4j.ade.energy3.model.supportingClasses.AbstractScheduleProperty; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.citygml.core.AbstractCityObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperationProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperationProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperationProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperationProperty.java index 3c93c6a..8e75b6e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/DeviceOperationProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/DeviceOperationProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificate.java b/src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificate.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificate.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificate.java index 89326fe..b0146af 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificate.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificate.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificateProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificateProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificateProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificateProperty.java index 5878bb6..7dcb8b9 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/EnergyPerformanceCertificateProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/EnergyPerformanceCertificateProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/NetworkConnectionStatusValue.java b/src/main/java/org/citygml4j/ade/energy3/model/core/NetworkConnectionStatusValue.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/NetworkConnectionStatusValue.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/NetworkConnectionStatusValue.java index 13e19df..9305edf 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/NetworkConnectionStatusValue.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/NetworkConnectionStatusValue.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; public enum NetworkConnectionStatusValue { diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedArea.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedArea.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedArea.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedArea.java index 83c1b2b..edbfc48 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedArea.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedArea.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedAreaProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedAreaProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java index bd0d6e4..bef6563 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedAreaProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeight.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeight.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeight.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeight.java index 4e1c9a0..85a6760 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeight.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeight.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeightProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeightProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java index 469e5f9..b310040 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedHeightProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolume.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolume.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolume.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolume.java index b9aa312..274e500 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolume.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolume.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolumeProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolumeProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java index 029e20b..578d1ce 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/QualifiedVolumeProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/ReferencePointProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/ReferencePointProperty.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/ReferencePointProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/ReferencePointProperty.java index 60019a9..b54c1c4 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/ReferencePointProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/ReferencePointProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasure.java b/src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasure.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasure.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasure.java index fbba2ee..057ecf8 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasure.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasure.java @@ -1,8 +1,7 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; -import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasureProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasureProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasureProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasureProperty.java index 10daedf..3fadf25 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/RefurbishmentMeasureProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/RefurbishmentMeasureProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/RelatedToProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/RelatedToProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/RelatedToProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/RelatedToProperty.java index 7b44a65..8515436 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/RelatedToProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/RelatedToProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import net.opengis.citygml._2.AbstractCityObjectType; import org.citygml4j.builder.copy.CopyBuilder; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/Suitability.java b/src/main/java/org/citygml4j/ade/energy3/model/core/Suitability.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/core/Suitability.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/Suitability.java index 5b0f068..bd8aa18 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/Suitability.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/Suitability.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.measures.Scale; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/SuitabilityProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java similarity index 87% rename from src/main/java/org/citygml4j/ade/energy/model/core/SuitabilityProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java index ba91eaf..cc3ad18 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/SuitabilityProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java @@ -1,6 +1,5 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; -import net.opengis.gml.CodeType; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.sig3d.citygml.energyADE2beta7.SuitabilityPropertyType; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/ThermalStatusValue.java b/src/main/java/org/citygml4j/ade/energy3/model/core/ThermalStatusValue.java similarity index 76% rename from src/main/java/org/citygml4j/ade/energy/model/core/ThermalStatusValue.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/ThermalStatusValue.java index bc6a858..1f92a46 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/ThermalStatusValue.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/ThermalStatusValue.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; public enum ThermalStatusValue { diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnection.java b/src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnection.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnection.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnection.java index 6e8c90f..35174a2 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnection.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnection.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnectionProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnectionProperty.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnectionProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnectionProperty.java index 0e8fb72..cc81545 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/UtilityNetworkConnectionProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/UtilityNetworkConnectionProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherData.java b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherData.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/core/WeatherData.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/WeatherData.java index 7209b75..4c3d883 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherData.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherData.java @@ -1,18 +1,15 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractTimeSeriesProperty; +import org.citygml4j.ade.energy3.model.supportingClasses.AbstractTimeSeriesProperty; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; import org.citygml4j.model.common.visitor.GMLFunctor; import org.citygml4j.model.common.visitor.GMLVisitor; -import org.citygml4j.model.gml.base.AbstractGML; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.basicTypes.Measure; import org.citygml4j.model.gml.feature.AbstractFeature; -import org.citygml4j.model.gml.geometry.primitives.PointProperty; -import org.sig3d.citygml.energyADE2beta7.AbstractTimeSeriesPropertyType; public class WeatherData extends AbstractFeature implements ADEModelObject { private Code libraryCode; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataProperty.java index aa3ac3f..67306fc 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataPropertyElement.java b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataPropertyElement.java similarity index 91% rename from src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataPropertyElement.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataPropertyElement.java index 2c560e8..14c3a70 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataPropertyElement.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataPropertyElement.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; diff --git a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataTypeValue.java b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataTypeValue.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataTypeValue.java rename to src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataTypeValue.java index bee511f..3c74c3b 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/core/WeatherDataTypeValue.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/core/WeatherDataTypeValue.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.core; +package org.citygml4j.ade.energy3.model.core; public enum WeatherDataTypeValue { AIR_TEMPERATURE("airTemperature"), diff --git a/src/main/java/org/citygml4j/ade/energy/model/module/EnergyADEModule.java b/src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/module/EnergyADEModule.java rename to src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java index 2c452b8..5a9c447 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/module/EnergyADEModule.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java @@ -1,8 +1,8 @@ -package org.citygml4j.ade.energy.model.module; +package org.citygml4j.ade.energy3.model.module; -import org.citygml4j.ade.energy.EnergyADEContext; -import org.citygml4j.ade.energy.model.core.*; -import org.citygml4j.ade.energy.model.supportingClasses.*; +import org.citygml4j.ade.energy3.EnergyADEContext; +import org.citygml4j.ade.energy3.model.core.*; +import org.citygml4j.ade.energy3.model.supportingClasses.*; import org.citygml4j.model.gml.feature.AbstractFeature; import org.citygml4j.model.module.ade.ADEModule; import org.citygml4j.model.module.citygml.CityGMLVersion; @@ -12,7 +12,7 @@ import java.net.URL; import java.util.*; public class EnergyADEModule extends ADEModule { - public static final EnergyADEModule v2_0 = new EnergyADEModule(); + public static final EnergyADEModule v3_0 = new EnergyADEModule(); private HashMap> features; private HashSet featureProperties; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSchedule.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSchedule.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSchedule.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSchedule.java index 06feae4..3a31a3d 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSchedule.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSchedule.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractScheduleProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractScheduleProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractScheduleProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractScheduleProperty.java index 54e151c..ffd1d86 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractScheduleProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractScheduleProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollector.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollector.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollector.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollector.java index 60f8f68..21be7a6 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollector.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollector.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.GMLFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollectorProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollectorProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollectorProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollectorProperty.java index cecf1ad..07280f6 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractSolarCollectorProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractSolarCollectorProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeries.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeries.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeries.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeries.java index f1c5840..ac01565 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeries.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeries.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeriesProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeriesProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeriesProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeriesProperty.java index d057e59..c65648f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AbstractTimeSeriesProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AbstractTimeSeriesProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicSchedule.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicSchedule.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicSchedule.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicSchedule.java index 5ff5894..6e1ce2e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicSchedule.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicSchedule.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicScheduleProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicScheduleProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicScheduleProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicScheduleProperty.java index cbbc4a9..ce197f5 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/AtomicScheduleProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/AtomicScheduleProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Boiler.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Boiler.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Boiler.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Boiler.java index 8493d83..44db3c4 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Boiler.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Boiler.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/BoilerProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/BoilerProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/BoilerProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/BoilerProperty.java index 756eb8b..4e7ddc4 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/BoilerProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/BoilerProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeSchedule.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeSchedule.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeSchedule.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeSchedule.java index 2ec3031..9db8385 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeSchedule.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeSchedule.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeScheduleProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeScheduleProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeScheduleProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeScheduleProperty.java index 28c5111..102e98c 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/CompositeScheduleProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/CompositeScheduleProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterial.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterial.java similarity index 90% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterial.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterial.java index d136123..18cd1e3 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterial.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterial.java @@ -1,12 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.common.visitor.GMLFunctor; -import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.basicTypes.Code; public class ConstructionMaterial extends AbstractResource implements ADEModelObject { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterialProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterialProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterialProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterialProperty.java index e1ce99c..314e3fb 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ConstructionMaterialProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ConstructionMaterialProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueSchedule.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueSchedule.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueSchedule.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueSchedule.java index 791fe86..e338434 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueSchedule.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueSchedule.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueScheduleProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueScheduleProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueScheduleProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueScheduleProperty.java index 9b4fd92..4c3edc5 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/DualValueScheduleProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/DualValueScheduleProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDevice.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDevice.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDevice.java index 218e173..1408b46 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDevice.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDevice.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDeviceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDeviceProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDeviceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDeviceProperty.java index 5f337c2..0097ee0 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ElectricalStorageDeviceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ElectricalStorageDeviceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Energy.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Energy.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Energy.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Energy.java index 5dce4c7..81c2e41 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Energy.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Energy.java @@ -1,12 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.common.visitor.GMLFunctor; -import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.basicTypes.Measure; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/EnergyProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/EnergyProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/EnergyProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/EnergyProperty.java index 981ce30..587ab82 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/EnergyProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/EnergyProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Food.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Food.java similarity index 88% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Food.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Food.java index 5875b2c..9d3dc31 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Food.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Food.java @@ -1,12 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.common.visitor.GMLFunctor; -import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.basicTypes.Code; public class Food extends AbstractResource implements ADEModelObject { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/FoodProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/FoodProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/FoodProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/FoodProperty.java index 7e7e77e..9b66b07 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/FoodProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/FoodProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericDevice.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericDevice.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericDevice.java index cbf92ba..c1eba01 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/GenericDevice.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericDevice.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericElectricalDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericElectricalDevice.java new file mode 100644 index 0000000..8767cd6 --- /dev/null +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericElectricalDevice.java @@ -0,0 +1,4 @@ +package org.citygml4j.ade.energy3.model.supportingClasses; + +public class GenericElectricalDevice { +} diff --git a/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericSolarCollector.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericSolarCollector.java new file mode 100644 index 0000000..a82fe85 --- /dev/null +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/GenericSolarCollector.java @@ -0,0 +1,4 @@ +package org.citygml4j.ade.energy3.model.supportingClasses; + +public class GenericSolarCollector { +} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPump.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPump.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPump.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPump.java index b9b03fd..466ec3b 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPump.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPump.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPumpProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPumpProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPumpProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPumpProperty.java index c1c2040..a049968 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/HeatPumpProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/HeatPumpProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/InterpolationTypeValue.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/InterpolationTypeValue.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/InterpolationTypeValue.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/InterpolationTypeValue.java index 073f8b8..384646e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/InterpolationTypeValue.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/InterpolationTypeValue.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; public enum InterpolationTypeValue { MAVERAGE_IN_PRECEDING_INTERVAL("averageInPrecedingInterval"), diff --git a/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/LightingDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/LightingDevice.java new file mode 100644 index 0000000..bd37da3 --- /dev/null +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/LightingDevice.java @@ -0,0 +1,4 @@ +package org.citygml4j.ade.energy3.model.supportingClasses; + +public class LightingDevice { +} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDevice.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDevice.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDevice.java index 2ac5169..efa32f4 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDevice.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDevice.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDeviceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDeviceProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDeviceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDeviceProperty.java index 4b90443..efc5c8f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/MovableShadingDeviceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/MovableShadingDeviceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResource.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResource.java similarity index 89% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResource.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResource.java index 967d8d3..c103a81 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResource.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResource.java @@ -1,12 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.common.visitor.GMLFunctor; -import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.basicTypes.Code; public class OtherResource extends AbstractResource implements ADEModelObject { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResourceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResourceProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResourceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResourceProperty.java index ded5f6e..d3952d6 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/OtherResourceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/OtherResourceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollector.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollector.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollector.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollector.java index c96c78a..80c1254 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollector.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollector.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollectorProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollectorProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollectorProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollectorProperty.java index e3c6c89..48ebd1e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicCollectorProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicCollectorProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollector.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollector.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollector.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollector.java index 741ba37..c4bb690 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollector.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollector.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java index 8ff2bcc..d00024e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/PhotovoltaicThermalCollectorProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeries.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeries.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeries.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeries.java index 33d041b..dc3a163 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeries.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeries.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFile.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFile.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFile.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFile.java index fc7586f..752362d 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFile.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFile.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFileProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFileProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFileProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFileProperty.java index 2b746a3..8bb36ef 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesFileProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesFileProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesProperty.java index a9657dc..7c9cd2f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/RegularTimeSeriesProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/RegularTimeSeriesProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponent.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponent.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponent.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponent.java index 9cc7057..deb99c1 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponent.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponent.java @@ -1,6 +1,5 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.DeviceOperation; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponentProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponentProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponentProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponentProperty.java index 3a7e426..a3f24e8 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleComponentProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleComponentProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibrary.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibrary.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibrary.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibrary.java index 743e8ac..cc79619 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibrary.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibrary.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibraryProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibraryProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibraryProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibraryProperty.java index 553ee34..857ee44 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/ScheduleLibraryProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ScheduleLibraryProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnection.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnection.java similarity index 99% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnection.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnection.java index f192975..538ac58 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnection.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnection.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnectionProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnectionProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnectionProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnectionProperty.java index 3c5a7e6..97d8c2b 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SensorConnectionProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SensorConnectionProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollector.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollector.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollector.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollector.java index cc5c3cb..cea10d6 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollector.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollector.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollectorProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollectorProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollectorProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollectorProperty.java index 3ebbf9a..30d857f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SolarThermalCollectorProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SolarThermalCollectorProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SurfaceSide.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SurfaceSide.java similarity index 88% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SurfaceSide.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SurfaceSide.java index 924115d..5bec295 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/SurfaceSide.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/SurfaceSide.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; public enum SurfaceSide { diff --git a/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ThermalStorageDevice.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ThermalStorageDevice.java new file mode 100644 index 0000000..924c0cb --- /dev/null +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/ThermalStorageDevice.java @@ -0,0 +1,4 @@ +package org.citygml4j.ade.energy3.model.supportingClasses; + +public class ThermalStorageDevice { +} diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeClock.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeClock.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeClock.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeClock.java index 9f23ffb..3321189 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeClock.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeClock.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeIntervalLength.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeIntervalLength.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeIntervalLength.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeIntervalLength.java index 9ec4635..757d4b4 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimeIntervalLength.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimeIntervalLength.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriod.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriod.java similarity index 89% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriod.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriod.java index cfefcfa..c690051 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriod.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriod.java @@ -1,14 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import net.opengis.gml.TimeInstantPropertyType; -import net.opengis.gml.TimeIntervalLengthType; -import net.opengis.gml.TimePositionType; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.association.Associable; import org.citygml4j.model.common.base.ModelObject; -import javax.xml.datatype.Duration; import java.time.ZonedDateTime; public class TimePeriod implements Associable, ADEModelObject { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriodProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriodProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriodProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriodProperty.java index 9e7c418..0dcc0ef 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TimePeriodProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TimePeriodProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Transmittance.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Transmittance.java similarity index 56% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Transmittance.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Transmittance.java index 5cb25a9..a2de261 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Transmittance.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Transmittance.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; public class Transmittance { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeries.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeries.java similarity index 97% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeries.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeries.java index 32a4a41..ba3276a 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeries.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeries.java @@ -1,11 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; import org.citygml4j.model.gml.basicTypes.MeasureList; -import java.sql.Timestamp; import java.time.LocalTime; public class TypicalValuesTimeSeries extends AbstractTimeSeries { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFile.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFile.java similarity index 98% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFile.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFile.java index 59b45d6..bbc618e 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFile.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFile.java @@ -1,9 +1,8 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.gml.measures.Time; import java.net.URI; import java.time.ZonedDateTime; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java index 10746da..1fac6e6 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesFileProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesProperty.java similarity index 96% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesProperty.java index ecefe03..2ddc867 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/TypicalValuesTimeSeriesProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/TypicalValuesTimeSeriesProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionArea.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionArea.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionArea.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionArea.java index eb6908f..aa09f94 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionArea.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionArea.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.citygml.cityobjectgroup.CityObjectGroup; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionAreaProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionAreaProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionAreaProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionAreaProperty.java index 1aa791a..6776d03 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanFunctionAreaProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanFunctionAreaProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpace.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpace.java similarity index 92% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpace.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpace.java index 6ad421b..48c59f4 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpace.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpace.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpaceProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpaceProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpaceProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpaceProperty.java index 092cc51..0193a8f 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/UrbanSpaceProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/UrbanSpaceProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Waste.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Waste.java similarity index 91% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Waste.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Waste.java index a7a13dc..3448a84 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Waste.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Waste.java @@ -1,12 +1,10 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; -import org.citygml4j.model.common.visitor.GMLFunctor; -import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.basicTypes.Code; public class Waste extends AbstractResource implements ADEModelObject { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WasteProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WasteProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WasteProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WasteProperty.java index ebbcf92..de8e33c 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WasteProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WasteProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Water.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Water.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Water.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Water.java index 4b67405..0a035a2 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/Water.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/Water.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.AbstractResource; +import org.citygml4j.ade.energy3.model.core.AbstractResource; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.common.visitor.FeatureFunctor; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WaterProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WaterProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WaterProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WaterProperty.java index 35edb47..41559f22a 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WaterProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WaterProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WavelengthRange.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WavelengthRange.java similarity index 89% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WavelengthRange.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WavelengthRange.java index 885c29b..2f33211 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WavelengthRange.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WavelengthRange.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; public enum WavelengthRange { diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStation.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStation.java similarity index 86% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStation.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStation.java index b098ab2..f7a74a1 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStation.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStation.java @@ -1,20 +1,15 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; -import org.citygml4j.ade.energy.model.core.WeatherDataProperty; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.citygml.core.AbstractCityObject; -import org.citygml4j.model.common.child.ChildList; import org.citygml4j.model.common.visitor.FeatureFunctor; import org.citygml4j.model.common.visitor.FeatureVisitor; import org.citygml4j.model.common.visitor.GMLFunctor; import org.citygml4j.model.common.visitor.GMLVisitor; import org.citygml4j.model.gml.feature.BoundingShape; -import org.citygml4j.model.gml.geometry.primitives.PointProperty; import org.citygml4j.util.bbox.BoundingBoxOptions; -import java.util.List; - public class WeatherStation extends AbstractCityObject implements ADEModelObject { @Override diff --git a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStationProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStationProperty.java similarity index 95% rename from src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStationProperty.java rename to src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStationProperty.java index c07bd0f..32dbe2b 100644 --- a/src/main/java/org/citygml4j/ade/energy/model/supportingClasses/WeatherStationProperty.java +++ b/src/main/java/org/citygml4j/ade/energy3/model/supportingClasses/WeatherStationProperty.java @@ -1,4 +1,4 @@ -package org.citygml4j.ade.energy.model.supportingClasses; +package org.citygml4j.ade.energy3.model.supportingClasses; import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureFunctionWalker.java b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureFunctionWalker.java similarity index 83% rename from src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureFunctionWalker.java rename to src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureFunctionWalker.java index 76e3797..7b48092 100644 --- a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureFunctionWalker.java +++ b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureFunctionWalker.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.walker; +package org.citygml4j.ade.energy3.walker; -import org.citygml4j.ade.energy.model.supportingClasses.WeatherStation; +import org.citygml4j.ade.energy3.model.supportingClasses.WeatherStation; import org.citygml4j.model.citygml.ade.binding.ADEWalker; import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.util.walker.FeatureFunctionWalker; diff --git a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureWalker.java b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureWalker.java similarity index 81% rename from src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureWalker.java rename to src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureWalker.java index 84a6ef7..4c3709f 100644 --- a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEFeatureWalker.java +++ b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEFeatureWalker.java @@ -1,6 +1,6 @@ -package org.citygml4j.ade.energy.walker; +package org.citygml4j.ade.energy3.walker; -import org.citygml4j.ade.energy.model.supportingClasses.WeatherStation; +import org.citygml4j.ade.energy3.model.supportingClasses.WeatherStation; import org.citygml4j.model.citygml.ade.binding.ADEWalker; import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.util.walker.FeatureWalker; diff --git a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLFunctionWalker.java b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLFunctionWalker.java similarity index 93% rename from src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLFunctionWalker.java rename to src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLFunctionWalker.java index cd8bd8b..8737d6e 100644 --- a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLFunctionWalker.java +++ b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLFunctionWalker.java @@ -1,12 +1,11 @@ -package org.citygml4j.ade.energy.walker; +package org.citygml4j.ade.energy3.walker; -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.ADEWalker; import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.model.gml.base.AbstractGML; import org.citygml4j.model.gml.base.AssociationByRepOrRef; -import org.citygml4j.model.gml.feature.FeatureProperty; import org.citygml4j.util.walker.GMLFunctionWalker; public class EnergyADEGMLFunctionWalker implements ADEWalker> { diff --git a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLWalker.java b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLWalker.java similarity index 94% rename from src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLWalker.java rename to src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLWalker.java index baa8a96..19b4842 100644 --- a/src/main/java/org/citygml4j/ade/energy/walker/EnergyADEGMLWalker.java +++ b/src/main/java/org/citygml4j/ade/energy3/walker/EnergyADEGMLWalker.java @@ -1,7 +1,7 @@ -package org.citygml4j.ade.energy.walker; +package org.citygml4j.ade.energy3.walker; -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.ADEWalker; import org.citygml4j.model.citygml.core.AbstractCityObject; import org.citygml4j.model.gml.base.AbstractGML; diff --git a/src/main/resources/META-INF/services/org.citygml4j.model.citygml.ade.binding.ADEContext b/src/main/resources/META-INF/services/org.citygml4j.model.citygml.ade.binding.ADEContext index 903bc5b..18c117a 100644 --- a/src/main/resources/META-INF/services/org.citygml4j.model.citygml.ade.binding.ADEContext +++ b/src/main/resources/META-INF/services/org.citygml4j.model.citygml.ade.binding.ADEContext @@ -1 +1 @@ -org.citygml4j.ade.energy.EnergyADEContext \ No newline at end of file +org.citygml4j.ade.energy3.EnergyADEContext \ No newline at end of file -- GitLab