diff --git a/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.form b/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.form index 9506199..b77fb20 100644 --- a/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.form +++ b/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.form @@ -1,6 +1,6 @@
- + @@ -66,25 +66,9 @@ - - - - - - - - - - - - - - - - - + @@ -93,7 +77,7 @@ - + @@ -109,7 +93,7 @@ - + @@ -117,7 +101,7 @@ - + @@ -127,7 +111,7 @@ - + diff --git a/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.java b/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.java index 55d9196..49bcbf6 100644 --- a/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.java +++ b/src/de/oszimt/ls/aliendefence/view/menue/MainMenu.java @@ -15,7 +15,6 @@ public class MainMenu { private JPanel main; private JTextField loginTextField; - private JComboBox level; private JButton playButton; private JButton testButton; private JButton highscoreButton; @@ -24,12 +23,10 @@ public class MainMenu { private JPasswordField passwordTextField; public MainMenu(AlienDefenceController alienDefenceController) { - //fill level chooser // Levelliste für die ComboBox abrufen List arrLevel = alienDefenceController.getLevelController().readAllLevels(); String[] arrLevelNames = getLevelNames(arrLevel); - level.setModel(new DefaultComboBoxModel(arrLevelNames)); // Button Spielen - ActionListener playButton.addActionListener(new ActionListener() { @@ -45,8 +42,8 @@ public class MainMenu { @Override public void run() { - GameController gameController = alienDefenceController.startGame(arrLevel.get(level.getSelectedIndex()), user); - new GameGUI(gameController).start(); + //GameController gameController = alienDefenceController.startGame(arrLevel.get(level.getSelectedIndex()), user); + //new GameGUI(gameController).start(); } }; t.start(); @@ -72,7 +69,7 @@ public class MainMenu { highscoreButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - new Highscore(alienDefenceController.getAttemptController(), arrLevel.get(level.getSelectedIndex())); + new Highscore(alienDefenceController.getAttemptController(), arrLevel.get(1)); } });