From 560513d7e867a00797ec7f9a3316e0e268f75a01 Mon Sep 17 00:00:00 2001 From: Martin Beyer Date: Fri, 17 Sep 2021 15:54:45 +0200 Subject: [PATCH] Rearrange Imports --- .../cryptomator/common/settings/Settings.java | 8 ++--- .../common/settings/SettingsJsonAdapter.java | 4 +-- .../ui/mainwindow/MainWindowController.java | 20 +++++------ .../ui/mainwindow/MainWindowModule.java | 10 +++--- .../mainwindow/MainWindowTitleController.java | 14 ++++---- .../ui/mainwindow/ResizeController.java | 34 ++++++++++--------- .../resources/fxml/main_window_resize.fxml | 16 ++++----- 7 files changed, 54 insertions(+), 52 deletions(-) diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java index ac15dbe0e..82f2fb794 100644 --- a/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/src/main/java/org/cryptomator/common/settings/Settings.java @@ -8,6 +8,9 @@ ******************************************************************************/ package org.cryptomator.common.settings; +import org.apache.commons.lang3.SystemUtils; +import org.cryptomator.common.Environment; + import javafx.beans.Observable; import javafx.beans.property.BooleanProperty; import javafx.beans.property.IntegerProperty; @@ -20,9 +23,6 @@ import javafx.beans.property.StringProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.geometry.NodeOrientation; -import org.apache.commons.lang3.SystemUtils; -import org.cryptomator.common.Environment; - import java.util.function.Consumer; public class Settings { @@ -154,7 +154,7 @@ public class Settings { return theme; } - public ObjectProperty keychainProvider() { return keychainProvider; } + public ObjectProperty keychainProvider() {return keychainProvider;} public ObjectProperty userInterfaceOrientation() { return userInterfaceOrientation; diff --git a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java b/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java index ee040071a..6d8d880e6 100644 --- a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java +++ b/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java @@ -9,13 +9,13 @@ import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; -import javafx.geometry.NodeOrientation; import org.cryptomator.common.Environment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; import javax.inject.Singleton; +import javafx.geometry.NodeOrientation; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -95,7 +95,7 @@ public class SettingsJsonAdapter extends TypeAdapter { case "windowXPosition" -> settings.windowXPositionProperty().set(in.nextInt()); case "windowYPosition" -> settings.windowYPositionProperty().set(in.nextInt()); case "windowWidth" -> settings.windowWidthProperty().set(in.nextInt()); - case "windowHeight"-> settings.windowHeightProperty().set(in.nextInt()); + case "windowHeight" -> settings.windowHeightProperty().set(in.nextInt()); case "displayConfiguration" -> settings.displayConfigurationProperty().set(in.nextString()); default -> { diff --git a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java index bb8dc5ce7..5d1781e19 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java @@ -1,15 +1,5 @@ package org.cryptomator.ui.mainwindow; -import javafx.beans.Observable; -import javafx.beans.property.BooleanProperty; -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.ReadOnlyObjectProperty; -import javafx.beans.property.SimpleBooleanProperty; -import javafx.fxml.FXML; -import javafx.scene.input.DragEvent; -import javafx.scene.input.TransferMode; -import javafx.scene.layout.StackPane; -import javafx.stage.Stage; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; @@ -21,6 +11,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; +import javafx.beans.Observable; +import javafx.beans.property.BooleanProperty; +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.ReadOnlyObjectProperty; +import javafx.beans.property.SimpleBooleanProperty; +import javafx.fxml.FXML; +import javafx.scene.input.DragEvent; +import javafx.scene.input.TransferMode; +import javafx.scene.layout.StackPane; +import javafx.stage.Stage; import java.io.File; import java.io.IOException; import java.nio.file.Path; diff --git a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java index 993670159..545a45c04 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java @@ -4,11 +4,6 @@ import dagger.Binds; import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.SimpleObjectProperty; -import javafx.scene.Scene; -import javafx.stage.Stage; -import javafx.stage.StageStyle; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent; import org.cryptomator.ui.common.FxController; @@ -25,6 +20,11 @@ import org.cryptomator.ui.vaultoptions.VaultOptionsComponent; import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent; import javax.inject.Provider; +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.SimpleObjectProperty; +import javafx.scene.Scene; +import javafx.stage.Stage; +import javafx.stage.StageStyle; import java.util.Map; import java.util.ResourceBundle; diff --git a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java index cff4d54df..7a4983159 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java @@ -1,12 +1,5 @@ package org.cryptomator.ui.mainwindow; -import javafx.beans.binding.Bindings; -import javafx.beans.binding.BooleanBinding; -import javafx.beans.property.ReadOnlyBooleanProperty; -import javafx.fxml.FXML; -import javafx.scene.input.MouseButton; -import javafx.scene.layout.HBox; -import javafx.stage.Stage; import org.cryptomator.common.LicenseHolder; import org.cryptomator.common.settings.Settings; import org.cryptomator.ui.common.FxController; @@ -19,6 +12,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; +import javafx.beans.binding.Bindings; +import javafx.beans.binding.BooleanBinding; +import javafx.beans.property.ReadOnlyBooleanProperty; +import javafx.fxml.FXML; +import javafx.scene.input.MouseButton; +import javafx.scene.layout.HBox; +import javafx.stage.Stage; @MainWindowScoped public class MainWindowTitleController implements FxController { diff --git a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java index 6b0ac08fd..9e9377c44 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java @@ -1,18 +1,22 @@ package org.cryptomator.ui.mainwindow; -import javafx.beans.binding.Bindings; -import javafx.beans.binding.BooleanBinding; -import javafx.fxml.FXML; -import javafx.scene.input.MouseEvent; -import javafx.scene.layout.Region; -import javafx.stage.Stage; import org.cryptomator.common.settings.Settings; import org.cryptomator.ui.common.FxController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; -import java.awt.*; +import javafx.beans.binding.Bindings; +import javafx.beans.binding.BooleanBinding; +import javafx.fxml.FXML; +import javafx.scene.input.MouseEvent; +import javafx.scene.layout.Region; +import javafx.stage.Stage; +import java.awt.Dimension; +import java.awt.DisplayMode; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; +import java.awt.Toolkit; @MainWindow public class ResizeController implements FxController { @@ -47,7 +51,7 @@ public class ResizeController implements FxController { public void initialize() { LOG.trace("init ResizeController"); - if (neverTouched()){ + if (neverTouched()) { settings.displayConfigurationProperty().setValue(getMonitorSizes()); return; } else { @@ -58,8 +62,7 @@ public class ResizeController implements FxController { window.setY((size.getHeight() - window.getMinHeight()) / 2); window.setWidth(window.getMinWidth()); window.setHeight(window.getMinHeight()); - } - else { + } else { window.setHeight(settings.windowHeightProperty().get() > window.getMinHeight() ? settings.windowHeightProperty().get() : window.getMinHeight()); window.setWidth(settings.windowWidthProperty().get() > window.getMinWidth() ? settings.windowWidthProperty().get() : window.getMinWidth()); window.setX(settings.windowXPositionProperty().get()); @@ -69,12 +72,11 @@ public class ResizeController implements FxController { savePositionalSettings(); } - private boolean neverTouched(){ - return (settings.windowHeightProperty().get() == 0) && (settings.windowWidthProperty().get() == 0) && - (settings.windowXPositionProperty().get() == 0) && (settings.windowYPositionProperty().get() == 0); + private boolean neverTouched() { + return (settings.windowHeightProperty().get() == 0) && (settings.windowWidthProperty().get() == 0) && (settings.windowXPositionProperty().get() == 0) && (settings.windowYPositionProperty().get() == 0); } - private boolean checkForChangedDisplayConfiguration(){ + private boolean checkForChangedDisplayConfiguration() { String currentDisplayConfiguration = getMonitorSizes(); String settingsDisplayConfiguration = settings.displayConfigurationProperty().get(); boolean changedConfiguration = !settingsDisplayConfiguration.equals(currentDisplayConfiguration); @@ -84,11 +86,11 @@ public class ResizeController implements FxController { private String getMonitorSizes() { GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); - GraphicsDevice[] gs = ge.getScreenDevices(); + GraphicsDevice[] gs = ge.getScreenDevices(); StringBuilder sb = new StringBuilder(); for (int i = 0; i < gs.length; i++) { DisplayMode dm = gs[i].getDisplayMode(); - if(!sb.isEmpty()) sb.append(" "); + if (!sb.isEmpty()) sb.append(" "); sb.append("displayId: " + i + ", " + dm.getWidth() + "x" + dm.getHeight() + ";"); } return sb.toString(); diff --git a/src/main/resources/fxml/main_window_resize.fxml b/src/main/resources/fxml/main_window_resize.fxml index 705271ec3..108b0962b 100644 --- a/src/main/resources/fxml/main_window_resize.fxml +++ b/src/main/resources/fxml/main_window_resize.fxml @@ -14,14 +14,14 @@ - - - - - - - - + + + + + + + +