Refactor: Move node classes into their own package

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/CityDoctorController.java

@@ -9,6 +9,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.*;
 import de.hft.stuttgart.citydoctor2.exceptions.CityDoctorWriteException;
 import de.hft.stuttgart.citydoctor2.gui.table.ErrorStat;
 import de.hft.stuttgart.citydoctor2.gui.tree.*;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.CityObjectGroupNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.CityObjectNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.GeometryNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.OpeningNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.TopLevelCityObjectNode;
 import de.hft.stuttgart.citydoctor2.mapper.citygml3.GMLValidationHandler;
 import de.hft.stuttgart.citydoctor2.parser.*;
 import de.hft.stuttgart.citydoctor2.utils.ArchivePacker;

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/Renderer.java

@@ -6,6 +6,12 @@ import de.hft.stuttgart.citydoctor2.checks.util.CityObjectCollector;
 import de.hft.stuttgart.citydoctor2.datastructure.*;
 import de.hft.stuttgart.citydoctor2.gui.filter.ViewFilter;
 import de.hft.stuttgart.citydoctor2.gui.tree.*;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.EdgeNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.ErrorNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.GenericAttributeNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.LinearRingNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.PolygonNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.VertexNode;
 import de.hft.stuttgart.citydoctor2.math.Triangle3d;
 import javafx.application.Platform;
 import javafx.scene.control.TreeItem;

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryManager.java

 package de.hft.stuttgart.citydoctor2.gui;
 
 import de.hft.stuttgart.citydoctor2.gui.tree.ZipEntryListCell;
-import de.hft.stuttgart.citydoctor2.gui.tree.ZipEntryNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.ZipEntryNode;
 import de.hft.stuttgart.citydoctor2.utils.Localization;
 import de.hft.stuttgart.citydoctor2.zip.CityGmlZipArchive;
 import de.hft.stuttgart.citydoctor2.zip.CityGmlZipEntry;

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/ErrorItemVisitor.java

@@ -46,6 +46,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.EdgeNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.LinearRingNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.PolygonNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.TextNode;
+import de.hft.stuttgart.citydoctor2.gui.tree.node.VertexNode;
 import de.hft.stuttgart.citydoctor2.math.Triangle3d;
 import de.hft.stuttgart.citydoctor2.utils.Localization;
 import de.hft.stuttgart.citydoctor2.utils.PolygonIntersection;

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/ZipEntryListCell.java

 package de.hft.stuttgart.citydoctor2.gui.tree;
 
+import de.hft.stuttgart.citydoctor2.gui.tree.node.ZipEntryNode;
 import javafx.scene.control.ListCell;
 
 public class ZipEntryListCell extends ListCell<ZipEntryNode> {

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/CityObjectGroupNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/CityObjectGroupNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.gui.Renderer;
+import de.hft.stuttgart.citydoctor2.gui.tree.Renderable;
 import javafx.scene.paint.Color;
 
 import java.util.List;

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/CityObjectNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/CityObjectNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
 import de.hft.stuttgart.citydoctor2.gui.Renderer;
+import de.hft.stuttgart.citydoctor2.gui.tree.Renderable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public class CityObjectNode extends Renderable implements FeatureNode{
+public class CityObjectNode extends Renderable {
 
 	private static final Logger logger = LogManager.getLogger(CityObjectNode.class);
 
@@ -37,10 +38,8 @@ public class CityObjectNode extends Renderable implements FeatureNode{
 		renderer.render(co);
 	}
 
-	@Override
 	public CityObject getFeature() {
 		return co;
 	}
 
-
 }

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/EdgeNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/EdgeNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -6,6 +6,7 @@ import java.text.DecimalFormatSymbols;
 import de.hft.stuttgart.citydoctor2.datastructure.Edge;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 import de.hft.stuttgart.citydoctor2.gui.Renderer;
+import de.hft.stuttgart.citydoctor2.gui.tree.Renderable;
 
 public class EdgeNode extends Renderable {
 	

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/ErrorNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/ErrorNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.gui.Renderer;
+import de.hft.stuttgart.citydoctor2.gui.tree.Renderable;
 
 public class ErrorNode extends Renderable {
 	

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/GenericAttributeNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/GenericAttributeNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import de.hft.stuttgart.citydoctor2.datastructure.GenericAttribute;
 import de.hft.stuttgart.citydoctor2.gui.Renderer;
+import de.hft.stuttgart.citydoctor2.gui.tree.Renderable;
 
 public class GenericAttributeNode extends Renderable {
 

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/GeometryNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/GeometryNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.ImplicitGeometryHolder;
 import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
 import de.hft.stuttgart.citydoctor2.gui.Renderer;
+import de.hft.stuttgart.citydoctor2.gui.tree.Renderable;
 
 public class GeometryNode extends Renderable {
 

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/LinearRingNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/LinearRingNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
 import de.hft.stuttgart.citydoctor2.gui.Renderer;
+import de.hft.stuttgart.citydoctor2.gui.tree.Renderable;
 
 public class LinearRingNode extends Renderable {
 

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/OpeningNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/OpeningNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import de.hft.stuttgart.citydoctor2.datastructure.Opening;
 import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
 import de.hft.stuttgart.citydoctor2.gui.Renderer;
+import de.hft.stuttgart.citydoctor2.gui.tree.Renderable;
 
 public class OpeningNode extends Renderable {
 

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/PolygonNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/PolygonNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
 import de.hft.stuttgart.citydoctor2.gui.Renderer;
+import de.hft.stuttgart.citydoctor2.gui.tree.Renderable;
 
 public class PolygonNode extends Renderable {
 

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/TextNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/TextNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import de.hft.stuttgart.citydoctor2.gui.Renderer;
+import de.hft.stuttgart.citydoctor2.gui.tree.Renderable;
 
 public class TextNode extends Renderable {
 	

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/TopLevelCityObjectNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/TopLevelCityObjectNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.gui.MainWindow;

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/VertexNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/VertexNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 import de.hft.stuttgart.citydoctor2.gui.Renderer;
+import de.hft.stuttgart.citydoctor2.gui.tree.Renderable;
 
 public class VertexNode extends Renderable {
 	

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/ZipEntryNode.java → CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/tree/node/ZipEntryNode.java

-package de.hft.stuttgart.citydoctor2.gui.tree;
+package de.hft.stuttgart.citydoctor2.gui.tree.node;
 
 import de.hft.stuttgart.citydoctor2.zip.CityGmlZipEntry;
 import javafx.scene.paint.Color;