From d2c31cdc6f144af4b63bbf889f4c812bc48bf8e6 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sun, 9 Feb 2025 15:41:37 +0000 Subject: [PATCH] Refactor --- .../beacon/impl/TerminalPrepareExchangeImpl.java | 2 +- .../app/beacon/impl/TerminalWaitExchangeImpl.java | 1 - .../browser/BrowserFileChooserSessionComp.java | 2 -- .../xpipe/app/browser/BrowserFullSessionComp.java | 1 - .../app/browser/BrowserFullSessionModel.java | 1 - .../app/browser/file/BrowserBreadcrumbBar.java | 3 --- .../xpipe/app/browser/file/BrowserClipboard.java | 1 - .../browser/file/BrowserConnectionListComp.java | 1 - .../app/browser/file/BrowserContextMenu.java | 1 - .../app/browser/file/BrowserFileListComp.java | 1 - .../browser/file/BrowserFileSystemTabModel.java | 3 +-- .../app/browser/file/BrowserHistoryTabComp.java | 6 ------ .../app/browser/file/BrowserOverviewComp.java | 2 -- .../app/browser/file/BrowserTransferComp.java | 2 -- .../io/xpipe/app/comp/base/AppLayoutComp.java | 2 -- .../java/io/xpipe/app/comp/base/CountComp.java | 2 -- .../java/io/xpipe/app/comp/base/DropdownComp.java | 1 - .../io/xpipe/app/comp/base/ListBoxViewComp.java | 2 -- .../xpipe/app/comp/base/ListVirtualViewComp.java | 1 - .../app/comp/base/ModalOverlayContentComp.java | 2 +- .../java/io/xpipe/app/comp/store/OsLogoComp.java | 1 - .../app/comp/store/StoreCategoryWrapper.java | 1 - .../xpipe/app/comp/store/StoreCreationComp.java | 3 --- .../io/xpipe/app/comp/store/StoreEntryComp.java | 1 - .../xpipe/app/comp/store/StoreEntryWrapper.java | 2 -- .../xpipe/app/comp/store/StoreIconChoiceComp.java | 7 +------ .../app/comp/store/StoreIconChoiceDialog.java | 1 - .../io/xpipe/app/comp/store/StoreSection.java | 1 - app/src/main/java/io/xpipe/app/core/AppFont.java | 1 - app/src/main/java/io/xpipe/app/core/AppI18n.java | 15 --------------- .../java/io/xpipe/app/core/AppLayoutModel.java | 1 - .../java/io/xpipe/app/core/AppProperties.java | 3 +-- app/src/main/java/io/xpipe/app/core/AppStyle.java | 1 - .../java/io/xpipe/app/core/mode/BaseMode.java | 2 +- .../java/io/xpipe/app/core/window/AppDialog.java | 3 --- .../io/xpipe/app/core/window/AppMainWindow.java | 1 - .../java/io/xpipe/app/ext/ActionProvider.java | 2 +- .../java/io/xpipe/app/icon/SystemIconCache.java | 1 - .../java/io/xpipe/app/icon/SystemIconSource.java | 6 +++--- .../io/xpipe/app/icon/SystemIconSourceData.java | 4 +--- .../java/io/xpipe/app/issue/EventHandlerImpl.java | 1 - .../io/xpipe/app/issue/TerminalErrorHandler.java | 1 - .../main/java/io/xpipe/app/prefs/AppPrefs.java | 1 - .../java/io/xpipe/app/prefs/AppPrefsComp.java | 2 -- .../xpipe/app/prefs/AppPrefsStorageHandler.java | 4 ---- .../java/io/xpipe/app/prefs/IconsCategory.java | 10 ---------- .../java/io/xpipe/app/prefs/VaultCategory.java | 2 -- .../io/xpipe/app/storage/DataStorageSecret.java | 2 -- .../xpipe/app/terminal/ExternalTerminalType.java | 2 +- .../io/xpipe/app/terminal/PtyxisTerminalType.java | 5 +---- .../xpipe/app/terminal/WindowsTerminalType.java | 2 +- .../main/java/io/xpipe/app/test/TestModule.java | 2 +- .../java/io/xpipe/app/util/ContextMenuHelper.java | 1 - .../main/java/io/xpipe/app/util/LocalExec.java | 4 ---- .../java/io/xpipe/app/util/LocalShellCache.java | 1 - .../main/java/io/xpipe/app/util/PasswdFile.java | 2 +- .../main/java/io/xpipe/app/util/ScanDialog.java | 1 - .../java/io/xpipe/app/util/ScanDialogComp.java | 2 -- .../io/xpipe/app/util/SecretQueryFormatter.java | 2 -- .../java/io/xpipe/app/util/ShellControlCache.java | 6 ------ .../java/io/xpipe/app/util/ShellStoreFormat.java | 1 - .../java/io/xpipe/app/util/WindowsRegistry.java | 4 ++-- .../process/TerminalLaunchCommandFunction.java | 5 +---- .../xpipe/core/process/WrapperShellControl.java | 2 +- .../java/io/xpipe/core/util/JacksonExtension.java | 2 -- .../io/xpipe/ext/base/SelfReferentialStore.java | 2 +- .../io/xpipe/ext/base/browser/BackAction.java | 2 +- .../io/xpipe/ext/base/browser/ForwardAction.java | 2 +- .../base/browser/MultiExecuteSelectionAction.java | 5 ----- .../ext/base/identity/IdentitySelectComp.java | 1 - .../base/script/SimpleScriptStoreProvider.java | 1 - .../AbstractServiceGroupStoreProvider.java | 1 - .../ext/base/service/CustomServiceGroupStore.java | 1 - .../ext/base/service/ServiceControlSession.java | 2 -- .../ext/base/service/ServiceControlStore.java | 9 +-------- .../base/service/ServiceControlStoreProvider.java | 7 ------- .../ext/base/service/ServiceProtocolType.java | 6 ------ .../base/service/ServiceProtocolTypeHelper.java | 3 --- 78 files changed, 24 insertions(+), 179 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/TerminalPrepareExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/TerminalPrepareExchangeImpl.java index fc3d06e06..4c08a290d 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/TerminalPrepareExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/TerminalPrepareExchangeImpl.java @@ -11,7 +11,7 @@ import io.xpipe.beacon.api.TerminalPrepareExchange; public class TerminalPrepareExchangeImpl extends TerminalPrepareExchange { @Override - public Object handle(HttpExchange exchange, Request msg) throws BeaconClientException, BeaconServerException { + public Object handle(HttpExchange exchange, Request msg) throws BeaconClientException { TerminalView.get().open(msg.getRequest(), msg.getPid()); TerminalLauncherManager.registerPid(msg.getRequest(), msg.getPid()); var term = AppPrefs.get().terminalType().getValue(); diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/TerminalWaitExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/TerminalWaitExchangeImpl.java index 16974f86f..2765ed077 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/TerminalWaitExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/TerminalWaitExchangeImpl.java @@ -1,7 +1,6 @@ package io.xpipe.app.beacon.impl; import io.xpipe.app.terminal.TerminalLauncherManager; -import io.xpipe.app.terminal.TerminalView; import io.xpipe.beacon.BeaconClientException; import io.xpipe.beacon.BeaconServerException; import io.xpipe.beacon.api.TerminalWaitExchange; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java index 48aab1c7a..e35c3d372 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java @@ -11,8 +11,6 @@ import io.xpipe.app.comp.base.LeftSplitPaneComp; import io.xpipe.app.comp.base.StackComp; import io.xpipe.app.comp.base.VerticalComp; import io.xpipe.app.comp.store.StoreEntryWrapper; -import io.xpipe.app.core.AppFont; -import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.storage.DataStoreEntryRef; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java index 614ea75f8..510f4ed29 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java @@ -12,7 +12,6 @@ import io.xpipe.app.comp.base.LoadingOverlayComp; import io.xpipe.app.comp.base.StackComp; import io.xpipe.app.comp.base.VerticalComp; import io.xpipe.app.comp.store.StoreEntryWrapper; -import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.util.BindingsHelper; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java index 69116e982..9eb9dfc49 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java @@ -2,7 +2,6 @@ package io.xpipe.app.browser; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.browser.file.BrowserHistorySavedState; -import io.xpipe.app.browser.file.BrowserHistorySavedStateImpl; import io.xpipe.app.browser.file.BrowserHistoryTabModel; import io.xpipe.app.browser.file.BrowserTransferModel; import io.xpipe.app.prefs.AppPrefs; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserBreadcrumbBar.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserBreadcrumbBar.java index 62baa348f..f6406a6cf 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserBreadcrumbBar.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserBreadcrumbBar.java @@ -4,14 +4,11 @@ import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.util.PlatformThread; import io.xpipe.core.store.FileNames; -import javafx.geometry.Insets; import javafx.scene.Node; import javafx.scene.control.Button; import javafx.scene.control.ButtonBase; import javafx.scene.control.Label; -import javafx.scene.layout.Background; import javafx.scene.layout.Region; -import javafx.scene.paint.Color; import javafx.util.Callback; import atlantafx.base.controls.Breadcrumbs; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserClipboard.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserClipboard.java index 70c69b403..1e5d5ee9d 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserClipboard.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserClipboard.java @@ -3,7 +3,6 @@ package io.xpipe.app.browser.file; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.core.process.OsType; import io.xpipe.core.store.FileEntry; import io.xpipe.core.util.FailableRunnable; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java index 9f71d7eb3..0926b5499 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java @@ -4,7 +4,6 @@ import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.store.*; -import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.PlatformThread; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java index cf47fee90..b11ea11c3 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java @@ -1,7 +1,6 @@ package io.xpipe.app.browser.file; import io.xpipe.app.browser.action.BrowserAction; -import io.xpipe.app.core.AppFont; import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.util.InputHelper; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java index 43f6b56c1..d141f1969 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java @@ -2,7 +2,6 @@ package io.xpipe.app.browser.file; import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.comp.SimpleComp; -import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.*; import io.xpipe.core.process.OsType; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java index d87865945..84922d5d0 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java @@ -10,7 +10,6 @@ import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.terminal.*; import io.xpipe.app.util.BooleanScope; @@ -312,7 +311,7 @@ public final class BrowserFileSystemTabModel extends BrowserStoreSessionTab> table, String filterString) { var displayedIcons = filterString == null || filterString.isBlank() || filterString.length() < 2 - ? icons.stream().sorted(Comparator.comparing(systemIcon -> systemIcon.getId())).toList() + ? icons.stream().sorted(Comparator.comparing(systemIcon -> systemIcon.getId())).toList() : icons.stream() .filter(icon -> containsString(icon.getId(), filterString)) .toList(); diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceDialog.java b/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceDialog.java index 776c04772..fb406b4d9 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceDialog.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceDialog.java @@ -5,7 +5,6 @@ import io.xpipe.app.icon.SystemIcon; import io.xpipe.app.icon.SystemIconManager; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStoreEntry; -import io.xpipe.app.util.Hyperlinks; import javafx.application.Platform; import javafx.beans.property.ObjectProperty; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java b/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java index df8678442..a7297e2af 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java @@ -15,7 +15,6 @@ import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import lombok.Getter; -import lombok.Value; import java.util.ArrayList; import java.util.Comparator; diff --git a/app/src/main/java/io/xpipe/app/core/AppFont.java b/app/src/main/java/io/xpipe/app/core/AppFont.java index 2a4be9459..94be1e4e1 100644 --- a/app/src/main/java/io/xpipe/app/core/AppFont.java +++ b/app/src/main/java/io/xpipe/app/core/AppFont.java @@ -4,7 +4,6 @@ import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.resources.AppResources; import io.xpipe.core.process.OsType; -import javafx.scene.Node; import javafx.scene.text.Font; import org.kordamp.ikonli.javafx.FontIcon; diff --git a/app/src/main/java/io/xpipe/app/core/AppI18n.java b/app/src/main/java/io/xpipe/app/core/AppI18n.java index 1c3d843ba..e17e9be10 100644 --- a/app/src/main/java/io/xpipe/app/core/AppI18n.java +++ b/app/src/main/java/io/xpipe/app/core/AppI18n.java @@ -7,28 +7,13 @@ import io.xpipe.app.prefs.SupportedLocale; import io.xpipe.app.util.BindingsHelper; import io.xpipe.app.util.PlatformState; import io.xpipe.app.util.PlatformThread; -import io.xpipe.core.util.XPipeInstallation; import javafx.beans.binding.Bindings; -import javafx.beans.binding.StringBinding; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; -import lombok.Value; -import org.apache.commons.io.FilenameUtils; - -import java.io.IOException; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.regex.Pattern; public class AppI18n { diff --git a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java index 350f338f8..fdd6de9c5 100644 --- a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java +++ b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java @@ -4,7 +4,6 @@ import io.xpipe.app.browser.BrowserFullSessionComp; import io.xpipe.app.browser.BrowserFullSessionModel; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.store.StoreLayoutComp; -import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.AppPrefsComp; import io.xpipe.app.util.Hyperlinks; import io.xpipe.app.util.LabelGraphic; diff --git a/app/src/main/java/io/xpipe/app/core/AppProperties.java b/app/src/main/java/io/xpipe/app/core/AppProperties.java index 82eb6414a..aa378a1ea 100644 --- a/app/src/main/java/io/xpipe/app/core/AppProperties.java +++ b/app/src/main/java/io/xpipe/app/core/AppProperties.java @@ -97,8 +97,7 @@ public class AppProperties { staging = Optional.ofNullable(System.getProperty("io.xpipe.app.staging")) .map(Boolean::parseBoolean) .orElse(false); - devLoginPassword = Optional.ofNullable(System.getProperty("io.xpipe.app.loginPassword")) - .orElse(null); + devLoginPassword = System.getProperty("io.xpipe.app.loginPassword"); useVirtualThreads = Optional.ofNullable(System.getProperty("io.xpipe.app.useVirtualThreads")) .map(Boolean::parseBoolean) .orElse(true); diff --git a/app/src/main/java/io/xpipe/app/core/AppStyle.java b/app/src/main/java/io/xpipe/app/core/AppStyle.java index 30d4b14c1..93b102a5c 100644 --- a/app/src/main/java/io/xpipe/app/core/AppStyle.java +++ b/app/src/main/java/io/xpipe/app/core/AppStyle.java @@ -7,7 +7,6 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.resources.AppResources; import javafx.application.Platform; -import javafx.beans.value.ObservableValue; import javafx.scene.Scene; import java.io.IOException; diff --git a/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java b/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java index 66f8cb645..e76f21ebb 100644 --- a/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java +++ b/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java @@ -45,7 +45,7 @@ public class BaseMode extends OperationMode { } @Override - public void onSwitchTo() throws Throwable { + public void onSwitchTo() { if (initialized) { return; } diff --git a/app/src/main/java/io/xpipe/app/core/window/AppDialog.java b/app/src/main/java/io/xpipe/app/core/window/AppDialog.java index 1601ac481..68877aef2 100644 --- a/app/src/main/java/io/xpipe/app/core/window/AppDialog.java +++ b/app/src/main/java/io/xpipe/app/core/window/AppDialog.java @@ -3,8 +3,6 @@ package io.xpipe.app.core.window; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.ModalButton; import io.xpipe.app.comp.base.ModalOverlay; -import io.xpipe.app.core.AppFont; -import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.PlatformInit; import io.xpipe.app.util.PlatformThread; @@ -12,7 +10,6 @@ import io.xpipe.app.util.ThreadHelper; import javafx.animation.PauseTransition; import javafx.application.Platform; -import javafx.beans.Observable; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; diff --git a/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java b/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java index 1590a598d..8a06897a9 100644 --- a/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java +++ b/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java @@ -9,7 +9,6 @@ import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.CloseBehaviourDialog; import io.xpipe.app.resources.AppImages; -import io.xpipe.app.core.AppDistributionType; import io.xpipe.app.util.LicenseProvider; import io.xpipe.app.util.PlatformThread; import io.xpipe.app.util.ThreadHelper; diff --git a/app/src/main/java/io/xpipe/app/ext/ActionProvider.java b/app/src/main/java/io/xpipe/app/ext/ActionProvider.java index 5bf8986f0..5d3098d04 100644 --- a/app/src/main/java/io/xpipe/app/ext/ActionProvider.java +++ b/app/src/main/java/io/xpipe/app/ext/ActionProvider.java @@ -142,7 +142,7 @@ public interface ActionProvider { } static LeafDataStoreCallSite simple(boolean major, String nameKey, String icon, Class applicableClass, FailableConsumer, Exception> action) { - return new LeafDataStoreCallSite() { + return new LeafDataStoreCallSite<>() { @Override public boolean isMajor(DataStoreEntryRef o) { return major; diff --git a/app/src/main/java/io/xpipe/app/icon/SystemIconCache.java b/app/src/main/java/io/xpipe/app/icon/SystemIconCache.java index 8cc1e6cf6..53a6865e7 100644 --- a/app/src/main/java/io/xpipe/app/icon/SystemIconCache.java +++ b/app/src/main/java/io/xpipe/app/icon/SystemIconCache.java @@ -6,7 +6,6 @@ import com.github.weisj.jsvg.attributes.ViewBox; import com.github.weisj.jsvg.parser.SVGLoader; import io.xpipe.app.core.AppProperties; import io.xpipe.app.issue.ErrorEvent; -import io.xpipe.app.resources.AppImages; import lombok.Getter; import javax.imageio.ImageIO; diff --git a/app/src/main/java/io/xpipe/app/icon/SystemIconSource.java b/app/src/main/java/io/xpipe/app/icon/SystemIconSource.java index f9d4d5177..97efafedd 100644 --- a/app/src/main/java/io/xpipe/app/icon/SystemIconSource.java +++ b/app/src/main/java/io/xpipe/app/icon/SystemIconSource.java @@ -29,7 +29,7 @@ public interface SystemIconSource { @Builder @Jacksonized @JsonTypeName("directory") - static class Directory implements SystemIconSource{ + class Directory implements SystemIconSource{ Path path; String id; @@ -76,7 +76,7 @@ public interface SystemIconSource { @Builder @Jacksonized @JsonTypeName("git") - static class GitRepository implements SystemIconSource{ + class GitRepository implements SystemIconSource{ String remote; String id; @@ -120,7 +120,7 @@ public interface SystemIconSource { } @Override - public void open() throws Exception { + public void open() { Hyperlinks.open(remote); } } diff --git a/app/src/main/java/io/xpipe/app/icon/SystemIconSourceData.java b/app/src/main/java/io/xpipe/app/icon/SystemIconSourceData.java index 2e8120706..79efc72c4 100644 --- a/app/src/main/java/io/xpipe/app/icon/SystemIconSourceData.java +++ b/app/src/main/java/io/xpipe/app/icon/SystemIconSourceData.java @@ -5,11 +5,9 @@ import lombok.Value; import org.apache.commons.io.FilenameUtils; import java.io.IOException; -import java.nio.file.FileVisitOption; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -19,7 +17,7 @@ public class SystemIconSourceData { Path directory; List icons; - public static SystemIconSourceData of(SystemIconSource source) throws IOException { + public static SystemIconSourceData of(SystemIconSource source) { var target = source.getPath(); var list = new ArrayList(); walkTree(source, target, list); diff --git a/app/src/main/java/io/xpipe/app/issue/EventHandlerImpl.java b/app/src/main/java/io/xpipe/app/issue/EventHandlerImpl.java index 48e371fdc..9d4b2c5e3 100644 --- a/app/src/main/java/io/xpipe/app/issue/EventHandlerImpl.java +++ b/app/src/main/java/io/xpipe/app/issue/EventHandlerImpl.java @@ -3,7 +3,6 @@ package io.xpipe.app.issue; import io.xpipe.app.core.AppLogs; import io.xpipe.app.core.AppProperties; import io.xpipe.app.core.mode.OperationMode; -import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.util.Deobfuscator; import java.nio.file.Path; diff --git a/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java b/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java index c0aff26f3..8b885621c 100644 --- a/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java +++ b/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java @@ -5,7 +5,6 @@ import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.*; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.core.window.AppDialog; -import io.xpipe.app.core.AppDistributionType; import io.xpipe.app.util.Hyperlinks; import io.xpipe.app.util.PlatformInit; import io.xpipe.app.util.ThreadHelper; diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java index 1da57fba6..d4e9808f7 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java @@ -10,7 +10,6 @@ import io.xpipe.app.icon.SystemIconSource; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.terminal.ExternalTerminalType; -import io.xpipe.app.core.AppDistributionType; import io.xpipe.app.util.PlatformThread; import io.xpipe.core.util.ModuleHelper; diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java index 67c9dd285..b5c55cc1a 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java @@ -1,8 +1,6 @@ package io.xpipe.app.prefs; import io.xpipe.app.comp.SimpleComp; -import io.xpipe.app.core.AppFont; -import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.util.PlatformThread; import javafx.geometry.Insets; diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java index 59aa8ed8e..616e66a84 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java @@ -1,8 +1,5 @@ package io.xpipe.app.prefs; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import com.fasterxml.jackson.databind.util.TokenBuffer; import io.xpipe.app.ext.PrefsChoiceValue; import io.xpipe.app.issue.ErrorEvent; @@ -13,7 +10,6 @@ import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.NullNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; import lombok.SneakyThrows; diff --git a/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java b/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java index 794d57f79..123fd54ba 100644 --- a/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java @@ -2,27 +2,17 @@ package io.xpipe.app.prefs; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.*; -import io.xpipe.app.core.AppFont; -import io.xpipe.app.core.AppFontSizes; -import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.window.AppDialog; -import io.xpipe.app.ext.PrefsChoiceValue; -import io.xpipe.app.icon.SystemIcon; -import io.xpipe.app.icon.SystemIconCache; import io.xpipe.app.icon.SystemIconManager; import io.xpipe.app.icon.SystemIconSource; import io.xpipe.app.storage.DataStorage; -import io.xpipe.app.storage.DataStorageUserHandler; import io.xpipe.app.util.*; import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; import javafx.collections.FXCollections; -import javafx.geometry.Insets; -import javafx.geometry.Pos; import javafx.scene.control.TextField; -import org.kordamp.ikonli.javafx.FontIcon; import java.nio.file.Path; import java.util.ArrayList; diff --git a/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java b/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java index 4f10e1502..868fc992f 100644 --- a/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java @@ -1,13 +1,11 @@ package io.xpipe.app.prefs; -import atlantafx.base.layout.ModalBox; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.comp.base.ModalButton; import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.window.AppDialog; -import io.xpipe.app.core.window.AppWindowHelper; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStorageSyncHandler; import io.xpipe.app.storage.DataStorageUserHandler; diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorageSecret.java b/app/src/main/java/io/xpipe/app/storage/DataStorageSecret.java index 46e13ca6b..3372f3c77 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorageSecret.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorageSecret.java @@ -15,8 +15,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import lombok.Value; -import lombok.experimental.NonFinal; import java.io.IOException; diff --git a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java index 28afcf0db..680b67eb5 100644 --- a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java @@ -758,6 +758,6 @@ public interface ExternalTerminalType extends PrefsChoiceValue { launch(configuration.getColoredTitle(), args); } - protected abstract CommandBuilder toCommand(TerminalLaunchConfiguration configuration) throws Exception; + protected abstract CommandBuilder toCommand(TerminalLaunchConfiguration configuration); } } diff --git a/app/src/main/java/io/xpipe/app/terminal/PtyxisTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/PtyxisTerminalType.java index e7732d07b..8adde8eda 100644 --- a/app/src/main/java/io/xpipe/app/terminal/PtyxisTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/PtyxisTerminalType.java @@ -1,9 +1,6 @@ package io.xpipe.app.terminal; -import io.xpipe.app.util.CommandSupport; -import io.xpipe.app.util.LocalShell; import io.xpipe.core.process.CommandBuilder; -import io.xpipe.core.process.ShellControl; public class PtyxisTerminalType extends ExternalTerminalType.SimplePathType implements TrackableTerminalType { @@ -32,7 +29,7 @@ public class PtyxisTerminalType extends ExternalTerminalType.SimplePathType impl } @Override - protected CommandBuilder toCommand(TerminalLaunchConfiguration configuration) throws Exception { + protected CommandBuilder toCommand(TerminalLaunchConfiguration configuration) { var toExecute = CommandBuilder.of() .add(executable) .addIf(configuration.isPreferTabs(), "--tab") diff --git a/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java index 8d7571771..5f4d2ece4 100644 --- a/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java @@ -148,7 +148,7 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm } @Override - protected CommandBuilder toCommand(TerminalLaunchConfiguration configuration) throws Exception { + protected CommandBuilder toCommand(TerminalLaunchConfiguration configuration) { return WindowsTerminalType.toCommand(configuration); } diff --git a/app/src/main/java/io/xpipe/app/test/TestModule.java b/app/src/main/java/io/xpipe/app/test/TestModule.java index 46f1fb94d..931f0b80d 100644 --- a/app/src/main/java/io/xpipe/app/test/TestModule.java +++ b/app/src/main/java/io/xpipe/app/test/TestModule.java @@ -50,7 +50,7 @@ public abstract class TestModule { return argumentBuilder.build(); } - protected abstract void init(Map> list) throws Exception; + protected abstract void init(Map> list); protected abstract Class getValueClass(); } diff --git a/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java b/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java index 8c82f4985..7bdaa55ea 100644 --- a/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java +++ b/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java @@ -3,7 +3,6 @@ package io.xpipe.app.util; import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppI18n; -import io.xpipe.core.process.OsType; import javafx.application.Platform; import javafx.geometry.Side; import javafx.scene.Node; diff --git a/app/src/main/java/io/xpipe/app/util/LocalExec.java b/app/src/main/java/io/xpipe/app/util/LocalExec.java index eccf66e7f..4ae00541c 100644 --- a/app/src/main/java/io/xpipe/app/util/LocalExec.java +++ b/app/src/main/java/io/xpipe/app/util/LocalExec.java @@ -1,13 +1,9 @@ package io.xpipe.app.util; -import io.xpipe.app.core.AppProperties; -import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import java.nio.charset.StandardCharsets; -import java.util.Arrays; import java.util.Optional; -import java.util.stream.Collectors; public class LocalExec { diff --git a/app/src/main/java/io/xpipe/app/util/LocalShellCache.java b/app/src/main/java/io/xpipe/app/util/LocalShellCache.java index 62e48222a..8a1af8cdb 100644 --- a/app/src/main/java/io/xpipe/app/util/LocalShellCache.java +++ b/app/src/main/java/io/xpipe/app/util/LocalShellCache.java @@ -5,7 +5,6 @@ import io.xpipe.app.prefs.ExternalApplicationType; import io.xpipe.app.prefs.ExternalEditorType; import io.xpipe.core.process.OsType; import io.xpipe.core.process.ShellControl; -import io.xpipe.core.store.FilePath; import java.nio.file.Path; import java.util.Optional; diff --git a/app/src/main/java/io/xpipe/app/util/PasswdFile.java b/app/src/main/java/io/xpipe/app/util/PasswdFile.java index c0b18f007..ad24df972 100644 --- a/app/src/main/java/io/xpipe/app/util/PasswdFile.java +++ b/app/src/main/java/io/xpipe/app/util/PasswdFile.java @@ -10,6 +10,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.OptionalInt; +@Getter public class PasswdFile { public static PasswdFile parse(ShellControl sc) throws Exception { @@ -18,7 +19,6 @@ public class PasswdFile { return passwdFile; } - @Getter private final Map users = new LinkedHashMap<>(); public OptionalInt getUidForUserIfPresent(String name) { diff --git a/app/src/main/java/io/xpipe/app/util/ScanDialog.java b/app/src/main/java/io/xpipe/app/util/ScanDialog.java index 7d7e21a12..714a14c4d 100644 --- a/app/src/main/java/io/xpipe/app/util/ScanDialog.java +++ b/app/src/main/java/io/xpipe/app/util/ScanDialog.java @@ -1,6 +1,5 @@ package io.xpipe.app.util; -import io.xpipe.app.comp.base.LoadingOverlayComp; import io.xpipe.app.comp.base.ModalButton; import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.ext.ScanProvider; diff --git a/app/src/main/java/io/xpipe/app/util/ScanDialogComp.java b/app/src/main/java/io/xpipe/app/util/ScanDialogComp.java index 6e3708dda..9f2bab9e5 100644 --- a/app/src/main/java/io/xpipe/app/util/ScanDialogComp.java +++ b/app/src/main/java/io/xpipe/app/util/ScanDialogComp.java @@ -15,7 +15,6 @@ import io.xpipe.app.storage.DataStoreEntryRef; import javafx.application.Platform; import javafx.beans.property.*; -import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.scene.layout.Region; @@ -24,7 +23,6 @@ import javafx.scene.layout.VBox; import lombok.Getter; import java.util.ArrayList; -import java.util.Collections; import java.util.function.Function; import static javafx.scene.layout.Priority.ALWAYS; diff --git a/app/src/main/java/io/xpipe/app/util/SecretQueryFormatter.java b/app/src/main/java/io/xpipe/app/util/SecretQueryFormatter.java index 75ea4b74b..2a10bd455 100644 --- a/app/src/main/java/io/xpipe/app/util/SecretQueryFormatter.java +++ b/app/src/main/java/io/xpipe/app/util/SecretQueryFormatter.java @@ -1,7 +1,5 @@ package io.xpipe.app.util; -import io.xpipe.core.util.SecretValue; - import java.util.Optional; public interface SecretQueryFormatter { diff --git a/app/src/main/java/io/xpipe/app/util/ShellControlCache.java b/app/src/main/java/io/xpipe/app/util/ShellControlCache.java index 3e2445fa6..ac61fc136 100644 --- a/app/src/main/java/io/xpipe/app/util/ShellControlCache.java +++ b/app/src/main/java/io/xpipe/app/util/ShellControlCache.java @@ -1,18 +1,12 @@ package io.xpipe.app.util; -import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.prefs.ExternalEditorType; -import io.xpipe.core.process.OsType; import io.xpipe.core.process.ShellControl; -import io.xpipe.core.store.FilePath; import io.xpipe.core.util.FailableSupplier; import lombok.Getter; -import java.nio.file.Path; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import java.util.function.Supplier; @Getter diff --git a/app/src/main/java/io/xpipe/app/util/ShellStoreFormat.java b/app/src/main/java/io/xpipe/app/util/ShellStoreFormat.java index 6e1c9c010..cf88b8b5f 100644 --- a/app/src/main/java/io/xpipe/app/util/ShellStoreFormat.java +++ b/app/src/main/java/io/xpipe/app/util/ShellStoreFormat.java @@ -2,7 +2,6 @@ package io.xpipe.app.util; import io.xpipe.app.comp.store.StoreSection; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.process.ShellDialects; import io.xpipe.core.process.ShellEnvironmentStoreState; import io.xpipe.core.process.ShellStoreState; diff --git a/app/src/main/java/io/xpipe/app/util/WindowsRegistry.java b/app/src/main/java/io/xpipe/app/util/WindowsRegistry.java index 5af7f7caa..43183c17c 100644 --- a/app/src/main/java/io/xpipe/app/util/WindowsRegistry.java +++ b/app/src/main/java/io/xpipe/app/util/WindowsRegistry.java @@ -66,7 +66,7 @@ public abstract class WindowsRegistry { } @Override - public List listSubKeys(int hkey, String key) throws Exception { + public List listSubKeys(int hkey, String key) { // This can fail even with errors in case the jna native library extraction or loading fails try { return Arrays.asList(Advapi32Util.registryGetKeys(hkey(hkey), key)); @@ -88,7 +88,7 @@ public abstract class WindowsRegistry { } @Override - public OptionalInt readIntegerValueIfPresent(int hkey, String key, String valueName) throws Exception { + public OptionalInt readIntegerValueIfPresent(int hkey, String key, String valueName) { // This can fail even with errors in case the jna native library extraction or loading fails try { if (!Advapi32Util.registryValueExists(hkey(hkey), key, valueName)) { diff --git a/core/src/main/java/io/xpipe/core/process/TerminalLaunchCommandFunction.java b/core/src/main/java/io/xpipe/core/process/TerminalLaunchCommandFunction.java index fdce2ae6b..d2d24a9b7 100644 --- a/core/src/main/java/io/xpipe/core/process/TerminalLaunchCommandFunction.java +++ b/core/src/main/java/io/xpipe/core/process/TerminalLaunchCommandFunction.java @@ -1,9 +1,6 @@ package io.xpipe.core.process; -import io.xpipe.core.store.FilePath; -import io.xpipe.core.util.FailableFunction; - public interface TerminalLaunchCommandFunction { - CommandBuilder apply(ShellControl shellControl, boolean requiresExecutableFirst, boolean supportsRawArguments, String file, boolean exit) throws Exception; + CommandBuilder apply(ShellControl shellControl, boolean requiresExecutableFirst, boolean supportsRawArguments, String file, boolean exit); } diff --git a/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java b/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java index e5095f9c2..6f8e10011 100644 --- a/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java +++ b/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java @@ -15,9 +15,9 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.function.Consumer; import java.util.function.Function; +@Getter public class WrapperShellControl implements ShellControl { - @Getter protected final ShellControl parent; public WrapperShellControl(ShellControl parent) { diff --git a/core/src/main/java/io/xpipe/core/util/JacksonExtension.java b/core/src/main/java/io/xpipe/core/util/JacksonExtension.java index e2dc7f95d..425c74fe9 100644 --- a/core/src/main/java/io/xpipe/core/util/JacksonExtension.java +++ b/core/src/main/java/io/xpipe/core/util/JacksonExtension.java @@ -1,7 +1,5 @@ package io.xpipe.core.util; -import com.fasterxml.jackson.databind.*; - public interface JacksonExtension { Class getType(); diff --git a/ext/base/src/main/java/io/xpipe/ext/base/SelfReferentialStore.java b/ext/base/src/main/java/io/xpipe/ext/base/SelfReferentialStore.java index 7874b93bf..124901a2e 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/SelfReferentialStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/SelfReferentialStore.java @@ -10,7 +10,7 @@ import java.util.UUID; public interface SelfReferentialStore extends DataStore { - static Map FALLBACK = new HashMap<>(); + Map FALLBACK = new HashMap<>(); default DataStoreEntry getSelfEntry() { return DataStorage.get() diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java index 93c9613d8..d8bbd398b 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java @@ -18,7 +18,7 @@ import java.util.List; public class BackAction implements BrowserLeafAction { @Override - public void execute(BrowserFileSystemTabModel model, List entries) throws Exception { + public void execute(BrowserFileSystemTabModel model, List entries) { model.backSync(1); } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java index 12cebc7f5..bd157528c 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java @@ -18,7 +18,7 @@ import java.util.List; public class ForwardAction implements BrowserLeafAction { @Override - public void execute(BrowserFileSystemTabModel model, List entries) throws Exception { + public void execute(BrowserFileSystemTabModel model, List entries) { model.forthSync(1); } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/MultiExecuteSelectionAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/MultiExecuteSelectionAction.java index f2398b6b5..45ac38fc8 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/MultiExecuteSelectionAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/MultiExecuteSelectionAction.java @@ -1,16 +1,12 @@ package io.xpipe.ext.base.browser; -import atlantafx.base.layout.ModalBox; import io.xpipe.app.browser.action.BrowserBranchAction; import io.xpipe.app.browser.action.BrowserLeafAction; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.ModalOverlay; -import io.xpipe.app.core.AppFont; -import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.core.window.AppDialog; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.process.CommandBuilder; @@ -20,7 +16,6 @@ import io.xpipe.core.process.ShellControl; import javafx.beans.value.ObservableValue; import javafx.scene.control.TextArea; import javafx.scene.layout.StackPane; -import javafx.scene.text.Text; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentitySelectComp.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentitySelectComp.java index 4805f383c..31c5f34c3 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentitySelectComp.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentitySelectComp.java @@ -11,7 +11,6 @@ import io.xpipe.app.comp.store.StoreEntryWrapper; import io.xpipe.app.comp.store.StoreViewState; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.DataStoreCreationCategory; -import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStoreProvider.java index f6e9361ec..9322ef123 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStoreProvider.java @@ -18,7 +18,6 @@ import io.xpipe.app.util.Validator; import io.xpipe.core.process.ShellDialect; import io.xpipe.core.process.ShellDialects; import io.xpipe.core.store.DataStore; -import io.xpipe.core.util.Identifiers; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStoreProvider.java index fdd325037..1107e1ef8 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStoreProvider.java @@ -5,7 +5,6 @@ import io.xpipe.app.comp.store.*; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreUsageCategory; -import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.ThreadHelper; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceGroupStore.java b/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceGroupStore.java index c1861ed23..324cde0d5 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceGroupStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceGroupStore.java @@ -2,7 +2,6 @@ package io.xpipe.ext.base.service; import io.xpipe.app.util.Validators; import io.xpipe.core.store.DataStore; -import io.xpipe.core.store.NetworkTunnelStore; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.*; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlSession.java b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlSession.java index f98d61101..71ae2a8b4 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlSession.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlSession.java @@ -2,10 +2,8 @@ package io.xpipe.ext.base.service; import io.xpipe.core.process.CommandBuilder; import io.xpipe.core.process.ElevationFunction; -import io.xpipe.core.process.ShellControl; import io.xpipe.core.store.Session; import io.xpipe.core.store.SessionListener; -import io.xpipe.core.util.FailableSupplier; import lombok.Getter; @Getter diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStore.java b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStore.java index b3cb062c8..ea3408fa0 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStore.java @@ -2,18 +2,11 @@ package io.xpipe.ext.base.service; import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.ext.ShellStore; -import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.util.HostHelper; -import io.xpipe.app.util.LicenseProvider; import io.xpipe.core.process.ShellScript; import io.xpipe.app.util.Validators; import io.xpipe.core.store.DataStore; -import io.xpipe.core.store.NetworkTunnelSession; -import io.xpipe.core.store.NetworkTunnelStore; import io.xpipe.core.store.SingletonSessionStore; -import io.xpipe.ext.base.store.StartableStore; -import io.xpipe.ext.base.store.StoppableStore; import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; @@ -39,7 +32,7 @@ public class ServiceControlStore implements SingletonSessionStore {}, this); } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStoreProvider.java index ee6facec9..147fa242f 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStoreProvider.java @@ -1,6 +1,5 @@ package io.xpipe.ext.base.service; -import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.IntegratedTextAreaComp; import io.xpipe.app.comp.store.*; import io.xpipe.app.core.AppI18n; @@ -11,19 +10,13 @@ import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DataStoreFormatter; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.util.ShellStoreFormat; -import io.xpipe.core.process.ShellDialect; import io.xpipe.core.store.DataStore; -import io.xpipe.ext.base.script.ScriptStore; -import io.xpipe.ext.base.script.SimpleScriptStore; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; import javafx.beans.property.SimpleBooleanProperty; -import javafx.beans.property.SimpleListProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; -import javafx.collections.FXCollections; -import java.util.ArrayList; import java.util.List; public class ServiceControlStoreProvider implements SingletonSessionStoreProvider, DataStoreProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolType.java b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolType.java index 0ead2bb1f..aea44aa9d 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolType.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolType.java @@ -1,17 +1,11 @@ package io.xpipe.ext.base.service; -import io.xpipe.app.issue.ErrorEvent; -import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.ExternalApplicationHelper; -import io.xpipe.app.util.CommandSupport; import io.xpipe.app.util.Hyperlinks; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.util.LocalShell; -import io.xpipe.core.process.CommandBuilder; -import io.xpipe.core.process.OsType; import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolTypeHelper.java b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolTypeHelper.java index f0cb4fee0..63421e264 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolTypeHelper.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceProtocolTypeHelper.java @@ -1,14 +1,11 @@ package io.xpipe.ext.base.service; -import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.CompStructure; import io.xpipe.app.comp.base.TextFieldComp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.OptionsBuilder; import javafx.beans.property.*; import javafx.beans.value.ObservableValue; -import javafx.scene.control.TextField; import java.util.LinkedHashMap;