add different handling of global schematron errors to be more specific with the error type

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java

@@ -221,18 +221,11 @@ public class Checker {
             model.createFeatureStream().forEach(f -> featureMap.put(f.getGmlId().getGmlString(), f));
         }
         handler.getFeatureErrors().forEach((k, v) -> {
-            if (k.trim().isEmpty()) {
-            	handleSchematronErrorsGlobal(v);
-            	return;
-            }
-            CityObject co = featureMap.get(k);
+        	String trimmedId = k.trim();
+            CityObject co = featureMap.get(trimmedId);
             if (co == null) {
                 // gml id reported by schematron was not found, add to general errors
                 handleSchematronErrorsGlobal(v);
-
-//                for (SchematronError se : v) {
-//                    model.addGlobalError(se);
-//                }
             } else {
                 handleSchematronErrorsForCityObject(v, co);
                 co.setValidated(true);
@@ -242,18 +235,18 @@ public class Checker {
 
 	private void handleSchematronErrorsGlobal(List<SchematronError> v) {
 		for (SchematronError se : v) {
-//		    CheckError err;
-//		    if (AttributeMissingError.ID.getIdString().equals(se.getErrorIdString())) {
-//		        err = new AttributeMissingError(null, se.getChildId(), se.getNameOfAttribute());
-//		    } else if (AttributeValueWrongError.ID.getIdString().equals(se.getErrorIdString())) {
-//		        err = new AttributeValueWrongError(null, se.getChildId(), se.getNameOfAttribute());
-//		    } else if (AttributeInvalidError.ID.getIdString().equals(se.getErrorIdString())) {
-//		        err = new AttributeInvalidError(null, se.getChildId(), se.getNameOfAttribute());
-//		    } else {
-//		        throw new IllegalStateException(
-//		                "Unknown error ID was given in schematron file: " + se.getErrorIdString());
-//		    }
-		    model.addGlobalError(se);
+		    CheckError err;
+		    if (AttributeMissingError.ID.getIdString().equals(se.getErrorIdString())) {
+		        err = new AttributeMissingError(null, se.getChildId(), se.getNameOfAttribute());
+		    } else if (AttributeValueWrongError.ID.getIdString().equals(se.getErrorIdString())) {
+		        err = new AttributeValueWrongError(null, se.getChildId(), se.getNameOfAttribute());
+		    } else if (AttributeInvalidError.ID.getIdString().equals(se.getErrorIdString())) {
+		        err = new AttributeInvalidError(null, se.getChildId(), se.getNameOfAttribute());
+		    } else {
+		        throw new IllegalStateException(
+		                "Unknown error ID was given in schematron file: " + se.getErrorIdString());
+		    }
+		    model.addGlobalError(err);
 		}
 	}
 

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/SvrlContentHandler.java

@@ -111,7 +111,7 @@ public class SvrlContentHandler implements ContentHandler {
 			String errorId = split[2];
 			String nameOfAttribute = split[3];
 			SchematronError err = new SchematronError(errorId, gmlId, childId, nameOfAttribute);
-			if (gmlId == null || gmlId.isEmpty()) {
+			if (gmlId == null || gmlId.isBlank()) {
 				// general error
 				generalErrors.add(err);
 			} else {

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

@@ -21,6 +21,7 @@ import de.hft.stuttgart.citydoctor2.utils.Localization;
 import de.hft.stuttgart.citydoctor2.zip.CityGmlZipArchive;
 import de.hft.stuttgart.citydoctor2.zip.CityGmlZipEntry;
 import de.hft.stuttgart.citydoctor2.zip.MalformedZipFileException;
+import de.hft.stuttgart.quality.adapter.types.ErrorAdapter;
 import javafx.application.Platform;
 import javafx.scene.chart.XYChart.Data;
 import javafx.scene.chart.XYChart.Series;
@@ -1044,11 +1045,7 @@ public class CityDoctorController {
                 // apply check results to tree views
                 updateFeatureTrees();
                 updateTree(mainWindow.getPolygonsView().getRoot());
-                for (CheckError e : model.getGlobalErrors()) {
-                    if (e instanceof SchematronError se) {
-                        mainWindow.getGlobalErrorsView().getItems().add(se.getErrorIdString() + " - " + se.getNameOfAttribute());
-                    }
-                }
+                updateGlobalErrors();
                 renderer.refresh();
                 mainWindow.getWriteReportButton().setDisable(false);
             });
@@ -1057,6 +1054,13 @@ public class CityDoctorController {
         }
     }
 
+	private void updateGlobalErrors() {
+		GlobalErrorVisitor globErrVisitor = new GlobalErrorVisitor(mainWindow);
+		for (CheckError e : model.getGlobalErrors()) {
+		    e.accept(globErrVisitor);
+		}
+	}
+
     public void startZipFileChecks(ValidationConfiguration config, ProgressListener l, boolean lowMemoryMode,
                                    Path outputPath, boolean pdfReports, boolean xmlReports) {
         if (zipArchive == null && logger.isWarnEnabled()) {
@@ -1097,11 +1101,7 @@ public class CityDoctorController {
                 // apply check results to tree views
                 updateFeatureTrees();
                 updateTree(mainWindow.getPolygonsView().getRoot());
-                for (CheckError e : model.getGlobalErrors()) {
-                    if (e instanceof SchematronError se) {
-                        mainWindow.getGlobalErrorsView().getItems().add(se.getErrorIdString() + " - " + se.getNameOfAttribute());
-                    }
-                }
+                updateGlobalErrors();
                 renderer.refresh();
                 mainWindow.getWriteReportButton().setDisable(false);
                 currentZipEntryManager.refresh();

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

+package de.hft.stuttgart.citydoctor2.gui;
+
+import de.hft.stuttgart.citydoctor2.check.CheckError;
+import de.hft.stuttgart.citydoctor2.check.ErrorVisitor;
+import de.hft.stuttgart.citydoctor2.check.error.AllPolygonsWrongOrientationError;
+import de.hft.stuttgart.citydoctor2.check.error.AttributeInvalidError;
+import de.hft.stuttgart.citydoctor2.check.error.AttributeMissingError;
+import de.hft.stuttgart.citydoctor2.check.error.AttributeValueWrongError;
+import de.hft.stuttgart.citydoctor2.check.error.ConsecutivePointSameError;
+import de.hft.stuttgart.citydoctor2.check.error.DegeneratedRingError;
+import de.hft.stuttgart.citydoctor2.check.error.DependenciesNotMetError;
+import de.hft.stuttgart.citydoctor2.check.error.MultipleConnectedComponentsError;
+import de.hft.stuttgart.citydoctor2.check.error.NestedRingError;
+import de.hft.stuttgart.citydoctor2.check.error.NonManifoldEdgeError;
+import de.hft.stuttgart.citydoctor2.check.error.NonManifoldVertexError;
+import de.hft.stuttgart.citydoctor2.check.error.NonPlanarPolygonDistancePlaneError;
+import de.hft.stuttgart.citydoctor2.check.error.NonPlanarPolygonNormalsDeviation;
+import de.hft.stuttgart.citydoctor2.check.error.NotCeilingError;
+import de.hft.stuttgart.citydoctor2.check.error.NotFloorError;
+import de.hft.stuttgart.citydoctor2.check.error.NotGroundError;
+import de.hft.stuttgart.citydoctor2.check.error.NotWallError;
+import de.hft.stuttgart.citydoctor2.check.error.NullAreaError;
+import de.hft.stuttgart.citydoctor2.check.error.PlanarityError;
+import de.hft.stuttgart.citydoctor2.check.error.PointTouchesEdgeError;
+import de.hft.stuttgart.citydoctor2.check.error.PolygonError;
+import de.hft.stuttgart.citydoctor2.check.error.PolygonHoleOutsideError;
+import de.hft.stuttgart.citydoctor2.check.error.PolygonInteriorDisconnectedError;
+import de.hft.stuttgart.citydoctor2.check.error.PolygonIntersectingRingsError;
+import de.hft.stuttgart.citydoctor2.check.error.PolygonSameOrientationError;
+import de.hft.stuttgart.citydoctor2.check.error.PolygonWithoutSurfaceError;
+import de.hft.stuttgart.citydoctor2.check.error.PolygonWrongOrientationError;
+import de.hft.stuttgart.citydoctor2.check.error.RingDuplicatePointError;
+import de.hft.stuttgart.citydoctor2.check.error.RingEdgeIntersectionError;
+import de.hft.stuttgart.citydoctor2.check.error.RingError;
+import de.hft.stuttgart.citydoctor2.check.error.RingNotClosedError;
+import de.hft.stuttgart.citydoctor2.check.error.RingSelfIntersectionError;
+import de.hft.stuttgart.citydoctor2.check.error.RingTooFewPointsError;
+import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
+import de.hft.stuttgart.citydoctor2.check.error.SolidError;
+import de.hft.stuttgart.citydoctor2.check.error.SolidNotClosedError;
+import de.hft.stuttgart.citydoctor2.check.error.SolidSelfIntError;
+import de.hft.stuttgart.citydoctor2.check.error.SurfaceUnfragmentedError;
+import de.hft.stuttgart.citydoctor2.check.error.TooFewPolygonsError;
+import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
+
+public class GlobalErrorVisitor implements ErrorVisitor {
+	
+	private MainWindow mainWindow;
+	
+	public GlobalErrorVisitor(MainWindow mainWindow) {
+		this.mainWindow = mainWindow;
+	}
+
+	@Override
+	public void visit(RingError err) {
+	}
+
+	@Override
+	public void visit(PolygonError err) {
+	}
+
+	@Override
+	public void visit(RingSelfIntersectionError err) {
+	}
+
+	@Override
+	public void visit(PlanarityError err) {
+	}
+
+	@Override
+	public void visit(PolygonHoleOutsideError err) {
+	}
+
+	@Override
+	public void visit(NonManifoldEdgeError err) {
+	}
+
+	@Override
+	public void visit(MultipleConnectedComponentsError err) {
+	}
+
+	@Override
+	public void visit(NestedRingError err) {
+	}
+
+	@Override
+	public void visit(NonManifoldVertexError err) {
+	}
+
+	@Override
+	public void visit(PolygonWrongOrientationError err) {
+	}
+
+	@Override
+	public void visit(PolygonSameOrientationError err) {
+	}
+
+	@Override
+	public void visit(SolidNotClosedError err) {
+	}
+
+	@Override
+	public void visit(DependenciesNotMetError err) {
+	}
+
+	@Override
+	public void visit(UnknownCheckError err) {
+	}
+
+	@Override
+	public void visit(RingNotClosedError err) {
+	}
+
+	@Override
+	public void visit(ConsecutivePointSameError err) {
+	}
+
+	@Override
+	public void visit(AllPolygonsWrongOrientationError err) {
+	}
+
+	@Override
+	public void visit(PolygonInteriorDisconnectedError err) {
+	}
+
+	@Override
+	public void visit(NullAreaError err) {
+	}
+
+	@Override
+	public void visit(RingTooFewPointsError err) {
+	}
+
+	@Override
+	public void visit(NonPlanarPolygonNormalsDeviation err) {
+	}
+
+	@Override
+	public void visit(NonPlanarPolygonDistancePlaneError err) {
+	}
+
+	@Override
+	public void visit(PolygonIntersectingRingsError err) {
+	}
+
+	@Override
+	public void visit(SolidSelfIntError err) {
+	}
+
+	@Override
+	public void visit(TooFewPolygonsError err) {
+	}
+
+	@Override
+	public void visit(RingDuplicatePointError err) {
+	}
+
+	@Override
+	public void visit(RingEdgeIntersectionError err) {
+	}
+
+	@Override
+	public void visit(PointTouchesEdgeError err) {
+	}
+
+	@Override
+	public void visit(NotCeilingError err) {
+	}
+
+	@Override
+	public void visit(NotFloorError err) {
+	}
+
+	@Override
+	public void visit(NotWallError err) {
+	}
+
+	@Override
+	public void visit(NotGroundError err) {
+	}
+
+	@Override
+	public void visit(SchematronError se) {
+        mainWindow.getGlobalErrorsView().getItems().add(se.getErrorIdString() + " - " + se.getNameOfAttribute());
+	}
+
+	@Override
+	public void visit(SurfaceUnfragmentedError err) {
+	}
+
+	@Override
+	public void visit(DegeneratedRingError err) {
+	}
+
+	@Override
+	public void visit(AttributeMissingError err) {
+        mainWindow.getGlobalErrorsView().getItems().add(err.getErrorId().getIdString()
+        		+ " - " + err.getNameOfAttribute());
+	}
+
+	@Override
+	public void visit(AttributeValueWrongError err) {
+        mainWindow.getGlobalErrorsView().getItems().add(err.getErrorId().getIdString()
+        		+ " - " + err.getNameOfAttribute());
+	}
+
+	@Override
+	public void visit(AttributeInvalidError err) {
+        mainWindow.getGlobalErrorsView().getItems().add(err.getErrorId().getIdString()
+        		+ " - " + err.getNameOfAttribute());
+	}
+
+	@Override
+	public void visit(PolygonWithoutSurfaceError err) {
+	}
+
+	@Override
+	public void visit(CheckError err) {
+	}
+
+	@Override
+	public void visit(SolidError err) {
+	}
+
+}