diff --git a/src/main/java/projekt/enigma/GuiController.java b/src/main/java/projekt/enigma/GuiController.java index 6d9e92bb70c18a6677b02b8f01edd1c94ef8372f..f35487cefbb794d0dd1b3548c3538640ed1bbe01 100644 --- a/src/main/java/projekt/enigma/GuiController.java +++ b/src/main/java/projekt/enigma/GuiController.java @@ -54,7 +54,7 @@ public class GuiController { mBtnStartPos1, mBtnStartPos2, mBtnStartPos3; //deklariert die benötigten Textfelder @FXML - private TextField tfCodiert, tfKlartext; + private TextArea tfCodiert, tfKlartext; //deklariert benötigtes GridPane @FXML private ChkBoxGridPane[] chkBoxGridPane; @@ -668,6 +668,9 @@ public class GuiController { mBtnStartPos1.setText(String.valueOf(this.codierer.fetchWalzen()[0])); mBtnStartPos2.setText(String.valueOf(this.codierer.fetchWalzen()[1])); mBtnStartPos3.setText(String.valueOf(this.codierer.fetchWalzen()[2])); + } else { + new Fehler().showErrorDialog("error", "Du Labertasche!", "250 Zeichen sind " + + "selbst für die Wehrmacht zu viel!"); } } diff --git a/src/main/java/projekt/enigma/model/Walze.java b/src/main/java/projekt/enigma/model/Walze.java index cd2324cb51c59469af1f51245a1e5bcae6eb603b..52a87661f5ea5d9201a204069d950139863e51f0 100644 --- a/src/main/java/projekt/enigma/model/Walze.java +++ b/src/main/java/projekt/enigma/model/Walze.java @@ -113,7 +113,7 @@ public class Walze { * @return char : decodierter Buchstabe. */ char codiere2(char buchstabe) { - return this.alphabet.charAt((this.fetchWalze().indexOf(buchstabe) - this.turns + 260) % 26); + return this.alphabet.charAt((this.fetchWalze().indexOf(buchstabe) - this.turns + 520) % 26); } /** diff --git a/src/main/resources/projekt/enigma/gui.fxml b/src/main/resources/projekt/enigma/gui.fxml index 2fb0e1dd7cd965f66218918d708e51b6990fda7f..d2b8126c4e70926f98c33daa130091ac3328b048 100644 --- a/src/main/resources/projekt/enigma/gui.fxml +++ b/src/main/resources/projekt/enigma/gui.fxml @@ -1,12 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<?import javafx.geometry.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> -<?import javafx.scene.shape.*?> -<?import javafx.scene.text.*?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.control.Button?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.MenuButton?> +<?import javafx.scene.control.ProgressIndicator?> +<?import javafx.scene.control.TextArea?> +<?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.ColumnConstraints?> +<?import javafx.scene.layout.GridPane?> +<?import javafx.scene.layout.Pane?> +<?import javafx.scene.layout.RowConstraints?> +<?import javafx.scene.shape.Circle?> +<?import javafx.scene.text.Font?> -<AnchorPane fx:id="anchorPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="677.0" prefWidth="962.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="projekt.enigma.GuiController"> +<AnchorPane fx:id="anchorPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="677.0" prefWidth="962.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="projekt.enigma.GuiController"> <GridPane layoutX="23.0" layoutY="60.0" prefHeight="158.0" prefWidth="237.0" AnchorPane.leftAnchor="23.0" AnchorPane.topAnchor="60.0"> <columnConstraints> <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> @@ -585,12 +593,6 @@ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> </rowConstraints> - <TextField fx:id="tfKlartext" editable="false" prefHeight="70.0" prefWidth="293.0"> - <GridPane.margin> - <Insets /> - </GridPane.margin> - </TextField> - <TextField fx:id="tfCodiert" editable="false" prefHeight="70.0" prefWidth="293.0" GridPane.rowIndex="1" /> <Button fx:id="btnSenden" alignment="CENTER" contentDisplay="RIGHT" mnemonicParsing="false" onAction="#gedrueckteTaste" prefHeight="70.0" prefWidth="195.0" text="An Funker senden" textAlignment="CENTER" GridPane.columnIndex="1"> <GridPane.margin> <Insets left="80.0" /> @@ -601,6 +603,16 @@ <Insets left="80.0" /> </GridPane.margin> </Button> + <TextArea fx:id="tfKlartext" prefHeight="66.0" prefWidth="293.0" wrapText="true"> + <GridPane.margin> + <Insets bottom="5.0" top="5.0" /> + </GridPane.margin> + </TextArea> + <TextArea fx:id="tfCodiert" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.rowIndex="1"> + <GridPane.margin> + <Insets bottom="5.0" top="5.0" /> + </GridPane.margin> + </TextArea> </GridPane> <Label fx:id="lblKenngruppe" layoutX="682.0" layoutY="34.0" prefHeight="17.0" prefWidth="177.0" /> <Pane layoutX="266.0" layoutY="194.0" prefHeight="200.0" prefWidth="354.0" style="-fx-background-color: white; -fx-border-color: black;" visible="false">