Various smaller improvements

* GUI Improvements on Linux
* Creation of Collector in PacketCollectorsPopUp possible

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/Main.java

@@ -21,7 +21,6 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Protocol;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SmartDevice;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.protocols.MQTT_protocol;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.SimpleLink;
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.SimplePacketSniffer;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.Manipulation_RandomMove;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.SimpleProtocol;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.MainFrame;
@@ -73,7 +72,8 @@ public class Main {
 		sim = controller.getSimulationController();
 	    //initializeTest();
 	    initializeMQTTTest();
-	    sim.getPacketCaptureController().addPacketCollector(new PacketCollector(new SimplePacketSniffer()));
+	    //Test packetCapture
+	    //sim.getPacketCaptureController().addPacketCollector(new PacketCollector(new SimplePacketSniffer()));
 	    v = new MainFrame(controller);
 	    /*
 	    for(int i=0; i<10; i++)

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/EditCollectorsPopUp.java

@@ -1,17 +1,14 @@
 package de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups;
 
+import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JList;
-
-
-import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
 
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.PacketCaptureController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.SimulationController;
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.NetworkManipulationAlgorithm;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.PacketCollector;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util.Utility;
 
@@ -22,7 +19,6 @@ import java.util.Iterator;
 import java.util.Observable;
 import java.util.Observer;
 
-import javax.swing.JButton;
 
 
 /**
@@ -88,47 +84,16 @@ public class EditCollectorsPopUp extends JDialog implements Observer {
 		
 		list = null;
 
-		//TODO: Maybe create PacketSniffer ?
-		JButton btnImportAlgorithm = new JButton("Import Algorithm");
-		btnImportAlgorithm.setToolTipText("Import new algorithm, which will be executed after each time step.");
+		JButton btnImportAlgorithm = new JButton("Create Collector");
+		btnImportAlgorithm.setToolTipText("Create a new PacketCollector which will collect packets");
 		btnImportAlgorithm.setBounds(220, 130, 160, 25);
 		getContentPane().add(btnImportAlgorithm);
 		btnImportAlgorithm.addActionListener(a->{
 			if(mutex)
 				return;
-			/**
-			 * PopUp for importing NetworkManipulationAlgo
-			 */
-			ImportPopUp<NetworkManipulationAlgorithm> popUp = new ImportPopUp<NetworkManipulationAlgorithm>(this, NetworkManipulationAlgorithm.class);
-			/**
-			 * Imported Class
-			 */
-			Class<? extends NetworkManipulationAlgorithm> imported = null;
-			/**
-			 * Instance of imported Algorithm class
-			 */
-			NetworkManipulationAlgorithm importedAlgo = null;
-			try {
-				imported = popUp.showPopUp();
-			} catch (Exception e1) {
-				JOptionPane.showMessageDialog(this, "Import failed: " + e1.getMessage());
-				return;
-			}
-			if (imported == null) {
-				// Import cancelled
-				return;
-			}
-			try {
-				/**
-				 * Create and add new instance
-				 */
-				importedAlgo = imported.newInstance();
-				sim.addAlgorithm(importedAlgo, controller);
-				//Refresh gui
-				update(null,null);
-			} catch (Exception e) {
-				JOptionPane.showMessageDialog(this, "Import failed: Missing empty constructor");
-			}
+			EditPacketSniffer popUp = new EditPacketSniffer(controller, that, new PacketCollector(), false); 
+			popUp.setEnabled(true);
+			popUp.setVisible(true);
 		});
 		
 		JButton btnRemoveSelected = new JButton("Remove Selected");
@@ -138,7 +103,6 @@ public class EditCollectorsPopUp extends JDialog implements Observer {
 		btnRemoveSelected.addActionListener(a->{
 			if(mutex)
 				return;
-			//TODO:
 			/**
 			 * Selected Index
 			 */
@@ -165,7 +129,6 @@ public class EditCollectorsPopUp extends JDialog implements Observer {
 		btnEditSelected.addActionListener(a->{
 			if(mutex)
 				return;
-			//TODO:
 			/**
 			 * Selected Index
 			 */

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/EditPacketSniffer.java

@@ -110,6 +110,7 @@ public class EditPacketSniffer extends JDialog implements Observer {
 		captureController.addObserver(this);
 		this.collector = collector;
 		this.setSize(400, 400);
+		this.setResizable(false);
 		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 		setTitle((this.edit?"Edit":"Create")+" PacketCollector");
 		this.setIconImage(Utility.loadFile("images/smartHome_icon.png"));
@@ -156,7 +157,7 @@ public class EditPacketSniffer extends JDialog implements Observer {
 				//Else import aborted 
 			}
 		});
-		btnImportPacketcapturealgorithm.setBounds(189, 13, 181, 25);
+		btnImportPacketcapturealgorithm.setBounds(180, 10, 210, 30);
 		getContentPane().add(btnImportPacketcapturealgorithm);
 		
 		lblAlgorithm = new JLabel();
@@ -189,11 +190,11 @@ public class EditPacketSniffer extends JDialog implements Observer {
 			}
 		});
 		
-		btnStopCapturingLink.setBounds(189, 153, 181, 25);
+		btnStopCapturingLink.setBounds(180, 150, 210, 30);
 		getContentPane().add(btnStopCapturingLink);
 		
 		JButton btnStopCapturingDevice = new JButton("Stop Capturing Device");
-		btnStopCapturingDevice.setBounds(189, 206, 181, 25);
+		btnStopCapturingDevice.setBounds(180, 200, 210, 30);
 		getContentPane().add(btnStopCapturingDevice);
 		
 		btnStopCapturingDevice.addActionListener(a->{
@@ -213,7 +214,7 @@ public class EditPacketSniffer extends JDialog implements Observer {
 			}
 		});
 		
-		JButton btnCreatePacketCollector = new JButton("Create/Edit Packet Collector");
+		JButton btnCreatePacketCollector = new JButton("Validate Collector");
 		btnCreatePacketCollector.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				if(mutex)return;
@@ -227,7 +228,7 @@ public class EditPacketSniffer extends JDialog implements Observer {
 			}
 		});
 		
-		btnCreatePacketCollector.setBounds(189, 315, 181, 25);
+		btnCreatePacketCollector.setBounds(180, 310, 210, 30);
 		getContentPane().add(btnCreatePacketCollector);
 
 		this.addWindowListener(new WindowAdapter() {

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/SimulationConfigurator.java

@@ -41,7 +41,7 @@ public class SimulationConfigurator extends JFrame implements Observer{
 	 */
 	private JTextField tfEndTimeLong;
 	/**
-	 * Textfield for editing the step durationr
+	 * Textfield for editing the step duration
 	 */
 	private JTextField tfStepDuration;
 	/**