Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop

src/ui/view/SimulationMenu.java

@@ -14,6 +14,8 @@ import javax.swing.event.CaretListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import com.sun.crypto.provider.JceKeyStore;
+
 import classes.CpsObject;
 import classes.HolonObject;
 import classes.HolonSwitch;
@@ -21,7 +23,7 @@ import classes.HolonTransformer;
 import ui.controller.Control;
 import ui.model.Model;
 import java.util.ArrayList;
-
+import java.util.HashMap;
 import java.awt.GridBagLayout;
 import java.awt.Color;
 import java.awt.Cursor;
@@ -46,10 +48,10 @@ public class SimulationMenu extends JMenuBar {
 	private JRadioButton simButton = new JRadioButton("Simulate");
 	private JLabel simSpeedLabel = new JLabel("Simulation Speed:");
 	private JTextField simSpeedText = new JTextField("1000");
-	private JLabel algoLabel = new JLabel("Algorithm:");
-	private JComboBox algoCombo;
-	private JButton algoFolderButton = new JButton("Set Algorithm Folder");
-
+	private JComboBox algoCombo = new JComboBox<>();
+	private JButton algoFolderButton = new JButton("Algorithm:");
+	private HashMap<String, File> algosHash = new HashMap<>();
+	
 	Model model;
 	Control controller;
 
@@ -78,7 +80,12 @@ public class SimulationMenu extends JMenuBar {
 					File[] files = fileChooser.getSelectedFile().listFiles();
 					for (int i = 0; i < files.length; i++) {
 						if (files[i].toString().endsWith(".java") || files[i].toString().endsWith(".class")) {
-							algoCombo.addItem(files[i]);
+							String name = files[i].toString();
+							int tmpA = name.lastIndexOf('/');
+							int tmpB = name.lastIndexOf('.');
+							name = name.substring(tmpA+1, tmpB);
+							algosHash.put(name, files[i]);
+							algoCombo.addItem(name);
 						}
 					}
 				}
@@ -134,25 +141,20 @@ public class SimulationMenu extends JMenuBar {
 		gbc_simSpeedText.gridx = 2;
 		gbc_simSpeedText.gridy = 0;
 		menuPanel.add(simSpeedText, gbc_simSpeedText);
-		GridBagConstraints gbc_algoLabel = new GridBagConstraints();
-		gbc_algoLabel.anchor = GridBagConstraints.WEST;
-		gbc_algoLabel.insets = new Insets(0, 0, 0, 5);
-		gbc_algoLabel.gridx = 3;
-		gbc_algoLabel.gridy = 0;
-		menuPanel.add(algoLabel, gbc_algoLabel);
-
-		algoCombo = new JComboBox<>();
+		GridBagConstraints gbc_algoFolderButton = new GridBagConstraints();
+		gbc_algoFolderButton.anchor = GridBagConstraints.WEST;
+		gbc_algoFolderButton.insets = new Insets(0, 0, 0, 5);
+		gbc_algoFolderButton.gridx = 3;
+		gbc_algoFolderButton.gridy = 0;
+		menuPanel.add(algoFolderButton, gbc_algoFolderButton);
+
 		GridBagConstraints gbc_algoCombo = new GridBagConstraints();
 		gbc_algoCombo.anchor = GridBagConstraints.WEST;
 		gbc_algoCombo.insets = new Insets(0, 0, 0, 5);
 		gbc_algoCombo.gridx = 4;
 		gbc_algoCombo.gridy = 0;
 		menuPanel.add(algoCombo, gbc_algoCombo);
-		GridBagConstraints gbc_algoFolderButton = new GridBagConstraints();
-		gbc_algoFolderButton.anchor = GridBagConstraints.NORTHWEST;
-		gbc_algoFolderButton.gridx = 5;
-		gbc_algoFolderButton.gridy = 0;
-		menuPanel.add(algoFolderButton, gbc_algoFolderButton);
+		algoCombo.addItem("choose folder");
 		
 		//Add Panel to SimulationMenu
 		this.add(menuPanel);