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/Geometry.java

@@ -19,13 +19,11 @@
 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.math.Triangle3d;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 import de.hft.stuttgart.citydoctor2.tesselation.TesselatedPolygon;
 import de.hft.stuttgart.citydoctor2.utils.BoundingBoxCalculator;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import de.hft.stuttgart.citydoctor2.utils.SerializablePair;
 
 import java.io.Serial;
@@ -345,58 +343,4 @@ public class Geometry extends GmlElement {
         edges = null;
         edgeMap = null;
     }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        handler.addInstance(parent);
-        handler.addInstance(polygons);
-        handler.addInstance(edges);
-        handler.addInstance(vertices);
-        if (edgeMap != null) {
-            for (Entry<SerializablePair<Vertex, Vertex>, Edge> e : edgeMap.entrySet()) {
-                handler.addInstance(e.getKey().getValue0());
-                handler.addInstance(e.getKey().getValue1());
-                handler.addInstance(e.getValue());
-            }
-        }
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new Geometry(type, lod);
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        Geometry originalGeometry = (Geometry) original;
-        for (Polygon originalPoly : originalGeometry.polygons) {
-            polygons.add(handler.getCopyInstance(originalPoly));
-        }
-        if (originalGeometry.edges != null) {
-            edges = new ArrayList<>(originalGeometry.edges.size());
-            for (Edge originalEdge : originalGeometry.edges) {
-                edges.add(handler.getCopyInstance(originalEdge));
-            }
-        }
-        if (originalGeometry.edgeMap != null) {
-            edgeMap = new HashMap<>(originalGeometry.edgeMap.size());
-            for (Entry<SerializablePair<Vertex, Vertex>, Edge> originalEntry : originalGeometry.edgeMap.entrySet()) {
-                Vertex copyV0 = handler.getCopyInstance(originalEntry.getKey().getValue0());
-                Vertex copyV1 = handler.getCopyInstance(originalEntry.getKey().getValue1());
-                SerializablePair<Vertex, Vertex> pair = new SerializablePair<>(copyV0, copyV1);
-                Edge copyEdge = handler.getCopyInstance(originalEntry.getValue());
-                edgeMap.put(pair, copyEdge);
-            }
-        }
-        if (originalGeometry.vertices != null) {
-            vertices = new ArrayList<>(originalGeometry.vertices.size());
-            for (Vertex originalVertex : originalGeometry.vertices) {
-                vertices.add(handler.getCopyInstance(originalVertex));
-            }
-        }
-        parent = handler.getCopyInstance(originalGeometry.parent);
-
-    }
-
 }

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

@@ -19,8 +19,6 @@
 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Checkable;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 
 import java.io.Serial;
 
@@ -29,7 +27,7 @@ import java.io.Serial;
  *
  * @author Matthias Betz
  */
-public abstract class GmlElement extends Checkable implements Copyable {
+public abstract class GmlElement extends Checkable {
 
     @Serial
     private static final long serialVersionUID = -3242505393303017359L;
@@ -52,11 +50,5 @@ public abstract class GmlElement extends Checkable implements Copyable {
         return gmlId != null && !gmlId.isGenerated();
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        GmlElement originalElement = (GmlElement) original;
-        // generate gml id before copying
-        gmlId = originalElement.getGmlId();
-    }
 
 }

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

@@ -19,11 +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.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;
@@ -225,30 +223,4 @@ public class Installation extends CityObject {
         }
         return boundarySurfaces;
     }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        Installation originalBi = (Installation) original;
-        for (BoundarySurface originalBs : originalBi.boundarySurfaces) {
-            boundarySurfaces.add(handler.getCopyInstance(originalBs));
-        }
-        gmlBi = originalBi.gmlBi;
-        parent = handler.getCopyInstance(parent);
-    }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        for (BoundarySurface bs : boundarySurfaces) {
-            handler.addInstance(bs);
-        }
-        handler.addInstance(parent);
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new Installation();
-    }
-
 }

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

@@ -21,7 +21,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.Copyable;
 import javafx.scene.paint.Color;
 import org.citygml4j.core.model.core.AbstractCityObject;
 import org.citygml4j.core.model.landuse.LandUse;
@@ -126,9 +125,4 @@ public class LandObject extends CityObject {
         return "LandObject [id=" + getGmlId() + "]";
     }
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new LandObject(lu);
-    }
-
 }

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

@@ -20,8 +20,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.math.*;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 
 import java.io.Serial;
 import java.util.ArrayList;
@@ -312,27 +310,4 @@ public class LinearRing extends GmlElement {
         parent.prepareLowMemoryUsageMode();
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        LinearRing originalRing = (LinearRing) original;
-        type = originalRing.type;
-        parent = handler.getCopyInstance(originalRing.parent);
-        for (Vertex v : originalRing.vertices) {
-            vertices.add(handler.getCopyInstance(v));
-        }
-    }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        for (Vertex v : vertices) {
-            handler.addInstance(v);
-        }
-        handler.addInstance(parent);
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new LinearRing(type);
-    }
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinkedPolygon.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.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 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.List;
@@ -252,24 +249,6 @@ public class LinkedPolygon extends Polygon {
         return false;
     }
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        handler.addInstance(parent);
-        handler.addInstance(poly);
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new LinkedPolygon();
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        LinkedPolygon linkedOriginal = (LinkedPolygon) original;
-        parent = handler.getCopyInstance(linkedOriginal.parent);
-        poly = handler.getCopyInstance(linkedOriginal.poly);
-    }
-
     @Override
     public void remove() {
         poly.remove();

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

@@ -21,8 +21,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 org.citygml4j.core.model.construction.AbstractFillingSurface;
 import org.citygml4j.core.model.core.AbstractCityObject;
 import org.citygml4j.core.util.geometry.GeometryFactory;
@@ -154,25 +152,4 @@ public class Opening extends CityObject {
         return FeatureType.OPENING;
     }
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new Opening(type);
-    }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(partOf);
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        Opening originalOpening = (Opening) original;
-        partOf = handler.getCopyInstance(originalOpening.partOf);
-        type = originalOpening.type;
-        featureType = originalOpening.featureType;
-        ao = originalOpening.ao;
-    }
-
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObject.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 javafx.scene.paint.Color;
 import org.citygml4j.core.model.relief.ReliefFeature;
 import org.citygml4j.core.util.geometry.GeometryFactory;
@@ -55,26 +52,6 @@ public class ReliefObject extends CityObject {
         }
     }
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        handler.addInstance(components);
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        ReliefObject originalRelief = (ReliefObject) original;
-        for (TinObject tin : originalRelief.components) {
-            components.add(handler.getCopyInstance(tin));
-        }
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new ReliefObject(feature);
-    }
-
-
     @Override
     public void rebuildGeometries(GeometryFactory factory, ParserConfiguration config) {
         // no geometries

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Storey.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,11 +15,6 @@ public class Storey extends AbstractBuildingSubdivision {
 
     private final List<BuildingUnit> buildingUnits = new ArrayList<>();
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new Storey();
-    }
-
 
     @Override
     public void rebuildGeometries(GeometryFactory factory, ParserConfiguration config) {
@@ -40,24 +32,6 @@ public class Storey extends AbstractBuildingSubdivision {
         }
     }
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        for (BuildingUnit buildingUnit : buildingUnits) {
-            buildingUnit.collectInstances(handler);
-        }
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        Storey originalSt = (Storey) original;
-        for (BuildingUnit buildingUnit : originalSt.buildingUnits) {
-            buildingUnits.add(handler.getCopyInstance(buildingUnit));
-        }
-        this.abs = originalSt.abs;
-    }
-
     public List<BuildingUnit> getBuildingUnits() {
         return buildingUnits;
     }

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

@@ -56,10 +56,6 @@ public class TinObject extends CityObject {
         }
     }
 
-    @Override
-    public TinObject createCopyInstance() {
-        return new TinObject(gmlRelief);
-    }
 
     @Override
     public void rebuildGeometries(GeometryFactory factory, ParserConfiguration config) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeature.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.model.deprecated.transportation.TransportationComplex;
 import org.citygml4j.core.model.transportation.Railway;
 import org.citygml4j.core.model.transportation.Road;
 import org.citygml4j.core.model.transportation.Square;
 import org.citygml4j.core.model.transportation.Track;
 import org.citygml4j.core.model.transportation.Waterway;
-import org.citygml4j.core.util.geometry.GeometryFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -94,40 +89,9 @@ public class TopLevelTransportFeature extends TransportationSpace {
         }
     }
 
-
     @Override
     public String toString() {
         return "TopLevelTransportFeature [id=" + getGmlId() + "]";
     }
 
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        for (TransportSection section : sections) {
-            section.collectInstances(handler);
-        }
-        for (TransportSection section : intersections) {
-            section.collectInstances(handler);
-        }
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        TransportationObject originalTo = (TransportationObject) original;
-        for (TransportSection section : sections) {
-            section.fillValues(originalTo, handler);
-        }
-        for (TransportSection section : intersections) {
-            section.fillValues(originalTo, handler);
-        }
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new TopLevelTransportFeature(type);
-    }
-
-
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceObject.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.AbstractSpace;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface;
@@ -107,29 +104,4 @@ public class TrafficSpaceObject extends TransportationObject {
         return "TransportationSpaceObject [id=" + getGmlId() + "]";
     }
 
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        for (TrafficAreaObject tao : trafficAreas) {
-            handler.addInstance(tao);
-        }
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        TrafficSpaceObject originalTao = (TrafficSpaceObject) original;
-        for (TrafficAreaObject tao : originalTao.trafficAreas) {
-            trafficAreas.add(handler.getCopyInstance(tao));
-        }
-        super.setGmlObject(originalTao.getGmlObject());
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new TrafficSpaceObject(null);
-    }
-
-
 }

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

@@ -18,22 +18,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.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.citygml4j.core.model.core.AbstractCityObject;
-import org.citygml4j.core.model.core.AbstractSpace;
-import org.citygml4j.core.model.transportation.AbstractTransportationSpace;
-import org.citygml4j.core.model.transportation.AuxiliaryTrafficArea;
-import org.citygml4j.core.model.transportation.TrafficArea;
-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;
@@ -109,17 +96,4 @@ public abstract class TransportationObject extends CityObject {
         return String.format("[%s] %s", this.type.name(), this.getGmlId().toString());
     }
 
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        TransportationObject originalTo = (TransportationObject) original;
-        ato = originalTo.ato;
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return null;
-    }
-
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationSpace.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.AbstractSpace;
 import org.citygml4j.core.model.transportation.AbstractTransportationSpace;
 import org.citygml4j.core.util.geometry.GeometryFactory;
@@ -125,28 +122,4 @@ public abstract class TransportationSpace extends TransportationObject {
         return "TransportationSpace [id=" + getGmlId() + "]";
     }
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        for (TrafficSpaceObject to : trafficSpaces) {
-            to.collectInstances(handler);
-        }
-        for (TrafficSpaceObject to : auxTrafficSpaces) {
-            to.collectInstances(handler);
-        }
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        TransportationObject originalTo = (TransportationObject) original;
-        for (TrafficSpaceObject to : trafficSpaces) {
-            to.fillValues(originalTo, handler);
-        }
-        for (TrafficSpaceObject to : auxTrafficSpaces) {
-            to.fillValues(originalTo, handler);
-        }
-    }
-
-
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Tunnel.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.model.core.AbstractSpaceBoundaryProperty;
 import org.citygml4j.core.model.tunnel.TunnelInstallation;
 import org.citygml4j.core.model.tunnel.TunnelInstallationProperty;
-import org.citygml4j.core.util.geometry.GeometryFactory;
 
 import java.io.Serial;
 import java.util.ArrayList;
@@ -68,27 +63,6 @@ public class Tunnel extends AbstractTunnel {
         setCityGmlBuilding(gmlT);
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        Tunnel originalTunnel = (Tunnel) original;
-        for (TunnelPart originalTp : originalTunnel.tunnelParts) {
-            tunnelParts.add(handler.getCopyInstance(originalTp));
-        }
-    }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        for (TunnelPart tp : tunnelParts) {
-            handler.addInstance(tp);
-        }
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new Tunnel();
-    }
 
 
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TunnelConstructiveElement.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;
@@ -50,11 +47,6 @@ public class TunnelConstructiveElement extends CityObject {
         return parent.getRenderColor();
     }
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new TunnelConstructiveElement(gmlTunnelElement);
-    }
-
     @Override
     public void rebuildGeometries(GeometryFactory factory, ParserConfiguration config) {
         // only handles CityGML2 for now
@@ -185,18 +177,4 @@ public class TunnelConstructiveElement 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);
-        TunnelConstructiveElement originalTce = (TunnelConstructiveElement) original;
-        for (BoundarySurface originalTs : originalTce.boundarySurfaceList) {
-            boundarySurfaceList.add(handler.getCopyInstance(originalTs));
-        }
-    }
 }

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 
 import java.io.Serial;
 
@@ -13,9 +12,4 @@ public class TunnelFurniture extends AbstractFurniture {
         super.setGmlObject(gmlObject);
     }
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new BuildingRoomFurniture();
-    }
-
 }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TunnelHollow.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.tunnel.TunnelFurnitureProperty;
 
@@ -41,27 +39,9 @@ public class TunnelHollow extends AbstractRoom {
         return parent.getRenderColor();
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-
-        TunnelHollow oHollow = (TunnelHollow) original;
-        parent = handler.getCopyInstance(oHollow.getParent());
-    }
-
     @Override
     public CityObject getTopLevelCityObject() {
         return parent.getTopLevelCityObject();
     }
 
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(parent);
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new TunnelHollow();
-    }
 }

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

 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 TunnelPart extends AbstractTunnel {
@@ -37,24 +34,6 @@ public class TunnelPart extends AbstractTunnel {
         return "TunnelPart [id=" + getGmlId() + "]";
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        TunnelPart originalPart = (TunnelPart) original;
-        parent = handler.getCopyInstance(originalPart.parent);
-    }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(parent);
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new TunnelPart();
-    }
-
     private TunnelPart() {
     }
 }

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

@@ -21,7 +21,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.Copyable;
 import javafx.scene.paint.Color;
 import org.citygml4j.core.model.core.AbstractCityObject;
 import org.citygml4j.core.model.vegetation.AbstractVegetationObject;
@@ -236,8 +235,4 @@ public class Vegetation extends CityObject {
         return "Vegetation [id=" + getGmlId() + "]";
     }
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new Vegetation(type);
-    }
 }