Commit 1e8e9afd authored by Rushikesh Padsala's avatar Rushikesh Padsala
Browse files

support for importing-exporting CityObjectRelation

parent ac82c637
...@@ -73,7 +73,8 @@ public class EnergyADEMarshaller implements ADEMarshaller { ...@@ -73,7 +73,8 @@ public class EnergyADEMarshaller implements ADEMarshaller {
.with(SensorConnection.class, this::createSensorConnection) .with(SensorConnection.class, this::createSensorConnection)
.with(WeatherData.class, this::createWeatherData) .with(WeatherData.class, this::createWeatherData)
.with(WeatherDataProperty.class, this::createWeatherDataProperty) .with(WeatherDataProperty.class, this::createWeatherDataProperty)
.with(WeatherStation.class, this::createWeatherStation); .with(WeatherStation.class, this::createWeatherStation)
.with(CityObjectRelationProperty.class, this::createCityObjectRelationProperty);
} }
} finally { } finally {
lock.unlock(); lock.unlock();
...@@ -137,7 +138,9 @@ public class EnergyADEMarshaller implements ADEMarshaller { ...@@ -137,7 +138,9 @@ public class EnergyADEMarshaller implements ADEMarshaller {
.with(TypicalValuesTimeSeries.class, this::marshalTypicalValuesTimeSeries) .with(TypicalValuesTimeSeries.class, this::marshalTypicalValuesTimeSeries)
.with(TypicalValuesTimeSeriesFile.class, this::marshalTypicalValuesTimeSeriesFile) .with(TypicalValuesTimeSeriesFile.class, this::marshalTypicalValuesTimeSeriesFile)
.with(SensorConnection.class, this::marshalSensorConnection) .with(SensorConnection.class, this::marshalSensorConnection)
.with(WeatherStationProperty.class, this::marshalWeatherStationProperty); .with(WeatherStationProperty.class, this::marshalWeatherStationProperty)
.with(CityObjectRelationProperty.class, this::marshalCityObjectRelationProperty);
} }
} finally { } finally {
lock.unlock(); lock.unlock();
...@@ -2245,6 +2248,10 @@ public class EnergyADEMarshaller implements ADEMarshaller { ...@@ -2245,6 +2248,10 @@ public class EnergyADEMarshaller implements ADEMarshaller {
return factory.createRefurbishmentMeasureProperty(marshalRefurbishmentMeasureProperty(src)); return factory.createRefurbishmentMeasureProperty(marshalRefurbishmentMeasureProperty(src));
} }
private JAXBElement<?> createCityObjectRelationProperty(CityObjectRelationProperty src) {
return factory.createRelatedTo(marshalCityObjectRelationProperty(src));
}
private JAXBElement<?> createAbstractQualifiedAttributeProperty(AbstractQualifiedAttributeProperty src) { private JAXBElement<?> createAbstractQualifiedAttributeProperty(AbstractQualifiedAttributeProperty src) {
AbstractQualifiedAttribute attribute = src.getValue(); AbstractQualifiedAttribute attribute = src.getValue();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment