Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma
Conflicts: src/main/resources/projekt/enigma/kenngruppe.fxml
Showing
- pom.xml 2 additions, 2 deletionspom.xml
- src/main/java/projekt/enigma/App.java 3 additions, 5 deletionssrc/main/java/projekt/enigma/App.java
- src/main/java/projekt/enigma/GuiController.java 42 additions, 19 deletionssrc/main/java/projekt/enigma/GuiController.java
- src/main/java/projekt/enigma/KenngruppeController.java 1 addition, 1 deletionsrc/main/java/projekt/enigma/KenngruppeController.java
- src/main/java/projekt/enigma/Main.java 1 addition, 1 deletionsrc/main/java/projekt/enigma/Main.java
- src/main/java/projekt/enigma/database/DatenbankSqlite.java 8 additions, 3 deletionssrc/main/java/projekt/enigma/database/DatenbankSqlite.java
- src/main/java/projekt/enigma/model/Codebuch.java 3 additions, 3 deletionssrc/main/java/projekt/enigma/model/Codebuch.java
- src/main/java/projekt/enigma/model/Codierer.java 63 additions, 8 deletionssrc/main/java/projekt/enigma/model/Codierer.java
- src/main/java/projekt/enigma/model/Funkraum.java 1 addition, 1 deletionsrc/main/java/projekt/enigma/model/Funkraum.java
- src/main/java/projekt/enigma/model/Hardware.java 1 addition, 1 deletionsrc/main/java/projekt/enigma/model/Hardware.java
- src/main/java/projekt/enigma/model/Morsecode.java 1 addition, 1 deletionsrc/main/java/projekt/enigma/model/Morsecode.java
- src/main/java/projekt/enigma/model/Reflektor.java 13 additions, 17 deletionssrc/main/java/projekt/enigma/model/Reflektor.java
- src/main/java/projekt/enigma/model/Steckbrett.java 116 additions, 0 deletionssrc/main/java/projekt/enigma/model/Steckbrett.java
- src/main/java/projekt/enigma/model/Walze.java 3 additions, 1 deletionsrc/main/java/projekt/enigma/model/Walze.java
- src/main/resources/projekt/enigma/codebuch.sqlite 0 additions, 0 deletionssrc/main/resources/projekt/enigma/codebuch.sqlite
- src/main/resources/projekt/enigma/gui.fxml 1 addition, 1 deletionsrc/main/resources/projekt/enigma/gui.fxml
- src/main/resources/projekt/enigma/kenngruppe.fxml 0 additions, 0 deletionssrc/main/resources/projekt/enigma/kenngruppe.fxml
- src/test/java/projekt/enigma/model/CodebuchTest.java 6 additions, 10 deletionssrc/test/java/projekt/enigma/model/CodebuchTest.java
- src/test/java/projekt/enigma/model/HardwareTest.java 1 addition, 1 deletionsrc/test/java/projekt/enigma/model/HardwareTest.java
- src/test/java/projekt/enigma/model/ReflektorTest.java 1 addition, 1 deletionsrc/test/java/projekt/enigma/model/ReflektorTest.java
Loading
Please register or sign in to comment