Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma
Conflicts: src/main/java/Enigma/App.java
Showing
- src/main/java/Enigma/App.java 90 additions, 17 deletionssrc/main/java/Enigma/App.java
- src/main/java/Enigma/model/Codebuch.java 76 additions, 42 deletionssrc/main/java/Enigma/model/Codebuch.java
- src/main/java/Enigma/model/DatenbankSqlite.java 27 additions, 15 deletionssrc/main/java/Enigma/model/DatenbankSqlite.java
- src/main/java/Enigma/model/Funkraum.java 0 additions, 1 deletionsrc/main/java/Enigma/model/Funkraum.java
- src/main/java/Enigma/model/Hardware.java 206 additions, 0 deletionssrc/main/java/Enigma/model/Hardware.java
- src/main/java/Enigma/model/Morsecode.java 0 additions, 1 deletionsrc/main/java/Enigma/model/Morsecode.java
- src/main/java/Enigma/model/Reflektor.java 11 additions, 43 deletionssrc/main/java/Enigma/model/Reflektor.java
- src/main/java/Enigma/model/Steckbrett.java 77 additions, 61 deletionssrc/main/java/Enigma/model/Steckbrett.java
- src/main/java/Enigma/model/Walze.java 220 additions, 226 deletionssrc/main/java/Enigma/model/Walze.java
- src/test/java/Enigma/model/CodebuchTest.java 1 addition, 3 deletionssrc/test/java/Enigma/model/CodebuchTest.java
- src/test/java/Enigma/model/HardwareTest.java 62 additions, 0 deletionssrc/test/java/Enigma/model/HardwareTest.java
- src/test/java/Enigma/model/ReflektorTest.java 0 additions, 10 deletionssrc/test/java/Enigma/model/ReflektorTest.java
- src/test/java/Enigma/model/SteckbrettTest.java 4 additions, 15 deletionssrc/test/java/Enigma/model/SteckbrettTest.java
- src/test/java/Enigma/model/WalzeTest.java 15 additions, 17 deletionssrc/test/java/Enigma/model/WalzeTest.java
Loading
Please register or sign in to comment