Adds packetCapturing for existing Collectors to GUI

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/PacketCollectionManager.java

@@ -57,9 +57,6 @@ public class PacketCollectionManager {
 					 */
 					LinkedList<SmartDevice> linkDevices = new LinkedList<SmartDevice>(link.getDevices());
 					linkDevices.retainAll(devices);
-					System.out.println("Devices:");
-					for(SmartDevice d:linkDevices)
-						System.out.println(d.getName());
 					/**
 					 * Check packets just if devices, which are part of the link, should be collected
 					 */

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/VisualisationInteractor.java

@@ -17,10 +17,12 @@ import javax.swing.event.MouseInputListener;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.SettingsController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.NetworkController;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.PacketCaptureController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionPerformance;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Packet;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.PacketCollector;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Port;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SmartDevice;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.SimpleLink;
@@ -84,6 +86,10 @@ public class VisualisationInteractor implements MouseInputListener,
 	 * RightClickMenu for editing connections
 	 */
 	private JMenu itemEditConnection;
+	/**
+	 * RightClickMenu for options for capturing of packets
+	 */
+	private JMenu itemCapture;
 	/**
 	 * Position of editCreate connection in the Rightclick menu 
 	 */
@@ -194,6 +200,11 @@ public class VisualisationInteractor implements MouseInputListener,
 	 * Link which was clicked
 	 */
 	private Link clickedLink = null;
+
+	/**
+	 * PacketCapture Controller, for capturing packets
+	 */
+	private PacketCaptureController captureController;
 	
 	/**
 	 * Creates a new VisualisationInteractor
@@ -211,6 +222,7 @@ public class VisualisationInteractor implements MouseInputListener,
 		this.config = controller.getSettingsController();
 		this.network = controller.getNetworkController();
 		this.toolTip = new LinkToolTip();
+		this.captureController = controller.getSimulationController().getPacketCaptureController();
 
 		initializeRightClickMenu();
 	}
@@ -757,12 +769,17 @@ public class VisualisationInteractor implements MouseInputListener,
 		// Just execute if Mouse Position is on the Panel
 		if (mousePos != null) {			
 			if (clickedOn == null) {
+				/**
+				 * Links which could be captured
+				 */
+				LinkedList<Link> captureLinks = new LinkedList<Link>();
 				if(clickedLink == null){
 					itemCreateLink.setText("Create Link");
 					itemCreateLink.setEnabled(false);
 				}else{
 					itemCreateLink.setText("Edit Link");
 					itemCreateLink.setEnabled(true);
+					captureLinks.add(clickedLink);
 				}
 				
 				itemCreate.setText("Create Device");
@@ -785,6 +802,11 @@ public class VisualisationInteractor implements MouseInputListener,
 						a.addActionListener(e->new ConnectionCreationDialog(p.getLeft(), controller, panel));
 						itemEditConnection.add(a);
 					}
+					//Add Links of editable connections to the editLinks
+					for(Connection c:editableConnections){
+						if(c.getLink() != null && !captureLinks.contains(c.getLink()))
+							captureLinks.add(c.getLink());
+					}
 					
 					if(rightClickMenu.getComponentIndex(itemCreateConnection)!=-1){
 						rightClickMenu.remove(itemCreateConnection);
@@ -799,6 +821,39 @@ public class VisualisationInteractor implements MouseInputListener,
 					}
 					itemCreateConnection.setEnabled(false);
 				}
+				
+				//Item capture
+				itemCapture.removeAll();
+				if(captureLinks.isEmpty()){
+					itemCapture.setEnabled(false);
+				}else{
+					for(Link l: captureLinks){
+						/**
+						 * Menu item to display a link which could be captured
+						 */
+						JMenu currentLink = new JMenu(l.getName());
+						for(PacketCollector collector: captureController.getPacketCollectors()){
+							JMenuItem currentAlgorithm = new JMenuItem();
+							String algoName;
+							if(collector.getPacketAlgorithm()==null){
+								algoName = "Null";
+							}else{
+								algoName = collector.getPacketAlgorithm().getClass().getSimpleName();
+							}
+							if(collector.getLinks().contains(l)){
+								algoName += ": stop capture";
+								currentAlgorithm.addActionListener(a->captureController.removeLinkFromCollector(collector, l));
+							}else{
+								algoName += ": start capture";
+								currentAlgorithm.addActionListener(a->captureController.addLinkToCollector(collector, l));
+							}
+							currentAlgorithm.setText(algoName);
+							currentLink.add(currentAlgorithm);
+						}
+						itemCapture.add(currentLink);
+					}
+					itemCapture.setEnabled(true);
+				}
 			} else {
 				itemCreate.setText("Edit Device");
 				itemCreate.setEnabled(true);
@@ -819,6 +874,27 @@ public class VisualisationInteractor implements MouseInputListener,
 					itemCreateLink.setEnabled(false);
 					itemCreateConnection.setEnabled(false);
 				}
+				
+				itemCapture.removeAll();
+				for(PacketCollector collector:captureController.getPacketCollectors()){
+					JMenuItem itemCaptureDevice = new JMenuItem();
+					String captureDeviceText = "";
+					if(collector.getPacketAlgorithm()==null){
+						captureDeviceText += "Null: ";
+					}else{
+						captureDeviceText += collector.getPacketAlgorithm().getClass().getSimpleName()+": ";
+					}
+					if(collector.getDevices().contains(clickedOn)){
+						captureDeviceText += "stop capture";
+						itemCaptureDevice.addActionListener(a->captureController.removeDeviceFromCollector(collector, clickedOn));
+					}else{
+						captureDeviceText += "start capture";
+						itemCaptureDevice.addActionListener(a->captureController.addDeviceToCollector(collector, clickedOn));
+					}
+					itemCaptureDevice.setText(captureDeviceText);
+					itemCapture.add(itemCaptureDevice);
+					itemCapture.setEnabled(true);
+				}
 			}
 			// Show the RightClickMenu
 			rightClickMenu.show(panel, mousePos.x, mousePos.y);
@@ -900,7 +976,14 @@ public class VisualisationInteractor implements MouseInputListener,
 		
 		// Edit connection
 		itemEditConnection = new JMenu("Edit Connection");
-
+		
+		rightClickMenu.add(itemEditConnection);
+		
+		//Capture packets
+		itemCapture = new JMenu("Capture Packets");
+		
+		rightClickMenu.add(itemCapture);
+		
 		// Delete device option
 		itemDelete = new JMenuItem("Delete");