diff --git a/src/de/bricked/game/levels/LevelPackHandler.java b/src/de/bricked/game/levels/LevelPackHandler.java index 2a0723ed1de75226fc74aab9d70f70c80d3797a1..d2255872cd1419b221b9ad4b4b0b9a9991eba1cb 100644 --- a/src/de/bricked/game/levels/LevelPackHandler.java +++ b/src/de/bricked/game/levels/LevelPackHandler.java @@ -2,6 +2,7 @@ package de.bricked.game.levels; import de.bricked.game.Config; import de.bricked.utils.FileUtils; +import logger.Logger; import tools.PathUtils; import java.io.*; @@ -96,7 +97,7 @@ public class LevelPackHandler } catch (IOException e) { - e.printStackTrace(); + Logger.error(e); } } return stringContent; diff --git a/src/de/bricked/ui/CommandLineAvailabale.java b/src/de/bricked/ui/CommandLineAvailabale.java new file mode 100644 index 0000000000000000000000000000000000000000..3ac71623ea00e2f0db223ac3e7976dbe8b8fe2b0 --- /dev/null +++ b/src/de/bricked/ui/CommandLineAvailabale.java @@ -0,0 +1,6 @@ +package de.bricked.ui; + +public interface CommandLineAvailabale +{ + public void showCommandLine(); +} \ No newline at end of file diff --git a/src/de/bricked/ui/Controller.java b/src/de/bricked/ui/Controller.java index 3726c298a3e5b290bbd9a6be11d237bba572a56e..fa64c8c5e994aa48cac0cdc01766c1ae325da0fd 100644 --- a/src/de/bricked/ui/Controller.java +++ b/src/de/bricked/ui/Controller.java @@ -14,6 +14,7 @@ import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.Button; +import javafx.scene.control.Alert.AlertType; import javafx.scene.image.Image; import javafx.scene.input.KeyEvent; import javafx.scene.layout.AnchorPane; @@ -24,7 +25,7 @@ import kuusisto.tinysound.TinySound; import logger.Logger; import tools.AlertGenerator; -public class Controller +public class Controller implements CommandLineAvailabale { @FXML private AnchorPane mainPane; @FXML private Button buttonLevelSelect; @@ -76,7 +77,7 @@ public class Controller buttonAchievements.setStyle("-fx-base: " + bundle.getString("color.button")); buttonAbout.setStyle("-fx-base: " + bundle.getString("color.button")); - //TODO + //TODO re-activate buttonAchievements.setDisable(true); Logger.info("successfully started"); @@ -106,7 +107,7 @@ public class Controller } catch(IOException e1) { - e1.printStackTrace(); + Logger.error(e1); } } @@ -133,7 +134,7 @@ public class Controller } catch(IOException e1) { - e1.printStackTrace(); + Logger.error(e1); } } @@ -142,6 +143,7 @@ public class Controller } + @Override public void showCommandLine() { try @@ -150,8 +152,8 @@ public class Controller } catch(IOException e) { - //TODO: errorhandling - Logger.error(e);; + AlertGenerator.showAlert(AlertType.ERROR, "Error", "", "An error occurred while opening the debug console.\n\nDetails:\n" + e.getMessage(), icon, stage, null, false); + Logger.error(e); } } diff --git a/src/de/bricked/ui/LevelController.java b/src/de/bricked/ui/LevelController.java index c56f3a1c68dc7b4f926995f00d247f13907b14c0..a33a918731140ef6391937460bff20307d885b34 100644 --- a/src/de/bricked/ui/LevelController.java +++ b/src/de/bricked/ui/LevelController.java @@ -44,6 +44,7 @@ import javafx.scene.Scene; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.Label; +import javafx.scene.control.Alert.AlertType; import javafx.scene.effect.Lighting; import javafx.scene.image.Image; import javafx.scene.image.ImageView; @@ -70,7 +71,7 @@ import logger.Logger; import tools.AlertGenerator; import tools.Worker; -public class LevelController +public class LevelController implements CommandLineAvailabale { @FXML private AnchorPane anchorPane; @FXML private Label labelLevelName; @@ -1032,6 +1033,7 @@ public class LevelController labelFPS.setVisible(value); } + @Override public void showCommandLine() { try @@ -1040,7 +1042,7 @@ public class LevelController } catch(IOException e) { - // TODO: errorhandling + AlertGenerator.showAlert(AlertType.ERROR, "Error", "", "An error occurred while opening the debug console.\n\nDetails:\n" + e.getMessage(), icon, stage, null, false); Logger.error(e); } } diff --git a/src/de/bricked/ui/LevelPackSelectController.java b/src/de/bricked/ui/LevelPackSelectController.java index 172c0f7cf29e820d31372f2ac52c512ba453f96d..24a6d5b82bad258f4f0a8ae5a4c84d7b965f778b 100644 --- a/src/de/bricked/ui/LevelPackSelectController.java +++ b/src/de/bricked/ui/LevelPackSelectController.java @@ -25,6 +25,7 @@ import javafx.scene.control.ListView; import javafx.scene.control.ScrollPane; import javafx.scene.control.ScrollPane.ScrollBarPolicy; import javafx.scene.control.TextInputDialog; +import javafx.scene.control.Alert.AlertType; import javafx.scene.image.Image; import javafx.scene.input.KeyEvent; import javafx.scene.input.MouseEvent; @@ -35,8 +36,9 @@ import javafx.stage.WindowEvent; import javafx.util.Callback; import kuusisto.tinysound.TinySound; import logger.Logger; +import tools.AlertGenerator; -public class LevelPackSelectController +public class LevelPackSelectController implements CommandLineAvailabale { @FXML private AnchorPane mainPane; @FXML private ScrollPane pane; @@ -192,6 +194,7 @@ public class LevelPackSelectController controller.stage.show(); } + @Override public void showCommandLine() { try @@ -200,7 +203,7 @@ public class LevelPackSelectController } catch(IOException e) { - // TODO: errorhandling + AlertGenerator.showAlert(AlertType.ERROR, "Error", "", "An error occurred while opening the debug console.\n\nDetails:\n" + e.getMessage(), icon, stage, null, false); Logger.error(e); } } diff --git a/src/de/bricked/ui/LevelSelectController.java b/src/de/bricked/ui/LevelSelectController.java index 85bdc7e826c9f24d50d0a5847e613d6534bdc61b..75fb3a73469b1f670bd2acfbf954410869469846 100644 --- a/src/de/bricked/ui/LevelSelectController.java +++ b/src/de/bricked/ui/LevelSelectController.java @@ -19,6 +19,7 @@ import javafx.scene.control.Label; import javafx.scene.control.ListCell; import javafx.scene.control.ListView; import javafx.scene.control.ScrollPane; +import javafx.scene.control.Alert.AlertType; import javafx.scene.control.ScrollPane.ScrollBarPolicy; import javafx.scene.image.Image; import javafx.scene.input.KeyEvent; @@ -30,8 +31,9 @@ import javafx.stage.WindowEvent; import javafx.util.Callback; import kuusisto.tinysound.TinySound; import logger.Logger; +import tools.AlertGenerator; -public class LevelSelectController +public class LevelSelectController implements CommandLineAvailabale { @FXML private AnchorPane mainPane; @FXML private ScrollPane pane; @@ -173,6 +175,7 @@ public class LevelSelectController controller.stage.show(); } + @Override public void showCommandLine() { try @@ -181,7 +184,7 @@ public class LevelSelectController } catch(IOException e) { - // TODO: errorhandling + AlertGenerator.showAlert(AlertType.ERROR, "Error", "", "An error occurred while opening the debug console.\n\nDetails:\n" + e.getMessage(), icon, stage, null, false); Logger.error(e); } } diff --git a/src/de/bricked/ui/SettingsController.java b/src/de/bricked/ui/SettingsController.java index 3fb70b9d6822c55e61661922acbd9874c29b2398..33e67748e638f5ccfa276d879e8cfbc34432a877 100644 --- a/src/de/bricked/ui/SettingsController.java +++ b/src/de/bricked/ui/SettingsController.java @@ -23,13 +23,15 @@ import javafx.scene.control.Slider; import javafx.scene.control.TableColumn; import javafx.scene.control.TableColumn.CellDataFeatures; import javafx.scene.control.TableView; +import javafx.scene.control.Alert.AlertType; import javafx.scene.image.Image; import javafx.scene.layout.AnchorPane; import javafx.stage.Stage; import javafx.util.Callback; import logger.Logger; +import tools.AlertGenerator; -public class SettingsController +public class SettingsController implements CommandLineAvailabale { @FXML private AnchorPane mainPane; @FXML private Label labelLevelPack; @@ -173,6 +175,7 @@ public class SettingsController tableViewControls.getItems().addAll(controls); } + @Override public void showCommandLine() { try @@ -181,7 +184,7 @@ public class SettingsController } catch(IOException e) { - // TODO: errorhandling + AlertGenerator.showAlert(AlertType.ERROR, "Error", "", "An error occurred while opening the debug console.\n\nDetails:\n" + e.getMessage(), icon, stage, null, false); Logger.error(e); } } diff --git a/src/de/brickedleveleditor/ui/controller/LevelPackDialogController.java b/src/de/brickedleveleditor/ui/controller/LevelPackDialogController.java index 9f32ef6842b3af90da0323573e4c760a5d0ce4c0..9a1d81dc45b592344b5074177f14a8b4a69f63a9 100644 --- a/src/de/brickedleveleditor/ui/controller/LevelPackDialogController.java +++ b/src/de/brickedleveleditor/ui/controller/LevelPackDialogController.java @@ -9,9 +9,10 @@ import javafx.scene.control.Spinner; import javafx.scene.control.TextField; import tools.AlertGenerator; +@SuppressWarnings("all") public class LevelPackDialogController extends AbstractController { - @FXML private Spinner difficultySpinner; + @FXML private Spinner difficultySpinner; @FXML private ComboBox paddleSizeComboBox; @FXML private Spinner startLivesSpinner; @FXML private TextField authorTextField;