ZHAW-IT21b_WIN
/
team02-AngryNerds-projekt2-turnierverwaltung
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict

This commit is contained in:
Andrin Fassbind 2022-05-13 23:03:15 +02:00
parent 4392fabc38
commit 4db2c582e2
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
View File

@ -119,8 +119,7 @@ public class FactoryDecorator implements IsObservable {
*/ */
public void openTournamentList() { public void openTournamentList() {
logger.fine("Showing TournamentList view"); logger.fine("Showing TournamentList view");
factory.showTournamentList((BorderPane) pane, this); factory.showTournamentList((BorderPane) pane);
informListener(); informListener();
} }

5
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
View File

@ -31,10 +31,7 @@ public class MainWindowController extends FXController {
@FXML @FXML
private Menu menuItemLanguage; private Menu menuItemLanguage;
/**
private static final Logger logger = Logger.getLogger(MainWindowController.class.getCanonicalName());
* Method changes the language Setting to german * Method changes the language Setting to german
*/ */
@FXML @FXML