GroupNodeCanvas Rename

.gitignore

@@ -139,3 +139,5 @@ nbdist/
 .idea/
 praktikum-holons.iml
 /gb_singlerun.txt
+/PSO i100 p20 m3e-3 v4 (52).metalog
+/PSO i100 p20 m3e-3 v6.metalog

src/TypeAdapter/AbstractCpsObjectAdapter.java

@@ -13,7 +13,7 @@ import com.google.gson.JsonSerializer;
 
 import classes.AbstractCanvasObject;
 import classes.GroupNode;
-import ui.view.UpperNodeCanvas;
+import ui.view.GroupNodeCanvas;
 
 public class AbstractCpsObjectAdapter
 		implements JsonSerializer<AbstractCanvasObject>, JsonDeserializer<AbstractCanvasObject> {

src/ui/controller/UpdateController.java

@@ -14,7 +14,7 @@ import ui.model.Model;
 import ui.view.DefaulTable;
 import ui.view.Languages;
 import ui.view.PropertyTable;
-import ui.view.UpperNodeCanvas;
+import ui.view.GroupNodeCanvas;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -279,7 +279,7 @@ public class UpdateController {
 	 * 
 	 * @return selected CpsObject
 	 */
-	public AbstractCanvasObject getActualCpsUpperNode(UpperNodeCanvas canvas) {
+	public AbstractCanvasObject getActualCpsUpperNode(GroupNodeCanvas canvas) {
 		int tempID = model.getSelectedObjectID();
 		AbstractCanvasObject tempCps = controller.searchByIDUpperNode(tempID, canvas.upperNode);
 		return tempCps;

src/ui/view/CanvasResizePopUp.java

@@ -61,14 +61,14 @@ public class CanvasResizePopUp extends JDialog {
 				canvas.setPreferredSize(new Dimension(model.getCanvasX(), model.getCanvasY()));
 				for (int i = 4; i < tabbedPane.getTabCount(); i++) {
 					if (tabbedPane.getComponentAt(i) != null) {
-						UpperNodeCanvas unc = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i))
+						GroupNodeCanvas unc = ((GroupNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i))
 								.getViewport().getComponent(0));
 						unc.setPreferredSize(new Dimension(model.getCanvasX(), model.getCanvasY()));
 						unc.repaint();
 					}
 				}
 				if (tabbedPane2 != null && tabbedPane2.getSelectedIndex() >= 4) {
-					UpperNodeCanvas unc = ((UpperNodeCanvas) ((JScrollPane) tabbedPane2.getSelectedComponent())
+					GroupNodeCanvas unc = ((GroupNodeCanvas) ((JScrollPane) tabbedPane2.getSelectedComponent())
 							.getViewport().getComponent(0));
 					unc.setPreferredSize(new Dimension(model.getCanvasX(), model.getCanvasY()));
 					unc.repaint();

src/ui/view/GUI.java

@@ -270,7 +270,7 @@ public class GUI implements CategoryListener {
 	private JSplitPane tempSplit;
 	private boolean initSplit = true;
 	private String catOfObjToBeEdited;
-	private UpperNodeCanvas unc;
+	private GroupNodeCanvas unc;
 	private JPanel contentPane;
 	private String holonEleNamesDisplayed = "None ";
 	// Pop up Windows
@@ -458,8 +458,8 @@ public class GUI implements CategoryListener {
 				Component canvasOrUpperNodeCanvas = scrollPane.getViewport()
 						.getComponent(0);
 
-				if (canvasOrUpperNodeCanvas instanceof UpperNodeCanvas) {
-					UpperNodeCanvas uNC = (UpperNodeCanvas) canvasOrUpperNodeCanvas;
+				if (canvasOrUpperNodeCanvas instanceof GroupNodeCanvas) {
+					GroupNodeCanvas uNC = (GroupNodeCanvas) canvasOrUpperNodeCanvas;
 					for (AbstractCanvasObject cps : uNC.upperNode.getNodes()) {
 						controller.addSelectedObject(cps);
 					}
@@ -497,8 +497,8 @@ public class GUI implements CategoryListener {
 				// complete re-evaluation of the net)
 				boolean wasProducerDeleted = true;
 
-				if (canvasOrUpperNodeCanvas instanceof UpperNodeCanvas) {
-					UpperNodeCanvas uNC = (UpperNodeCanvas) canvasOrUpperNodeCanvas;
+				if (canvasOrUpperNodeCanvas instanceof GroupNodeCanvas) {
+					GroupNodeCanvas uNC = (GroupNodeCanvas) canvasOrUpperNodeCanvas;
 					for (AbstractCanvasObject cps : model.getSelectedCpsObjects()) {
 
 
@@ -596,8 +596,8 @@ public class GUI implements CategoryListener {
 
 				JScrollPane scrollPane = getScrollPaneFromTabbedPane();
 				if (!model.getSelectedCpsObjects().isEmpty()) {
-					if (scrollPane.getViewport().getComponent(0) instanceof UpperNodeCanvas)
-						controller.copy(((UpperNodeCanvas) scrollPane
+					if (scrollPane.getViewport().getComponent(0) instanceof GroupNodeCanvas)
+						controller.copy(((GroupNodeCanvas) scrollPane
 								.getViewport().getComponent(0)).upperNode);
 					else
 						controller.copy(null);
@@ -632,10 +632,10 @@ public class GUI implements CategoryListener {
 							.getViewport().getComponent(0);
 
 					if (tabTemp != null
-							&& canvasOrUpperNodeCanvas instanceof UpperNodeCanvas) {
+							&& canvasOrUpperNodeCanvas instanceof GroupNodeCanvas) {
 
 						controller
-								.paste(((UpperNodeCanvas) canvasOrUpperNodeCanvas).upperNode,
+								.paste(((GroupNodeCanvas) canvasOrUpperNodeCanvas).upperNode,
 										canvasOrUpperNodeCanvas
 												.getMousePosition());
 						unitGraph.update(model.getSelectedCpsObjects());
@@ -670,8 +670,8 @@ public class GUI implements CategoryListener {
 
 				JScrollPane scrollPane = getScrollPaneFromTabbedPane();
 				if (!model.getSelectedCpsObjects().isEmpty()) {
-					if (scrollPane.getViewport().getComponent(0) instanceof UpperNodeCanvas) {
-						controller.cut(((UpperNodeCanvas) scrollPane
+					if (scrollPane.getViewport().getComponent(0) instanceof GroupNodeCanvas) {
+						controller.cut(((GroupNodeCanvas) scrollPane
 								.getViewport().getComponent(0)).upperNode);
 						controller.calculateStateAndVisualForCurrentTimeStep();
 						scrollPane.getViewport().getComponent(0).repaint();
@@ -826,8 +826,8 @@ public class GUI implements CategoryListener {
 					Component canvasOrUpperNodeCanvas = getScrollPaneFromTabbedPane()
 							.getViewport().getComponent(0);
 					if (canvasOrUpperNodeCanvas != null
-							&& canvasOrUpperNodeCanvas instanceof UpperNodeCanvas) {
-						((UpperNodeCanvas) canvasOrUpperNodeCanvas).repaint();
+							&& canvasOrUpperNodeCanvas instanceof GroupNodeCanvas) {
+						((GroupNodeCanvas) canvasOrUpperNodeCanvas).repaint();
 					}
 				});
 
@@ -844,8 +844,8 @@ public class GUI implements CategoryListener {
 				Component canvasOrUpperNodeCanvas = getScrollPaneFromTabbedPane()
 						.getViewport().getComponent(0);
 				if (canvasOrUpperNodeCanvas != null
-						&& canvasOrUpperNodeCanvas instanceof UpperNodeCanvas) {
-					((UpperNodeCanvas) canvasOrUpperNodeCanvas).repaint();
+						&& canvasOrUpperNodeCanvas instanceof GroupNodeCanvas) {
+					((GroupNodeCanvas) canvasOrUpperNodeCanvas).repaint();
 				}
 			});
 
@@ -869,13 +869,13 @@ public class GUI implements CategoryListener {
 
 					JScrollPane scrollPane = getScrollPaneFromTabbedPane();
 
-					if (scrollPane.getViewport().getComponent(0) instanceof UpperNodeCanvas) {
+					if (scrollPane.getViewport().getComponent(0) instanceof GroupNodeCanvas) {
 						scrollPane.getViewport().getComponent(0).repaint();
 					} else {
 						canvas.repaint();
 					}
 					if (!initSplit
-							&& scrollPane.getViewport().getComponent(0) instanceof UpperNodeCanvas) {
+							&& scrollPane.getViewport().getComponent(0) instanceof GroupNodeCanvas) {
 						scrollPane.getViewport().getComponent(0).repaint();
 					} else {
 						canvas.repaint();
@@ -900,8 +900,8 @@ public class GUI implements CategoryListener {
 				if(spane != null){
 					Component canvasOrUpperNodeCanvas = spane.getViewport().getComponent(0);
 					if (canvasOrUpperNodeCanvas != null
-							&& canvasOrUpperNodeCanvas instanceof UpperNodeCanvas) {
-						((UpperNodeCanvas) canvasOrUpperNodeCanvas).repaint();
+							&& canvasOrUpperNodeCanvas instanceof GroupNodeCanvas) {
+						((GroupNodeCanvas) canvasOrUpperNodeCanvas).repaint();
 					}
 				}
 			});
@@ -960,8 +960,8 @@ public class GUI implements CategoryListener {
 						backgroundDialog
 								.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 						backgroundDialog.setVisible(true);
-					} else if (scrollPane.getViewport().getComponent(0) instanceof UpperNodeCanvas) {
-						UpperNodeCanvas uNodeCanvas = (UpperNodeCanvas) (scrollPane
+					} else if (scrollPane.getViewport().getComponent(0) instanceof GroupNodeCanvas) {
+						GroupNodeCanvas uNodeCanvas = (GroupNodeCanvas) (scrollPane
 								.getViewport().getComponent(0));
 						BackgroundPopUp backgroundDialog = new BackgroundPopUp(
 								model, controller, null, uNodeCanvas.upperNode,
@@ -1620,7 +1620,7 @@ public class GUI implements CategoryListener {
 						tabTemp = tabbedPaneOriginal;
 						JScrollPane scrollPane = getScrollPaneFromTabbedPane();
 
-						UpperNodeCanvas unc = ((UpperNodeCanvas) scrollPane
+						GroupNodeCanvas unc = ((GroupNodeCanvas) scrollPane
 								.getViewport().getComponent(0));
 
 						if (unc.upperNode.getId() == updCon.getActualCps()
@@ -1779,8 +1779,8 @@ public class GUI implements CategoryListener {
 					/**
 					 * check for replacements on the canvas
 					 */
-					if (canvasOrUpperNodeCanvas instanceof UpperNodeCanvas) {
-						UpperNodeCanvas unc = (UpperNodeCanvas) canvasOrUpperNodeCanvas;
+					if (canvasOrUpperNodeCanvas instanceof GroupNodeCanvas) {
+						GroupNodeCanvas unc = (GroupNodeCanvas) canvasOrUpperNodeCanvas;
 						if(unc.getMousePosition()==null)return;
 						int x = (int) unc.getMousePosition().getX()+16;
 						int y = (int) unc.getMousePosition().getY()+16;
@@ -1834,8 +1834,8 @@ public class GUI implements CategoryListener {
 						Component canvasOrUpperNodeCanvas = scrollPane
 								.getViewport().getComponent(0);
 
-						if (canvasOrUpperNodeCanvas instanceof UpperNodeCanvas) {
-							UpperNodeCanvas unc = (UpperNodeCanvas) canvasOrUpperNodeCanvas;
+						if (canvasOrUpperNodeCanvas instanceof GroupNodeCanvas) {
+							GroupNodeCanvas unc = (GroupNodeCanvas) canvasOrUpperNodeCanvas;
 							int x = (int) unc.getMousePosition().getX() + 16;
 							int y = (int) unc.getMousePosition().getY() + 16;
 
@@ -2789,12 +2789,12 @@ public class GUI implements CategoryListener {
 
 		JScrollPane scrollPane = getScrollPaneFromTabbedPane();
 		if (scrollPane.getViewport().getComponent(0) instanceof MyCanvas) {
-			unc = new UpperNodeCanvas(model, controller, unitGraph,
+			unc = new GroupNodeCanvas(model, controller, unitGraph,
 					(GroupNode) temp, "", scrollPane.getViewport().getComponent(0));
 
 		} else {
-			unc = new UpperNodeCanvas(model, controller, unitGraph,
-					(GroupNode) temp, ((UpperNodeCanvas) scrollPane
+			unc = new GroupNodeCanvas(model, controller, unitGraph,
+					(GroupNode) temp, ((GroupNodeCanvas) scrollPane
 							.getViewport().getComponent(0)).path + " -> ", scrollPane.getViewport().getComponent(0));
 		}
 		unc.setShowedInformation(canvas.getShowedInformation());
@@ -2806,7 +2806,7 @@ public class GUI implements CategoryListener {
 			JScrollPane paneOriginal = (JScrollPane) tabbedPaneInnerOriginal
 					.getComponentAt(i);
 			if (paneOriginal != null
-					&& ((UpperNodeCanvas) paneOriginal.getViewport()
+					&& ((GroupNodeCanvas) paneOriginal.getViewport()
 							.getComponent(0)).upperNode.getId() == temp.getId()) {
 				dupl = true;
 				// set selected component to view
@@ -2826,7 +2826,7 @@ public class GUI implements CategoryListener {
 							.getComponentAt(i);
 					if (!initSplit
 							&& paneSplit != null
-							&& ((UpperNodeCanvas) paneSplit.getViewport()
+							&& ((GroupNodeCanvas) paneSplit.getViewport()
 									.getComponent(0)).upperNode.getId() == temp
 									.getId()) {
 						dupl = true;
@@ -2862,7 +2862,7 @@ public class GUI implements CategoryListener {
 					chooseTabTemp();
 
 					JScrollPane scrollPane1 = getScrollPaneFromTabbedPane();
-					temp = ((UpperNodeCanvas) scrollPane1.getViewport()
+					temp = ((GroupNodeCanvas) scrollPane1.getViewport()
 							.getComponent(0)).tempCps;
 					if (doubleClick() && MouseEvent.BUTTON3 != e.getButton()
 							&& temp instanceof GroupNode) {
@@ -2915,10 +2915,10 @@ public class GUI implements CategoryListener {
 				continue;
 			}
 			Component pane = ((JScrollPane) c).getViewport().getComponent(0);
-			if (pane instanceof UpperNodeCanvas) {
+			if (pane instanceof GroupNodeCanvas) {
 				temp = model.getHashcodeMap()
-						.get(((UpperNodeCanvas) pane).code);
-				((UpperNodeCanvas) pane).upperNode = (GroupNode) temp;
+						.get(((GroupNodeCanvas) pane).code);
+				((GroupNodeCanvas) pane).upperNode = (GroupNode) temp;
 			}
 		}
 	}
@@ -2938,7 +2938,7 @@ public class GUI implements CategoryListener {
 
 				if (scrollPaneOriginal == null) {
 					splitView = true;
-				} else if (((UpperNodeCanvas) scrollPaneOriginal.getViewport()
+				} else if (((GroupNodeCanvas) scrollPaneOriginal.getViewport()
 						.getComponent(0)).upperNode.getId() == cps.getId()) {
 					((ButtonTabComponent) tabbedPaneInnerOriginal
 							.getTabComponentAt(i)).removeTabs();
@@ -2951,7 +2951,7 @@ public class GUI implements CategoryListener {
 				JTabbedPane tabbedPaneInnerSplit = (JTabbedPane) tabbedPaneSplit
 						.getComponentAt(0);
 
-				if (((UpperNodeCanvas) ((JScrollPane) tabbedPaneInnerSplit
+				if (((GroupNodeCanvas) ((JScrollPane) tabbedPaneInnerSplit
 						.getSelectedComponent()).getViewport().getComponent(0)).upperNode
 						.getId() == cps.getId()) {
 					((ButtonTabComponent) tabbedPaneInnerOriginal
@@ -3174,7 +3174,7 @@ public class GUI implements CategoryListener {
 		for (int i = 1; i < tabbedPaneInnerOriginal.getTabCount(); i++) {
 			JScrollPane scrollPaneOriginal = (JScrollPane) tabbedPaneInnerOriginal
 					.getComponentAt(i);
-			if (((UpperNodeCanvas) scrollPaneOriginal.getViewport()
+			if (((GroupNodeCanvas) scrollPaneOriginal.getViewport()
 					.getComponent(0)).upperNode == null) {
 				((ButtonTabComponent) tabbedPaneInnerOriginal
 						.getTabComponentAt(i)).removeTabs();
@@ -3196,9 +3196,9 @@ public class GUI implements CategoryListener {
 		for (int i = 1; i < tabbedPaneInnerOriginal.getTabCount(); i++) {
 			JScrollPane scrollPaneOriginal = (JScrollPane) tabbedPaneInnerOriginal
 					.getComponentAt(i);
-			if (((UpperNodeCanvas) scrollPaneOriginal.getViewport()
+			if (((GroupNodeCanvas) scrollPaneOriginal.getViewport()
 					.getComponent(0)).upperNode != null) {
-				((UpperNodeCanvas) scrollPaneOriginal.getViewport()
+				((GroupNodeCanvas) scrollPaneOriginal.getViewport()
 						.getComponent(0)).disable = state;
 			}
 		}

src/ui/view/GroupNodeCanvas.java

@@ -37,7 +37,7 @@ import java.util.HashSet;
  *
  * @author Gruppe14
  */
-public class UpperNodeCanvas extends AbstractCanvas implements MouseListener, MouseMotionListener {
+public class GroupNodeCanvas extends AbstractCanvas implements MouseListener, MouseMotionListener {
 
     private static final long serialVersionUID = 1L;
     // The UpperNode
@@ -57,7 +57,7 @@ public class UpperNodeCanvas extends AbstractCanvas implements MouseListener, Mo
      * @param control   the Controller
      * @param unitGraph
      */
-    UpperNodeCanvas(Model mod, Control control, UnitGraph unitGraph, GroupNode UpperNode, String parentPath, Component parentComponent) {
+    GroupNodeCanvas(Model mod, Control control, UnitGraph unitGraph, GroupNode UpperNode, String parentPath, Component parentComponent) {
         toolTip = false;
 
         this.controller = control;
@@ -281,7 +281,7 @@ public class UpperNodeCanvas extends AbstractCanvas implements MouseListener, Mo
                         for (int i = 4; i < tabbedPane.getTabCount(); i++) {
 
                             if (tabbedPane.getComponentAt(i) != null &&
-                                    ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
+                                    ((GroupNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
                                             .getComponent(0)).upperNode.getId() == cps.getId()) {
                                 ((ButtonTabComponent) tabbedPane.getTabComponentAt(i)).removeTabs();
                                 break;
@@ -291,7 +291,7 @@ public class UpperNodeCanvas extends AbstractCanvas implements MouseListener, Mo
                         // tabbedPane2 is the deleted upperNode
                         try {
                             if (tabbedPane2 != null
-                                    && ((UpperNodeCanvas) ((JScrollPane) tabbedPane2.getSelectedComponent())
+                                    && ((GroupNodeCanvas) ((JScrollPane) tabbedPane2.getSelectedComponent())
                                     .getViewport().getComponent(0)).upperNode.getId() == cps.getId()) {
                                 ((ButtonTabComponent) tabbedPane.getTabComponentAt(tabbedPane2.getSelectedIndex()))
                                         .removeTabs();
@@ -1344,7 +1344,7 @@ public class UpperNodeCanvas extends AbstractCanvas implements MouseListener, Mo
 	public void closeUpperNodeTab(int upperNodeId) {
         JTabbedPane tabbedPane = (JTabbedPane) getParent().getParent().getParent();
         for (int i = 4; i < tabbedPane.getTabCount(); i++) {
-            if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
+            if (((GroupNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport()
                     .getComponent(0)).upperNode.getId() == upperNodeId) {
                 tabbedPane.remove(i);
                 break;

src/ui/view/MyCanvas.java

@@ -279,7 +279,7 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
 					// Look if the uppernode is open in a Tab
 					for (int i = 4; i < tabbedPane.getTabCount(); i++) {
 						if (tabbedPane.getComponentAt(i) != null
-								&& ((UpperNodeCanvas) ((JScrollPane) tabbedPane
+								&& ((GroupNodeCanvas) ((JScrollPane) tabbedPane
 										.getComponentAt(i)).getViewport()
 										.getComponent(0)).upperNode.getId() == cps
 										.getId()) {
@@ -292,7 +292,7 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
 					// tabbedPane2 is the deleted upperNode
 					try {
 						if (tabbedPane2 != null
-								&& ((UpperNodeCanvas) ((JScrollPane) tabbedPane2
+								&& ((GroupNodeCanvas) ((JScrollPane) tabbedPane2
 										.getSelectedComponent()).getViewport()
 										.getComponent(0)).upperNode.getId() == cps
 										.getId()) {
@@ -1181,7 +1181,7 @@ public class MyCanvas extends AbstractCanvas implements MouseListener,
 		JTabbedPane tabbedPaneInner = (JTabbedPane) getParent()
 				.getParent().getParent().getParent();
 		for (int i = 1; i < tabbedPaneInner.getTabCount(); i++) {
-			if (((UpperNodeCanvas) ((JScrollPane) tabbedPaneInner
+			if (((GroupNodeCanvas) ((JScrollPane) tabbedPaneInner
 					.getComponentAt(i)).getViewport().getComponent(
 							0)).upperNode.getId() == upperNodeId) {
 				tabbedPaneInner.remove(i);