unify naming

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"), //

src/main/java/org/cryptomator/ui/eventviewer/EventViewerComponent.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> 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);
 	}
 }

src/main/java/org/cryptomator/ui/eventviewer/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<Event> reversedEventList;

src/main/java/org/cryptomator/ui/eventviewer/EventViewerModule.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<Class<? extends FxController>, Provider<FxController>> 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);
 	}
 
 

src/main/java/org/cryptomator/ui/eventviewer/EventViewerScoped.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 {
 
 }

src/main/java/org/cryptomator/ui/eventviewer/EventViewerWindow.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 {
 
 }

src/main/java/org/cryptomator/ui/eventviewer/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

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 {

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;

src/main/resources/fxml/eventviewer.fxml

@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.eventviewer.EventViewController"
+	  fx:controller="org.cryptomator.ui.eventview.EventViewController"
 	  minWidth="300"
 	  minHeight="450"
 	  prefWidth="300"

src/main/resources/fxml/eventviewer_update.fxml

@@ -4,7 +4,7 @@
 <?import javafx.scene.text.Text?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.eventviewer.UpdateEventViewController"
+	  fx:controller="org.cryptomator.ui.eventview.UpdateEventViewController"
 	  alignment="TOP_CENTER"
 	  spacing="9">