fixed places are deleted.

solved #45

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java

@@ -19,14 +19,6 @@ public class Game implements Serializable {
         this.previousGame2 = previousGame2;
     }
 
-    public Place getLocation() {
-        return place;
-    }
-
-    public void setLocation(Place place) {
-        this.place = place;
-    }
-
     public int getPoints1() {
         return points1;
     }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java

@@ -8,7 +8,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 
 public class TournamentDecorator implements IsObservable{
     private Tournament tournament;
@@ -176,11 +175,6 @@ public class TournamentDecorator implements IsObservable{
         }
     }
 
-    public void closeApplication() throws InterruptedException {
-        executorService.shutdown();
-        executorService.awaitTermination(2000, TimeUnit.MILLISECONDS);
-    }
-
     private class saveTask implements Runnable {
 
         @Override

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java

@@ -5,31 +5,28 @@ import ch.zhaw.projekt2.turnierverwaltung.FactoryDecorator;
 import ch.zhaw.projekt2.turnierverwaltung.FileIO;
 import ch.zhaw.projekt2.turnierverwaltung.TournamentDecorator;
 import javafx.application.Application;
-import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
-
-import java.util.logging.Logger;
 
 
 public class MainWindow extends Application {
     private FileIO fileIO = new FileIO(System.getProperty("user.dir") + System.getProperty("file.separator") + "tournierverwaltung_angrynerds");
     private FactoryDecorator factoryDecorator;
     private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO);
-    private Factory factory = new Factory(fileIO, tournamentDecorator);
+    private Factory factory = new Factory(fileIO, tournamentDecorator); //TODO make it private!
-    private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
 
     @Override
     public void start(Stage primaryStage) throws Exception {
+
         BorderPane pane = factory.loadMainWindow();
         factoryDecorator = new FactoryDecorator(fileIO, factory, pane);
         factory.loadAllViews(factoryDecorator, pane);
         tournamentDecorator.setFactoryDecorator(factoryDecorator);
         factoryDecorator.openTournamentList();
 
+
         Scene scene = new Scene(pane);
         primaryStage.setScene(scene);
         primaryStage.setMaximized(true);
@@ -38,13 +35,5 @@ public class MainWindow extends Application {
         primaryStage.show();
     }
 
-    @Override
+
-    public void stop() {
-        try {
-            super.stop();
-            tournamentDecorator.closeApplication();
-        } catch (Exception e) {
-            logger.warning("Exception while closing application");
-        }
-    }
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java

@@ -1,7 +1,6 @@
 package ch.zhaw.projekt2.turnierverwaltung.main;
 
 import ch.zhaw.projekt2.turnierverwaltung.FXController;
-import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 
@@ -14,7 +13,7 @@ public class MainWindowController extends FXController {
 
     @FXML
     void closeApplication(ActionEvent event) {
-        Platform.exit();
+
     }
 
     @Override

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java

@@ -74,7 +74,7 @@ public class GameController extends FXController{
     public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane, GameDecorator gameDecorator) {
         setTournamentDecorator(tournamentDecorator);
         this.gameDecorator = gameDecorator;
-        placesChoiceBox.getSelectionModel().selectedItemProperty().addListener((ObservableValue<? extends Place> observable, Place oldValue, Place newValue) -> saveGamePlace(newValue));
+        placesChoiceBox.getSelectionModel().selectedItemProperty().addListener((ObservableValue<? extends Place> observable, Place oldValue, Place newValue) -> saveGamePlace(newValue == null ? oldValue : newValue));
     }
 
 }