Rework focusing method

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

@@ -14,15 +14,18 @@ import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
 import de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException;
 import de.hft.stuttgart.citydoctor2.parser.ProgressListener;
 import de.hft.stuttgart.citydoctor2.utils.Localization;
+import de.hft.stuttgart.citydoctor2.utils.Pair;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.embed.swing.SwingFXUtils;
+import javafx.event.Event;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.*;
 import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.skin.VirtualFlow;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.image.WritableImage;
@@ -1147,43 +1150,40 @@ public class MainWindow extends Application {
     }
 
     public void showCityObjectDetail(CityObject co) {
+        Pair<Tab, TreeView<Renderable>> tabPair = getFeatureTabOf(co);
+        Tab featureTab = tabPair.getValue0();
+        TreeView<Renderable> featureView = tabPair.getValue1();
+        featurePane.getSelectionModel().select(featureTab);
+        searchField.setText(co.getGmlId().getGmlString());
+        searchBtn.fire();
+        featureView.getSelectionModel().select(0);
+        featureView.getSelectionModel().getSelectedItem().getValue().visit(renderer);
+
+    }
+
+    private Pair<Tab,TreeView<Renderable>> getFeatureTabOf(CityObject co) {
         FeatureType coType = co.getFeatureType();
-        TreeView<Renderable> featureView;
-        Tab featureTab;
         if (coType == FeatureType.BUILDING){
-            featureView = buildingsView;
-            featureTab = buildingsTab;
+            return new Pair<>(buildingsTab, buildingsView);
         } else if (coType == FeatureType.VEGETATION){
-            featureView = vegetationView;
-            featureTab = vegetationTab;
+            return new Pair<>(vegetationTab, vegetationView);
         } else if (coType == FeatureType.TRANSPORTATION){
-            featureView = transView;
-            featureTab = transportationTab;
+            return new Pair<>(transportationTab,transView);
         } else if (coType == FeatureType.TUNNEL){
-            featureView = tunnelView;
-            featureTab = tunnelTab;
+            return new Pair<>(tunnelTab, tunnelView);
         } else if (coType == FeatureType.BRIDGE){
-            featureView = bridgeView;
-            featureTab = bridgeTab;
+            return new Pair<>(bridgeTab, bridgeView);
         } else if (coType == FeatureType.WATER){
-            featureView = waterView;
-            featureTab = waterTab;
+            return new Pair<>(waterTab, waterView);
         } else if (coType == FeatureType.LAND){
-            featureView = terrainView;
-            featureTab = terrainTab;
+            return new Pair<>(terrainTab, terrainView);
         } else if (coType == FeatureType.CITY_FURNITURE){
-            featureView = cityFurnitureView;
-            featureTab = cityFurnitureTab;
+            return new Pair<>(cityFurnitureTab, cityFurnitureView);
         } else if (coType == FeatureType.GENERIC_CITY_OBJECT){
-            featureView = otherObjectsView;
-            featureTab = otherObjectsTab;
+            return new Pair<>(otherObjectsTab, otherObjectsView);
         } else {
             throw new IllegalArgumentException("unknown feature type: " + coType);
         }
-        featurePane.getSelectionModel().select(featureTab);
-        searchField.setText(co.getGmlId().getGmlString());
-        searchBtn.fire();
-        renderer.render(co);
     }
 
     public MainToolBar getMainToolbar() {