Просмотр исходного кода

Fixed Bugs with Exceptions while creating Edges

Jan Enders 8 лет назад
Родитель
Сommit
f5d6abf2a6

+ 2 - 2
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/io/GraphMLImporter.java

@@ -89,10 +89,10 @@ public class GraphMLImporter {
 				n.removeAttribute("yEd.y");
 			}
 			if (!n.hasAttribute("process-need") || n.getAttribute("process-need").equals("")) {
-				n.addAttribute("process-need", 0);
+				n.addAttribute("process-need", 0.0);
 			}
 			if (!n.hasAttribute("process-max") || n.getAttribute("process-max").equals("")) {
-				n.addAttribute("process-max", 0);
+				n.addAttribute("process-max", 0.0);
 			}
 		}
 	}

+ 8 - 9
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/PropertiesManager.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Optional;
 
-import org.graphstream.algorithm.Toolkit;
 import org.graphstream.graph.Edge;
 import org.graphstream.graph.Element;
 import org.graphstream.graph.Node;
@@ -261,30 +260,30 @@ public final class PropertiesManager {
 			case "weight":
 				if (selected instanceof Edge
 						&& Layer.UNDERLAY == Main.getInstance().getGraphManager().getGraph().getAttribute("layer")) {
-					newData.add(new KeyValuePair(key, selected.getAttribute(key).toString(), double.class));
+					newData.add(new KeyValuePair(key, selected.getAttribute(key).toString(), Double.class));
 					break;
 				}
 				break;
 			case "process-need":
 				if (selected instanceof Node
 						&& Layer.OPERATOR == Main.getInstance().getGraphManager().getGraph().getAttribute("layer")) {
-					newData.add(new KeyValuePair(key, selected.getAttribute(key).toString(), double.class));
+					newData.add(new KeyValuePair(key, selected.getAttribute(key).toString(), Double.class));
 					break;
 				}
 				break;
 			case "process-max":
-			case "typeOfDevice":
 				if (selected instanceof Node
 						&& Layer.UNDERLAY == Main.getInstance().getGraphManager().getGraph().getAttribute("layer")) {
-					newData.add(new KeyValuePair(key, selected.getAttribute(key).toString(), double.class));
+					newData.add(new KeyValuePair(key, selected.getAttribute(key).toString(), Double.class));
 					break;
 				}
+			case "typeOfDevice":
+				if (selected instanceof Node
+						&& Layer.UNDERLAY == Main.getInstance().getGraphManager().getGraph().getAttribute("layer")) {
+					newData.add(new KeyValuePair(key, selected.getAttribute(key).toString(), String.class));
+				}
 
 			case "xyz":
-				double[] pos = Toolkit.nodePosition((Node) selected);
-				newData.add(new KeyValuePair("x", String.valueOf(pos[0]), double.class));
-				newData.add(new KeyValuePair("y", String.valueOf(pos[1]), double.class));
-				newData.add(new KeyValuePair("z", String.valueOf(pos[2]), double.class));
 				break;
 			case "mapping":
 			case "mapping-parent":

+ 5 - 1
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/ToolboxManager.java

@@ -1,5 +1,6 @@
 package de.tu_darmstadt.informatik.tk.scopviz.ui;
 
+import de.tu_darmstadt.informatik.tk.scopviz.debug.Debug;
 import de.tu_darmstadt.informatik.tk.scopviz.main.CreationMode;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Main;
 import de.tu_darmstadt.informatik.tk.scopviz.main.MainApp;
@@ -118,9 +119,12 @@ public final class ToolboxManager {
 
 			if (node instanceof TableRow) {
 				row = (TableRow<Pair<Object, String>>) node;
-			} else {
+			} else if (node.getParent() instanceof TableRow){
 				// clicking on text part
 				row = (TableRow<Pair<Object, String>>) node.getParent();
+			} else {
+				Debug.out("You managed to click on Something that is neither a TableColumn nor a Tablerow");
+				return;
 			}
 
 			// Set CreateModus based on pressed TableRow