Refactor: Delete Copyable and CopyHandler

CopyHandler and the Copyable-Interface are obsolete due to Copy.copy
offering the object-copying functionality with serialization.

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java

@@ -19,11 +19,8 @@
 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty;
@@ -248,41 +245,4 @@ public abstract class AbstractBuilding extends CityObject {
         return buildingUnits;
     }
 
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(boundarySurfaceList);
-        handler.addInstance(buildingInstallations);
-        handler.addInstance(buildingRooms);
-        handler.addInstance(buildingRoomFurnitureList);
-        handler.addInstance(buildingStoreys);
-        handler.addInstance(buildingUnits);
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        AbstractBuilding originalAb = (AbstractBuilding) original;
-        for (BoundarySurface originalBs : originalAb.boundarySurfaceList) {
-            boundarySurfaceList.add(handler.getCopyInstance(originalBs));
-        }
-        for (Installation originalBi : originalAb.buildingInstallations) {
-            buildingInstallations.add(handler.getCopyInstance(originalBi));
-        }
-        for (BuildingRoom originalBr : originalAb.buildingRooms) {
-            buildingRooms.add(handler.getCopyInstance(originalBr));
-        }
-        for (BuildingRoomFurniture originalBFR : originalAb.buildingRoomFurnitureList) {
-            buildingRoomFurnitureList.add(handler.getCopyInstance(originalBFR));
-        }
-        for (Storey originalBStoreys : originalAb.buildingStoreys) {
-            buildingStoreys.add(handler.getCopyInstance(originalBStoreys));
-        }
-        for (BuildingUnit originalBun : originalAb.buildingUnits) {
-            buildingUnits.add(handler.getCopyInstance(originalBun));
-        }
-        ab = originalAb.ab;
-    }
-
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingSubdivision.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty;
@@ -198,35 +195,6 @@ public abstract class AbstractBuildingSubdivision extends CityObject {
         return buildingRoomFurnitureList;
     }
 
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(boundarySurfaceList);
-        handler.addInstance(buildingInstallations);
-        handler.addInstance(buildingRooms);
-        handler.addInstance(buildingRoomFurnitureList);
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        AbstractBuildingSubdivision originalAbs = (AbstractBuildingSubdivision) original;
-        for (BoundarySurface originalBs : originalAbs.boundarySurfaceList) {
-            boundarySurfaceList.add(handler.getCopyInstance(originalBs));
-        }
-        for (Installation originalBi : originalAbs.buildingInstallations) {
-            buildingInstallations.add(handler.getCopyInstance(originalBi));
-        }
-        for (BuildingRoom originalBr : originalAbs.buildingRooms) {
-            buildingRooms.add(handler.getCopyInstance(originalBr));
-        }
-        for (BuildingRoomFurniture originalBFR : originalAbs.buildingRoomFurnitureList) {
-            buildingRoomFurnitureList.add(handler.getCopyInstance(originalBFR));
-        }
-        abs = originalAbs.abs;
-    }
-
 }
 
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractFurniture.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
+
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import javafx.scene.paint.Color;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface;
@@ -142,10 +140,4 @@ public abstract class AbstractFurniture extends CityObject {
         return FeatureType.FURNITURE;
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        AbstractFurniture originalAf = (AbstractFurniture) original;
-        af = originalAf.af;
-    }
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoom.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import org.citygml4j.core.model.core.AbstractCityObject;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface;
@@ -142,24 +139,4 @@ public abstract class AbstractRoom extends CityObject {
         return FeatureType.ROOM;
     }
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(roomInstallations);
-        handler.addInstance(boundarySurfaceList);
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        AbstractRoom originalAr = (AbstractRoom) original;
-        for (BoundarySurface originalBs : originalAr.boundarySurfaceList) {
-            boundarySurfaceList.add(handler.getCopyInstance(originalBs));
-        }
-        for (Installation originalRi : originalAr.roomInstallations) {
-            roomInstallations.add(handler.getCopyInstance(originalRi));
-        }
-        cgmlRoom = originalAr.cgmlRoom;
-    }
-
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnel.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import javafx.scene.paint.Color;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -233,39 +230,4 @@ public abstract class AbstractTunnel extends CityObject {
         return tunnelConstructiveElements;
     }
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(boundarySurfaceList);
-        handler.addInstance(tunnelInstallations);
-        handler.addInstance(tunnelHollows);
-        handler.addInstance(tunnelFurnitureList);
-        handler.addInstance(tunnelConstructiveElements);
-        handler.addInstance(tunnelParts);
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        AbstractTunnel originalAt = (AbstractTunnel) original;
-        for (BoundarySurface originalBs : originalAt.boundarySurfaceList) {
-            boundarySurfaceList.add(handler.getCopyInstance(originalBs));
-        }
-        for (Installation originalTi : originalAt.tunnelInstallations) {
-            tunnelInstallations.add(handler.getCopyInstance(originalTi));
-        }
-        for (TunnelHollow originalTh : originalAt.tunnelHollows) {
-            tunnelHollows.add(handler.getCopyInstance(originalTh));
-        }
-        for (TunnelFurniture originalTFR : originalAt.tunnelFurnitureList) {
-            tunnelFurnitureList.add(handler.getCopyInstance(originalTFR));
-        }
-        for (TunnelConstructiveElement originalTE : originalAt.tunnelConstructiveElements) {
-            tunnelConstructiveElements.add(handler.getCopyInstance(originalTE));
-        }
-        for (TunnelPart originalTp : originalAt.tunnelParts) {
-            tunnelParts.add(handler.getCopyInstance(originalTp));
-        }
-        at = originalAt.at;
-    }
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurface.java

@@ -19,18 +19,13 @@
 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import javafx.scene.paint.Color;
-import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty;
 import org.citygml4j.core.model.core.AbstractThematicSurface;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty;
-
 import java.io.Serial;
 import java.util.ArrayList;
 import java.util.List;
@@ -208,32 +203,4 @@ public class BoundarySurface extends CityObject {
         openings.add(opening);
         opening.setPartOfSurface(this);
     }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new BoundarySurface(gmlObject);
-    }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        for (Opening o : openings) {
-            handler.addInstance(o);
-        }
-        handler.addInstance(parent);
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        BoundarySurface originalBs = (BoundarySurface) original;
-        featureType = originalBs.featureType;
-        type = originalBs.type;
-        for (Opening originalOpening : originalBs.openings) {
-            openings.add(handler.getCopyInstance(originalOpening));
-        }
-        parent = handler.getCopyInstance(originalBs.parent);
-        gmlObject = originalBs.gmlObject;
-    }
-
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeConstructiveElement.java

@@ -19,11 +19,8 @@
 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import javafx.scene.paint.Color;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -71,11 +68,6 @@ public class BridgeConstructiveElement extends CityObject {
         return parent.getRenderColor().brighter();
     }
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new BridgeConstructiveElement(gmlBridgeElement);
-    }
-
     @Override
     public void rebuildGeometries(GeometryFactory factory, ParserConfiguration config) {
         // only handles CityGML2 for now
@@ -226,19 +218,4 @@ public class BridgeConstructiveElement extends CityObject {
         return boundarySurfaceList;
     }
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(boundarySurfaceList);
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        BridgeConstructiveElement originalBce = (BridgeConstructiveElement) original;
-        for (BoundarySurface originalBs : originalBce.boundarySurfaceList) {
-            boundarySurfaceList.add(handler.getCopyInstance(originalBs));
-        }
-    }
-
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObject.java

@@ -19,12 +19,8 @@
 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import javafx.scene.paint.Color;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -276,35 +272,6 @@ public class BridgeObject extends CityObject {
     }
 
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        for (BoundarySurface bs : boundarySurfaces) {
-            handler.addInstance(bs);
-        }
-        for (Installation bi : bridgeInstallations) {
-            handler.addInstance(bi);
-        }
-
-        for (BridgeObject part : parts) {
-            handler.addInstance(part);
-        }
-
-
-        for (BridgeConstructiveElement ele : elements) {
-            handler.addInstance(ele);
-        }
-
-        for (BridgeRoom br : bridgeRooms) {
-            handler.addInstance(br);
-        }
-
-        for (BridgeRoomFurniture bri : bridgeFurniture) {
-            handler.addInstance(bri);
-        }
-
-    }
-
     public void anonymize() {
         for (Geometry geom : getGeometries()) {
             geom.anonymize();
@@ -322,36 +289,6 @@ public class BridgeObject extends CityObject {
         this.ab = gmlB;
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        BridgeObject originalBo = (BridgeObject) original;
-        for (BoundarySurface originalBs : originalBo.boundarySurfaces) {
-            boundarySurfaces.add(handler.getCopyInstance(originalBs));
-        }
-        for (Installation originalBi : originalBo.bridgeInstallations) {
-            bridgeInstallations.add(handler.getCopyInstance(originalBi));
-        }
-
-        for (BridgeObject part : originalBo.parts) {
-            getParts().add(handler.getCopyInstance(part));
-        }
-
-
-        for (BridgeConstructiveElement ele : originalBo.elements) {
-            getConstructiveElements().add(handler.getCopyInstance(ele));
-        }
-
-        for (BridgeRoom br : originalBo.bridgeRooms) {
-            getBridgeRooms().add(handler.getCopyInstance(br));
-        }
-
-        for (BridgeRoomFurniture bri : originalBo.bridgeFurniture) {
-            getBridgeFurniture().add(handler.getCopyInstance(bri));
-        }
-
-    }
-
     public List<BoundarySurface> getBoundarySurfaces() {
         return boundarySurfaces;
     }
@@ -361,11 +298,6 @@ public class BridgeObject extends CityObject {
         element.setParent(this);
     }
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new BridgeObject(type, ab, parent);
-    }
-
     public List<BridgeObject> getParts() {
         return parts;
     }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeRoom.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import javafx.scene.paint.Color;
 
 import java.io.Serial;
@@ -31,13 +29,6 @@ public class BridgeRoom extends AbstractRoom {
         return parent;
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        BridgeRoom oRoom = (BridgeRoom) original;
-        parent = handler.getCopyInstance(oRoom.getParent());
-    }
-
     @Override
     public CityObject getTopLevelCityObject() {
         return parent.getTopLevelCityObject();
@@ -48,14 +39,4 @@ public class BridgeRoom extends AbstractRoom {
         return parent.getRenderColor();
     }
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(parent);
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new BridgeRoom();
-    }
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeRoomFurniture.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import org.citygml4j.core.model.bridge.BridgeFurniture;
 
 import java.io.Serial;
@@ -13,9 +12,4 @@ public class BridgeRoomFurniture extends AbstractFurniture {
     public void setGmlObject(BridgeFurniture gmlObject) {
         super.setGmlObject(gmlObject);
     }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new BridgeRoomFurniture();
-    }
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Building.java

@@ -19,14 +19,9 @@
 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import org.citygml4j.core.model.building.BuildingInstallation;
 import org.citygml4j.core.model.building.BuildingInstallationProperty;
 import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty;
-import org.citygml4j.core.util.geometry.GeometryFactory;
 
 import java.io.Serial;
 import java.util.ArrayList;
@@ -86,26 +81,4 @@ public class Building extends AbstractBuilding {
         setCityGmlBuilding(gmlB);
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        Building originalBuilding = (Building) original;
-        for (BuildingPart originalBp : originalBuilding.buildingParts) {
-            buildingParts.add(handler.getCopyInstance(originalBp));
-        }
-    }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        for (BuildingPart bp : buildingParts) {
-            handler.addInstance(bp);
-        }
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new Building();
-    }
-
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingPart.java

@@ -18,9 +18,6 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
-
 import java.io.Serial;
 
 public class BuildingPart extends AbstractBuilding {
@@ -57,22 +54,4 @@ public class BuildingPart extends AbstractBuilding {
         return "BuildingPart [id=" + getGmlId() + "]";
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        BuildingPart originalPart = (BuildingPart) original;
-        parent = handler.getCopyInstance(originalPart.parent);
-    }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(parent);
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new BuildingPart();
-    }
-
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingRoom.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import javafx.scene.paint.Color;
 import org.citygml4j.core.model.building.BuildingFurnitureProperty;
 
@@ -43,14 +41,6 @@ public class BuildingRoom extends AbstractRoom {
         return parent;
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-
-        BuildingRoom oRoom = (BuildingRoom) original;
-        parent = handler.getCopyInstance(oRoom.getParent());
-    }
-
     @Override
     public CityObject getTopLevelCityObject() {
         return getParent().getTopLevelCityObject();
@@ -60,15 +50,4 @@ public class BuildingRoom extends AbstractRoom {
     public Color getRenderColor() {
         return parent.getRenderColor();
     }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(parent);
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new BuildingRoom();
-    }
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingRoomFurniture.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
 
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import org.citygml4j.core.model.building.BuildingFurniture;
 
 import java.io.Serial;
@@ -15,10 +14,5 @@ public class BuildingRoomFurniture extends AbstractFurniture {
         super.setGmlObject(gmlObject);
     }
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new BuildingRoomFurniture();
-    }
-
 }
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingUnit.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 
 import java.io.Serial;
@@ -18,12 +15,6 @@ public class BuildingUnit extends AbstractBuildingSubdivision {
 
     private final List<Storey> storeys = new ArrayList<>();
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new BuildingUnit();
-    }
-
-
 
     @Override
     public void rebuildGeometries(GeometryFactory factory, ParserConfiguration config) {
@@ -42,23 +33,6 @@ public class BuildingUnit extends AbstractBuildingSubdivision {
     }
 
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        for (Storey storey : storeys) {
-            storey.collectInstances(handler);
-        }
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        BuildingUnit originalBu = (BuildingUnit) original;
-        for (Storey storey : originalBu.storeys) {
-            storeys.add(handler.getCopyInstance(storey));
-        }
-        this.abs = originalBu.abs;
-    }
 
     public List<Storey> getStoreys() {
         return storeys;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityFurniture.java

@@ -3,8 +3,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import javafx.scene.paint.Color;
 import org.citygml4j.core.model.core.AbstractCityObject;
 import org.citygml4j.core.util.geometry.GeometryFactory;
@@ -122,15 +120,4 @@ public class CityFurniture extends CityObject {
         return FeatureType.CITY_FURNITURE;
     }
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new CityFurniture();
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        CityFurniture originalCF = (CityFurniture) original;
-        cgmlCityFurniture = originalCF.cgmlCityFurniture;
-    }
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityObject.java

@@ -19,10 +19,7 @@
 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import de.hft.stuttgart.citydoctor2.utils.visitors.GmlGeometryRebuilder;
 import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor;
 import javafx.scene.paint.Color;
@@ -163,19 +160,5 @@ public abstract class CityObject extends GmlElement {
         return null;
     }
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        for (Geometry geom : geometryList) {
-            handler.addInstance(geom);
-        }
-    }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        CityObject originalCo = (CityObject) original;
-        for (Geometry geom : originalCo.geometryList) {
-            geometryList.add(handler.getCopyInstance(geom));
-        }
-    }
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ConcretePolygon.java

@@ -19,13 +19,10 @@
 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 import de.hft.stuttgart.citydoctor2.tesselation.JoglTesselator;
 import de.hft.stuttgart.citydoctor2.tesselation.TesselatedPolygon;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 
 import java.io.Serial;
 import java.util.ArrayList;
@@ -396,43 +393,6 @@ public class ConcretePolygon extends Polygon {
 	}
 
 
-	@Override
-	public void collectInstances(CopyHandler handler) {
-		handler.addInstance(exterior);
-		if (innerRings != null) {
-			for (LinearRing lr : innerRings) {
-				handler.addInstance(lr);
-			}
-		}
-		handler.addInstance(partOfSurface);
-		handler.addInstance(partfOfInstallation);
-		handler.addInstance(parent);
-		handler.addInstance(linkedFromPolygon);
-	}
-	
-
-	@Override
-	public Copyable createCopyInstance() {
-		return new ConcretePolygon();
-	}
-	
-	@Override
-	public void fillValues(Copyable original, CopyHandler handler) {
-		super.fillValues(original, handler);
-		ConcretePolygon originalPoly = (ConcretePolygon) original;
-		exterior = handler.getCopyInstance(originalPoly.exterior);
-		if (originalPoly.innerRings != null) {
-			innerRings = new ArrayList<>(originalPoly.innerRings.size());
-			for (LinearRing originalRing : originalPoly.innerRings) {
-				innerRings.add(handler.getCopyInstance(originalRing));
-			}
-		}
-		parent = handler.getCopyInstance(originalPoly.parent);
-		partfOfInstallation = handler.getCopyInstance(originalPoly.partfOfInstallation);
-		partOfSurface = handler.getCopyInstance(originalPoly.partOfSurface);
-		linkedFromPolygon = handler.getCopyInstance(originalPoly.linkedFromPolygon);
-	}
-
 	@Override
 	public void remove() {
 		parent.removePolygon(this);

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Edge.java

@@ -18,9 +18,6 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
-
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -31,7 +28,7 @@ import java.util.List;
  *
  * @author Matthias Betz
  */
-public class Edge implements Serializable, Copyable {
+public class Edge implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -504694863498128296L;
@@ -186,33 +183,7 @@ public class Edge implements Serializable, Copyable {
         }
         return null;
     }
+}
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        handler.addInstance(from);
-        handler.addInstance(to);
-        handler.addInstance(adjacentPolygons);
-        handler.addInstance(adjacentRings);
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new Edge();
-    }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        Edge originalEdge = (Edge) original;
-        from = handler.getCopyInstance(originalEdge.from);
-        to = handler.getCopyInstance(originalEdge.to);
-        numberOfHalfEdges = originalEdge.numberOfHalfEdges;
-        numberOfOppositeHalfEdges = originalEdge.numberOfOppositeHalfEdges;
-        for (Polygon originalPoly : originalEdge.adjacentPolygons) {
-            adjacentPolygons.add(handler.getCopyInstance(originalPoly));
-        }
-        for (LinearRing originalRing : originalEdge.adjacentRings) {
-            adjacentRings.add(handler.getCopyInstance(originalRing));
-        }
-    }
 
-}

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObject.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import javafx.scene.paint.Color;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -117,23 +114,6 @@ public class GenericCityObject extends CityObject {
                 throw new IllegalStateException("Cannot add " + geom.getLod() + " solid to buildings");
         }
     }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(boundarySurfaceList);
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        GenericCityObject originalGos = (GenericCityObject) original;
-        for (BoundarySurface originalBs : originalGos.boundarySurfaceList) {
-            boundarySurfaceList.add(handler.getCopyInstance(originalBs));
-        }
-        cgmlGos = originalGos.cgmlGos;
-    }
-
     @Override
     public AbstractCityObject getGmlObject() {
         return cgmlGos;
@@ -181,9 +161,4 @@ public class GenericCityObject extends CityObject {
         bs.setParent(this);
     }
 
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new GenericCityObject();
-    }
 }