Browse Source

tabs now never open duplicates

Jessey Widhalm 7 years ago
parent
commit
159975c9e5
1 changed files with 30 additions and 28 deletions
  1. 30 28
      src/ui/view/GUI.java

+ 30 - 28
src/ui/view/GUI.java

@@ -1345,17 +1345,7 @@ public class GUI<E> implements CategoryListener {
 				}
 				// New Tab with NodeOfNode
 				if (doubleClick() && temp instanceof CpsUpperNode) {
-					// check if tab already open for clicked NodeOfNode
-					boolean dupl = false;
-					for (int i = 2; i < tabbedPane.getTabCount() && dupl == false; i++) {
-						if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
-								.getComponent(0)).upperNode.getID() == temp.getID()) {
-							dupl = true;
-							tabbedPane.setSelectedComponent(tabbedPane.getComponentAt(i));
-						}
-					}
-					if (!dupl)
-						openNewUpperNodeTab();
+					openNewUpperNodeTab();
 				}
 			}
 
@@ -1990,27 +1980,39 @@ public class GUI<E> implements CategoryListener {
 							.getComponent(0)).path + " -> ");
 		}
 
-		unc.setBorder(null);
-		unc.setBackground(Color.WHITE);
-		unc.setPreferredSize(new Dimension(model.getCanvasX(), model.getCanvasY()));
+		// check if tab already open for clicked NodeOfNode
+		boolean dupl = false;
+		for (int i = 2; i < tabbedPane.getTabCount() && dupl == false; i++) {
+			if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport().getComponent(0)).upperNode
+					.getID() == temp.getID()) {
+				dupl = true;
+				tabbedPane.setSelectedComponent(tabbedPane.getComponentAt(i));
+			}
+		}
+		if (!dupl) {
 
-		unc.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mousePressed(MouseEvent e) {
-				temp = unc.tempCps;
-				if (doubleClick() && temp instanceof CpsUpperNode) {
-					openNewUpperNodeTab();
+			unc.setBorder(null);
+			unc.setBackground(Color.WHITE);
+			unc.setPreferredSize(new Dimension(model.getCanvasX(), model.getCanvasY()));
+
+			unc.addMouseListener(new MouseAdapter() {
+				@Override
+				public void mousePressed(MouseEvent e) {
+					temp = unc.tempCps;
+					if (doubleClick() && temp instanceof CpsUpperNode) {
+						openNewUpperNodeTab();
+					}
 				}
-			}
-		});
+			});
 
-		JScrollPane sp = new JScrollPane(unc);
-		sp.setBorder(null);
-		tabbedPane.add(temp.getName(), sp);
-		tabbedPane.setSelectedComponent(sp);
-		tabbedPane.setTabComponentAt(tabbedPane.getTabCount() - 1, new ButtonTabComponent(tabbedPane));
-		temp = null;
+			JScrollPane sp = new JScrollPane(unc);
+			sp.setBorder(null);
+			tabbedPane.add(temp.getName(), sp);
+			tabbedPane.setSelectedComponent(sp);
+			tabbedPane.setTabComponentAt(tabbedPane.getTabCount() - 1, new ButtonTabComponent(tabbedPane));
+			temp = null;
 
+		}
 	}
 
 }