浏览代码

Merge branch 'Jascha' of
https://git.tk.informatik.tu-darmstadt.de/julien.gedeon/bp-scopviz.git
into Jascha

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

jascha Bohne 8 年之前
父节点
当前提交
53ba8f321c
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/ButtonManager.java

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

@@ -138,7 +138,11 @@ public final class ButtonManager {
 
 		ToolboxManager.setOperatorItems();
 		setBorderStyle((Button) arg0.getSource());
+<<<<<<< HEAD
 
+=======
+		
+>>>>>>> branch 'Jascha' of https://git.tk.informatik.tu-darmstadt.de/julien.gedeon/bp-scopviz.git
 		controller.getOpenButton().setText("Open...");
 	}
 
@@ -162,7 +166,7 @@ public final class ButtonManager {
 	 * Handler for the Symbol Representation Layer switch Button.
 	 */
 	public static void symbolRepAction(ActionEvent arg0) {
-
+		
 		if (!(GraphDisplayManager.getCurrentLayer().equals(Layer.SYMBOL))) {
 
 			// add a copy of the underlay graph to the the symbol layer