Merge branch 'master' into 'master' (f86546f8) · Commits · Flori N / Enigma · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

E

Enigma
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

f86546f8

Commit f86546f8 authored 5 years ago by Dennis Eisold

Downloads
- Plain Diff

Merge branch 'master' into 'master'

NullPointer Exception bei "empfangeNachricht" behoben.

See merge request alfatrainingkurse/java/enigma!95

parents 08263370 4541acf1

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/projekt/enigma/App.java 51 additions, 28 deletions

src/main/java/projekt/enigma/App.java
src/main/java/projekt/enigma/GuiController.java 5 additions, 2 deletions

src/main/java/projekt/enigma/GuiController.java
src/main/java/projekt/enigma/model/Codierer.java 4 additions, 6 deletions

src/main/java/projekt/enigma/model/Codierer.java
src/main/java/projekt/enigma/model/Fehler.java 2 additions, 5 deletions

src/main/java/projekt/enigma/model/Fehler.java
src/main/java/projekt/enigma/model/Funkraum.java 9 additions, 6 deletions

src/main/java/projekt/enigma/model/Funkraum.java
src/main/java/projekt/enigma/model/Hardware.java 194 additions, 172 deletions

src/main/java/projekt/enigma/model/Hardware.java

with 265 additions and 219 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment