Merge remote-tracking branch 'origin/dominik'

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/GUIController.java

@@ -14,6 +14,7 @@ import javafx.embed.swing.SwingNode;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.Button;
+import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TableCell;
@@ -52,17 +53,6 @@ public class GUIController implements Initializable {
 	@FXML
 	public Button createEdge;
 
-	// The ScrollPanes surrounding the graph viewer, containing most
-	// functionality
-	@FXML
-	public ScrollPane toolboxScrollPane;
-	@FXML
-	public ScrollPane layerScrollPane;
-	@FXML
-	public ScrollPane propertiesScrollPane;
-	@FXML
-	public ScrollPane metricScrollPane;
-
 	// The contents of the corresponding ScrollPanes
 	@FXML
 	public TableView<Pair<Object, String>> toolbox;
@@ -70,6 +60,8 @@ public class GUIController implements Initializable {
 	public TableView<KeyValuePair> properties;
 	@FXML
 	public ListView<String> metricListView;
+	@FXML
+	public ListView<String> layerListView;
 
 	@FXML
 	public TableColumn<Pair<Object, String>, String> toolboxStringColumn;
@@ -97,11 +89,8 @@ public class GUIController implements Initializable {
 		assert createNode != null : "fx:id=\"createNode\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
 		assert createEdge != null : "fx:id=\"createEdge\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
 
-		assert layerScrollPane != null : "fx:id=\"layerScrollPane\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
-		assert propertiesScrollPane != null : "fx:id=\"propertiesScrollPane\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
-		assert metricScrollPane != null : "fx:id=\"metricSrollPane\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
-		assert toolboxScrollPane != null : "fx:id=\"toolboxScrollPane\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
-
+		assert layerListView != null : "fx:id=\"layerListView\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
+	
 		assert toolbox != null : "fx:id=\"toolbox\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
 		assert properties != null : "fx:id=\"properties\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
 		assert metricListView != null : "fx:id=\"metricListView\" was not injected: check your FXML file 'NewBetterCoolerWindowTest.fxml'.";
@@ -114,7 +103,7 @@ public class GUIController implements Initializable {
 
 		initializeToolbox();
 		initializeProperties();
-
+		
 		// Remove Header for TableViews
 		removeHeaderTableView(toolbox);
 		removeHeaderTableView(properties);

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/MenuBarManager.java

@@ -0,0 +1,25 @@
+package de.tu_darmstadt.informatik.tk.scopviz.ui;
+
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+
+public class MenuBarManager {
+	
+	// Handler for NewFile MenuItem
+	public static EventHandler<ActionEvent> newFileHandler = new EventHandler<ActionEvent>() {
+		
+		@Override
+        public void handle(ActionEvent t) {
+			
+        }
+	};
+	
+	// Handler for OpenFile MenuItem
+	public static EventHandler<ActionEvent> openFileHandler = new EventHandler<ActionEvent>() {
+		
+		@Override
+        public void handle(ActionEvent t) {
+	
+        }
+	};
+}

scopviz/src/main/resources/NewBetterCoolerWindowTest.fxml

@@ -6,7 +6,6 @@
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.SeparatorMenuItem?>
 <?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.control.TableColumn?>
@@ -113,7 +112,7 @@
                                       <items>
                                         <AnchorPane>
                                              <children>
-                                                <ScrollPane fx:id="layerScrollPane" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                                <ListView fx:id="layerListView" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
                                              </children>
                                           </AnchorPane>
                                         <AnchorPane>