Merge branch 'master' into 'master'

Klassenvariablen eingeführt, MenuButton Variablen umbenannt

See merge request !14

src/main/java/Enigma/GuiController.java

@@ -2,48 +2,46 @@ package Enigma;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
-import javafx.scene.control.Label;
 import javafx.scene.control.MenuButton;
 import javafx.scene.control.MenuItem;
 
-import javax.swing.*;
-import java.awt.*;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.beans.EventHandler;
 import java.util.ArrayList;
-import java.util.List;
 
-public class GuiController {
+public class GuiController2 {
+    private ArrayList<MenuItem> mItem;
+    private final static String[] str= {"I", "II", "III", "IV", "V"};
+    private final static String[] num ={"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26"};
+    private final static String[] bs ={"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"};
+
 
     @FXML
-    private MenuButton w1;
+    private MenuButton mBtnWalzPos1;
 
     @FXML
-    private MenuButton w2;
+    private MenuButton mBtnWalzPos2;
 
     @FXML
-    private MenuButton w3;
+    private MenuButton mBtnWalzPos3;
 
     @FXML
-    private MenuButton r1;
+    private MenuButton mBtnNotchPos1;
 
     @FXML
-    private MenuButton r2;
+    private MenuButton mBtnNotchPos2;
 
     @FXML
-    private MenuButton r3;
+    private MenuButton mBtnNotchPos3;
 
 
     @FXML
-    private MenuButton a1;
+    private MenuButton mBtnStartPos1;
 
     @FXML
-    private MenuButton a3;
+    private MenuButton mBtnStartPos2;
 
     @FXML
-    private MenuButton a2;
+    private MenuButton mBtnStartPos3;
     @FXML
     private Button L;
 
@@ -132,7 +130,7 @@ public class GuiController {
 //    public void gedrueckteTaste() {
 //        txt.setText("hello");
 
-   // }
+    // }
 //    public void action(ActionEvent ae){
 //        if (ae.getSource()==)
 //    }
@@ -149,12 +147,12 @@ public class GuiController {
 //        txtoriginal.setText(bn.getText());
 //    }
 
-   // public void gedrueckteTaste(Button bn){
+    // public void gedrueckteTaste(Button bn){
 
 
 
 
-   // }
+    // }
 
 
 
@@ -179,9 +177,6 @@ public class GuiController {
 
     }
 
-
-
-
     /**
      * Methode zum setzen des menuButton Textes auf das ausgewählte MenuItem
      * @param mb : MenuButton der Walze
@@ -196,17 +191,17 @@ public class GuiController {
      * @param button : Button für die die Einträge erstellt werden sollen
      */
     private void menu(MenuButton button, String[] str) {
-        ArrayList<MenuItem> mi = new ArrayList<>();
+        mItem = new ArrayList<>();
         for (int i = 0; i < str.length; i++) {
 
             //Eintrag aus str der Arraylist mi hinzufügen
-            mi.add(new MenuItem(str[i]));
+            mItem.add(new MenuItem(str[i]));
             //MenuItem mi dem Button button hinzufügen
-            button.getItems().add(mi.get(i));
+            button.getItems().add(mItem.get(i));
             int finalI = i;
             //Listener für die einzelnen Einträge
-            ArrayList<MenuItem> finalMi = mi;
-            mi.get(i).setOnAction(e -> {
+            ArrayList<MenuItem> finalMi = mItem;
+            mItem.get(i).setOnAction(e -> {
                 listener(button, finalMi.get(finalI));
             });
         }
@@ -215,22 +210,18 @@ public class GuiController {
     private Button löschen;
     @FXML
     void initialize() {
-        String[] str={"I", "II", "III", "IV", "V"};
-        String[] num ={"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26"};
-        String[] bs ={"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"};
-
         //Einträge für Walzen
-        menu(w1, str);
-        menu(w2, str);
-        menu(w3, str);
+        menu(mBtnWalzPos1, str);
+        menu(mBtnWalzPos2, str);
+        menu(mBtnWalzPos3, str);
         //Einträge für die Ringe
-        menu(r1, num);
-        menu(r2, num);
-        menu(r3, num);
+        menu(mBtnNotchPos1, num);
+        menu(mBtnNotchPos2, num);
+        menu(mBtnNotchPos3, num);
         //Einträge für die Startpositionen
-        menu(a1, bs);
-        menu(a2, bs);
-        menu(a3, bs);
+        menu(mBtnStartPos1, bs);
+        menu(mBtnStartPos3, bs);
+        menu(mBtnStartPos2, bs);
 
         assert L != null : "fx:id=\"L\" was not injected: check your FXML file 'gui.fxml'.";
         assert P != null : "fx:id=\"P\" was not injected: check your FXML file 'gui.fxml'.";
@@ -259,15 +250,34 @@ public class GuiController {
         assert I != null : "fx:id=\"I\" was not injected: check your FXML file 'gui.fxml'.";
         assert O != null : "fx:id=\"O\" was not injected: check your FXML file 'gui.fxml'.";
         assert löschen != null : "fx:id=\"löschen\" was not injected: check your FXML file 'gui.fxml'.";
-        assert w1 != null : "fx:id=\"w1\" was not injected: check your FXML file 'gui.fxml'.";
-        assert w3 != null : "fx:id=\"w3\" was not injected: check your FXML file 'gui.fxml'.";
-        assert w2 != null : "fx:id=\"w2\" was not injected: check your FXML file 'gui.fxml'.";
-        assert r3 != null : "fx:id=\"r3\" was not injected: check your FXML file 'gui.fxml'.";
-        assert r2 != null : "fx:id=\"r2\" was not injected: check your FXML file 'gui.fxml'.";
-        assert a1 != null : "fx:id=\"a1\" was not injected: check your FXML file 'gui.fxml'.";
-        assert a3 != null : "fx:id=\"a3\" was not injected: check your FXML file 'gui.fxml'.";
-        assert a2 != null : "fx:id=\"a2\" was not injected: check your FXML file 'gui.fxml'.";
-        assert r1 != null : "fx:id=\"r1\" was not injected: check your FXML file 'gui.fxml'.";
+        assert mBtnWalzPos1 != null : "fx:id=\"w1\" was not injected: check your FXML file 'gui.fxml'.";
+        assert mBtnWalzPos3 != null : "fx:id=\"w3\" was not injected: check your FXML file 'gui.fxml'.";
+        assert mBtnWalzPos2 != null : "fx:id=\"w2\" was not injected: check your FXML file 'gui.fxml'.";
+        assert mBtnNotchPos3 != null : "fx:id=\"r3\" was not injected: check your FXML file 'gui.fxml'.";
+        assert mBtnNotchPos2 != null : "fx:id=\"r2\" was not injected: check your FXML file 'gui.fxml'.";
+        assert mBtnStartPos1 != null : "fx:id=\"a1\" was not injected: check your FXML file 'gui.fxml'.";
+        assert mBtnStartPos2 != null : "fx:id=\"a3\" was not injected: check your FXML file 'gui.fxml'.";
+        assert mBtnStartPos3 != null : "fx:id=\"a2\" was not injected: check your FXML file 'gui.fxml'.";
+        assert mBtnNotchPos1 != null : "fx:id=\"r1\" was not injected: check your FXML file 'gui.fxml'.";
     }
 
+    /**
+     * Setzt die Anzeige des entsprechende Gui-Element auf die entsprechende Walze
+     *
+     * @param walze => gibt die Walzennummer an (entspricht
+     * @param position => gibt die Position der Walze (entspricht
+     */
+    public void setzeWalze(int walze, int position){
+        switch (position){
+            case 1:
+                mBtnWalzPos1.setText();
+                break;
+            case 2:
+                break;
+            case 3:
+                break;
+        }
+
+
+    }
 }