mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-14 08:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved class name conflict

Browse Source
This commit is contained in:
Sebastian Stenzel
2022-03-07 17:42:56 +01:00
parent a404740ceb
commit ad6d5bfae9
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
View File

@@ -5,6 +5,7 @@ import org.cryptomator.integrations.common.Priority;
import org.cryptomator.integrations.tray.ActionItem;
import org.cryptomator.integrations.tray.SeparatorItem;
import org.cryptomator.integrations.tray.SubMenuItem;
import org.cryptomator.integrations.tray.TrayMenuController;
import org.cryptomator.integrations.tray.TrayMenuItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,7 +22,7 @@ import java.io.InputStream;
import java.util.List;
@Priority(Priority.FALLBACK)
public class AwtTrayMenuController implements org.cryptomator.integrations.tray.TrayMenuController {
public class AwtTrayMenuController implements TrayMenuController {
private static final Logger LOG = LoggerFactory.getLogger(AwtTrayMenuController.class);
@@ -58,6 +59,7 @@ public class AwtTrayMenuController implements org.cryptomator.integrations.tray.
if (item instanceof ActionItem a) {
var menuItem = new MenuItem(a.title());
menuItem.addActionListener(evt -> a.action().run());
// TODO menuItem.setEnabled(a.enabled());
menu.add(menuItem);
} else if (item instanceof SeparatorItem) {
menu.addSeparator();

11
src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java → src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java
View File

@@ -6,6 +6,7 @@ import org.cryptomator.common.vaults.Vault;
import org.cryptomator.integrations.tray.ActionItem;
import org.cryptomator.integrations.tray.SeparatorItem;
import org.cryptomator.integrations.tray.SubMenuItem;
import org.cryptomator.integrations.tray.TrayMenuController;
import org.cryptomator.integrations.tray.TrayMenuItem;
import org.cryptomator.ui.fxapp.FxApplication;
import org.cryptomator.ui.launcher.AppLifecycleListener;
@@ -16,20 +17,16 @@ import javax.inject.Inject;
import javafx.application.Platform;
import javafx.beans.Observable;
import javafx.collections.ObservableList;
import java.awt.Image;
import java.awt.Toolkit;
import java.awt.event.ActionListener;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.ArrayList;
import java.util.EventObject;
import java.util.List;
import java.util.Optional;
import java.util.ResourceBundle;
import java.util.function.Consumer;
@TrayMenuScoped
public class TrayMenuController {
public class TrayMenuBuilder {
private static final String TRAY_ICON_MAC = "/img/tray_icon_mac.png";
private static final String TRAY_ICON = "/img/tray_icon.png";
@@ -38,12 +35,12 @@ public class TrayMenuController {
private final AppLifecycleListener appLifecycle;
private final FxApplicationStarter fxApplicationStarter;
private final ObservableList<Vault> vaults;
private final org.cryptomator.integrations.tray.TrayMenuController trayMenu;
private final TrayMenuController trayMenu;
private volatile boolean initialized;
@Inject
TrayMenuController(ResourceBundle resourceBundle, AppLifecycleListener appLifecycle, FxApplicationStarter fxApplicationStarter, ObservableList<Vault> vaults, Optional<org.cryptomator.integrations.tray.TrayMenuController> trayMenu) {
TrayMenuBuilder(ResourceBundle resourceBundle, AppLifecycleListener appLifecycle, FxApplicationStarter fxApplicationStarter, ObservableList<Vault> vaults, Optional<TrayMenuController> trayMenu) {
this.resourceBundle = resourceBundle;
this.appLifecycle = appLifecycle;
this.fxApplicationStarter = fxApplicationStarter;

7
src/main/java/org/cryptomator/ui/traymenu/TrayMenuComponent.java
View File

@@ -18,7 +18,7 @@ public interface TrayMenuComponent {
Optional<TrayMenuController> trayMenuController();
org.cryptomator.ui.traymenu.TrayMenuController trayMenuController2(); // TODO tmp name
TrayMenuBuilder trayMenuBuilder();
/**
* @return <code>true</code> if a tray icon can be installed
@@ -32,7 +32,7 @@ public interface TrayMenuComponent {
* @return <code>true</code> if a tray icon has been installed
*/
default boolean isInitialized() {
return isSupported() && trayMenuController2().isInitialized();
return isSupported() && trayMenuBuilder().isInitialized();
}
/**
@@ -42,8 +42,7 @@ public interface TrayMenuComponent {
*/
default void initializeTrayIcon() throws IllegalStateException {
Preconditions.checkState(isSupported(), "system tray not supported");
trayMenuController2().initTrayMenu();
trayMenuBuilder().initTrayMenu();
}
@Subcomponent.Builder