Merge branch 'dominik' of

https://git.tk.informatik.tu-darmstadt.de/julien.gedeon/bp-scopviz.git
into dominik

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

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

@@ -171,6 +171,7 @@ public final class ButtonManager {
 	}
 
 	/**
+<<<<<<< HEAD
 	 * replaces all node sprites with symbol sprites corresponding with the
 	 * device/hardware type
 	 * 
@@ -196,6 +197,8 @@ public final class ButtonManager {
 	}
 
 	/**
+=======
+>>>>>>> branch 'dominik' of https://git.tk.informatik.tu-darmstadt.de/julien.gedeon/bp-scopviz.git
 	 * Functionality for "edge visible" Checkbox
 	 * 
 	 * @param ov

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

@@ -20,7 +20,6 @@ import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
 import javafx.scene.control.MenuItem;
-import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
@@ -28,7 +27,6 @@ import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
-import javafx.util.Callback;
 import javafx.util.Pair;
 
 /**
@@ -233,14 +231,9 @@ public class GUIController implements Initializable {
 		toolboxStringColumn.setCellValueFactory(new ToolboxManager.PairKeyFactory());
 		toolboxObjectColumn.setCellValueFactory(new ToolboxManager.PairValueFactory());
 
-		toolboxObjectColumn.setCellFactory(
-				new Callback<TableColumn<Pair<Object, String>, Object>, TableCell<Pair<Object, String>, Object>>() {
-					@Override
-					public TableCell<Pair<Object, String>, Object> call(
-							TableColumn<Pair<Object, String>, Object> column) {
-						return new ToolboxManager.PairValueCell();
-					}
-				});
+		toolboxObjectColumn.setCellFactory((column) -> {
+			return new ToolboxManager.PairValueCell();
+		});
 
 		toolbox.getColumns().setAll(toolboxObjectColumn, toolboxStringColumn);
 

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

@@ -160,17 +160,14 @@ public final class PropertiesManager {
 			final MenuItem onlyAddPropMenuItem = new MenuItem("Add..");
 
 			// add functionality
-			onlyAddPropMenuItem.setOnAction(addPropHandler);
-			addPropMenuItem.setOnAction(addPropHandler);
+			onlyAddPropMenuItem.setOnAction((event) -> addPropFunctionality());
+			addPropMenuItem.setOnAction((event) -> addPropFunctionality());
 
 			// delete functionality
-			deletePropMenuItem.setOnAction(new EventHandler<ActionEvent>() {
-				@Override
-				public void handle(ActionEvent event) {
-					Debug.out("Remove Element");
-					removeProperty(row.getItem());
-					properties.getItems().remove(row.getItem());
-				}
+			deletePropMenuItem.setOnAction((event) -> {
+				Debug.out("Remove Element");
+				removeProperty(row.getItem());
+				properties.getItems().remove(row.getItem());
 			});
 
 			// add MenuItem to ContextMenu
@@ -294,20 +291,10 @@ public final class PropertiesManager {
 	}
 
 	/**
-	 * MenuItem Handler, clicked on MenuItem
-	 */
-	private static EventHandler<ActionEvent> addPropHandler = new EventHandler<ActionEvent>() {
-		@Override
-		public void handle(ActionEvent event) {
-			Debug.out("Add Element");
-			addProperty();
-		}
-	};
-
-	/**
-	 * Add a new property to the selected node or edge
+	 * contextMenu add button functionality
 	 */
-	private static void addProperty() {
+	private static void addPropFunctionality() {
+		Debug.out("Add Element");
 
 		// Create new Dialog
 		Dialog<ArrayList<String>> addPropDialog = new Dialog<>();