Adds and moves to view.popups package for Popups/Panels/Configurators

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

@@ -16,6 +16,7 @@ import javax.swing.SwingConstants;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.util.Utility;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups.SimulationConfigurator;
 
 /**
  * Main class of the GUI, which combines the UserInterface and visualisation of the simulation.
@@ -73,7 +74,7 @@ public class MainFrame extends JFrame {
 		}
 		
 		JMenuBar menuBar = new JMenuBar();
-		super.setJMenuBar(menuBar);
+		super.setJMenuBar(menuBar);	
 		//getContentPane().add(menuBar, BorderLayout.NORTH);
 		/*
 		JMenuItem mntmOptions = new JMenuItem("Options");
@@ -88,7 +89,11 @@ public class MainFrame extends JFrame {
 			sim.setVisible(true);
 		});
 		menuBar.add(mntmSimulation);
-		
+		/*
+		JMenuItem mntmOption = new JMenuItem("Options");
+		menuBar.add(mntmOption);
+		menuBar.setLayout(new FlowLayout(FlowLayout.LEFT));
+		*/
 		this.setVisible(true);
 		//Set Dimension of the model to the JPanel size
 		panel.delayedInit();

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

@@ -25,6 +25,9 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SmartDevice;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.SimpleLink;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.SimpleProtocol;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.util.Pair;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups.ConnectionCreationDialog;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups.LinkCreationDialog;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups.SmartDeviceCreationPopUp;
 
 /**
  * Listener which detects User Interaction with the {@link VisualisationPanel},

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/ConnectionCreationDialog.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/ConnectionCreationDialog.java

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.tk.SmartHomeNetworkSim.view;
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups;
 
 import java.awt.Component;
 import java.util.Collection;

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/ConnectionCreationPanel.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/ConnectionCreationPanel.java

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.tk.SmartHomeNetworkSim.view;
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups;
 
 import java.awt.Color;
 import java.awt.Dimension;

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/LinkCreationDialog.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/LinkCreationDialog.java

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.tk.SmartHomeNetworkSim.view;
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups;
 
 import java.awt.Component;
 import java.util.Collection;

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/LinkCreationPanel.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/LinkCreationPanel.java

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.tk.SmartHomeNetworkSim.view;
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups;
 
 import java.awt.Dimension;
 import java.awt.Window;

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/LinkEditorPanel.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/LinkEditorPanel.java

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.tk.SmartHomeNetworkSim.view;
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups;
 
 import java.awt.Dimension;
 import java.awt.Window;

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/PortEditorPanel.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/PortEditorPanel.java

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.tk.SmartHomeNetworkSim.view;
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups;
  
 import java.awt.*;
 import java.awt.event.ActionEvent;

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

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.tk.SmartHomeNetworkSim.view;
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups;
 
 import javax.swing.JFrame;
 import javax.swing.JProgressBar;

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/SmartDeviceCreationPopUp.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/SmartDeviceCreationPopUp.java

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.tk.SmartHomeNetworkSim.view;
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -15,6 +15,7 @@ import javax.swing.JTextField;
 
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SmartDevice;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.IntegerInputValidator;
 
 @SuppressWarnings("serial")
 /**

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * Popups, panels and configuration frames for the SmartHomeNetworkSim
+ * 
+ * @author Andreas T. Meyer-Berg
+ */
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.view.popups;