Issue #36 editable under edit->showed informaiton

src/ui/view/MyCanvas.java

@@ -71,7 +71,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	ArrayList<HolonElement> dataSelected = new ArrayList<HolonElement>();
 	ArrayList<AbstractCpsObject> tempSelected = new ArrayList<AbstractCpsObject>();
 
-	private boolean[] showedInformation = new boolean[4];
+	private boolean[] showedInformation = new boolean[5];
 	private boolean dragging = false; // for dragging
 	private boolean dragged = false; // if an object/objects was/were dragged
 	private boolean drawEdge = false; // for drawing edges
@@ -131,6 +131,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		showedInformation[0] = true;
 		showedInformation[1] = true;
 		showedInformation[3] = false;
+		showedInformation[4] = true;
 		control.setMaxCapacity(10000);
 
 		popmenu.add(itemCut);
@@ -1112,11 +1113,13 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 	 *            boolean for conecction
 	 * @param object
 	 *            boolean for objects
+	 * @param nodeOfnode 
 	 */
-	public void setShowedInformation(boolean connection, boolean object, boolean border) {
+	public void setShowedInformation(boolean connection, boolean object, boolean border, boolean nodeOfnode) {
 		showedInformation[0] = connection;
 		showedInformation[1] = object;
 		showedInformation[3] = border;
+		showedInformation[4] = nodeOfnode;
 	}
 
 	/**

src/ui/view/ShowedInformationPopUp.java

@@ -24,6 +24,7 @@ public class ShowedInformationPopUp extends JDialog {
 	private JCheckBox objectEnergyCheckbox;
 	private JCheckBox connectionCheckbox;
 	private JCheckBox colorizedBorderCheckbox;
+	private JCheckBox nodeOfnodeConnectionCheckbox;
 	private JPanel toUpdate;
 
 	/**
@@ -36,7 +37,7 @@ public class ShowedInformationPopUp extends JDialog {
 		super((java.awt.Frame) null, true);
 		setModalityType(java.awt.Dialog.ModalityType.APPLICATION_MODAL);
 		this.setTitle(Languages.getLanguage()[31]);
-		setBounds(100, 100, 400, 220);
+		setBounds(100, 100, 400, 254);
 		getContentPane().setLayout(new BorderLayout());
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
 		getContentPane().add(contentPanel, BorderLayout.CENTER);
@@ -57,11 +58,11 @@ public class ShowedInformationPopUp extends JDialog {
 		btnOk.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				setInformation(connectionCheckbox.isSelected(), objectEnergyCheckbox.isSelected(),
-						colorizedBorderCheckbox.isSelected());
+						colorizedBorderCheckbox.isSelected(), nodeOfnodeConnectionCheckbox.isSelected());
 				dispose();
 			}
 		});
-		btnOk.setBounds(171, 147, 82, 23);
+		btnOk.setBounds(174, 193, 82, 23);
 		contentPanel.add(btnOk);
 
 		JButton btnCancel = new JButton(Languages.getLanguage()[34]);
@@ -71,13 +72,18 @@ public class ShowedInformationPopUp extends JDialog {
 				dispose();
 			}
 		});
-		btnCancel.setBounds(72, 147, 89, 23);
+		btnCancel.setBounds(69, 193, 89, 23);
 		contentPanel.add(btnCancel);
 		
 		colorizedBorderCheckbox = new JCheckBox("Show colorized Border for Objects");
-		colorizedBorderCheckbox.setBounds(19, 96, 195, 23);
+		colorizedBorderCheckbox.setBounds(19, 96, 369, 23);
 		contentPanel.add(colorizedBorderCheckbox);
 		colorizedBorderCheckbox.setSelected(canvas.getShowedInformation()[3]);
+		
+		nodeOfnodeConnectionCheckbox = new JCheckBox("Show outside Connections in gouped Nodes");
+		nodeOfnodeConnectionCheckbox.setBounds(19, 133, 369, 23);
+		contentPanel.add(nodeOfnodeConnectionCheckbox);
+		nodeOfnodeConnectionCheckbox.setSelected(canvas.getShowedInformation()[4]);
 	}
 
 	/**
@@ -87,9 +93,10 @@ public class ShowedInformationPopUp extends JDialog {
 	 *            conection Information
 	 * @param object
 	 *            Object Information
+	 * @param nodeOfnode 
 	 */
-	private void setInformation(boolean connection, boolean object, boolean borders) {
-		canvas.setShowedInformation(connection, object, borders);
+	private void setInformation(boolean connection, boolean object, boolean borders, boolean nodeOfnode) {
+		canvas.setShowedInformation(connection, object, borders, nodeOfnode);
 		canvas.repaint();
 		toUpdate.updateUI();
 	}

src/ui/view/UpperNodeCanvas.java

@@ -74,7 +74,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 	// The UpperNode
 	public CpsUpperNode upperNode;
 
-	private boolean[] showedInformation = new boolean[3];
+	private boolean[] showedInformation = new boolean[5];
 	private boolean dragging = false; // for dragging
 	private boolean dragged = false; // if an object/objects was/were dragged
 	private boolean drawEdge = false; // for drawing edges
@@ -151,6 +151,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 
 		showedInformation[0] = true;
 		showedInformation[1] = true;
+		showedInformation[4] = true;
 
 		popmenu.add(itemCut);
 		popmenu.add(itemCopy);
@@ -666,7 +667,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 				cps = e.getA();
 			}
 			// Show and Highlight
-			if (model.getSelectedCpsObjects().contains(cps)) {
+			if (model.getSelectedCpsObjects().contains(cps) || showedInformation[4] == true) {
 				for (CpsEdge ed : cps.getConnections()) {
 					AbstractCpsObject obj = null;
 					if (upperNode.getNodes().contains(ed.getA())) {
@@ -1423,9 +1424,10 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 	 * @param object
 	 *            boolean for objects
 	 */
-	public void setShowedInformation(boolean connection, boolean object) {
+	public void setShowedInformation(boolean connection, boolean object, boolean nodeOfnode) {
 		showedInformation[0] = connection;
 		showedInformation[1] = object;
+		showedInformation[4] = nodeOfnode;
 	}
 
 	/**