Toolbox now changes according to the active layer

- new set...Items() Methods in ToolboxManager
- removed the parameter in Toolboxmanager.initialiazeItems
- button actions set the correct toolbox items now

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

@@ -119,7 +119,8 @@ public final class ButtonManager {
 
 		GraphDisplayManager.setCurrentLayer(Layer.UNDERLAY);
 		GraphDisplayManager.switchActiveGraph();
-
+		
+		ToolboxManager.setUnderlayItems();
 		setBorderStyle((Button) arg0.getSource());
 
 	}
@@ -133,9 +134,9 @@ public final class ButtonManager {
 
 		GraphDisplayManager.setCurrentLayer(Layer.OPERATOR);
 		GraphDisplayManager.switchActiveGraph();
-
+		
+		ToolboxManager.setOperatorItems();
 		setBorderStyle((Button) arg0.getSource());
-
 	}
 
 	/**
@@ -147,7 +148,8 @@ public final class ButtonManager {
 
 		GraphDisplayManager.setCurrentLayer(Layer.MAPPING);
 		GraphDisplayManager.switchActiveGraph();
-
+		
+		ToolboxManager.setMappingItems();
 		setBorderStyle((Button) arg0.getSource());
 
 	}

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

@@ -155,7 +155,7 @@ public class GUIController implements Initializable {
 		removeHeaderTableView(toolbox);
 
 		// Initialize the Managers for the various for UI elements
-		ToolboxManager.initializeItems(toolbox);
+		ToolboxManager.initializeItems();
 		PropertiesManager.initializeItems(properties);
 		
 		GraphDisplayManager.init(this);

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

@@ -52,24 +52,49 @@ public final class ToolboxManager {
 	/**
 	 * Initializes the toolbox to contain the specified list of entries.
 	 * 
-	 * @param toolbox
-	 *            the list of entries to add to the toolbox
 	 */
-	public static void initializeItems(TableView<Pair<Object, String>> toolbox) {
+	public static void initializeItems() {
+		
+		setUnderlayItems();
+		
+	}
 
+	/**
+	 * 
+	 */
+	public static void setUnderlayItems(){
+		
 		@SuppressWarnings("unchecked")
 		ObservableList<Pair<Object, String>> data = FXCollections.observableArrayList(
 				pair(new Image(MainApp.class.getResource("/png/standard.png").toString()), "Standard"),
 				pair(new Image(MainApp.class.getResource("/png/source.png").toString()), "Source"),
+				pair(new Image(MainApp.class.getResource("/png/undirEdge.png").toString()), "Undirected"));
+		
+		controller.toolbox.getItems().setAll(data);
+	}
+	
+	public static void setOperatorItems(){
+		
+		@SuppressWarnings("unchecked")
+		ObservableList<Pair<Object, String>> data = FXCollections.observableArrayList(
 				pair(new Image(MainApp.class.getResource("/png/sink.png").toString()), "Sink"),
 				pair(new Image(MainApp.class.getResource("/png/procEn.png").toString()), "EnProc"),
-				pair(new Image(MainApp.class.getResource("/png/operator.png").toString()), "operator"), pair("", ""),
-				pair(new Image(MainApp.class.getResource("/png/dirEdge.png").toString()), "Directed"),
-				pair(new Image(MainApp.class.getResource("/png/undirEdge.png").toString()), "Undirected"));
-
-		toolbox.getItems().setAll(data);
+				pair(new Image(MainApp.class.getResource("/png/dirEdge.png").toString()), "Directed"));
+		
+		controller.toolbox.getItems().setAll(data);
+		
 	}
-
+	
+	public static void setMappingItems(){
+			
+			@SuppressWarnings("unchecked")
+			ObservableList<Pair<Object, String>> data = FXCollections.observableArrayList(
+					pair(new Image(MainApp.class.getResource("/png/dirEdge.png").toString()), "Directed"));
+			
+			controller.toolbox.getItems().setAll(data);
+			
+		}
+	
 	/**
 	 * Handler for TableRows
 	 */