|
@@ -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
|
|
|
*/
|