From a4f79fb98a94b97b55422703a90006f6a303ec28 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 14 Feb 2025 11:17:08 +0100 Subject: [PATCH] unify naming --- .../org/cryptomator/ui/common/FxmlFile.java | 2 +- .../EventViewComponent.java} | 14 ++++++------- .../EventViewController.java | 4 ++-- .../EventViewModule.java} | 20 +++++++++---------- .../EventViewScoped.java} | 4 ++-- .../EventViewWindow.java} | 4 ++-- .../UpdateEventViewController.java | 4 ++-- .../ui/fxapp/FxApplicationModule.java | 4 ++-- .../ui/fxapp/FxApplicationWindows.java | 6 +++--- .../fxml/{eventviewer.fxml => eventview.fxml} | 2 +- ...ewer_update.fxml => eventview_update.fxml} | 2 +- 11 files changed, 33 insertions(+), 33 deletions(-) rename src/main/java/org/cryptomator/ui/{eventviewer/EventViewerComponent.java => eventview/EventViewComponent.java} (63%) rename src/main/java/org/cryptomator/ui/{eventviewer => eventview}/EventViewController.java (93%) rename src/main/java/org/cryptomator/ui/{eventviewer/EventViewerModule.java => eventview/EventViewModule.java} (81%) rename src/main/java/org/cryptomator/ui/{eventviewer/EventViewerScoped.java => eventview/EventViewScoped.java} (74%) rename src/main/java/org/cryptomator/ui/{eventviewer/EventViewerWindow.java => eventview/EventViewWindow.java} (75%) rename src/main/java/org/cryptomator/ui/{eventviewer => eventview}/UpdateEventViewController.java (76%) rename src/main/resources/fxml/{eventviewer.fxml => eventview.fxml} (90%) rename src/main/resources/fxml/{eventviewer_update.fxml => eventview_update.fxml} (77%) diff --git a/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/src/main/java/org/cryptomator/ui/common/FxmlFile.java index a45e21307..c9e3b833e 100644 --- a/src/main/java/org/cryptomator/ui/common/FxmlFile.java +++ b/src/main/java/org/cryptomator/ui/common/FxmlFile.java @@ -13,7 +13,7 @@ public enum FxmlFile { CONVERTVAULT_HUBTOPASSWORD_CONVERT("/fxml/convertvault_hubtopassword_convert.fxml"), // CONVERTVAULT_HUBTOPASSWORD_SUCCESS("/fxml/convertvault_hubtopassword_success.fxml"), // ERROR("/fxml/error.fxml"), // - EVENT_VIEWER("/fxml/eventviewer.fxml"), // + EVENT_VIEW("/fxml/eventview.fxml"), // FORGET_PASSWORD("/fxml/forget_password.fxml"), // HEALTH_START("/fxml/health_start.fxml"), // HEALTH_CHECK_LIST("/fxml/health_check_list.fxml"), // diff --git a/src/main/java/org/cryptomator/ui/eventviewer/EventViewerComponent.java b/src/main/java/org/cryptomator/ui/eventview/EventViewComponent.java similarity index 63% rename from src/main/java/org/cryptomator/ui/eventviewer/EventViewerComponent.java rename to src/main/java/org/cryptomator/ui/eventview/EventViewComponent.java index 2aa788e21..ceca15227 100644 --- a/src/main/java/org/cryptomator/ui/eventviewer/EventViewerComponent.java +++ b/src/main/java/org/cryptomator/ui/eventview/EventViewComponent.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.eventviewer; +package org.cryptomator.ui.eventview; import dagger.BindsInstance; import dagger.Lazy; @@ -10,14 +10,14 @@ import javax.inject.Named; import javafx.scene.Scene; import javafx.stage.Stage; -@EventViewerScoped -@Subcomponent(modules = {EventViewerModule.class}) -public interface EventViewerComponent { +@EventViewScoped +@Subcomponent(modules = {EventViewModule.class}) +public interface EventViewComponent { - @EventViewerWindow + @EventViewWindow Stage window(); - @FxmlScene(FxmlFile.EVENT_VIEWER) + @FxmlScene(FxmlFile.EVENT_VIEW) Lazy scene(); default void showEventViewerWindow() { @@ -30,6 +30,6 @@ public interface EventViewerComponent { @Subcomponent.Factory interface Factory { - EventViewerComponent create(@BindsInstance @Named("owner") Stage owner); + EventViewComponent create(@BindsInstance @Named("owner") Stage owner); } } diff --git a/src/main/java/org/cryptomator/ui/eventviewer/EventViewController.java b/src/main/java/org/cryptomator/ui/eventview/EventViewController.java similarity index 93% rename from src/main/java/org/cryptomator/ui/eventviewer/EventViewController.java rename to src/main/java/org/cryptomator/ui/eventview/EventViewController.java index e13f00065..d29053f0a 100644 --- a/src/main/java/org/cryptomator/ui/eventviewer/EventViewController.java +++ b/src/main/java/org/cryptomator/ui/eventview/EventViewController.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.eventviewer; +package org.cryptomator.ui.eventview; import org.cryptomator.event.Event; import org.cryptomator.ui.common.FxController; @@ -10,7 +10,7 @@ import javafx.fxml.FXML; import javafx.scene.control.ListView; import java.util.Comparator; -@EventViewerScoped +@EventViewScoped public class EventViewController implements FxController { private final SortedList reversedEventList; diff --git a/src/main/java/org/cryptomator/ui/eventviewer/EventViewerModule.java b/src/main/java/org/cryptomator/ui/eventview/EventViewModule.java similarity index 81% rename from src/main/java/org/cryptomator/ui/eventviewer/EventViewerModule.java rename to src/main/java/org/cryptomator/ui/eventview/EventViewModule.java index 9931252f7..23037c2d5 100644 --- a/src/main/java/org/cryptomator/ui/eventviewer/EventViewerModule.java +++ b/src/main/java/org/cryptomator/ui/eventview/EventViewModule.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.eventviewer; +package org.cryptomator.ui.eventview; import dagger.Binds; import dagger.Module; @@ -21,11 +21,11 @@ import java.util.Map; import java.util.ResourceBundle; @Module -abstract class EventViewerModule { +abstract class EventViewModule { @Provides - @EventViewerScoped - @EventViewerWindow + @EventViewScoped + @EventViewWindow static Stage provideStage(StageFactory factory, ResourceBundle resourceBundle, @Named("owner") Stage owner) { Stage stage = factory.create(); stage.setTitle("TODO EVENTVIEWER"); @@ -36,17 +36,17 @@ abstract class EventViewerModule { } @Provides - @EventViewerScoped - @EventViewerWindow + @EventViewScoped + @EventViewWindow static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides - @FxmlScene(FxmlFile.EVENT_VIEWER) - @EventViewerScoped - static Scene provideEventViewerScene(@EventViewerWindow FxmlLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.EVENT_VIEWER); + @FxmlScene(FxmlFile.EVENT_VIEW) + @EventViewScoped + static Scene provideEventViewerScene(@EventViewWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.EVENT_VIEW); } diff --git a/src/main/java/org/cryptomator/ui/eventviewer/EventViewerScoped.java b/src/main/java/org/cryptomator/ui/eventview/EventViewScoped.java similarity index 74% rename from src/main/java/org/cryptomator/ui/eventviewer/EventViewerScoped.java rename to src/main/java/org/cryptomator/ui/eventview/EventViewScoped.java index 24570752a..5281db3cd 100644 --- a/src/main/java/org/cryptomator/ui/eventviewer/EventViewerScoped.java +++ b/src/main/java/org/cryptomator/ui/eventview/EventViewScoped.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.eventviewer; +package org.cryptomator.ui.eventview; import javax.inject.Scope; import java.lang.annotation.Documented; @@ -8,6 +8,6 @@ import java.lang.annotation.RetentionPolicy; @Scope @Documented @Retention(RetentionPolicy.RUNTIME) -@interface EventViewerScoped { +@interface EventViewScoped { } diff --git a/src/main/java/org/cryptomator/ui/eventviewer/EventViewerWindow.java b/src/main/java/org/cryptomator/ui/eventview/EventViewWindow.java similarity index 75% rename from src/main/java/org/cryptomator/ui/eventviewer/EventViewerWindow.java rename to src/main/java/org/cryptomator/ui/eventview/EventViewWindow.java index eb67184bd..44e9b312a 100644 --- a/src/main/java/org/cryptomator/ui/eventviewer/EventViewerWindow.java +++ b/src/main/java/org/cryptomator/ui/eventview/EventViewWindow.java @@ -1,4 +1,4 @@ -package org.cryptomator.ui.eventviewer; +package org.cryptomator.ui.eventview; import javax.inject.Qualifier; import java.lang.annotation.Documented; @@ -9,6 +9,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Qualifier @Documented @Retention(RUNTIME) -@interface EventViewerWindow { +@interface EventViewWindow { } diff --git a/src/main/java/org/cryptomator/ui/eventviewer/UpdateEventViewController.java b/src/main/java/org/cryptomator/ui/eventview/UpdateEventViewController.java similarity index 76% rename from src/main/java/org/cryptomator/ui/eventviewer/UpdateEventViewController.java rename to src/main/java/org/cryptomator/ui/eventview/UpdateEventViewController.java index 5c2778ade..19c475447 100644 --- a/src/main/java/org/cryptomator/ui/eventviewer/UpdateEventViewController.java +++ b/src/main/java/org/cryptomator/ui/eventview/UpdateEventViewController.java @@ -1,10 +1,10 @@ -package org.cryptomator.ui.eventviewer; +package org.cryptomator.ui.eventview; import org.cryptomator.ui.common.FxController; import javax.inject.Inject; -@EventViewerScoped +@EventViewScoped public class UpdateEventViewController implements FxController { @Inject diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java index 37fb3e0f3..fabb8c164 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java @@ -8,7 +8,7 @@ package org.cryptomator.ui.fxapp; import dagger.Module; import dagger.Provides; import org.cryptomator.ui.error.ErrorComponent; -import org.cryptomator.ui.eventviewer.EventViewerComponent; +import org.cryptomator.ui.eventview.EventViewComponent; import org.cryptomator.ui.health.HealthCheckComponent; import org.cryptomator.ui.lock.LockComponent; import org.cryptomator.ui.mainwindow.MainWindowComponent; @@ -35,7 +35,7 @@ import java.io.InputStream; HealthCheckComponent.class, // UpdateReminderComponent.class, // ShareVaultComponent.class, // - EventViewerComponent.class}) + EventViewComponent.class}) abstract class FxApplicationModule { private static Image createImageFromResource(String resourceName) throws IOException { diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java index f51cfb25d..f319d1abb 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java @@ -7,7 +7,7 @@ import org.cryptomator.common.vaults.VaultState; import org.cryptomator.integrations.tray.TrayIntegrationProvider; import org.cryptomator.ui.dialogs.Dialogs; import org.cryptomator.ui.error.ErrorComponent; -import org.cryptomator.ui.eventviewer.EventViewerComponent; +import org.cryptomator.ui.eventview.EventViewComponent; import org.cryptomator.ui.lock.LockComponent; import org.cryptomator.ui.mainwindow.MainWindowComponent; import org.cryptomator.ui.preferences.PreferencesComponent; @@ -52,7 +52,7 @@ public class FxApplicationWindows { private final UpdateReminderComponent.Factory updateReminderWindowFactory; private final LockComponent.Factory lockWorkflowFactory; private final ErrorComponent.Factory errorWindowFactory; - private final EventViewerComponent.Factory eventViewWindow; + private final EventViewComponent.Factory eventViewWindow; private final ExecutorService executor; private final VaultOptionsComponent.Factory vaultOptionsWindow; private final ShareVaultComponent.Factory shareVaultWindow; @@ -71,7 +71,7 @@ public class FxApplicationWindows { ErrorComponent.Factory errorWindowFactory, // VaultOptionsComponent.Factory vaultOptionsWindow, // ShareVaultComponent.Factory shareVaultWindow, // - EventViewerComponent.Factory eventViewWindow, // + EventViewComponent.Factory eventViewWindow, // ExecutorService executor, // Dialogs dialogs) { this.primaryStage = primaryStage; diff --git a/src/main/resources/fxml/eventviewer.fxml b/src/main/resources/fxml/eventview.fxml similarity index 90% rename from src/main/resources/fxml/eventviewer.fxml rename to src/main/resources/fxml/eventview.fxml index 8240784e5..619719219 100644 --- a/src/main/resources/fxml/eventviewer.fxml +++ b/src/main/resources/fxml/eventview.fxml @@ -7,7 +7,7 @@