From e12da3d116bee39a137bb1ed479d0d8d9aafb431 Mon Sep 17 00:00:00 2001 From: Jannik Date: Sun, 8 Apr 2018 13:30:55 +0200 Subject: [PATCH] code cleanup & processbuilder * use a processBuilder to start the new application after updating --- .../application/MainWindowController.java | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java index 7b220e3..956fbd4 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java +++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java @@ -181,34 +181,34 @@ public class MainWindowController { @FXML public JFXSlider fontsizeSlider; - - @FXML - private Label homeflixSettingsLbl; - - @FXML - private Label mainColorLbl; - + + @FXML + private Label homeflixSettingsLbl; + + @FXML + private Label mainColorLbl; + @FXML private Label fontsizeLbl; - - @FXML - private Label languageLbl; - + + @FXML + private Label languageLbl; + @FXML private Label updateLbl; - + @FXML private Label branchLbl; - + @FXML private Label sourcesLbl; @FXML private Label versionLbl; - @FXML + @FXML private ImageView posterImageView; - private ImageView imv1; + private ImageView imv1; @FXML private TreeItem filmRoot = new TreeItem<>(new FilmTabelDataType("", "", "", "", false, false, imv1)); @@ -222,22 +222,22 @@ public class MainWindowController { private TreeTableColumn columnEpisode = new TreeTableColumn<>("Episode"); @FXML private TreeTableColumn columnFavorite = new TreeTableColumn<>("Favorite"); - - @FXML - private TreeItem sourceRoot =new TreeItem<>(new SourceDataType("", "")); - @FXML - private TableColumn sourceColumn; - @FXML - private TableColumn modeColumn; - + + @FXML + private TreeItem sourceRoot = new TreeItem<>(new SourceDataType("", "")); + @FXML + private TableColumn sourceColumn; + @FXML + private TableColumn modeColumn; + private boolean menuTrue = false; private boolean settingsTrue = false; private boolean autoUpdate = false; private boolean useBeta = false; private boolean autoplay = false; - private static final Logger LOGGER = LogManager.getLogger(MainWindowController.class.getName()); + private static final Logger LOGGER = LogManager.getLogger(MainWindowController.class.getName()); private int hashA = -647380320; - + private String version = "0.6.99"; private String buildNumber = "147"; private String versionName = "glowing vampire"; @@ -331,18 +331,18 @@ public class MainWindowController { filmsTreeTable.getColumns().add(columnFavorite); filmsTreeTable.getColumns().add(columnSeason); filmsTreeTable.getColumns().add(columnEpisode); - filmsTreeTable.getColumns().get(0).setVisible(false); //hide columnStreamUrl (important) - - // context menu for treeTableViewfilm + filmsTreeTable.getColumns().get(0).setVisible(false); // hide columnStreamUrl (important) + + // context menu for treeTableViewfilm filmsTreeTable.setContextMenu(menu); - - // sourcesTreeTable - sourceColumn.setCellValueFactory(cellData -> cellData.getValue().pathProperty()); - modeColumn.setCellValueFactory(cellData -> cellData.getValue().modeProperty()); - sourcesTable.setItems(sourcesList); + + // sourcesTreeTable + sourceColumn.setCellValueFactory(cellData -> cellData.getValue().pathProperty()); + modeColumn.setCellValueFactory(cellData -> cellData.getValue().modeProperty()); + sourcesTable.setItems(sourcesList); } - - //Initializing the actions + + // Initializing the actions private void initActions() { HamburgerBackArrowBasicTransition burgerTask = new HamburgerBackArrowBasicTransition(menuHam);