From d2f701dabe2ced18769ae2b40951891bc4cbe900 Mon Sep 17 00:00:00 2001 From: Riegel Date: Fri, 15 Nov 2024 13:21:53 +0100 Subject: [PATCH] Refactor fetching of top-level CityObject --- .../citydoctor2/gui/VertexClickHandler.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/VertexClickHandler.java b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/VertexClickHandler.java index 1f4e0dc4..32bdbe70 100644 --- a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/VertexClickHandler.java +++ b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/VertexClickHandler.java @@ -49,25 +49,19 @@ public class VertexClickHandler implements ClickHandler { MenuItem clipMi = new MenuItem(Localization.getText("MainWindow.copyId")); clipMi.setOnAction(ea -> { - CityObject parent = p.getParent().getParent(); - if (parent instanceof BoundarySurface bs) { - parent = bs.getParent(); - - } + CityObject topLevelCityObject = p.getParent().getParent().getTopLevelCityObject(); Clipboard clipboard = getSystemClipboard(); ClipboardContent content = new ClipboardContent(); - content.putString(parent.getGmlId().toString()); + content.putString(topLevelCityObject.getGmlId().toString()); clipboard.setContent(content); }); cMenu.getItems().add(clipMi); MenuItem detailMi = new MenuItem(Localization.getText("MainWindow.focusCityObject")); detailMi.setOnAction(ea -> { - CityObject parent = p.getParent().getParent(); - if (parent instanceof BoundarySurface bs) { - parent = bs.getParent(); - } - mainWindow.showCityObjectDetail(parent); + CityObject topLevelCityObject = p.getParent().getParent().getTopLevelCityObject(); + mainWindow.showCityObjectDetail(topLevelCityObject); + }); cMenu.getItems().add(detailMi); -- GitLab