Refactor: Restructure class

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

@@ -27,7 +27,6 @@ public abstract class AbstractTunnel extends CityObject implements ConstructionO
     private final List<Installation> tunnelInstallations = new ArrayList<>(2);
     private final List<BoundarySurface> boundarySurfaceList = new ArrayList<>();
     private final List<TunnelHollow> tunnelHollows = new ArrayList<>();
-    private final List<TunnelPart> tunnelParts = new ArrayList<>();
     private final List<TunnelFurniture> tunnelFurnitureList = new ArrayList<>();
     private final List<TunnelConstructiveElement> tunnelConstructiveElements = new ArrayList<>();
     private org.citygml4j.core.model.tunnel.AbstractTunnel at;
@@ -164,9 +163,6 @@ public abstract class AbstractTunnel extends CityObject implements ConstructionO
         for (TunnelConstructiveElement te : tunnelConstructiveElements) {
             te.accept(c);
         }
-        for (TunnelPart tp : tunnelParts) {
-            tp.accept(c);
-        }
     }
 
 
@@ -199,10 +195,6 @@ public abstract class AbstractTunnel extends CityObject implements ConstructionO
         te.setParent(this);
     }
 
-    public void addTunnelPart(TunnelPart tunnelPart) {
-        tunnelParts.add(tunnelPart);
-    }
-
     public void setGmlObject(org.citygml4j.core.model.tunnel.AbstractTunnel at) {
         this.at = at;
     }
@@ -221,10 +213,6 @@ public abstract class AbstractTunnel extends CityObject implements ConstructionO
         return tunnelFurnitureList;
     }
 
-    public List<TunnelPart> getTunnelParts() {
-        return tunnelParts;
-    }
-
     @Override
     public List<TunnelConstructiveElement> getConstructiveElements() {
         return tunnelConstructiveElements;

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnelTest.java

@@ -44,11 +44,11 @@ public class AbstractTunnelTest {
         BoundarySurface mockBoundarySurface = mock(BoundarySurface.class);
         Geometry mockGeometry = mock(Geometry.class);
 
-        at.addTunnelInstallation(mockInstallation);
-        at.addTunnelHollow(mockTunnelHollow);
-        at.addTunnelFurniture(mockTunnelFurniture);
+        at.addInstallation(mockInstallation);
+        at.addRoom(mockTunnelHollow);
+        at.addFurniture(mockTunnelFurniture);
         at.addTunnelPart(mockTunnelPart);
-        at.addTunnelConstructiveElement(mockTunnelConstructiveElement);
+        at.addConstructiveElement(mockTunnelConstructiveElement);
         at.addBoundarySurface(mockBoundarySurface);
         at.addGeometry(mockGeometry);