changed to beta8 classes

src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java

@@ -13,8 +13,8 @@ import org.citygml4j.model.gml.xlink.XLinkShow;
 import org.citygml4j.model.gml.xlink.XLinkType;
 import org.citygml4j.util.mapper.CheckedTypeMapper;
 import org.citygml4j.xml.io.reader.MissingADESchemaException;
-import org.sig3d.citygml.energyADE3beta7.*;
-import org.sig3d.citygml.energyADE3beta7.*;
+import org.sig3d.citygml.energyADE3beta8.*;
+import org.sig3d.citygml.energyADE3beta8.*;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.datatype.DatatypeConstants;
@@ -391,14 +391,14 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
         if (src.isSetType()) {
             dest.setType(helper.getGMLUnmarshaller().unmarshalCode(src.getType()));
         }
-        if (src.isSetEndDate()){
-            dest.setEndDate(src.getEndDate());
-        }
-        if (src.isSetStartDate())
-            dest.setStartDate(src.getStartDate());
-        if (src.isSetLibraryCode()){
-            dest.setLibraryCode(helper.getGMLUnmarshaller().unmarshalCode(src.getLibraryCode()));
-        }
+//        if (src.isSetEndDate()){
+//            dest.setEndDate(src.getEndDate());
+//        }
+//        if (src.isSetStartDate())
+//            dest.setStartDate(src.getStartDate());
+//        if (src.isSetLibraryCode()){
+//            dest.setLibraryCode(helper.getGMLUnmarshaller().unmarshalCode(src.getLibraryCode()));
+//        }
 
         return dest;
     }
@@ -454,19 +454,19 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
         if (src.isSetCertificationMethod()){
             dest.setCertificationMethod(src.getCertificationMethod());
         }
-        if (src.isSetCertificationURI()){
-            URI uri = new URI(src.getCertificationURI());
-            dest.setCertificationURI(uri);
-        }
-        if (src.isSetLabel()){
-            dest.setLabel(src.getLabel());
-        }
-        if (src.isSetIssueDate()){
-            dest.setIssueDate(src.getIssueDate());
-        }
-        if (src.isSetExpirationDate()){
-            dest.setExpirationDate(src.getExpirationDate());
-        }
+//        if (src.isSetCertificationURI()){
+//            URI uri = new URI(src.getCertificationURI());
+//            dest.setCertificationURI(uri);
+//        }
+//        if (src.isSetLabel()){
+//            dest.setLabel(src.getLabel());
+//        }
+//        if (src.isSetIssueDate()){
+//            dest.setIssueDate(src.getIssueDate());
+//        }
+//        if (src.isSetExpirationDate()){
+//            dest.setExpirationDate(src.getExpirationDate());
+//        }
         if (src.isSetValue()){
             dest.setValue(helper.getGMLUnmarshaller().unmarshalMeasure(src.getValue()));
         }
@@ -1317,8 +1317,8 @@ public class EnergyADEUnmarshaller implements ADEUnmarshaller {
         WeatherData dest = new WeatherData();
         if (src.isSetType())
             dest.setType(helper.getGMLUnmarshaller().unmarshalCode(src.getType()));
-        if (src.isSetLibraryCode())
-            dest.setLibraryCode(helper.getGMLUnmarshaller().unmarshalCode(src.getLibraryCode()));
+//        if (src.isSetLibraryCode())
+//            dest.setLibraryCode(helper.getGMLUnmarshaller().unmarshalCode(src.getLibraryCode()));
         if (src.isSetValueType())
             dest.setValueType(helper.getGMLUnmarshaller().unmarshalCode(src.getValueType()));
         if (src.isSetYearlyValue())

src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java

@@ -10,7 +10,7 @@ import org.citygml4j.model.common.visitor.GMLVisitor;
 import org.citygml4j.model.gml.basicTypes.Code;
 import org.citygml4j.model.gml.basicTypes.Measure;
 import org.citygml4j.model.gml.feature.AbstractFeature;
-import org.sig3d.citygml.energyADE3beta7.ResourceStatusValueType;
+import org.sig3d.citygml.energyADE3beta8.ResourceStatusValueType;
 
 public abstract class AbstractResource extends AbstractFeature implements ADEModelObject {
 

src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java

@@ -2,7 +2,7 @@ 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.energyADE3beta7.ThermalStatusValueType;
+import org.sig3d.citygml.energyADE3beta8.ThermalStatusValueType;
 
 public class BuildingAtticThermalStatusProperty extends ADEGenericApplicationProperty<ThermalStatusValueType> {
 

src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java

@@ -2,7 +2,7 @@ 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.energyADE3beta7.ThermalStatusValueType;
+import org.sig3d.citygml.energyADE3beta8.ThermalStatusValueType;
 
 public class BuildingBasementThermalStatusProperty extends ADEGenericApplicationProperty<ThermalStatusValueType> {
 

src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java

@@ -2,7 +2,7 @@ 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.energyADE3beta7.QualifiedAreaPropertyType;
+import org.sig3d.citygml.energyADE3beta8.QualifiedAreaPropertyType;
 
 public class BuildingFloorAreaProperty extends ADEGenericApplicationProperty<QualifiedAreaPropertyType> {
 

src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java

@@ -2,7 +2,7 @@ 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.energyADE3beta7.QualifiedHeightPropertyType;
+import org.sig3d.citygml.energyADE3beta8.QualifiedHeightPropertyType;
 
 public class BuildingHeightAboveGroundProperty extends ADEGenericApplicationProperty<QualifiedHeightPropertyType> {
 

src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java

@@ -2,7 +2,7 @@ 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.energyADE3beta7.QualifiedHeightPropertyType;
+import org.sig3d.citygml.energyADE3beta8.QualifiedHeightPropertyType;
 
 public class BuildingHeightProperty extends ADEGenericApplicationProperty<QualifiedHeightPropertyType> {
 

src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java

@@ -2,7 +2,7 @@ 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.energyADE3beta7.QualifiedVolumePropertyType;
+import org.sig3d.citygml.energyADE3beta8.QualifiedVolumePropertyType;
 
 public class BuildingVolumeProperty extends ADEGenericApplicationProperty<QualifiedVolumePropertyType> {
 

src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java

@@ -2,7 +2,7 @@ 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.energyADE3beta7.QualifiedAreaPropertyType;
+import org.sig3d.citygml.energyADE3beta8.QualifiedAreaPropertyType;
 
 public class QualifiedAreaProperty extends ADEGenericApplicationProperty<QualifiedAreaPropertyType> {
 

src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java

@@ -2,7 +2,7 @@ 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.energyADE3beta7.QualifiedHeightPropertyType;
+import org.sig3d.citygml.energyADE3beta8.QualifiedHeightPropertyType;
 
 public class QualifiedHeightProperty extends ADEGenericApplicationProperty<QualifiedHeightPropertyType> {
 

src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java

@@ -2,7 +2,7 @@ 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.energyADE3beta7.QualifiedVolumePropertyType;
+import org.sig3d.citygml.energyADE3beta8.QualifiedVolumePropertyType;
 
 public class QualifiedVolumeProperty extends ADEGenericApplicationProperty<QualifiedVolumePropertyType> {
     public QualifiedVolumeProperty() {}

src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java

@@ -2,7 +2,7 @@ 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.energyADE3beta7.SuitabilityPropertyType;
+import org.sig3d.citygml.energyADE3beta8.SuitabilityPropertyType;
 
 public class SuitabilityProperty extends ADEGenericApplicationProperty<SuitabilityPropertyType> {
 

src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java

@@ -49,12 +49,12 @@ public class EnergyADEModule extends ADEModule {
 
     @Override
     public URL getSchemaResource() {
-        return EnergyADEContext.class.getResource("/Energy_ADE_3.0_beta7.xsd");
+        return EnergyADEContext.class.getResource("/Energy_ADE_3.0_beta8.xsd");
     }
 
     @Override
     public List<String> getJAXBPackageNames() {
-        return Collections.singletonList("org.sig3d.citygml.energyADE3beta7");
+        return Collections.singletonList("org.sig3d.citygml.energyADE3beta8");
     }
 
     @Override