AlgoComboBox now has a "non chosen" option to deselect

src/ui/view/HolonCanvas.java

@@ -19,6 +19,11 @@ import classes.HolonObject;
 import classes.SubNet;
 import ui.controller.Control;
 import ui.model.Model;
+import javax.swing.JTextArea;
+import java.awt.List;
+
+import javax.swing.JComboBox;
+import javax.swing.JMenuBar;
 
 public class HolonCanvas extends JPanel implements MouseWheelListener {
 
@@ -37,23 +42,25 @@ public class HolonCanvas extends JPanel implements MouseWheelListener {
 	// Frames
 	private int currentFrameRate;
 
-	long previousTime = System.currentTimeMillis();
-	long currentTime = previousTime;
-	long elapsedTime;
-	long totalElapsedTime = 0;
-	int frameCount = 0;
+	private long previousTime = System.currentTimeMillis();
+	private long currentTime = previousTime;
+	private long elapsedTime;
+	private long totalElapsedTime = 0;
+	private int frameCount = 0;
 	private Dimension center;
 	private ArrayList<SubNet> subnets;
 
 	private Control controller;
 	private Model model;
-	int maxX;
-	int maxY;
-
+	private int maxX;
+	private int maxY;
+	private JComboBox<String> combo = new JComboBox<>();
+	
 	public HolonCanvas(Model mod, Control control) {
 		// Wire up Events
 		this.controller = control;
 		this.model = mod;
+		this.add(combo);
 		subnets = controller.getSimManager().getSubNets();
 		subCount = subnets.size();
 		previousTime = System.currentTimeMillis();
@@ -61,10 +68,10 @@ public class HolonCanvas extends JPanel implements MouseWheelListener {
 		totalElapsedTime = 0;
 		frameCount = 0;
 		this.addMouseWheelListener(this);
+		combo.addItem("ID");
 	}
 
 	// Start Render and Update Threads
-
 	public void paintComponent(Graphics g) {
 		super.paintComponent(g);
 

src/ui/view/SimulationMenu.java

@@ -66,12 +66,14 @@ public class SimulationMenu extends JMenuBar {
 		// Init Stuff
 		this.model = mod;
 		this.controller = cont;
+		algoCombo.addItem("non chosen");
 
 		// Algorithm ComboBox Action
 		algoCombo.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				setAlgorithm(algosHash.get(algoCombo.getSelectedItem()), algoCombo.getSelectedItem() + "");
+				if (algoCombo.getSelectedIndex() != 0)
+					setAlgorithm(algosHash.get(algoCombo.getSelectedItem()), algoCombo.getSelectedItem() + "");
 			}
 		});
 
@@ -91,6 +93,7 @@ public class SimulationMenu extends JMenuBar {
 
 				if (fileChooser.showOpenDialog(test) == JFileChooser.APPROVE_OPTION) {
 					algoCombo.removeAllItems();
+					algoCombo.addItem("non chosen");
 					File[] files = fileChooser.getSelectedFile().listFiles();
 					// Set Root Folder Path
 					root = new File(fileChooser.getCurrentDirectory().getPath());
@@ -148,7 +151,7 @@ public class SimulationMenu extends JMenuBar {
 
 		// timerSpeed
 		simSpeedText.setMaximumSize(new Dimension(300, 300));
-		//simSpeedText.setMinimumSize(new Dimension(300, 300));
+		// simSpeedText.setMinimumSize(new Dimension(300, 300));
 		simSpeedText.addCaretListener(new CaretListener() {
 			@Override
 			public void caretUpdate(CaretEvent e) {