Merge branch 'dev' into 'master'

Version 3.17.2

See merge request !32

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

-/*-
- *  Copyright 2022 Beuth Hochschule für Technik Berlin, Hochschule für Technik Stuttgart
- * 
- *  This file is part of CityDoctor2.
- *
- *  CityDoctor2 is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  CityDoctor2 is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with CityDoctor2.  If not, see <https://www.gnu.org/licenses/>.
- */
-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import java.util.List;
-
-import de.hft.stuttgart.citydoctor2.datastructure.TinObject;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class AllTinNode extends Renderable {
-
-	public AllTinNode(List<TinObject> components) {}
-
-	@Override
-	public void refreshTextColor() {}
-
-	@Override
-	public String getText() {
-		return "Components";
-	}
-
-	@Override
-	public void visit(Renderer renderer) {}
-
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.TrafficAreaObject;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-import java.util.List;
-
-public class AllTrafficAreaNode extends Renderable {
-
-    private final List<TrafficAreaObject> areas;
-
-    private final String text;
-
-    public AllTrafficAreaNode(List<TrafficAreaObject> areas, TrafficAreaObject.TrafficAreaType type) {
-        this.areas = areas;
-        this.text = type.toString();
-
-    }
-
-    @Override
-    public void refreshTextColor() {
-        // no use
-    }
-
-    @Override
-    public String getText() {
-        return this.text;
-    }
-
-    @Override
-    public void visit(Renderer renderer) {
-        renderer.renderTransportation(areas);
-    }
-
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.TrafficSpaceObject;
-
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-import java.util.List;
-
-public class AllTrafficSpacesNode extends Renderable {
-
-    private final List<TrafficSpaceObject> spaces;
-
-    private final String text;
-
-    public AllTrafficSpacesNode(List<TrafficSpaceObject> sections, TrafficSpaceObject.TrafficSpaceType type) {
-        this.spaces = sections;
-        this.text = type.toString();
-
-    }
-
-    @Override
-    public void refreshTextColor() {
-        // no use
-    }
-
-    @Override
-    public String getText() {
-        return this.text;
-    }
-
-    @Override
-    public void visit(Renderer renderer) {
-        renderer.renderTransportation(spaces);
-    }
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.TransportSection;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-import java.util.List;
-
-public class AllTransportSectionNode extends Renderable {
-
-    private final List<TransportSection> sections;
-
-    private final String text;
-
-    public AllTransportSectionNode(List<TransportSection> sections, TransportSection.SectionType type) {
-        this.sections = sections;
-        this.text = type.toString();
-
-    }
-
-    @Override
-    public void refreshTextColor() {
-        // no use
-    }
-
-    @Override
-    public String getText() {
-        return this.text;
-    }
-
-    @Override
-    public void visit(Renderer renderer) {
-        renderer.renderTransportation(sections);
-    }
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import java.util.List;
-
-import de.hft.stuttgart.citydoctor2.datastructure.TransportationObject;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class AllTransportationNode extends Renderable {
-	
-	private final List<TransportationObject> transportation;
-	
-	public AllTransportationNode(List<TransportationObject> transportation) {
-		this.transportation = transportation;
-	}
-
-	@Override
-	public void refreshTextColor() {
-		// no use
-	}
-
-	@Override
-	public String getText() {
-		return "Transportation";
-	}
-
-	@Override
-	public void visit(Renderer renderer) {
-		renderer.renderTransportation(transportation);
-	}
-
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.TunnelConstructiveElement;
-import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-import java.util.List;
-
-public class AllTunnelConstructiveElementsNode extends Renderable{
-
-    private final List<TunnelConstructiveElement> constructiveElements;
-
-    public AllTunnelConstructiveElementsNode(List<TunnelConstructiveElement> constructiveElements) {
-        this.constructiveElements = constructiveElements;
-    }
-
-    @Override
-    public String getText() {
-        return "Constructive Elements";
-    }
-
-    @Override
-    public void visit(Renderer renderer) {
-        renderer.clearCurrentRender();
-    }
-
-    @Override
-    public void refreshTextColor() {
-        boolean isValidated = false;
-        for (TunnelConstructiveElement bce : constructiveElements) {
-            if (bce.isValidated()) {
-                isValidated = true;
-            }
-            if (bce.containsAnyError()) {
-                setStatus(CheckStatus.ERROR);
-                return;
-            }
-        }
-        if (isValidated) {
-            setStatus(CheckStatus.OK);
-        } else {
-            setStatus(CheckStatus.NOT_CHECKED);
-        }
-    }
-
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.TunnelPart;
-import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-import java.util.List;
-
-public class AllTunnelPartsNode extends Renderable{
-
-    private final List<TunnelPart> tunnelParts;
-
-    public AllTunnelPartsNode(List<TunnelPart> tunnelParts) {
-        this.tunnelParts = tunnelParts;
-    }
-
-    @Override
-    public String getText() {
-        return "Tunnel Parts";
-    }
-
-    @Override
-    public void visit(Renderer renderer) {
-        renderer.clearCurrentRender();
-    }
-
-    @Override
-    public void refreshTextColor() {
-        boolean wasChecked = false;
-        for (TunnelPart tp : tunnelParts) {
-            if (tp.isValidated()) {
-                wasChecked = true;
-                if (tp.containsAnyError()) {
-                    setStatus(CheckStatus.ERROR);
-                    return;
-                }
-            }
-        }
-        if (wasChecked) {
-            setStatus(CheckStatus.OK);
-        } else {
-            setStatus(CheckStatus.NOT_CHECKED);
-        }
-    }
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.Tunnel;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-import java.util.List;
-
-public class AllTunnelsNode extends Renderable{
-
-    private final List<Tunnel> tunnels;
-
-    public AllTunnelsNode(List<Tunnel> tunnels) {
-        this.tunnels = tunnels;
-    }
-
-    @Override
-    public void refreshTextColor() {
-        // no color changes
-    }
-
-    @Override
-    public String getText() {
-        return "Tunnels";
-    }
-
-    @Override
-    public void visit(Renderer renderer) {
-        renderer.renderTunnels(tunnels);
-    }
-
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import java.util.List;
-
-import de.hft.stuttgart.citydoctor2.datastructure.Vegetation;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class AllVegetationNode extends Renderable {
-	
-	private final List<Vegetation> vegetation;
-	
-	public AllVegetationNode(List<Vegetation> vegetation) {
-		this.vegetation = vegetation;
-	}
-
-	@Override
-	public void refreshTextColor() {
-		// no use
-	}
-
-	@Override
-	public String getText() {
-		return "Vegetation";
-	}
-
-	@Override
-	public void visit(Renderer renderer) {
-		renderer.renderVegetation(vegetation);
-	}
-
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import java.util.List;
-
-import de.hft.stuttgart.citydoctor2.datastructure.WaterObject;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class AllWaterNode extends Renderable {
-	
-	private final List<WaterObject> water;
-	
-	public AllWaterNode(List<WaterObject> water) {
-		this.water = water;
-	}
-
-	@Override
-	public void refreshTextColor() {
-		// no use
-	}
-
-	@Override
-	public String getText() {
-		return "Water";
-	}
-
-	@Override
-	public void visit(Renderer renderer) {
-		renderer.renderWater(water);
-	}
-
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
-import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class BoundarySurfaceNode extends Renderable {
-
-	private final BoundarySurface bs;
-
-	public BoundarySurfaceNode(BoundarySurface bs) {
-		this.bs = bs;
-	}
-
-	@Override
-	public String getText() {
-		return bs.getGmlId().getGmlString() + " [" + bs.getType() + "]";
-	}
-
-	@Override
-	public void visit(Renderer renderer) {
-		renderer.render(bs);
-	}
-
-	@Override
-	public void refreshTextColor() {
-		if (!bs.isValidated()) {
-			setStatus(CheckStatus.NOT_CHECKED);
-		} else if (bs.containsAnyError()) {
-			setStatus(CheckStatus.ERROR);
-		} else {
-			setStatus(CheckStatus.OK);
-		}
-	}
-}

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

-/*-
- *  Copyright 2023 Beuth Hochschule für Technik Berlin, Hochschule für Technik Stuttgart
- * 
- *  This file is part of CityDoctor2.
- *
- *  CityDoctor2 is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  CityDoctor2 is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with CityDoctor2.  If not, see <https://www.gnu.org/licenses/>.
- */
-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.BridgeConstructiveElement;
-import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class BridgeConstructiveElementNode extends Renderable {
-	
-	private final BridgeConstructiveElement bce;
-
-	public BridgeConstructiveElementNode(BridgeConstructiveElement bce) {
-		this.bce = bce;
-	}
-
-	@Override
-	public String getText() {
-		return bce.getGmlId().getGmlString();
-	}
-
-	@Override
-	public void visit(Renderer renderer) {
-		renderer.render(bce);
-	}
-
-	@Override
-	public void refreshTextColor() {
-		if (!bce.isValidated()) {
-			setStatus(CheckStatus.NOT_CHECKED);
-		} else if (bce.containsAnyError()) {
-			setStatus(CheckStatus.ERROR);
-		} else {
-			setStatus(CheckStatus.OK);
-		}
-	}
-
-}

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

-/*-
- *  Copyright 2022 Beuth Hochschule für Technik Berlin, Hochschule für Technik Stuttgart
- * 
- *  This file is part of CityDoctor2.
- *
- *  CityDoctor2 is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  CityDoctor2 is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with CityDoctor2.  If not, see <https://www.gnu.org/licenses/>.
- */
-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.BridgeObject;
-import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
-import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class BridgeNode extends Renderable implements FeatureNode {
-	
-	private final BridgeObject bridge;
-
-	public BridgeNode(BridgeObject bridge) {
-		this.bridge = bridge;
-	}
-
-	@Override
-	public String getText() {
-		return bridge.getGmlId().getGmlString();
-	}
-
-	@Override
-	public void visit(Renderer renderer) {
-		renderer.render(bridge);
-	}
-
-	@Override
-	public void refreshTextColor() {
-		if (!bridge.isValidated()) {
-			setStatus(CheckStatus.NOT_CHECKED);
-		} else if (bridge.containsAnyError()) {
-			setStatus(CheckStatus.ERROR);
-		} else {
-			setStatus(CheckStatus.OK);
-		}
-	}
-
-
-	@Override
-	public CityObject getFeature() {
-		return bridge;
-	}
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.Building;
-import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
-import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class BuildingNode extends Renderable implements FeatureNode {
-
-	private final Building building;
-
-	public BuildingNode(Building building) {
-		this.building = building;
-	}
-
-	@Override
-	public String getText() {
-		return building.getGmlId().getGmlString();
-	}
-	
-	public Building getBuilding() {
-		return building;
-	}
-
-	@Override
-	public void visit(Renderer renderer) {
-		renderer.render(building);
-	}
-
-	@Override
-	public void refreshTextColor() {
-		if (!building.isValidated()) {
-			setStatus(CheckStatus.NOT_CHECKED);
-		} else if (building.containsAnyError()) {
-			setStatus(CheckStatus.ERROR);
-		} else {
-			setStatus(CheckStatus.OK);
-		}
-	}
-
-	@Override
-	public CityObject getFeature() {
-		return building;
-	}
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.BuildingPart;
-import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class BuildingPartNode extends Renderable {
-
-	private final BuildingPart bp;
-
-	public BuildingPartNode(BuildingPart bp) {
-		this.bp = bp;
-	}
-
-	@Override
-	public String getText() {
-		return bp.getGmlId().getGmlString();
-	}
-
-	@Override
-	public void visit(Renderer renderer) {
-		renderer.render(bp);
-	}
-
-	@Override
-	public void refreshTextColor() {
-		if (!bp.isValidated()) {
-			setStatus(CheckStatus.NOT_CHECKED);
-		} else if (bp.containsAnyError()) {
-			setStatus(CheckStatus.ERROR);
-		} else {
-			setStatus(CheckStatus.OK);
-		}
-	}
-
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.BuildingUnit;
-import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class BuildingUnitNode extends Renderable{
-
-    private final BuildingUnit buildingUnit;
-
-    public BuildingUnitNode(BuildingUnit buildingUnit) {
-        this.buildingUnit = buildingUnit;
-    }
-
-    @Override
-    public String getText() {
-        return buildingUnit.getGmlId().getGmlString();
-    }
-
-
-    @Override
-    public void visit(Renderer renderer) {
-        renderer.render(buildingUnit);
-    }
-
-    @Override
-    public void refreshTextColor() {
-        if (!buildingUnit.isValidated()) {
-            setStatus(CheckStatus.NOT_CHECKED);
-        } else if (buildingUnit.containsAnyError()) {
-            setStatus(CheckStatus.ERROR);
-        } else {
-            setStatus(CheckStatus.OK);
-        }
-    }
-
-
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
-
-public interface FeatureNode {
-
-    public CityObject getFeature();
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.AbstractFurniture;
-import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class FurnitureNode extends Renderable{
-
-    private final AbstractFurniture furniture;
-
-    public FurnitureNode(AbstractFurniture furniture) {
-        this.furniture = furniture;
-    }
-
-    @Override
-    public String getText() {
-        return furniture.getGmlId().getGmlString();
-    }
-
-
-    @Override
-    public void visit(Renderer renderer) {
-        renderer.render(furniture);
-    }
-
-    @Override
-    public void refreshTextColor() {
-        if (!furniture.isValidated()) {
-            setStatus(CheckStatus.NOT_CHECKED);
-        } else if (furniture.containsAnyError()) {
-            setStatus(CheckStatus.ERROR);
-        } else {
-            setStatus(CheckStatus.OK);
-        }
-    }
-}

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

-package de.hft.stuttgart.citydoctor2.gui.tree;
-
-import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
-import de.hft.stuttgart.citydoctor2.datastructure.GenericCityObject;
-import de.hft.stuttgart.citydoctor2.gui.CheckStatus;
-import de.hft.stuttgart.citydoctor2.gui.Renderer;
-
-public class GenericCityObjectsNode extends Renderable implements FeatureNode {
-
-    private final GenericCityObject gcobject;
-
-    public GenericCityObjectsNode(GenericCityObject gcobject) {
-        this.gcobject = gcobject;
-    }
-
-    @Override
-    public String getText() {
-        return gcobject.getGmlId().getGmlString();
-    }
-
-
-    @Override
-    public void visit(Renderer renderer) {
-        renderer.render(gcobject);
-    }
-
-    @Override
-    public void refreshTextColor() {
-        if (!gcobject.isValidated()) {
-            setStatus(CheckStatus.NOT_CHECKED);
-        } else if (gcobject.containsAnyError()) {
-            setStatus(CheckStatus.ERROR);
-        } else {
-            setStatus(CheckStatus.OK);
-        }
-    }
-
-    @Override
-    public CityObject getFeature() {
-        return gcobject;
-    }
-}