From 430dc176ab0bba32e218eb55b1ea8dfadf0a7399 Mon Sep 17 00:00:00 2001 From: crschnick Date: Fri, 4 Jul 2025 09:37:08 +0000 Subject: [PATCH] Reformat --- .../io/xpipe/app/action/ActionConfigComp.java | 2 +- .../xpipe/app/action/ActionConfirmComp.java | 2 +- .../xpipe/app/action/ActionJacksonMapper.java | 2 +- .../io/xpipe/app/action/ActionProvider.java | 20 +++---- .../xpipe/app/beacon/BeaconShellSession.java | 2 +- .../impl/ConnectionAddExchangeImpl.java | 4 +- .../beacon/impl/ShellStartExchangeImpl.java | 2 +- .../beacon/impl/SshLaunchExchangeImpl.java | 2 +- .../BrowserFileChooserSessionComp.java | 2 +- .../BrowserFileChooserSessionModel.java | 4 +- .../app/browser/BrowserFullSessionModel.java | 4 +- .../app/browser/BrowserStoreSessionTab.java | 2 +- .../app/browser/action/BrowserAction.java | 2 +- .../BrowseInNativeManagerActionProvider.java | 2 +- .../OpenFileNativeDetailsActionProvider.java | 4 +- .../impl/OpenFileWithActionProvider.java | 2 +- .../RunCommandInBrowserActionProvider.java | 2 +- .../impl/TransferFilesActionProvider.java | 2 +- .../app/browser/file/BrowserClipboard.java | 2 +- .../app/browser/file/BrowserFileListComp.java | 4 +- .../browser/file/BrowserFileListModel.java | 4 +- .../app/browser/file/BrowserFileOpener.java | 35 ++++++----- .../browser/file/BrowserFileSystemCache.java | 6 +- .../browser/file/BrowserFileSystemHelper.java | 4 +- .../file/BrowserFileSystemTabModel.java | 4 +- .../file/BrowserFileTransferOperation.java | 4 +- .../browser/file/BrowserLocalFileSystem.java | 4 +- .../app/browser/file/BrowserOverviewComp.java | 4 +- .../file/BrowserQuickAccessContextMenu.java | 2 +- .../browser/file/BrowserTransferModel.java | 3 +- .../menu/MultiExecuteMenuProvider.java | 2 +- .../browser/menu/impl/ChgrpMenuProvider.java | 2 +- .../browser/menu/impl/ChmodMenuProvider.java | 2 +- .../browser/menu/impl/ChownMenuProvider.java | 2 +- .../browser/menu/impl/JavapMenuProvider.java | 2 +- .../menu/impl/NewItemMenuProvider.java | 2 +- .../menu/impl/OpenFileWithMenuProvider.java | 2 +- .../menu/impl/RunFileMenuProvider.java | 6 +- .../impl/compress/BaseUntarMenuProvider.java | 3 +- .../compress/BaseUnzipUnixMenuProvider.java | 3 +- .../BaseUnzipWindowsActionProvider.java | 3 +- .../impl/compress/CompressMenuProvider.java | 2 +- .../impl/compress/UnzipActionProvider.java | 2 +- .../menu/impl/compress/ZipActionProvider.java | 2 +- .../ContextualFileReferenceChoiceComp.java | 2 +- .../app/comp/base/IntegratedTextAreaComp.java | 6 +- .../xpipe/app/comp/base/PrettyImageComp.java | 5 +- .../app/comp/base/PrettyImageHelper.java | 3 +- .../xpipe/app/core/AppExtensionManager.java | 2 +- .../java/io/xpipe/app/core/AppRestart.java | 4 +- .../app/core/check/AppCertutilCheck.java | 2 +- .../core/check/AppHomebrewCoreutilsCheck.java | 6 +- .../xpipe/app/core/check/AppShellChecker.java | 4 +- .../app/core/check/AppTestCommandCheck.java | 2 +- .../io/xpipe/app/core/mode/OperationMode.java | 2 +- .../xpipe/app/core/window/AppWindowTitle.java | 13 ++-- .../xpipe/app/ext/ConnectionFileSystem.java | 2 +- .../main/java/io/xpipe/app/ext/FileEntry.java | 1 + .../java/io/xpipe/app/ext/LinkFileEntry.java | 2 + .../java/io/xpipe/app/ext/ScanProvider.java | 2 +- .../io/xpipe/app/ext/StatefulDataStore.java | 2 +- .../app/hub/action/BatchHubProvider.java | 2 +- .../app/hub/action/BatchStoreAction.java | 2 +- .../app/hub/action/HubBranchProvider.java | 2 +- .../xpipe/app/hub/action/HubLeafProvider.java | 2 +- .../app/hub/action/HubMenuItemProvider.java | 2 +- .../app/hub/action/MultiStoreAction.java | 2 +- .../io/xpipe/app/hub/action/StoreAction.java | 2 +- .../action/impl/BrowseHubLeafProvider.java | 2 +- .../hub/action/impl/CloneHubLeafProvider.java | 2 +- .../hub/action/impl/EditHubLeafProvider.java | 2 +- .../hub/action/impl/InitHubLeafProvider.java | 15 +++-- .../impl/LaunchHubMenuLeafProvider.java | 2 +- .../action/impl/RefreshActionProvider.java | 2 +- .../action/impl/SampleHubLeafProvider.java | 4 +- .../hub/action/impl/ScanHubBatchProvider.java | 4 +- .../hub/action/impl/ScanHubLeafProvider.java | 4 +- .../io/xpipe/app/hub/comp/OsLogoComp.java | 10 +++- .../app/hub/comp/StandardStoreEntryComp.java | 21 ++++--- .../app/hub/comp/StoreCategoryConfigComp.java | 2 +- .../xpipe/app/hub/comp/StoreChoiceComp.java | 2 +- .../app/hub/comp/StoreCreationDialog.java | 2 +- .../app/hub/comp/StoreCreationModel.java | 8 +-- .../hub/comp/StoreEntryListStatusBarComp.java | 2 +- .../xpipe/app/hub/comp/StoreEntryWrapper.java | 17 +++--- .../app/hub/comp/StoreListChoiceComp.java | 2 +- .../xpipe/app/hub/comp/StoreToggleComp.java | 2 +- .../xpipe/app/hub/comp/SystemStateComp.java | 2 +- .../io/xpipe/app/icon/SystemIconManager.java | 2 +- .../io/xpipe/app/icon/SystemIconSource.java | 5 +- .../io/xpipe/app/issue/ErrorEventFactory.java | 2 +- .../java/io/xpipe/app/prefs/AppPrefs.java | 2 +- .../io/xpipe/app/prefs/DeveloperCategory.java | 2 +- .../app/prefs/ExternalApplicationHelper.java | 2 +- .../app/prefs/ExternalApplicationType.java | 6 +- .../xpipe/app/prefs/ExternalEditorType.java | 4 +- .../xpipe/app/prefs/TroubleshootCategory.java | 5 +- .../io/xpipe/app/process/CommandBuilder.java | 2 +- .../io/xpipe/app/process/OsFileSystem.java | 10 ++-- .../io/xpipe/app/process/ShellControl.java | 4 +- .../io/xpipe/app/process/ShellDialect.java | 2 +- .../io/xpipe/app/process/ShellStoreState.java | 2 +- .../app/process/WorkingDirectoryFunction.java | 2 +- .../app/process/WrapperShellControl.java | 4 +- .../app/pwman/BitwardenPasswordManager.java | 4 +- .../app/pwman/DashlanePasswordManager.java | 4 +- .../app/pwman/EnpassPasswordManager.java | 4 +- .../app/pwman/KeeperPasswordManager.java | 2 +- .../xpipe/app/pwman/OnePasswordManager.java | 2 +- .../app/pwman/PasswordManagerCommand.java | 4 +- .../xpipe/app/pwman/PsonoPasswordManager.java | 2 +- .../xpipe/app/rdp/DevolutionsRdpClient.java | 2 +- .../java/io/xpipe/app/rdp/MstscRdpClient.java | 2 +- .../io/xpipe/app/rdp/RemminaRdpClient.java | 2 +- .../app/rdp/RemoteDesktopAppRdpClient.java | 2 +- .../io/xpipe/app/rdp/WindowsAppRdpClient.java | 2 +- .../app/storage/ContextualFileReference.java | 4 +- .../io/xpipe/app/storage/DataStorage.java | 13 ++-- .../io/xpipe/app/storage/DataStorageNode.java | 2 +- .../io/xpipe/app/storage/DataStoreEntry.java | 4 +- .../app/terminal/AlacrittyTerminalType.java | 2 +- .../io/xpipe/app/terminal/ClinkHelper.java | 2 +- .../terminal/ConfigFileTerminalPrompt.java | 2 +- .../app/terminal/ExternalTerminalType.java | 2 +- .../xpipe/app/terminal/GnomeTerminalType.java | 4 +- .../app/terminal/ITerm2TerminalType.java | 2 +- .../xpipe/app/terminal/KittyTerminalType.java | 6 +- .../xpipe/app/terminal/MacOsTerminalType.java | 2 +- .../app/terminal/MobaXTermTerminalType.java | 2 +- .../app/terminal/OhMyPoshTerminalPrompt.java | 2 +- .../terminal/ScreenTerminalMultiplexer.java | 4 +- .../app/terminal/SecureCrtTerminalType.java | 2 +- .../app/terminal/StarshipTerminalPrompt.java | 2 +- .../xpipe/app/terminal/TabbyTerminalType.java | 4 +- .../terminal/TerminalLaunchConfiguration.java | 12 ++-- .../xpipe/app/terminal/TerminalLauncher.java | 2 +- .../io/xpipe/app/terminal/TerminalPrompt.java | 2 +- .../app/terminal/TerminalProxyManager.java | 4 +- .../app/terminal/TmuxTerminalMultiplexer.java | 2 +- .../xpipe/app/terminal/WarpTerminalType.java | 2 +- .../xpipe/app/terminal/WaveTerminalType.java | 2 +- .../xpipe/app/terminal/WezTerminalType.java | 4 +- .../app/terminal/WindowsTerminalType.java | 2 +- .../app/terminal/XShellTerminalType.java | 2 +- .../terminal/ZellijTerminalMultiplexer.java | 2 +- .../java/io/xpipe/app/test/ExtensionTest.java | 3 +- .../xpipe/app/update/AppDistributionType.java | 2 +- .../io/xpipe/app/update/AppDownloads.java | 2 +- .../io/xpipe/app/update/AppInstaller.java | 13 ++-- .../io/xpipe/app/update/ChocoUpdater.java | 6 +- .../io/xpipe/app/update/CommandUpdater.java | 2 +- .../io/xpipe/app/update/WingetUpdater.java | 4 +- .../io/xpipe/app/util/AppJacksonModule.java | 6 +- .../xpipe/app/util/BaseElevationHandler.java | 4 +- .../io/xpipe/app/util/CommandSupport.java | 4 +- .../java/io/xpipe/app/util/DesktopHelper.java | 4 +- .../io/xpipe/app/util/DesktopShortcuts.java | 2 +- .../java/io/xpipe/app/util/FileBridge.java | 2 +- .../java/io/xpipe/app/util/FileOpener.java | 4 +- .../java/io/xpipe/app/util/FileReference.java | 2 +- .../xpipe/app/util/FixedHierarchyStore.java | 2 +- .../java/io/xpipe/app/util/LocalShell.java | 2 +- .../java/io/xpipe/app/util/PasswdFile.java | 2 +- .../java/io/xpipe/app/util/ScanDialog.java | 4 +- .../io/xpipe/app/util/ScanDialogAction.java | 2 +- .../java/io/xpipe/app/util/ScriptHelper.java | 2 +- .../app/util/SecretRetrievalStrategy.java | 2 +- .../java/io/xpipe/app/util/ShellTemp.java | 2 +- .../java/io/xpipe/app/util/Validators.java | 2 +- .../io/xpipe/app/vnc/CustomVncClient.java | 2 +- .../io/xpipe/app/vnc/RemminaVncClient.java | 2 +- .../java/io/xpipe/app/vnc/TigerVncClient.java | 2 +- .../java/io/xpipe/app/vnc/TightVncClient.java | 2 +- .../java/io/xpipe/app/vnc/VncBaseStore.java | 2 +- .../io/xpipe/app/vnc/VncLaunchConfig.java | 2 +- .../java/io/xpipe/beacon/BeaconServer.java | 6 +- .../beacon/api/ConnectionAddExchange.java | 2 +- .../xpipe/beacon/api/ShellStartExchange.java | 2 +- .../main/java/io/xpipe/core/Deobfuscator.java | 3 +- .../java/io/xpipe/core/StreamCharset.java | 59 +++++++------------ .../java/io/xpipe/core/XPipeInstallation.java | 10 ++-- .../services/io.xpipe.core.ModuleLayerLoader | 3 +- .../base/desktop/DesktopApplicationStore.java | 4 +- .../DesktopApplicationStoreProvider.java | 2 +- .../ext/base/desktop/DesktopBaseStore.java | 2 +- .../ext/base/identity/IdentityStore.java | 2 +- .../base/identity/IdentityStoreProvider.java | 2 +- .../ext/base/identity/IdentityValue.java | 2 +- .../LocalIdentityConvertHubLeafProvider.java | 13 ++-- .../identity/LocalIdentityStoreProvider.java | 10 +++- .../PasswordManagerIdentityStore.java | 4 +- .../PasswordManagerIdentityStoreProvider.java | 2 +- .../base/identity/SshIdentityStrategy.java | 5 +- .../base/identity/SyncedIdentityStore.java | 2 +- .../identity/SyncedIdentityStoreProvider.java | 9 ++- .../base/script/PredefinedScriptStore.java | 2 +- .../RunHubBatchScriptActionProvider.java | 2 +- .../script/RunScriptActionProviderMenu.java | 4 +- .../ext/base/script/ScriptGroupStore.java | 4 +- .../base/script/ScriptGroupStoreProvider.java | 2 +- .../ext/base/script/ScriptStoreSetup.java | 3 +- .../ext/base/script/SimpleScriptStore.java | 8 +-- .../script/SimpleScriptStoreProvider.java | 9 +-- .../service/AbstractServiceGroupStore.java | 4 +- .../AbstractServiceGroupStoreProvider.java | 5 +- .../base/service/AbstractServiceStore.java | 2 +- .../service/AbstractServiceStoreProvider.java | 2 +- .../base/service/CustomServiceGroupStore.java | 2 +- .../CustomServiceGroupStoreProvider.java | 2 +- .../service/CustomServiceStoreProvider.java | 2 +- .../service/FixedServiceCreatorStore.java | 2 +- .../base/service/FixedServiceGroupStore.java | 4 +- .../FixedServiceGroupStoreProvider.java | 2 +- .../ext/base/service/FixedServiceStore.java | 4 +- .../service/FixedServiceStoreProvider.java | 2 +- .../service/MappedServiceStoreProvider.java | 2 +- .../ext/base/service/ServiceControlStore.java | 4 +- .../service/ServiceControlStoreProvider.java | 2 +- .../store/StoreRestartActionProvider.java | 2 +- .../ext/system/incus/IncusCommandView.java | 2 +- .../ext/system/incus/IncusContainerStore.java | 6 +- .../incus/IncusContainerStoreProvider.java | 2 +- .../ext/system/incus/IncusInstallStore.java | 8 +-- .../incus/IncusInstallStoreProvider.java | 2 +- .../ext/system/incus/IncusScanProvider.java | 2 +- .../io/xpipe/ext/system/lxd/LxdCmdStore.java | 8 +-- .../ext/system/lxd/LxdCmdStoreProvider.java | 2 +- .../xpipe/ext/system/lxd/LxdCommandView.java | 2 +- .../LxdContainerConsoleActionProvider.java | 1 - .../LxdContainerEditConfigActionProvider.java | 1 - .../ext/system/lxd/LxdContainerStore.java | 6 +- .../system/lxd/LxdContainerStoreProvider.java | 2 +- .../xpipe/ext/system/lxd/LxdScanProvider.java | 4 +- .../ext/system/podman/PodmanCmdStore.java | 2 +- .../system/podman/PodmanCmdStoreProvider.java | 2 +- .../system/podman/PodmanContainerStore.java | 10 ++-- .../podman/PodmanContainerStoreProvider.java | 2 +- .../ext/system/podman/PodmanScanProvider.java | 2 +- ext/system/src/main/java/module-info.java | 9 ++- 239 files changed, 477 insertions(+), 450 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/action/ActionConfigComp.java b/app/src/main/java/io/xpipe/app/action/ActionConfigComp.java index b70e42b73..42da5ca3f 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionConfigComp.java +++ b/app/src/main/java/io/xpipe/app/action/ActionConfigComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.action; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.*; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.action.BatchStoreAction; import io.xpipe.app.hub.action.MultiStoreAction; import io.xpipe.app.hub.action.StoreAction; @@ -11,7 +12,6 @@ import io.xpipe.app.hub.comp.StoreListChoiceComp; import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.*; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.*; import javafx.collections.FXCollections; diff --git a/app/src/main/java/io/xpipe/app/action/ActionConfirmComp.java b/app/src/main/java/io/xpipe/app/action/ActionConfirmComp.java index 3d1a2d56e..38c8267d9 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionConfirmComp.java +++ b/app/src/main/java/io/xpipe/app/action/ActionConfirmComp.java @@ -2,6 +2,7 @@ package io.xpipe.app.action; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.action.BatchStoreAction; import io.xpipe.app.hub.action.MultiStoreAction; import io.xpipe.app.hub.action.StoreAction; @@ -9,7 +10,6 @@ import io.xpipe.app.hub.comp.StoreListChoiceComp; import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.OptionsBuilder; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.SimpleListProperty; import javafx.collections.FXCollections; diff --git a/app/src/main/java/io/xpipe/app/action/ActionJacksonMapper.java b/app/src/main/java/io/xpipe/app/action/ActionJacksonMapper.java index 403962bfe..1b1d445fa 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionJacksonMapper.java +++ b/app/src/main/java/io/xpipe/app/action/ActionJacksonMapper.java @@ -1,9 +1,9 @@ package io.xpipe.app.action; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.action.BatchStoreAction; import io.xpipe.app.hub.action.MultiStoreAction; import io.xpipe.app.hub.action.StoreAction; -import io.xpipe.app.ext.DataStore; import io.xpipe.core.JacksonMapper; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/app/src/main/java/io/xpipe/app/action/ActionProvider.java b/app/src/main/java/io/xpipe/app/action/ActionProvider.java index 054e4214d..853649fdd 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionProvider.java +++ b/app/src/main/java/io/xpipe/app/action/ActionProvider.java @@ -18,16 +18,16 @@ public interface ActionProvider { actionProvider.init(); // For debugging -// if (actionProvider instanceof HubLeafProvider) { -// actionProvider.getActionClass().orElseThrow(); -// } -// if (actionProvider instanceof HubBranchProvider b) { -// for (HubMenuItemProvider child : b.getChildren(null)) { -// if (ALL.stream().noneMatch(a -> a.getClass().equals(child.getClass()))) { -// System.out.println(child.getClass()); -// } -// } -// } + // if (actionProvider instanceof HubLeafProvider) { + // actionProvider.getActionClass().orElseThrow(); + // } + // if (actionProvider instanceof HubBranchProvider b) { + // for (HubMenuItemProvider child : b.getChildren(null)) { + // if (ALL.stream().noneMatch(a -> a.getClass().equals(child.getClass()))) { + // System.out.println(child.getClass()); + // } + // } + // } } catch (Throwable t) { ErrorEventFactory.fromThrowable(t).handle(); diff --git a/app/src/main/java/io/xpipe/app/beacon/BeaconShellSession.java b/app/src/main/java/io/xpipe/app/beacon/BeaconShellSession.java index 36eb55982..1c04b6b70 100644 --- a/app/src/main/java/io/xpipe/app/beacon/BeaconShellSession.java +++ b/app/src/main/java/io/xpipe/app/beacon/BeaconShellSession.java @@ -1,7 +1,7 @@ package io.xpipe.app.beacon; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.storage.DataStoreEntry; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/ConnectionAddExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/ConnectionAddExchangeImpl.java index 65a156700..15b28154f 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/ConnectionAddExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/ConnectionAddExchangeImpl.java @@ -1,15 +1,15 @@ package io.xpipe.app.beacon.impl; import io.xpipe.app.ext.DataStore; +import io.xpipe.app.ext.ValidationException; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.beacon.BeaconClientException; import io.xpipe.beacon.api.ConnectionAddExchange; -import io.xpipe.app.ext.ValidationException; +import io.xpipe.core.JacksonMapper; import com.sun.net.httpserver.HttpExchange; -import io.xpipe.core.JacksonMapper; public class ConnectionAddExchangeImpl extends ConnectionAddExchange { diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/ShellStartExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/ShellStartExchangeImpl.java index 286c7b880..8981ef5b2 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/ShellStartExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/ShellStartExchangeImpl.java @@ -6,9 +6,9 @@ import io.xpipe.app.ext.ShellStore; import io.xpipe.app.storage.DataStorage; import io.xpipe.beacon.BeaconClientException; import io.xpipe.beacon.api.ShellStartExchange; +import io.xpipe.core.JacksonMapper; import com.sun.net.httpserver.HttpExchange; -import io.xpipe.core.JacksonMapper; import lombok.SneakyThrows; public class ShellStartExchangeImpl extends ShellStartExchange { diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/SshLaunchExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/SshLaunchExchangeImpl.java index 4ec0fc4ab..3e1472e95 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/SshLaunchExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/SshLaunchExchangeImpl.java @@ -1,9 +1,9 @@ package io.xpipe.app.beacon.impl; import io.xpipe.app.ext.ProcessControlProvider; +import io.xpipe.app.process.ShellDialects; import io.xpipe.app.terminal.TerminalLauncherManager; import io.xpipe.beacon.api.SshLaunchExchange; -import io.xpipe.app.process.ShellDialects; import com.sun.net.httpserver.HttpExchange; 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 315c07fc4..6f2fe5ded 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java @@ -9,6 +9,7 @@ import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.*; import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppLayoutModel; +import io.xpipe.app.ext.FileSystemStore; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.hub.comp.StoreEntryWrapper; import io.xpipe.app.hub.comp.StoreViewState; @@ -18,7 +19,6 @@ import io.xpipe.app.util.FileReference; import io.xpipe.app.util.PlatformThread; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.FilePath; -import io.xpipe.app.ext.FileSystemStore; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleObjectProperty; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionModel.java b/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionModel.java index b43ab52f0..5e519f629 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionModel.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionModel.java @@ -2,13 +2,13 @@ package io.xpipe.app.browser; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; +import io.xpipe.app.ext.FileSystemStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.BooleanScope; import io.xpipe.app.util.FileReference; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.core.FilePath; -import io.xpipe.app.ext.FileSystemStore; import io.xpipe.core.FailableFunction; +import io.xpipe.core.FilePath; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; 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 4b707dce3..7a72e0727 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionModel.java @@ -4,14 +4,14 @@ import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.browser.file.BrowserHistorySavedState; import io.xpipe.app.browser.file.BrowserHistoryTabModel; import io.xpipe.app.browser.file.BrowserTransferModel; +import io.xpipe.app.ext.FileSystemStore; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.BooleanScope; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.core.FilePath; -import io.xpipe.app.ext.FileSystemStore; import io.xpipe.core.FailableFunction; +import io.xpipe.core.FilePath; import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserStoreSessionTab.java b/app/src/main/java/io/xpipe/app/browser/BrowserStoreSessionTab.java index f45333b12..2b03cdf3c 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserStoreSessionTab.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserStoreSessionTab.java @@ -1,10 +1,10 @@ package io.xpipe.app.browser; import io.xpipe.app.comp.Comp; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreColor; import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java b/app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java index 3b5bceed8..f704c5626 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java +++ b/app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java @@ -5,9 +5,9 @@ import io.xpipe.app.browser.BrowserStoreSessionTab; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.core.AppLayoutModel; +import io.xpipe.app.ext.FileSystemStore; import io.xpipe.app.hub.action.StoreAction; import io.xpipe.core.FilePath; -import io.xpipe.app.ext.FileSystemStore; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.experimental.SuperBuilder; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/BrowseInNativeManagerActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/BrowseInNativeManagerActionProvider.java index 09faf3494..dd2f0961a 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/BrowseInNativeManagerActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/BrowseInNativeManagerActionProvider.java @@ -4,9 +4,9 @@ import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.util.DesktopHelper; import io.xpipe.app.util.LocalShell; -import io.xpipe.app.process.ShellControl; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileNativeDetailsActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileNativeDetailsActionProvider.java index e6571f2d0..7ec852680 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileNativeDetailsActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileNativeDetailsActionProvider.java @@ -4,11 +4,11 @@ import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.util.LocalShell; import io.xpipe.core.FileKind; +import io.xpipe.core.OsType; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileWithActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileWithActionProvider.java index 9b560c311..10c93efee 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileWithActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileWithActionProvider.java @@ -5,8 +5,8 @@ import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileOpener; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; -import io.xpipe.core.OsType; import io.xpipe.core.FileKind; +import io.xpipe.core.OsType; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBrowserActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBrowserActionProvider.java index ebffa2358..37ea6c6cb 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBrowserActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBrowserActionProvider.java @@ -3,8 +3,8 @@ package io.xpipe.app.browser.action.impl; import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; -import io.xpipe.app.util.CommandDialog; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.CommandDialog; import lombok.NonNull; import lombok.experimental.SuperBuilder; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/TransferFilesActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/TransferFilesActionProvider.java index 58e302c47..df5436a6c 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/TransferFilesActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/TransferFilesActionProvider.java @@ -4,10 +4,10 @@ import io.xpipe.app.action.AbstractAction; import io.xpipe.app.action.ActionProvider; import io.xpipe.app.action.StoreContextAction; import io.xpipe.app.browser.file.BrowserFileTransferOperation; +import io.xpipe.app.ext.FileSystemStore; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.ext.FileSystemStore; import lombok.NonNull; import lombok.experimental.SuperBuilder; 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 866389244..3ec9f913a 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 @@ -1,9 +1,9 @@ package io.xpipe.app.browser.file; +import io.xpipe.app.ext.FileEntry; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.util.GlobalClipboard; -import io.xpipe.app.ext.FileEntry; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; 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 eede216ad..92d8254be 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 @@ -3,11 +3,11 @@ package io.xpipe.app.browser.file; import io.xpipe.app.browser.menu.BrowserMenuProviders; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.util.*; -import io.xpipe.core.OsType; import io.xpipe.app.ext.FileEntry; +import io.xpipe.app.util.*; import io.xpipe.core.FileInfo; import io.xpipe.core.FileKind; +import io.xpipe.core.OsType; import javafx.application.Platform; import javafx.beans.binding.Bindings; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListModel.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListModel.java index 5472e25ad..09a7de2f8 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListModel.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListModel.java @@ -1,12 +1,12 @@ package io.xpipe.app.browser.file; import io.xpipe.app.browser.action.impl.MoveFileActionProvider; +import io.xpipe.app.ext.FileEntry; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.core.OsType; -import io.xpipe.app.ext.FileEntry; import io.xpipe.core.FileKind; import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import javafx.beans.property.Property; import javafx.beans.property.SimpleBooleanProperty; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOpener.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOpener.java index 89d5d1f5a..9eeddbe9d 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOpener.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOpener.java @@ -3,19 +3,19 @@ package io.xpipe.app.browser.file; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.window.AppDialog; import io.xpipe.app.ext.ConnectionFileSystem; +import io.xpipe.app.ext.FileEntry; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.AppPrefs; +import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.process.ElevationFunction; +import io.xpipe.app.process.ProcessOutputException; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.BooleanScope; import io.xpipe.app.util.FileBridge; import io.xpipe.app.util.FileOpener; -import io.xpipe.app.process.CommandBuilder; -import io.xpipe.app.process.ElevationFunction; -import io.xpipe.core.OsType; -import io.xpipe.app.process.ProcessOutputException; -import io.xpipe.app.ext.FileEntry; import io.xpipe.core.FileInfo; import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import lombok.SneakyThrows; @@ -45,8 +45,8 @@ public class BrowserFileOpener { } var sc = model.getFileSystem().getShell().orElseThrow(); - var requiresSudo = sc.getOsType() != OsType.WINDOWS && - requiresSudo(model, (FileInfo.Unix) file.getInfo(), file.getPath()); + var requiresSudo = + sc.getOsType() != OsType.WINDOWS && requiresSudo(model, (FileInfo.Unix) file.getInfo(), file.getPath()); var defOutput = createFileOutput(model, file, totalBytes, false); if (!requiresSudo) { @@ -91,12 +91,16 @@ public class BrowserFileOpener { return !test; } - private static BrowserFileOutput createFileOutput(BrowserFileSystemTabModel model, FileEntry file, long totalBytes, boolean elevate) throws - Exception { - var sc = elevate ? model.getFileSystem().getShell().orElseThrow() - .identicalDialectSubShell() - .elevated(ElevationFunction.elevated(null)) - .start() : model.getFileSystem().getShell().orElseThrow().start(); + private static BrowserFileOutput createFileOutput( + BrowserFileSystemTabModel model, FileEntry file, long totalBytes, boolean elevate) throws Exception { + var sc = elevate + ? model.getFileSystem() + .getShell() + .orElseThrow() + .identicalDialectSubShell() + .elevated(ElevationFunction.elevated(null)) + .start() + : model.getFileSystem().getShell().orElseThrow().start(); var fs = elevate ? new ConnectionFileSystem(sc) : model.getFileSystem(); var isSudoersFile = file.getPath().startsWith("/etc/sudo"); var output = new BrowserFileOutput() { @@ -135,7 +139,10 @@ public class BrowserFileOpener { if (isSudoersFile) { if (sc.view().findProgram("visudo").isPresent()) { try { - sc.command(CommandBuilder.of().add("visudo", "-c", "-f").addFile(file.getPath())).execute(); + sc.command(CommandBuilder.of() + .add("visudo", "-c", "-f") + .addFile(file.getPath())) + .execute(); } catch (ProcessOutputException ex) { ErrorEventFactory.fromThrowable(ex).expected().handle(); fs.copy(sc.getSystemTemporaryDirectory().join(file.getName()), file.getPath()); diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemCache.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemCache.java index a3aa3bb09..d0ba91b29 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemCache.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemCache.java @@ -1,11 +1,11 @@ package io.xpipe.app.browser.file; -import io.xpipe.app.util.PasswdFile; -import io.xpipe.app.util.ShellControlCache; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellDialect; +import io.xpipe.app.util.PasswdFile; +import io.xpipe.app.util.ShellControlCache; +import io.xpipe.core.OsType; import lombok.Getter; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemHelper.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemHelper.java index d6c9793b7..4fdf8effd 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemHelper.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemHelper.java @@ -1,11 +1,11 @@ package io.xpipe.app.browser.file; +import io.xpipe.app.ext.FileEntry; import io.xpipe.app.ext.FileSystem; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.core.OsType; -import io.xpipe.app.ext.FileEntry; import io.xpipe.core.FileKind; import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import java.time.Instant; import java.util.List; 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 bcd3c15eb..1e1e1ba68 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 @@ -8,6 +8,7 @@ import io.xpipe.app.browser.action.impl.TransferFilesActionProvider; import io.xpipe.app.browser.menu.BrowserMenuItemProvider; import io.xpipe.app.comp.Comp; import io.xpipe.app.core.window.AppMainWindow; +import io.xpipe.app.ext.FileEntry; import io.xpipe.app.ext.FileSystem; import io.xpipe.app.ext.FileSystemStore; import io.xpipe.app.ext.ProcessControlProvider; @@ -20,11 +21,10 @@ import io.xpipe.app.terminal.*; import io.xpipe.app.util.BooleanScope; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.FailableConsumer; - -import io.xpipe.app.ext.FileEntry; import io.xpipe.core.FileKind; import io.xpipe.core.FilePath; import io.xpipe.core.OsType; + import javafx.beans.binding.Bindings; import javafx.beans.property.*; import javafx.collections.FXCollections; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileTransferOperation.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileTransferOperation.java index c68961898..c0c8c3d75 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileTransferOperation.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileTransferOperation.java @@ -1,13 +1,13 @@ package io.xpipe.app.browser.file; +import io.xpipe.app.ext.FileEntry; import io.xpipe.app.ext.FileSystem; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.process.OsFileSystem; import io.xpipe.app.util.ThreadHelper; - -import io.xpipe.app.ext.FileEntry; import io.xpipe.core.FileKind; import io.xpipe.core.FilePath; + import javafx.beans.property.BooleanProperty; import javafx.beans.value.ChangeListener; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserLocalFileSystem.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserLocalFileSystem.java index 9f7027ca4..448fd1886 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserLocalFileSystem.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserLocalFileSystem.java @@ -1,10 +1,10 @@ package io.xpipe.app.browser.file; -import io.xpipe.app.ext.LocalStore; import io.xpipe.app.ext.FileEntry; +import io.xpipe.app.ext.FileSystem; +import io.xpipe.app.ext.LocalStore; import io.xpipe.core.FileKind; import io.xpipe.core.FilePath; -import io.xpipe.app.ext.FileSystem; import java.nio.file.Files; import java.nio.file.Path; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java index b174ac430..91b64b6d2 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java @@ -4,12 +4,12 @@ import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.SimpleTitledPaneComp; import io.xpipe.app.comp.base.VerticalComp; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.FileEntry; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.process.OsFileSystem; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.util.DerivedObservableList; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.app.process.ShellControl; -import io.xpipe.app.ext.FileEntry; import javafx.application.Platform; import javafx.collections.FXCollections; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java index ba5099aff..686b629b7 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java @@ -3,10 +3,10 @@ package io.xpipe.app.browser.file; import io.xpipe.app.browser.icon.BrowserIconManager; import io.xpipe.app.comp.base.PrettyImageHelper; import io.xpipe.app.core.AppFontSizes; +import io.xpipe.app.ext.FileEntry; import io.xpipe.app.util.BooleanAnimationTimer; import io.xpipe.app.util.InputHelper; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.app.ext.FileEntry; import io.xpipe.core.FileKind; import javafx.application.Platform; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferModel.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferModel.java index 9c9589671..b7e2f0cf2 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferModel.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferModel.java @@ -109,7 +109,8 @@ public class BrowserTransferModel { return; } - var fixedFile = OsFileSystem.ofLocal().makeFileSystemCompatible(entry.getRawFileEntry().getPath()); + var fixedFile = OsFileSystem.ofLocal() + .makeFileSystemCompatible(entry.getRawFileEntry().getPath()); Path file = TEMP.resolve(fixedFile.getFileName()); var item = new Item(model, name, entry, file); items.add(item); diff --git a/app/src/main/java/io/xpipe/app/browser/menu/MultiExecuteMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/MultiExecuteMenuProvider.java index fdae8feaa..fe494ae8a 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/MultiExecuteMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/MultiExecuteMenuProvider.java @@ -4,9 +4,9 @@ import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.core.AppI18n; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.app.util.CommandDialog; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.util.CommandDialog; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/ChgrpMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/ChgrpMenuProvider.java index 8917d8dbc..b8cd60bc4 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/ChgrpMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/ChgrpMenuProvider.java @@ -11,8 +11,8 @@ import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.core.OsType; import io.xpipe.core.FileKind; +import io.xpipe.core.OsType; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/ChmodMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/ChmodMenuProvider.java index 4accdc3c3..7f66e888b 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/ChmodMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/ChmodMenuProvider.java @@ -11,8 +11,8 @@ import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.core.OsType; import io.xpipe.core.FileKind; +import io.xpipe.core.OsType; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/ChownMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/ChownMenuProvider.java index 353441cc5..f2f8e97d3 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/ChownMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/ChownMenuProvider.java @@ -11,8 +11,8 @@ import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.core.OsType; import io.xpipe.core.FileKind; +import io.xpipe.core.OsType; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/JavapMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/JavapMenuProvider.java index cf584ba2e..831742f8c 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/JavapMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/JavapMenuProvider.java @@ -7,9 +7,9 @@ import io.xpipe.app.browser.menu.BrowserApplicationPathMenuProvider; import io.xpipe.app.browser.menu.BrowserMenuCategory; import io.xpipe.app.browser.menu.BrowserMenuLeafProvider; import io.xpipe.app.browser.menu.FileTypeMenuProvider; -import io.xpipe.app.util.FileOpener; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.util.FileOpener; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/NewItemMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/NewItemMenuProvider.java index 967b7f285..c907457ca 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/NewItemMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/NewItemMenuProvider.java @@ -14,9 +14,9 @@ import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.LabelGraphic; import io.xpipe.app.util.OptionsBuilder; -import io.xpipe.core.OsType; import io.xpipe.core.FileKind; import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/OpenFileWithMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/OpenFileWithMenuProvider.java index 13a4d1aa2..2dd143d49 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/OpenFileWithMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/OpenFileWithMenuProvider.java @@ -8,8 +8,8 @@ import io.xpipe.app.browser.menu.BrowserMenuCategory; import io.xpipe.app.browser.menu.BrowserMenuLeafProvider; import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.core.OsType; import io.xpipe.core.FileKind; +import io.xpipe.core.OsType; import javafx.beans.value.ObservableValue; import javafx.scene.input.KeyCode; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/RunFileMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/RunFileMenuProvider.java index ba58a65b9..abea9585a 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/RunFileMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/RunFileMenuProvider.java @@ -5,13 +5,13 @@ import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.browser.menu.BrowserMenuCategory; import io.xpipe.app.browser.menu.MultiExecuteMenuProvider; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.util.LabelGraphic; +import io.xpipe.app.ext.FileEntry; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellDialects; -import io.xpipe.app.ext.FileEntry; +import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.FileKind; +import io.xpipe.core.OsType; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUntarMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUntarMenuProvider.java index 5293b2e24..d73ada71d 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUntarMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUntarMenuProvider.java @@ -53,7 +53,8 @@ public class BaseUntarMenuProvider implements BrowserApplicationPathMenuProvider @Override public ObservableValue getName(BrowserFileSystemTabModel model, List entries) { - var sep = OsFileSystem.of(model.getFileSystem().getShell().orElseThrow().getOsType()).getFileSystemSeparator(); + var sep = OsFileSystem.of(model.getFileSystem().getShell().orElseThrow().getOsType()) + .getFileSystemSeparator(); var dir = entries.size() > 1 ? "[...]" : getTarget(entries.getFirst().getRawFileEntry().getPath()).getFileName() + sep; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUnzipUnixMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUnzipUnixMenuProvider.java index b7bfa5157..2892479eb 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUnzipUnixMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUnzipUnixMenuProvider.java @@ -50,7 +50,8 @@ public abstract class BaseUnzipUnixMenuProvider implements BrowserMenuLeafProvid @Override public ObservableValue getName(BrowserFileSystemTabModel model, List entries) { - var sep = OsFileSystem.of(model.getFileSystem().getShell().orElseThrow().getOsType()).getFileSystemSeparator(); + var sep = OsFileSystem.of(model.getFileSystem().getShell().orElseThrow().getOsType()) + .getFileSystemSeparator(); var dir = entries.size() > 1 ? "[...]" : UnzipActionProvider.getTarget( diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUnzipWindowsActionProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUnzipWindowsActionProvider.java index abdfe873e..5d353c825 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUnzipWindowsActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/BaseUnzipWindowsActionProvider.java @@ -36,7 +36,8 @@ public abstract class BaseUnzipWindowsActionProvider implements BrowserMenuLeafP @Override public ObservableValue getName(BrowserFileSystemTabModel model, List entries) { - var sep = OsFileSystem.of(model.getFileSystem().getShell().orElseThrow().getOsType()).getFileSystemSeparator(); + var sep = OsFileSystem.of(model.getFileSystem().getShell().orElseThrow().getOsType()) + .getFileSystemSeparator(); var dir = entries.size() > 1 ? "[...]" : UnzipActionProvider.getTarget( diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/CompressMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/CompressMenuProvider.java index c091e7f8f..19eef8a0e 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/CompressMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/CompressMenuProvider.java @@ -8,8 +8,8 @@ import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.CommandSupport; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.core.OsType; import io.xpipe.core.FileKind; +import io.xpipe.core.OsType; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/UnzipActionProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/UnzipActionProvider.java index 61d428154..05f33cd04 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/UnzipActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/UnzipActionProvider.java @@ -5,10 +5,10 @@ import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellDialects; import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/ZipActionProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/ZipActionProvider.java index c5ec38784..89781e17d 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/ZipActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/compress/ZipActionProvider.java @@ -4,10 +4,10 @@ import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellDialects; import io.xpipe.core.FileKind; import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import lombok.NonNull; import lombok.experimental.SuperBuilder; diff --git a/app/src/main/java/io/xpipe/app/comp/base/ContextualFileReferenceChoiceComp.java b/app/src/main/java/io/xpipe/app/comp/base/ContextualFileReferenceChoiceComp.java index f57fc6076..4f591dcb1 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/ContextualFileReferenceChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/ContextualFileReferenceChoiceComp.java @@ -6,6 +6,7 @@ import io.xpipe.app.comp.CompStructure; import io.xpipe.app.comp.SimpleCompStructure; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.core.window.AppDialog; +import io.xpipe.app.ext.FileSystemStore; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.AppPrefs; @@ -14,7 +15,6 @@ import io.xpipe.app.storage.DataStorageSyncHandler; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.PlatformThread; import io.xpipe.core.FilePath; -import io.xpipe.app.ext.FileSystemStore; import javafx.application.Platform; import javafx.beans.binding.Bindings; diff --git a/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java b/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java index 77ccda25f..b4d6fe065 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java @@ -3,11 +3,11 @@ package io.xpipe.app.comp.base; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; import io.xpipe.app.ext.ShellStore; -import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.util.FileOpener; +import io.xpipe.app.ext.StatefulDataStore; import io.xpipe.app.process.ShellScript; import io.xpipe.app.process.ShellStoreState; -import io.xpipe.app.ext.StatefulDataStore; +import io.xpipe.app.storage.DataStoreEntryRef; +import io.xpipe.app.util.FileOpener; import javafx.application.Platform; import javafx.beans.binding.Bindings; diff --git a/app/src/main/java/io/xpipe/app/comp/base/PrettyImageComp.java b/app/src/main/java/io/xpipe/app/comp/base/PrettyImageComp.java index 63cf49153..d326c59cb 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/PrettyImageComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/PrettyImageComp.java @@ -5,8 +5,8 @@ import io.xpipe.app.core.AppImages; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.PlatformThread; - import io.xpipe.core.FilePath; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; @@ -98,7 +98,8 @@ public class PrettyImageComp extends SimpleComp { && AppPrefs.get().theme().getValue() != null && AppPrefs.get().theme().getValue().isDark(); var fixed = val != null - ? FilePath.of(val).getBaseName() + (useDark ? "-dark" : "") + "." + FilePath.of(val).getExtension().orElseThrow() + ? FilePath.of(val).getBaseName() + (useDark ? "-dark" : "") + "." + + FilePath.of(val).getExtension().orElseThrow() : null; image.set(fixed); diff --git a/app/src/main/java/io/xpipe/app/comp/base/PrettyImageHelper.java b/app/src/main/java/io/xpipe/app/comp/base/PrettyImageHelper.java index 8e0167699..1111c1657 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/PrettyImageHelper.java +++ b/app/src/main/java/io/xpipe/app/comp/base/PrettyImageHelper.java @@ -4,9 +4,8 @@ import io.xpipe.app.comp.Comp; import io.xpipe.app.core.AppImages; import io.xpipe.app.core.window.AppMainWindow; import io.xpipe.app.util.BindingsHelper; - - import io.xpipe.core.FilePath; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleStringProperty; diff --git a/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java b/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java index 7e6054f5c..b03fc6944 100644 --- a/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java +++ b/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java @@ -5,8 +5,8 @@ import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.util.ModuleAccess; -import io.xpipe.core.OsType; import io.xpipe.core.ModuleLayerLoader; +import io.xpipe.core.OsType; import io.xpipe.core.XPipeInstallation; import lombok.Getter; diff --git a/app/src/main/java/io/xpipe/app/core/AppRestart.java b/app/src/main/java/io/xpipe/app/core/AppRestart.java index 2049340e8..cc7704f17 100644 --- a/app/src/main/java/io/xpipe/app/core/AppRestart.java +++ b/app/src/main/java/io/xpipe/app/core/AppRestart.java @@ -2,10 +2,10 @@ package io.xpipe.app.core; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.ext.ProcessControlProvider; -import io.xpipe.app.util.LocalShell; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellDialect; import io.xpipe.app.process.ShellDialects; +import io.xpipe.app.util.LocalShell; +import io.xpipe.core.OsType; import io.xpipe.core.XPipeInstallation; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/core/check/AppCertutilCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppCertutilCheck.java index a2581b765..93d192354 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppCertutilCheck.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppCertutilCheck.java @@ -2,8 +2,8 @@ package io.xpipe.app.core.check; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellDialects; +import io.xpipe.core.OsType; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/io/xpipe/app/core/check/AppHomebrewCoreutilsCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppHomebrewCoreutilsCheck.java index 331418565..153ddda69 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppHomebrewCoreutilsCheck.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppHomebrewCoreutilsCheck.java @@ -1,9 +1,8 @@ package io.xpipe.app.core.check; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.core.OsType; - import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import java.util.Optional; import java.util.concurrent.TimeUnit; @@ -17,7 +16,8 @@ public class AppHomebrewCoreutilsCheck { var out = new String(proc.getInputStream().readAllBytes()); proc.waitFor(1, TimeUnit.SECONDS); var first = out.lines().findFirst(); - return first.filter(s -> s.contains("coreutils")).map(s -> FilePath.of(s).getParent().toString()); + return first.filter(s -> s.contains("coreutils")) + .map(s -> FilePath.of(s).getParent().toString()); } catch (Exception e) { return Optional.empty(); } diff --git a/app/src/main/java/io/xpipe/app/core/check/AppShellChecker.java b/app/src/main/java/io/xpipe/app/core/check/AppShellChecker.java index be35308ae..95edc26e5 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppShellChecker.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppShellChecker.java @@ -2,10 +2,10 @@ package io.xpipe.app.core.check; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.util.LocalShell; -import io.xpipe.app.util.ScriptHelper; import io.xpipe.app.process.ProcessOutputException; import io.xpipe.app.process.ShellSpawnException; +import io.xpipe.app.util.LocalShell; +import io.xpipe.app.util.ScriptHelper; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/core/check/AppTestCommandCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppTestCommandCheck.java index b2190ab99..99002242d 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppTestCommandCheck.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppTestCommandCheck.java @@ -1,8 +1,8 @@ package io.xpipe.app.core.check; +import io.xpipe.app.process.ProcessOutputException; import io.xpipe.app.util.LocalShell; import io.xpipe.core.OsType; -import io.xpipe.app.process.ProcessOutputException; import io.xpipe.core.XPipeInstallation; public class AppTestCommandCheck { diff --git a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java index 0349c6f1f..034318db2 100644 --- a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java +++ b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java @@ -12,8 +12,8 @@ import io.xpipe.app.prefs.CloseBehaviour; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.update.AppDistributionType; import io.xpipe.app.util.*; -import io.xpipe.core.OsType; import io.xpipe.core.FailableRunnable; +import io.xpipe.core.OsType; import io.xpipe.core.XPipeDaemonMode; import javafx.application.Platform; diff --git a/app/src/main/java/io/xpipe/app/core/window/AppWindowTitle.java b/app/src/main/java/io/xpipe/app/core/window/AppWindowTitle.java index 20ade13b7..4d74e5a13 100644 --- a/app/src/main/java/io/xpipe/app/core/window/AppWindowTitle.java +++ b/app/src/main/java/io/xpipe/app/core/window/AppWindowTitle.java @@ -4,9 +4,10 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppProperties; import io.xpipe.app.update.AppDistributionType; import io.xpipe.app.util.LicenseProvider; -import io.xpipe.app.util.PlatformThread; + import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; + import lombok.Getter; public class AppWindowTitle { @@ -17,26 +18,28 @@ public class AppWindowTitle { public static void init() { if (LicenseProvider.get() != null) { var t = LicenseProvider.get().licenseTitle(); - t.subscribe(_ -> { + t.subscribe(ignored -> { title.setValue(createTitle()); }); } var l = AppI18n.activeLanguage(); - l.subscribe(_ -> { + l.subscribe(ignored -> { title.setValue(createTitle()); }); if (AppDistributionType.get() != AppDistributionType.UNKNOWN) { var u = AppDistributionType.get().getUpdateHandler().getPreparedUpdate(); - u.subscribe(_ -> { + u.subscribe(ignored -> { title.setValue(createTitle()); }); } } private static String createTitle() { - var t = LicenseProvider.get() != null ? " " + LicenseProvider.get().licenseTitle().getValue() : ""; + var t = LicenseProvider.get() != null + ? " " + LicenseProvider.get().licenseTitle().getValue() + : ""; var base = String.format("XPipe%s (%s)", t, AppProperties.get().getVersion()); var prefix = AppProperties.get().isStaging() ? "[Public Test Build, Not a proper release] " : ""; var dist = AppDistributionType.get(); diff --git a/app/src/main/java/io/xpipe/app/ext/ConnectionFileSystem.java b/app/src/main/java/io/xpipe/app/ext/ConnectionFileSystem.java index 52a0170a0..7bd7e9e1e 100644 --- a/app/src/main/java/io/xpipe/app/ext/ConnectionFileSystem.java +++ b/app/src/main/java/io/xpipe/app/ext/ConnectionFileSystem.java @@ -1,10 +1,10 @@ package io.xpipe.app.ext; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.util.DocumentationLink; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellDialects; +import io.xpipe.app.util.DocumentationLink; import io.xpipe.core.FilePath; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/app/src/main/java/io/xpipe/app/ext/FileEntry.java b/app/src/main/java/io/xpipe/app/ext/FileEntry.java index 74490bd49..d8c3e8b3f 100644 --- a/app/src/main/java/io/xpipe/app/ext/FileEntry.java +++ b/app/src/main/java/io/xpipe/app/ext/FileEntry.java @@ -3,6 +3,7 @@ package io.xpipe.app.ext; import io.xpipe.core.FileInfo; import io.xpipe.core.FileKind; import io.xpipe.core.FilePath; + import lombok.NonNull; import lombok.Setter; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/ext/LinkFileEntry.java b/app/src/main/java/io/xpipe/app/ext/LinkFileEntry.java index 72e04c985..99b94d2f4 100644 --- a/app/src/main/java/io/xpipe/app/ext/LinkFileEntry.java +++ b/app/src/main/java/io/xpipe/app/ext/LinkFileEntry.java @@ -3,9 +3,11 @@ package io.xpipe.app.ext; import io.xpipe.core.FileInfo; import io.xpipe.core.FileKind; import io.xpipe.core.FilePath; + import lombok.EqualsAndHashCode; import lombok.NonNull; import lombok.Value; + import java.time.Instant; @Value diff --git a/app/src/main/java/io/xpipe/app/ext/ScanProvider.java b/app/src/main/java/io/xpipe/app/ext/ScanProvider.java index d35cdbd47..3a13468c1 100644 --- a/app/src/main/java/io/xpipe/app/ext/ScanProvider.java +++ b/app/src/main/java/io/xpipe/app/ext/ScanProvider.java @@ -1,7 +1,7 @@ package io.xpipe.app.ext; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.core.ModuleLayerLoader; import lombok.AllArgsConstructor; diff --git a/app/src/main/java/io/xpipe/app/ext/StatefulDataStore.java b/app/src/main/java/io/xpipe/app/ext/StatefulDataStore.java index 7df8128d7..7c28a5b0c 100644 --- a/app/src/main/java/io/xpipe/app/ext/StatefulDataStore.java +++ b/app/src/main/java/io/xpipe/app/ext/StatefulDataStore.java @@ -1,7 +1,7 @@ package io.xpipe.app.ext; - import io.xpipe.app.storage.DataStateHandler; + import lombok.SneakyThrows; import java.util.Arrays; diff --git a/app/src/main/java/io/xpipe/app/hub/action/BatchHubProvider.java b/app/src/main/java/io/xpipe/app/hub/action/BatchHubProvider.java index af2fb5350..7e693fbc6 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/BatchHubProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/BatchHubProvider.java @@ -2,9 +2,9 @@ package io.xpipe.app.hub.action; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.action.ActionProvider; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.app.ext.DataStore; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/hub/action/BatchStoreAction.java b/app/src/main/java/io/xpipe/app/hub/action/BatchStoreAction.java index af602ddf7..0a277de3a 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/BatchStoreAction.java +++ b/app/src/main/java/io/xpipe/app/hub/action/BatchStoreAction.java @@ -1,10 +1,10 @@ package io.xpipe.app.hub.action; import io.xpipe.app.action.*; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.ext.DataStore; import io.xpipe.core.JacksonMapper; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/app/src/main/java/io/xpipe/app/hub/action/HubBranchProvider.java b/app/src/main/java/io/xpipe/app/hub/action/HubBranchProvider.java index 16bcc8a2c..36bd4c6e2 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/HubBranchProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/HubBranchProvider.java @@ -1,7 +1,7 @@ package io.xpipe.app.hub.action; -import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.ext.DataStore; +import io.xpipe.app.storage.DataStoreEntryRef; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/hub/action/HubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/HubLeafProvider.java index d77518c1a..b05e1d53f 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/HubLeafProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/HubLeafProvider.java @@ -1,8 +1,8 @@ package io.xpipe.app.hub.action; import io.xpipe.app.action.AbstractAction; -import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.ext.DataStore; +import io.xpipe.app.storage.DataStoreEntryRef; import lombok.SneakyThrows; diff --git a/app/src/main/java/io/xpipe/app/hub/action/HubMenuItemProvider.java b/app/src/main/java/io/xpipe/app/hub/action/HubMenuItemProvider.java index b946c8101..fb19d8696 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/HubMenuItemProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/HubMenuItemProvider.java @@ -1,9 +1,9 @@ package io.xpipe.app.hub.action; import io.xpipe.app.action.ActionProvider; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.app.ext.DataStore; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/hub/action/MultiStoreAction.java b/app/src/main/java/io/xpipe/app/hub/action/MultiStoreAction.java index f61c8a5f8..61479063a 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/MultiStoreAction.java +++ b/app/src/main/java/io/xpipe/app/hub/action/MultiStoreAction.java @@ -3,10 +3,10 @@ package io.xpipe.app.hub.action; import io.xpipe.app.action.ActionJacksonMapper; import io.xpipe.app.action.SerializableAction; import io.xpipe.app.action.StoreContextAction; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.ext.DataStore; import io.xpipe.core.JacksonMapper; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/app/src/main/java/io/xpipe/app/hub/action/StoreAction.java b/app/src/main/java/io/xpipe/app/hub/action/StoreAction.java index 8e513bcb0..726d58040 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/StoreAction.java +++ b/app/src/main/java/io/xpipe/app/hub/action/StoreAction.java @@ -3,10 +3,10 @@ package io.xpipe.app.hub.action; import io.xpipe.app.action.ActionJacksonMapper; import io.xpipe.app.action.SerializableAction; import io.xpipe.app.action.StoreContextAction; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.ext.DataStore; import io.xpipe.core.JacksonMapper; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/BrowseHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/BrowseHubLeafProvider.java index b4e0affb6..0383417a9 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/impl/BrowseHubLeafProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/BrowseHubLeafProvider.java @@ -3,6 +3,7 @@ package io.xpipe.app.hub.action.impl; import io.xpipe.app.browser.BrowserFullSessionModel; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppLayoutModel; +import io.xpipe.app.ext.FileSystemStore; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.hub.action.HubLeafProvider; import io.xpipe.app.hub.action.StoreAction; @@ -10,7 +11,6 @@ import io.xpipe.app.hub.action.StoreActionCategory; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.FilePath; -import io.xpipe.app.ext.FileSystemStore; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/CloneHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/CloneHubLeafProvider.java index 2977df979..df6abc9ac 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/impl/CloneHubLeafProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/CloneHubLeafProvider.java @@ -1,6 +1,7 @@ package io.xpipe.app.hub.action.impl; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.action.HubLeafProvider; import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.hub.action.StoreActionCategory; @@ -8,7 +9,6 @@ import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.app.ext.DataStore; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/EditHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/EditHubLeafProvider.java index d13941869..28609aa8d 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/impl/EditHubLeafProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/EditHubLeafProvider.java @@ -1,13 +1,13 @@ package io.xpipe.app.hub.action.impl; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.action.HubLeafProvider; import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.hub.action.StoreActionCategory; import io.xpipe.app.hub.comp.StoreCreationDialog; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.app.ext.DataStore; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/InitHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/InitHubLeafProvider.java index 12f30e1fe..306c2bca9 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/impl/InitHubLeafProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/InitHubLeafProvider.java @@ -1,10 +1,10 @@ package io.xpipe.app.hub.action.impl; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.action.HubLeafProvider; import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.app.ext.DataStore; public abstract class InitHubLeafProvider implements HubLeafProvider { @@ -17,11 +17,14 @@ public abstract class InitHubLeafProvider implements Hub // Update entries to potentially show item if (available != null) { - StoreViewState.get().getAllEntries().getList().stream().filter(w -> w.getValidity().getValue().isUsable()).forEach(w -> { - if (getApplicableClass().isAssignableFrom(w.getStore().getValue().getClass())) { - w.update(); - } - }); + StoreViewState.get().getAllEntries().getList().stream() + .filter(w -> w.getValidity().getValue().isUsable()) + .forEach(w -> { + if (getApplicableClass() + .isAssignableFrom(w.getStore().getValue().getClass())) { + w.update(); + } + }); } }); } diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/LaunchHubMenuLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/LaunchHubMenuLeafProvider.java index 54f59edb2..12450b6e0 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/impl/LaunchHubMenuLeafProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/LaunchHubMenuLeafProvider.java @@ -1,13 +1,13 @@ package io.xpipe.app.hub.action.impl; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.action.BatchHubProvider; import io.xpipe.app.hub.action.HubLeafProvider; import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.hub.action.StoreActionCategory; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.app.ext.DataStore; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshActionProvider.java index 280456591..365f2a0e9 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshActionProvider.java @@ -1,8 +1,8 @@ package io.xpipe.app.hub.action.impl; import io.xpipe.app.action.*; -import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.ext.DataStore; +import io.xpipe.app.hub.action.StoreAction; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/SampleHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/SampleHubLeafProvider.java index 0dc5f1800..55eca6659 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/impl/SampleHubLeafProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/SampleHubLeafProvider.java @@ -5,12 +5,12 @@ import io.xpipe.app.ext.ShellStore; import io.xpipe.app.hub.action.HubLeafProvider; import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.hub.action.StoreActionCategory; -import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.util.LabelGraphic; import io.xpipe.app.process.CommandControl; import io.xpipe.app.process.ElevationFunction; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellDialects; +import io.xpipe.app.storage.DataStoreEntryRef; +import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.FilePath; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubBatchProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubBatchProvider.java index 8c82cbc98..b036683ab 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubBatchProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubBatchProvider.java @@ -5,12 +5,12 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.hub.action.BatchHubProvider; import io.xpipe.app.hub.action.MultiStoreAction; +import io.xpipe.app.process.ShellTtyState; +import io.xpipe.app.process.SystemState; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.app.util.ScanDialog; import io.xpipe.app.util.ScanDialogAction; -import io.xpipe.app.process.ShellTtyState; -import io.xpipe.app.process.SystemState; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubLeafProvider.java index 7dff71b4b..34bb4b7af 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubLeafProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubLeafProvider.java @@ -6,11 +6,11 @@ import io.xpipe.app.ext.ShellStore; import io.xpipe.app.hub.action.HubLeafProvider; import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.hub.action.StoreActionCategory; +import io.xpipe.app.process.ShellTtyState; +import io.xpipe.app.process.SystemState; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.app.util.ScanDialog; -import io.xpipe.app.process.ShellTtyState; -import io.xpipe.app.process.SystemState; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/OsLogoComp.java b/app/src/main/java/io/xpipe/app/hub/comp/OsLogoComp.java index 9375eeab6..c404e9e83 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/OsLogoComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/OsLogoComp.java @@ -5,9 +5,8 @@ import io.xpipe.app.comp.base.PrettyImageHelper; import io.xpipe.app.comp.base.StackComp; import io.xpipe.app.core.AppResources; import io.xpipe.app.process.SystemState; - - import io.xpipe.core.FilePath; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; @@ -76,7 +75,12 @@ public class OsLogoComp extends SimpleComp { .map(path -> path.getFileName().toString()) .forEach(path -> { var base = path.replace("-dark", "").replace("-24.png", ".svg"); - ICONS.put(FilePath.of(base).getBaseName().toString().split("-")[0], "os/" + base); + ICONS.put( + FilePath.of(base) + .getBaseName() + .toString() + .split("-")[0], + "os/" + base); }); } }); diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StandardStoreEntryComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StandardStoreEntryComp.java index f369560f3..5daa18253 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StandardStoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StandardStoreEntryComp.java @@ -30,15 +30,18 @@ public class StandardStoreEntryComp extends StoreEntryComp { private Label createSummary() { var summary = new Label(); - summary.textProperty().bind(Bindings.createStringBinding(() -> { - var summaryValue = getWrapper().getShownSummary().getValue(); - if (summaryValue != null) { - return summaryValue; - } else { - var provider = getWrapper().getEntry().getProvider(); - return AppI18n.get(provider.getId() + ".displayName"); - } - }, getWrapper().getShownSummary())); + summary.textProperty() + .bind(Bindings.createStringBinding( + () -> { + var summaryValue = getWrapper().getShownSummary().getValue(); + if (summaryValue != null) { + return summaryValue; + } else { + var provider = getWrapper().getEntry().getProvider(); + return AppI18n.get(provider.getId() + ".displayName"); + } + }, + getWrapper().getShownSummary())); summary.getStyleClass().add("summary"); AppFontSizes.xs(summary); return summary; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryConfigComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryConfigComp.java index 6eec8f12e..5d8294d23 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryConfigComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryConfigComp.java @@ -4,12 +4,12 @@ import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.ModalButton; import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategoryConfig; import io.xpipe.app.storage.DataStoreColor; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.OptionsBuilder; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.Property; import javafx.beans.property.SimpleIntegerProperty; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreChoiceComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreChoiceComp.java index 3a53353ba..248122dee 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreChoiceComp.java @@ -6,6 +6,7 @@ import io.xpipe.app.comp.base.*; import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.window.AppDialog; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.LocalStore; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.storage.DataStorage; @@ -14,7 +15,6 @@ import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.BindingsHelper; import io.xpipe.app.util.DataStoreCategoryChoiceComp; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.app.ext.DataStore; import javafx.beans.binding.Bindings; import javafx.beans.property.*; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java index a715d0948..2330ead53 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java @@ -5,6 +5,7 @@ import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.core.window.AppDialog; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.DataStoreCreationCategory; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreProviders; @@ -13,7 +14,6 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*; -import io.xpipe.app.ext.DataStore; import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleBooleanProperty; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationModel.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationModel.java index bb929afe7..170482788 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationModel.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationModel.java @@ -1,17 +1,17 @@ package io.xpipe.app.hub.comp; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.ShellStore; +import io.xpipe.app.ext.ValidatableStore; +import io.xpipe.app.ext.ValidationException; import io.xpipe.app.hub.action.impl.LaunchHubMenuLeafProvider; import io.xpipe.app.issue.ErrorEventFactory; +import io.xpipe.app.process.ShellTtyState; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*; -import io.xpipe.app.process.ShellTtyState; -import io.xpipe.app.ext.DataStore; -import io.xpipe.app.ext.ValidatableStore; -import io.xpipe.app.ext.ValidationException; import javafx.application.Platform; import javafx.beans.binding.Bindings; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListStatusBarComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListStatusBarComp.java index 948ea9459..732da87ff 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListStatusBarComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListStatusBarComp.java @@ -6,10 +6,10 @@ import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.augment.ContextMenuAugment; import io.xpipe.app.comp.base.*; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.action.BatchHubProvider; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.*; -import io.xpipe.app.ext.DataStore; import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleObjectProperty; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryWrapper.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryWrapper.java index 5c0a18ff7..f905ee39c 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryWrapper.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryWrapper.java @@ -1,6 +1,7 @@ package io.xpipe.app.hub.comp; import io.xpipe.app.action.*; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.GroupStore; import io.xpipe.app.ext.LocalStore; import io.xpipe.app.ext.ShellStore; @@ -18,7 +19,6 @@ import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.FixedHierarchyStore; import io.xpipe.app.util.PlatformThread; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.app.ext.DataStore; import javafx.application.Platform; import javafx.beans.binding.Bindings; @@ -340,8 +340,9 @@ public class StoreEntryWrapper { } public boolean canBreakOutCategory() { - return (getStore().getValue() instanceof FixedHierarchyStore || getStore().getValue() instanceof GroupStore) && - StoreViewState.get().getParentSectionForWrapper(this).isPresent(); + return (getStore().getValue() instanceof FixedHierarchyStore + || getStore().getValue() instanceof GroupStore) + && StoreViewState.get().getParentSectionForWrapper(this).isPresent(); } public void breakOutCategory() { @@ -421,8 +422,9 @@ public class StoreEntryWrapper { } var isSingle = section.get().getAllChildren().getList().stream() - .filter(sec -> sec.getWrapper().getOrderIndex().get() == orderIndex.getValue()) - .count() == 1; + .filter(sec -> sec.getWrapper().getOrderIndex().get() == orderIndex.getValue()) + .count() + == 1; var max = section.get().getAllChildren().getList().stream() .map(sec -> sec.getWrapper().getOrderIndex().getValue()) .filter(value -> value != null && value != Integer.MIN_VALUE && value != Integer.MAX_VALUE) @@ -443,8 +445,9 @@ public class StoreEntryWrapper { } var isSingle = section.get().getAllChildren().getList().stream() - .filter(sec -> sec.getWrapper().getOrderIndex().get() == orderIndex.getValue()) - .count() == 1; + .filter(sec -> sec.getWrapper().getOrderIndex().get() == orderIndex.getValue()) + .count() + == 1; var min = section.get().getAllChildren().getList().stream() .map(sec -> sec.getWrapper().getOrderIndex().getValue()) .filter(value -> value != null && value != Integer.MIN_VALUE && value != Integer.MAX_VALUE) diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreListChoiceComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreListChoiceComp.java index c5ce70333..60b277f14 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreListChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreListChoiceComp.java @@ -3,8 +3,8 @@ package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.*; -import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.ext.DataStore; +import io.xpipe.app.storage.DataStoreEntryRef; import javafx.beans.binding.Bindings; import javafx.beans.property.ListProperty; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreToggleComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreToggleComp.java index 28528171f..2de0a1acf 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreToggleComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreToggleComp.java @@ -3,10 +3,10 @@ package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.ToggleSwitchComp; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.LabelGraphic; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.app.ext.DataStore; import javafx.application.Platform; import javafx.beans.binding.Bindings; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/SystemStateComp.java b/app/src/main/java/io/xpipe/app/hub/comp/SystemStateComp.java index 424d98ccf..40374e750 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/SystemStateComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/SystemStateComp.java @@ -1,9 +1,9 @@ package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; +import io.xpipe.app.process.ShellStoreState; import io.xpipe.app.util.BindingsHelper; import io.xpipe.app.util.PlatformThread; -import io.xpipe.app.process.ShellStoreState; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/icon/SystemIconManager.java b/app/src/main/java/io/xpipe/app/icon/SystemIconManager.java index feacf7038..dcbc886b3 100644 --- a/app/src/main/java/io/xpipe/app/icon/SystemIconManager.java +++ b/app/src/main/java/io/xpipe/app/icon/SystemIconManager.java @@ -3,11 +3,11 @@ package io.xpipe.app.icon; import io.xpipe.app.core.AppCache; import io.xpipe.app.core.AppImages; import io.xpipe.app.core.AppProperties; +import io.xpipe.app.ext.ValidationException; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.SupportedLocale; import io.xpipe.app.storage.DataStorage; -import io.xpipe.app.ext.ValidationException; import java.nio.file.Files; import java.nio.file.Path; 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 55d741313..cd2b937ac 100644 --- a/app/src/main/java/io/xpipe/app/icon/SystemIconSource.java +++ b/app/src/main/java/io/xpipe/app/icon/SystemIconSource.java @@ -1,14 +1,13 @@ package io.xpipe.app.icon; import io.xpipe.app.ext.ProcessControlProvider; +import io.xpipe.app.ext.ValidationException; import io.xpipe.app.issue.ErrorEventFactory; +import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.util.DesktopHelper; import io.xpipe.app.util.Hyperlinks; import io.xpipe.app.util.Validators; -import io.xpipe.app.process.CommandBuilder; - import io.xpipe.core.FilePath; -import io.xpipe.app.ext.ValidationException; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorEventFactory.java b/app/src/main/java/io/xpipe/app/issue/ErrorEventFactory.java index eb7dd8f4a..0bad0101d 100644 --- a/app/src/main/java/io/xpipe/app/issue/ErrorEventFactory.java +++ b/app/src/main/java/io/xpipe/app/issue/ErrorEventFactory.java @@ -1,8 +1,8 @@ package io.xpipe.app.issue; +import io.xpipe.app.process.ProcessOutputException; import io.xpipe.app.util.DocumentationLink; import io.xpipe.core.OsType; -import io.xpipe.app.process.ProcessOutputException; import java.util.Arrays; import java.util.IdentityHashMap; 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 04d8f2a18..e42dede22 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java @@ -6,6 +6,7 @@ import io.xpipe.app.ext.PrefsHandler; import io.xpipe.app.ext.PrefsProvider; import io.xpipe.app.icon.SystemIconManager; import io.xpipe.app.icon.SystemIconSource; +import io.xpipe.app.process.ShellScript; import io.xpipe.app.pwman.PasswordManager; import io.xpipe.app.rdp.ExternalRdpClient; import io.xpipe.app.storage.DataStorage; @@ -18,7 +19,6 @@ import io.xpipe.app.util.PlatformThread; import io.xpipe.app.vnc.ExternalVncClient; import io.xpipe.app.vnc.InternalVncClient; import io.xpipe.app.vnc.VncCategory; -import io.xpipe.app.process.ShellScript; import javafx.beans.property.*; import javafx.beans.value.ObservableBooleanValue; diff --git a/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java b/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java index 9a255e5e8..566cf0cf5 100644 --- a/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java @@ -6,11 +6,11 @@ import io.xpipe.app.comp.base.HorizontalComp; import io.xpipe.app.comp.base.TextFieldComp; import io.xpipe.app.core.AppProperties; import io.xpipe.app.issue.TrackEvent; +import io.xpipe.app.process.ProcessOutputException; import io.xpipe.app.util.LabelGraphic; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.app.process.ProcessOutputException; import javafx.beans.property.SimpleStringProperty; import javafx.geometry.Insets; diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationHelper.java b/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationHelper.java index 1d45176d3..d743eb958 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationHelper.java +++ b/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationHelper.java @@ -1,8 +1,8 @@ package io.xpipe.app.prefs; import io.xpipe.app.issue.TrackEvent; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.LocalShell; import java.util.Arrays; import java.util.Locale; diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java index 01827aae1..bfa178362 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java +++ b/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java @@ -2,13 +2,13 @@ package io.xpipe.app.prefs; import io.xpipe.app.ext.PrefsValue; import io.xpipe.app.issue.ErrorEventFactory; +import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.process.CommandControl; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.util.CommandSupport; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.Translatable; -import io.xpipe.app.process.CommandBuilder; -import io.xpipe.app.process.CommandControl; import io.xpipe.core.OsType; -import io.xpipe.app.process.ShellControl; import java.io.IOException; import java.nio.file.Files; diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalEditorType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalEditorType.java index efddd783e..caa568b02 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ExternalEditorType.java +++ b/app/src/main/java/io/xpipe/app/prefs/ExternalEditorType.java @@ -2,12 +2,12 @@ package io.xpipe.app.prefs; import io.xpipe.app.ext.PrefsChoiceValue; import io.xpipe.app.issue.ErrorEventFactory; +import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.process.ShellScript; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.WindowsRegistry; -import io.xpipe.app.process.CommandBuilder; import io.xpipe.core.OsType; -import io.xpipe.app.process.ShellScript; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/prefs/TroubleshootCategory.java b/app/src/main/java/io/xpipe/app/prefs/TroubleshootCategory.java index d3c88f4b8..dbc22cfb1 100644 --- a/app/src/main/java/io/xpipe/app/prefs/TroubleshootCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/TroubleshootCategory.java @@ -10,12 +10,11 @@ import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.core.window.AppDialog; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.issue.UserReportComp; +import io.xpipe.app.process.ShellScript; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.*; -import io.xpipe.core.OsType; -import io.xpipe.app.process.ShellScript; - import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import io.xpipe.core.XPipeInstallation; import com.sun.management.HotSpotDiagnosticMXBean; diff --git a/app/src/main/java/io/xpipe/app/process/CommandBuilder.java b/app/src/main/java/io/xpipe/app/process/CommandBuilder.java index 5b141a946..fd6159eec 100644 --- a/app/src/main/java/io/xpipe/app/process/CommandBuilder.java +++ b/app/src/main/java/io/xpipe/app/process/CommandBuilder.java @@ -1,8 +1,8 @@ package io.xpipe.app.process; -import io.xpipe.core.FilePath; import io.xpipe.core.FailableConsumer; import io.xpipe.core.FailableFunction; +import io.xpipe.core.FilePath; import lombok.Getter; import lombok.SneakyThrows; diff --git a/app/src/main/java/io/xpipe/app/process/OsFileSystem.java b/app/src/main/java/io/xpipe/app/process/OsFileSystem.java index df3ce1b71..f64f4a803 100644 --- a/app/src/main/java/io/xpipe/app/process/OsFileSystem.java +++ b/app/src/main/java/io/xpipe/app/process/OsFileSystem.java @@ -19,11 +19,11 @@ public interface OsFileSystem { static OsFileSystem of(OsType osType) { return switch (osType) { - case OsType.Windows _ -> WINDOWS; - case OsType.Bsd _ -> UNIX; - case OsType.Linux _ -> UNIX; - case OsType.MacOs _ -> MACOS; - case OsType.Solaris _ -> UNIX; + case OsType.Windows ignored -> WINDOWS; + case OsType.Bsd ignored -> UNIX; + case OsType.Linux ignored -> UNIX; + case OsType.MacOs ignored -> MACOS; + case OsType.Solaris ignored -> UNIX; default -> throw new IllegalStateException(); }; } diff --git a/app/src/main/java/io/xpipe/app/process/ShellControl.java b/app/src/main/java/io/xpipe/app/process/ShellControl.java index fe4a20a72..5dc8df9ee 100644 --- a/app/src/main/java/io/xpipe/app/process/ShellControl.java +++ b/app/src/main/java/io/xpipe/app/process/ShellControl.java @@ -1,12 +1,12 @@ package io.xpipe.app.process; import io.xpipe.app.ext.DataStore; -import io.xpipe.core.FilePath; import io.xpipe.app.ext.StatefulDataStore; import io.xpipe.core.FailableConsumer; import io.xpipe.core.FailableFunction; - +import io.xpipe.core.FilePath; import io.xpipe.core.OsType; + import lombok.NonNull; import java.io.IOException; diff --git a/app/src/main/java/io/xpipe/app/process/ShellDialect.java b/app/src/main/java/io/xpipe/app/process/ShellDialect.java index 627f5da0f..30a5e553a 100644 --- a/app/src/main/java/io/xpipe/app/process/ShellDialect.java +++ b/app/src/main/java/io/xpipe/app/process/ShellDialect.java @@ -1,8 +1,8 @@ package io.xpipe.app.process; import io.xpipe.app.ext.FileEntry; -import io.xpipe.core.FilePath; import io.xpipe.app.ext.FileSystem; +import io.xpipe.core.FilePath; import io.xpipe.core.StreamCharset; import java.nio.charset.Charset; diff --git a/app/src/main/java/io/xpipe/app/process/ShellStoreState.java b/app/src/main/java/io/xpipe/app/process/ShellStoreState.java index 0d1595b2f..d466891f0 100644 --- a/app/src/main/java/io/xpipe/app/process/ShellStoreState.java +++ b/app/src/main/java/io/xpipe/app/process/ShellStoreState.java @@ -1,8 +1,8 @@ package io.xpipe.app.process; import io.xpipe.app.ext.DataStoreState; - import io.xpipe.core.OsType; + import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/app/src/main/java/io/xpipe/app/process/WorkingDirectoryFunction.java b/app/src/main/java/io/xpipe/app/process/WorkingDirectoryFunction.java index 8bb848cdd..0496073f1 100644 --- a/app/src/main/java/io/xpipe/app/process/WorkingDirectoryFunction.java +++ b/app/src/main/java/io/xpipe/app/process/WorkingDirectoryFunction.java @@ -1,7 +1,7 @@ package io.xpipe.app.process; -import io.xpipe.core.FilePath; import io.xpipe.core.FailableFunction; +import io.xpipe.core.FilePath; public interface WorkingDirectoryFunction { diff --git a/app/src/main/java/io/xpipe/app/process/WrapperShellControl.java b/app/src/main/java/io/xpipe/app/process/WrapperShellControl.java index 0cfe3b8ca..4bec52650 100644 --- a/app/src/main/java/io/xpipe/app/process/WrapperShellControl.java +++ b/app/src/main/java/io/xpipe/app/process/WrapperShellControl.java @@ -1,10 +1,10 @@ package io.xpipe.app.process; import io.xpipe.app.ext.DataStore; -import io.xpipe.core.FilePath; import io.xpipe.core.FailableConsumer; - +import io.xpipe.core.FilePath; import io.xpipe.core.OsType; + import lombok.Getter; import java.io.IOException; diff --git a/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java index e666d4d2d..11a3f35fe 100644 --- a/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/BitwardenPasswordManager.java @@ -2,11 +2,11 @@ package io.xpipe.app.pwman; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.terminal.TerminalLauncher; -import io.xpipe.app.util.*; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellScript; +import io.xpipe.app.terminal.TerminalLauncher; +import io.xpipe.app.util.*; import io.xpipe.core.InPlaceSecretValue; import io.xpipe.core.JacksonMapper; diff --git a/app/src/main/java/io/xpipe/app/pwman/DashlanePasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/DashlanePasswordManager.java index 9bf476b8f..3cab95843 100644 --- a/app/src/main/java/io/xpipe/app/pwman/DashlanePasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/DashlanePasswordManager.java @@ -2,11 +2,11 @@ package io.xpipe.app.pwman; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.terminal.TerminalLauncher; -import io.xpipe.app.util.CommandSupport; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellScript; +import io.xpipe.app.terminal.TerminalLauncher; +import io.xpipe.app.util.CommandSupport; import io.xpipe.core.InPlaceSecretValue; import io.xpipe.core.JacksonMapper; diff --git a/app/src/main/java/io/xpipe/app/pwman/EnpassPasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/EnpassPasswordManager.java index bc7e417f0..ee555f930 100644 --- a/app/src/main/java/io/xpipe/app/pwman/EnpassPasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/EnpassPasswordManager.java @@ -3,10 +3,10 @@ package io.xpipe.app.pwman; import io.xpipe.app.comp.base.ContextualFileReferenceChoiceComp; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.storage.DataStorage; -import io.xpipe.app.util.*; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.storage.DataStorage; +import io.xpipe.app.util.*; import io.xpipe.core.FilePath; import io.xpipe.core.InPlaceSecretValue; import io.xpipe.core.JacksonMapper; diff --git a/app/src/main/java/io/xpipe/app/pwman/KeeperPasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/KeeperPasswordManager.java index 86c371033..f7a8f89b4 100644 --- a/app/src/main/java/io/xpipe/app/pwman/KeeperPasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/KeeperPasswordManager.java @@ -9,10 +9,10 @@ import io.xpipe.app.util.SecretManager; import io.xpipe.app.util.SecretRetrievalStrategy; import io.xpipe.core.InPlaceSecretValue; import io.xpipe.core.JacksonMapper; +import io.xpipe.core.OsType; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.JsonNode; -import io.xpipe.core.OsType; import java.util.UUID; diff --git a/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java index 9dfb579ec..8ee6c57eb 100644 --- a/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/OnePasswordManager.java @@ -3,9 +3,9 @@ package io.xpipe.app.pwman; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.util.CommandSupport; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.util.CommandSupport; import io.xpipe.core.InPlaceSecretValue; import io.xpipe.core.JacksonMapper; diff --git a/app/src/main/java/io/xpipe/app/pwman/PasswordManagerCommand.java b/app/src/main/java/io/xpipe/app/pwman/PasswordManagerCommand.java index ea55fe2df..7a2cf6726 100644 --- a/app/src/main/java/io/xpipe/app/pwman/PasswordManagerCommand.java +++ b/app/src/main/java/io/xpipe/app/pwman/PasswordManagerCommand.java @@ -7,10 +7,10 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.ExternalApplicationHelper; -import io.xpipe.app.storage.DataStorage; -import io.xpipe.app.util.*; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellScript; +import io.xpipe.app.storage.DataStorage; +import io.xpipe.app.util.*; import io.xpipe.core.InPlaceSecretValue; import io.xpipe.core.SecretValue; diff --git a/app/src/main/java/io/xpipe/app/pwman/PsonoPasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/PsonoPasswordManager.java index 368fbebc4..62fb18abf 100644 --- a/app/src/main/java/io/xpipe/app/pwman/PsonoPasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/PsonoPasswordManager.java @@ -5,9 +5,9 @@ import io.xpipe.app.comp.base.TextFieldComp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.util.*; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.util.*; import io.xpipe.core.InPlaceSecretValue; import io.xpipe.core.JacksonMapper; diff --git a/app/src/main/java/io/xpipe/app/rdp/DevolutionsRdpClient.java b/app/src/main/java/io/xpipe/app/rdp/DevolutionsRdpClient.java index 37f4bf363..c235ecee9 100644 --- a/app/src/main/java/io/xpipe/app/rdp/DevolutionsRdpClient.java +++ b/app/src/main/java/io/xpipe/app/rdp/DevolutionsRdpClient.java @@ -2,9 +2,9 @@ package io.xpipe.app.rdp; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.ExternalApplicationType; +import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.util.ThreadHelper; import io.xpipe.app.util.WindowsRegistry; -import io.xpipe.app.process.CommandBuilder; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/io/xpipe/app/rdp/MstscRdpClient.java b/app/src/main/java/io/xpipe/app/rdp/MstscRdpClient.java index f49185e8b..b3e549eee 100644 --- a/app/src/main/java/io/xpipe/app/rdp/MstscRdpClient.java +++ b/app/src/main/java/io/xpipe/app/rdp/MstscRdpClient.java @@ -1,10 +1,10 @@ package io.xpipe.app.rdp; import io.xpipe.app.prefs.ExternalApplicationType; +import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.RdpConfig; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.app.process.CommandBuilder; import io.xpipe.core.SecretValue; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/io/xpipe/app/rdp/RemminaRdpClient.java b/app/src/main/java/io/xpipe/app/rdp/RemminaRdpClient.java index 8a07d40e4..4f9e7a342 100644 --- a/app/src/main/java/io/xpipe/app/rdp/RemminaRdpClient.java +++ b/app/src/main/java/io/xpipe/app/rdp/RemminaRdpClient.java @@ -1,8 +1,8 @@ package io.xpipe.app.rdp; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.*; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.*; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/io/xpipe/app/rdp/RemoteDesktopAppRdpClient.java b/app/src/main/java/io/xpipe/app/rdp/RemoteDesktopAppRdpClient.java index 7c3242445..ad8835d58 100644 --- a/app/src/main/java/io/xpipe/app/rdp/RemoteDesktopAppRdpClient.java +++ b/app/src/main/java/io/xpipe/app/rdp/RemoteDesktopAppRdpClient.java @@ -1,8 +1,8 @@ package io.xpipe.app.rdp; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.LocalShell; public class RemoteDesktopAppRdpClient implements ExternalApplicationType.MacApplication, ExternalRdpClient { diff --git a/app/src/main/java/io/xpipe/app/rdp/WindowsAppRdpClient.java b/app/src/main/java/io/xpipe/app/rdp/WindowsAppRdpClient.java index 77fb585c4..99678e5bd 100644 --- a/app/src/main/java/io/xpipe/app/rdp/WindowsAppRdpClient.java +++ b/app/src/main/java/io/xpipe/app/rdp/WindowsAppRdpClient.java @@ -1,8 +1,8 @@ package io.xpipe.app.rdp; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.LocalShell; public class WindowsAppRdpClient implements ExternalApplicationType.MacApplication, ExternalRdpClient { diff --git a/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java b/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java index a5251b513..6b5cabc66 100644 --- a/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java +++ b/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java @@ -66,7 +66,9 @@ public class ContextualFileReference { public FilePath toAbsoluteFilePath(ShellControl sc) { return FilePath.of(path.replaceAll( - "/", Matcher.quoteReplacement(sc != null ? OsFileSystem.of(sc.getOsType()).getFileSystemSeparator() : "/"))); + "/", + Matcher.quoteReplacement( + sc != null ? OsFileSystem.of(sc.getOsType()).getFileSystemSeparator() : "/"))); } public boolean isInDataDirectory() { diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java index 5e5b4fbad..a9028c937 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java @@ -1,6 +1,8 @@ package io.xpipe.app.storage; import io.xpipe.app.core.AppProperties; +import io.xpipe.app.ext.DataStore; +import io.xpipe.app.ext.FixedChildStore; import io.xpipe.app.ext.GroupStore; import io.xpipe.app.ext.LocalStore; import io.xpipe.app.ext.NameableStore; @@ -8,8 +10,6 @@ import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.util.FixedHierarchyStore; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.app.ext.DataStore; -import io.xpipe.app.ext.FixedChildStore; import io.xpipe.core.StorePath; import javafx.util.Pair; @@ -454,7 +454,8 @@ public abstract class DataStorage { children.forEach(child -> { if (child.getBreakOutCategory() != null) { var childBreakOut = getStoreCategoryIfPresent(child.getBreakOutCategory()); - if (childBreakOut.isPresent() && childBreakOut.get().getParentCategory().equals(cat.getUuid())) { + if (childBreakOut.isPresent() + && childBreakOut.get().getParentCategory().equals(cat.getUuid())) { categoriesToMove.add(childBreakOut.get()); } } @@ -503,7 +504,8 @@ public abstract class DataStorage { children.forEach(child -> { if (childrenToKeep.contains(child)) { var cbo = getStoreCategoryIfPresent(child.getBreakOutCategory()); - if (cbo.isPresent() && cbo.get().getParentCategory().equals(breakOut.get().getUuid())) { + if (cbo.isPresent() + && cbo.get().getParentCategory().equals(breakOut.get().getUuid())) { moveCategories.add(cbo.get()); } return; @@ -519,8 +521,7 @@ public abstract class DataStorage { }); entry.setCategoryUuid(parent.get().getCategoryUuid()); - listeners.forEach( - storageListener -> storageListener.onEntryCategoryChange()); + listeners.forEach(storageListener -> storageListener.onEntryCategoryChange()); deleteStoreCategory(breakOut.get(), false, false); entry.setBreakOutCategory(null); listeners.forEach(storageListener -> storageListener.onStoreListUpdate()); diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorageNode.java b/app/src/main/java/io/xpipe/app/storage/DataStorageNode.java index 61b62b453..338bdb601 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorageNode.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorageNode.java @@ -1,10 +1,10 @@ package io.xpipe.app.storage; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.UserScopeStore; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.EncryptionToken; -import io.xpipe.app.ext.DataStore; import io.xpipe.core.InPlaceSecretValue; import io.xpipe.core.JacksonMapper; diff --git a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java index 349102fbb..c4410cddb 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java @@ -593,7 +593,9 @@ public class DataStoreEntry extends StorageElement { this.store = store; this.storeNode = DataStorageNode.ofNewStore(store); this.provider = DataStoreProviders.byStore(store); - this.validity = provider != null ? (store.isComplete() ? Validity.COMPLETE : Validity.INCOMPLETE) : Validity.LOAD_FAILED; + this.validity = provider != null + ? (store.isComplete() ? Validity.COMPLETE : Validity.INCOMPLETE) + : Validity.LOAD_FAILED; if (updateTime) { lastModified = Instant.now(); } diff --git a/app/src/main/java/io/xpipe/app/terminal/AlacrittyTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/AlacrittyTerminalType.java index 69e5149aa..173195c3b 100644 --- a/app/src/main/java/io/xpipe/app/terminal/AlacrittyTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/AlacrittyTerminalType.java @@ -2,8 +2,8 @@ package io.xpipe.app.terminal; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.LocalShell; public interface AlacrittyTerminalType extends ExternalTerminalType, TrackableTerminalType { diff --git a/app/src/main/java/io/xpipe/app/terminal/ClinkHelper.java b/app/src/main/java/io/xpipe/app/terminal/ClinkHelper.java index 24ca993f1..48a19b4d1 100644 --- a/app/src/main/java/io/xpipe/app/terminal/ClinkHelper.java +++ b/app/src/main/java/io/xpipe/app/terminal/ClinkHelper.java @@ -1,8 +1,8 @@ package io.xpipe.app.terminal; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.util.GithubReleaseDownloader; import io.xpipe.app.util.ShellTemp; -import io.xpipe.app.process.ShellControl; import io.xpipe.core.FilePath; import java.nio.file.FileSystems; diff --git a/app/src/main/java/io/xpipe/app/terminal/ConfigFileTerminalPrompt.java b/app/src/main/java/io/xpipe/app/terminal/ConfigFileTerminalPrompt.java index e158ec549..7db8f7754 100644 --- a/app/src/main/java/io/xpipe/app/terminal/ConfigFileTerminalPrompt.java +++ b/app/src/main/java/io/xpipe/app/terminal/ConfigFileTerminalPrompt.java @@ -1,11 +1,11 @@ package io.xpipe.app.terminal; import io.xpipe.app.comp.base.IntegratedTextAreaComp; -import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellDialect; import io.xpipe.app.process.ShellScript; import io.xpipe.app.process.ShellTerminalInitCommand; +import io.xpipe.app.util.OptionsBuilder; import io.xpipe.core.FilePath; import javafx.beans.property.Property; 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 000d57db1..e4ff6eb55 100644 --- a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java @@ -5,10 +5,10 @@ import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.ExternalApplicationType; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellDialects; import io.xpipe.app.process.TerminalInitFunction; import io.xpipe.app.update.AppDistributionType; +import io.xpipe.core.OsType; import lombok.Getter; diff --git a/app/src/main/java/io/xpipe/app/terminal/GnomeTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/GnomeTerminalType.java index 4b532c9b4..08011f416 100644 --- a/app/src/main/java/io/xpipe/app/terminal/GnomeTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/GnomeTerminalType.java @@ -2,10 +2,10 @@ package io.xpipe.app.terminal; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.CommandSupport; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.util.CommandSupport; +import io.xpipe.app.util.LocalShell; public class GnomeTerminalType implements ExternalApplicationType.PathApplication, TrackableTerminalType { diff --git a/app/src/main/java/io/xpipe/app/terminal/ITerm2TerminalType.java b/app/src/main/java/io/xpipe/app/terminal/ITerm2TerminalType.java index 3e96246f3..491ba05e6 100644 --- a/app/src/main/java/io/xpipe/app/terminal/ITerm2TerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/ITerm2TerminalType.java @@ -1,8 +1,8 @@ package io.xpipe.app.terminal; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.LocalShell; public class ITerm2TerminalType implements ExternalApplicationType.MacApplication, TrackableTerminalType { diff --git a/app/src/main/java/io/xpipe/app/terminal/KittyTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/KittyTerminalType.java index c1112164c..56bdb8f3f 100644 --- a/app/src/main/java/io/xpipe/app/terminal/KittyTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/KittyTerminalType.java @@ -3,13 +3,13 @@ package io.xpipe.app.terminal; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.ExternalApplicationType; +import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.process.ShellControl; +import io.xpipe.app.process.ShellDialects; import io.xpipe.app.util.CommandSupport; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.ShellTemp; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.app.process.CommandBuilder; -import io.xpipe.app.process.ShellControl; -import io.xpipe.app.process.ShellDialects; import io.xpipe.core.FilePath; import io.xpipe.core.XPipeInstallation; diff --git a/app/src/main/java/io/xpipe/app/terminal/MacOsTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/MacOsTerminalType.java index b8fbe469e..a449e63b2 100644 --- a/app/src/main/java/io/xpipe/app/terminal/MacOsTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/MacOsTerminalType.java @@ -1,8 +1,8 @@ package io.xpipe.app.terminal; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.LocalShell; public class MacOsTerminalType implements ExternalApplicationType.MacApplication, TrackableTerminalType { diff --git a/app/src/main/java/io/xpipe/app/terminal/MobaXTermTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/MobaXTermTerminalType.java index b8f1a557b..5486bb68d 100644 --- a/app/src/main/java/io/xpipe/app/terminal/MobaXTermTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/MobaXTermTerminalType.java @@ -2,8 +2,8 @@ package io.xpipe.app.terminal; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.*; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.*; import java.nio.file.Files; import java.nio.file.Path; diff --git a/app/src/main/java/io/xpipe/app/terminal/OhMyPoshTerminalPrompt.java b/app/src/main/java/io/xpipe/app/terminal/OhMyPoshTerminalPrompt.java index 60523bf8e..d7de56837 100644 --- a/app/src/main/java/io/xpipe/app/terminal/OhMyPoshTerminalPrompt.java +++ b/app/src/main/java/io/xpipe/app/terminal/OhMyPoshTerminalPrompt.java @@ -5,8 +5,8 @@ import io.xpipe.app.util.CommandSupport; import io.xpipe.app.util.GithubReleaseDownloader; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.core.FilePath; - import io.xpipe.core.OsType; + import javafx.beans.property.Property; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/app/src/main/java/io/xpipe/app/terminal/ScreenTerminalMultiplexer.java b/app/src/main/java/io/xpipe/app/terminal/ScreenTerminalMultiplexer.java index 9a2341c6b..53303ecd8 100644 --- a/app/src/main/java/io/xpipe/app/terminal/ScreenTerminalMultiplexer.java +++ b/app/src/main/java/io/xpipe/app/terminal/ScreenTerminalMultiplexer.java @@ -1,10 +1,10 @@ package io.xpipe.app.terminal; -import io.xpipe.app.util.CommandSupport; -import io.xpipe.app.util.ScriptHelper; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellScript; import io.xpipe.app.process.TerminalInitScriptConfig; +import io.xpipe.app.util.CommandSupport; +import io.xpipe.app.util.ScriptHelper; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Builder; diff --git a/app/src/main/java/io/xpipe/app/terminal/SecureCrtTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/SecureCrtTerminalType.java index e8d54dd26..c2ade6b8c 100644 --- a/app/src/main/java/io/xpipe/app/terminal/SecureCrtTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/SecureCrtTerminalType.java @@ -2,9 +2,9 @@ package io.xpipe.app.terminal; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.ExternalApplicationType; +import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.SshLocalBridge; -import io.xpipe.app.process.CommandBuilder; import java.nio.file.Files; import java.nio.file.Path; diff --git a/app/src/main/java/io/xpipe/app/terminal/StarshipTerminalPrompt.java b/app/src/main/java/io/xpipe/app/terminal/StarshipTerminalPrompt.java index 9d35c287a..f6e64a926 100644 --- a/app/src/main/java/io/xpipe/app/terminal/StarshipTerminalPrompt.java +++ b/app/src/main/java/io/xpipe/app/terminal/StarshipTerminalPrompt.java @@ -5,8 +5,8 @@ import io.xpipe.app.util.CommandSupport; import io.xpipe.app.util.GithubReleaseDownloader; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.core.FilePath; - import io.xpipe.core.OsType; + import javafx.beans.property.Property; import com.fasterxml.jackson.annotation.JsonTypeName; diff --git a/app/src/main/java/io/xpipe/app/terminal/TabbyTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/TabbyTerminalType.java index 591670ab9..dfe19e337 100644 --- a/app/src/main/java/io/xpipe/app/terminal/TabbyTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/TabbyTerminalType.java @@ -1,11 +1,11 @@ package io.xpipe.app.terminal; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.LocalShell; -import io.xpipe.app.util.WindowsRegistry; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellDialects; import io.xpipe.app.process.TerminalInitFunction; +import io.xpipe.app.util.LocalShell; +import io.xpipe.app.util.WindowsRegistry; import java.nio.file.Path; import java.util.Optional; diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalLaunchConfiguration.java b/app/src/main/java/io/xpipe/app/terminal/TerminalLaunchConfiguration.java index 999d21684..d1fc674a6 100644 --- a/app/src/main/java/io/xpipe/app/terminal/TerminalLaunchConfiguration.java +++ b/app/src/main/java/io/xpipe/app/terminal/TerminalLaunchConfiguration.java @@ -4,7 +4,10 @@ import io.xpipe.app.core.AppProperties; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.AppPrefs; +import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.OsFileSystem; +import io.xpipe.app.process.ShellDialect; +import io.xpipe.app.process.ShellDialects; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreColor; import io.xpipe.app.storage.DataStoreEntry; @@ -12,11 +15,8 @@ import io.xpipe.app.util.LicenseProvider; import io.xpipe.app.util.LicenseRequiredException; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.ScriptHelper; -import io.xpipe.app.process.CommandBuilder; -import io.xpipe.core.OsType; -import io.xpipe.app.process.ShellDialect; -import io.xpipe.app.process.ShellDialects; import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import lombok.*; import lombok.experimental.NonFinal; @@ -70,8 +70,8 @@ public class TerminalLaunchConfiguration { var logDir = AppProperties.get().getDataDir().resolve("sessions"); Files.createDirectories(logDir); - var logName = OsFileSystem.ofLocal().makeFileSystemCompatible( - FilePath.of(DataStorage.get().getStoreEntryDisplayName(entry) + " (" + var logName = OsFileSystem.ofLocal() + .makeFileSystemCompatible(FilePath.of(DataStorage.get().getStoreEntryDisplayName(entry) + " (" + DATE_FORMATTER.format(Instant.now()) + ").log")) .toString() .replaceAll(" ", "_"); diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java b/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java index e1590317f..44969d05a 100644 --- a/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java +++ b/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java @@ -9,8 +9,8 @@ import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.ScriptHelper; -import io.xpipe.core.FilePath; import io.xpipe.core.FailableFunction; +import io.xpipe.core.FilePath; import io.xpipe.core.XPipeInstallation; import java.io.IOException; diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalPrompt.java b/app/src/main/java/io/xpipe/app/terminal/TerminalPrompt.java index a20072b4f..af6deee3c 100644 --- a/app/src/main/java/io/xpipe/app/terminal/TerminalPrompt.java +++ b/app/src/main/java/io/xpipe/app/terminal/TerminalPrompt.java @@ -1,10 +1,10 @@ package io.xpipe.app.terminal; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.util.ShellTemp; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellDialect; import io.xpipe.app.process.ShellTerminalInitCommand; +import io.xpipe.app.util.ShellTemp; import io.xpipe.core.FilePath; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalProxyManager.java b/app/src/main/java/io/xpipe/app/terminal/TerminalProxyManager.java index 3442377b8..d91222cd9 100644 --- a/app/src/main/java/io/xpipe/app/terminal/TerminalProxyManager.java +++ b/app/src/main/java/io/xpipe/app/terminal/TerminalProxyManager.java @@ -1,12 +1,12 @@ package io.xpipe.app.terminal; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.AppPrefs; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.process.ShellControl; -import io.xpipe.app.ext.DataStore; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/terminal/TmuxTerminalMultiplexer.java b/app/src/main/java/io/xpipe/app/terminal/TmuxTerminalMultiplexer.java index ee4a4d7ad..e02ba6712 100644 --- a/app/src/main/java/io/xpipe/app/terminal/TmuxTerminalMultiplexer.java +++ b/app/src/main/java/io/xpipe/app/terminal/TmuxTerminalMultiplexer.java @@ -1,9 +1,9 @@ package io.xpipe.app.terminal; -import io.xpipe.app.util.CommandSupport; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellScript; import io.xpipe.app.process.TerminalInitScriptConfig; +import io.xpipe.app.util.CommandSupport; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Builder; diff --git a/app/src/main/java/io/xpipe/app/terminal/WarpTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/WarpTerminalType.java index 0ddb9e36b..e0dce8554 100644 --- a/app/src/main/java/io/xpipe/app/terminal/WarpTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/WarpTerminalType.java @@ -1,10 +1,10 @@ package io.xpipe.app.terminal; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.*; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellDialects; import io.xpipe.app.process.TerminalInitFunction; +import io.xpipe.app.util.*; import java.nio.file.Files; import java.nio.file.Path; diff --git a/app/src/main/java/io/xpipe/app/terminal/WaveTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/WaveTerminalType.java index 6d21ccbb3..f82c676d9 100644 --- a/app/src/main/java/io/xpipe/app/terminal/WaveTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/WaveTerminalType.java @@ -1,9 +1,9 @@ package io.xpipe.app.terminal; import io.xpipe.app.issue.ErrorEventFactory; +import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.util.CommandSupport; import io.xpipe.app.util.LocalShell; -import io.xpipe.app.process.CommandBuilder; import io.xpipe.core.XPipeInstallation; public interface WaveTerminalType extends ExternalTerminalType, TrackableTerminalType { diff --git a/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java index abbdfa0b6..c07161dab 100644 --- a/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java @@ -3,11 +3,11 @@ package io.xpipe.app.terminal; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.ExternalApplicationHelper; import io.xpipe.app.prefs.ExternalApplicationType; +import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.WindowsRegistry; -import io.xpipe.app.process.CommandBuilder; import io.xpipe.core.OsType; -import io.xpipe.app.process.ShellControl; import java.nio.file.Path; import java.util.Optional; 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 7bdfef6a1..726fe5b4a 100644 --- a/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java @@ -3,8 +3,8 @@ package io.xpipe.app.terminal; import io.xpipe.app.core.AppCache; import io.xpipe.app.core.AppProperties; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.LocalShell; import io.xpipe.core.FilePath; import io.xpipe.core.JacksonMapper; import io.xpipe.core.XPipeInstallation; diff --git a/app/src/main/java/io/xpipe/app/terminal/XShellTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/XShellTerminalType.java index 4ff7b7021..8f36928d5 100644 --- a/app/src/main/java/io/xpipe/app/terminal/XShellTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/XShellTerminalType.java @@ -7,10 +7,10 @@ import io.xpipe.app.core.AppCache; import io.xpipe.app.core.AppI18n; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.ExternalApplicationType; +import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.SshLocalBridge; import io.xpipe.app.util.WindowsRegistry; -import io.xpipe.app.process.CommandBuilder; import java.nio.file.Path; import java.util.Optional; diff --git a/app/src/main/java/io/xpipe/app/terminal/ZellijTerminalMultiplexer.java b/app/src/main/java/io/xpipe/app/terminal/ZellijTerminalMultiplexer.java index 3453cc4e3..7ac4c99ee 100644 --- a/app/src/main/java/io/xpipe/app/terminal/ZellijTerminalMultiplexer.java +++ b/app/src/main/java/io/xpipe/app/terminal/ZellijTerminalMultiplexer.java @@ -1,9 +1,9 @@ package io.xpipe.app.terminal; -import io.xpipe.app.util.CommandSupport; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellScript; import io.xpipe.app.process.TerminalInitScriptConfig; +import io.xpipe.app.util.CommandSupport; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Builder; diff --git a/app/src/main/java/io/xpipe/app/test/ExtensionTest.java b/app/src/main/java/io/xpipe/app/test/ExtensionTest.java index 718f35b80..fa172a5f0 100644 --- a/app/src/main/java/io/xpipe/app/test/ExtensionTest.java +++ b/app/src/main/java/io/xpipe/app/test/ExtensionTest.java @@ -1,8 +1,7 @@ package io.xpipe.app.test; - - import io.xpipe.core.FilePath; + import lombok.SneakyThrows; import java.nio.file.Files; diff --git a/app/src/main/java/io/xpipe/app/update/AppDistributionType.java b/app/src/main/java/io/xpipe/app/update/AppDistributionType.java index ccfc0e5ca..5fd6b64ef 100644 --- a/app/src/main/java/io/xpipe/app/update/AppDistributionType.java +++ b/app/src/main/java/io/xpipe/app/update/AppDistributionType.java @@ -3,10 +3,10 @@ package io.xpipe.app.update; import io.xpipe.app.core.*; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.issue.TrackEvent; +import io.xpipe.app.process.ShellScript; import io.xpipe.app.util.LocalExec; import io.xpipe.app.util.Translatable; import io.xpipe.core.OsType; -import io.xpipe.app.process.ShellScript; import io.xpipe.core.XPipeInstallation; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/update/AppDownloads.java b/app/src/main/java/io/xpipe/app/update/AppDownloads.java index 3ad4d166a..5785cf864 100644 --- a/app/src/main/java/io/xpipe/app/update/AppDownloads.java +++ b/app/src/main/java/io/xpipe/app/update/AppDownloads.java @@ -5,8 +5,8 @@ import io.xpipe.app.core.AppProperties; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.util.*; -import io.xpipe.core.OsType; import io.xpipe.core.JacksonMapper; +import io.xpipe.core.OsType; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/io/xpipe/app/update/AppInstaller.java b/app/src/main/java/io/xpipe/app/update/AppInstaller.java index 09e7a6bc5..3e2d37fb8 100644 --- a/app/src/main/java/io/xpipe/app/update/AppInstaller.java +++ b/app/src/main/java/io/xpipe/app/update/AppInstaller.java @@ -4,16 +4,15 @@ import io.xpipe.app.core.AppLogs; import io.xpipe.app.core.AppRestart; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.ext.ProcessControlProvider; +import io.xpipe.app.process.ShellDialects; +import io.xpipe.app.process.ShellScript; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.ScriptHelper; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.core.OsType; -import io.xpipe.app.process.ShellDialects; -import io.xpipe.app.process.ShellScript; - -import io.xpipe.core.FilePath; import io.xpipe.core.FailableRunnable; +import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import io.xpipe.core.XPipeInstallation; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -76,8 +75,8 @@ public class AppInstaller { public void installLocal(Path file) { var logsDir = AppLogs.get().getSessionLogsDirectory().getParent().toString(); - var logFile = FilePath.of( - logsDir, "installer_" + file.getFileName().toString() + ".log"); + var logFile = + FilePath.of(logsDir, "installer_" + file.getFileName().toString() + ".log"); var systemWide = isSystemWide(); var cmdScript = ProcessControlProvider.get().getEffectiveLocalDialect().equals(ShellDialects.CMD) diff --git a/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java b/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java index e6c029a37..1e23de6e6 100644 --- a/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java +++ b/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java @@ -6,12 +6,12 @@ import io.xpipe.app.core.AppProperties; import io.xpipe.app.core.AppRestart; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.terminal.TerminalLauncher; -import io.xpipe.app.util.Hyperlinks; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellDialects; import io.xpipe.app.process.ShellScript; +import io.xpipe.app.terminal.TerminalLauncher; +import io.xpipe.app.util.Hyperlinks; +import io.xpipe.app.util.LocalShell; import io.xpipe.core.XPipeInstallation; import java.nio.file.Files; diff --git a/app/src/main/java/io/xpipe/app/update/CommandUpdater.java b/app/src/main/java/io/xpipe/app/update/CommandUpdater.java index 798a5157a..107d9bbb8 100644 --- a/app/src/main/java/io/xpipe/app/update/CommandUpdater.java +++ b/app/src/main/java/io/xpipe/app/update/CommandUpdater.java @@ -4,9 +4,9 @@ import io.xpipe.app.comp.base.ModalButton; import io.xpipe.app.core.AppCache; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.issue.ErrorEventFactory; +import io.xpipe.app.process.ShellScript; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.Hyperlinks; -import io.xpipe.app.process.ShellScript; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/update/WingetUpdater.java b/app/src/main/java/io/xpipe/app/update/WingetUpdater.java index 2a9c18940..b69b61bed 100644 --- a/app/src/main/java/io/xpipe/app/update/WingetUpdater.java +++ b/app/src/main/java/io/xpipe/app/update/WingetUpdater.java @@ -6,11 +6,11 @@ import io.xpipe.app.core.AppProperties; import io.xpipe.app.core.AppRestart; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.issue.ErrorEventFactory; +import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.process.ShellScript; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.Hyperlinks; import io.xpipe.app.util.LocalShell; -import io.xpipe.app.process.CommandBuilder; -import io.xpipe.app.process.ShellScript; import io.xpipe.core.XPipeInstallation; import java.nio.file.Files; diff --git a/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java b/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java index 55caa6444..89e618db2 100644 --- a/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java +++ b/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java @@ -1,7 +1,5 @@ package io.xpipe.app.util; -import com.fasterxml.jackson.databind.jsontype.NamedType; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellDialect; import io.xpipe.app.process.ShellDialects; import io.xpipe.app.process.ShellScript; @@ -13,11 +11,13 @@ import io.xpipe.app.terminal.TerminalPrompt; import io.xpipe.app.vnc.ExternalVncClient; import io.xpipe.core.InPlaceSecretValue; import io.xpipe.core.JacksonMapper; +import io.xpipe.core.OsType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.deser.ContextualDeserializer; +import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.jsontype.TypeDeserializer; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; import com.fasterxml.jackson.databind.jsontype.impl.AsPropertyTypeDeserializer; @@ -52,7 +52,7 @@ public class AppJacksonModule extends SimpleModule { addSerializer(ShellDialect.class, new ShellDialectSerializer()); addDeserializer(ShellDialect.class, new ShellDialectDeserializer()); - + addSerializer(OsType.class, new OsTypeSerializer()); addDeserializer(OsType.Local.class, new OsTypeLocalDeserializer()); addDeserializer(OsType.Any.class, new OsTypeAnyDeserializer()); diff --git a/app/src/main/java/io/xpipe/app/util/BaseElevationHandler.java b/app/src/main/java/io/xpipe/app/util/BaseElevationHandler.java index cd3a96fad..3909392fc 100644 --- a/app/src/main/java/io/xpipe/app/util/BaseElevationHandler.java +++ b/app/src/main/java/io/xpipe/app/util/BaseElevationHandler.java @@ -1,10 +1,10 @@ package io.xpipe.app.util; -import io.xpipe.app.storage.DataStorage; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.process.CountDown; import io.xpipe.app.process.ElevationHandler; -import io.xpipe.app.ext.DataStore; import io.xpipe.app.process.SecretReference; +import io.xpipe.app.storage.DataStorage; import java.util.List; import java.util.UUID; diff --git a/app/src/main/java/io/xpipe/app/util/CommandSupport.java b/app/src/main/java/io/xpipe/app/util/CommandSupport.java index a2b2c15c8..398ad2b0c 100644 --- a/app/src/main/java/io/xpipe/app/util/CommandSupport.java +++ b/app/src/main/java/io/xpipe/app/util/CommandSupport.java @@ -1,11 +1,11 @@ package io.xpipe.app.util; import io.xpipe.app.issue.ErrorEventFactory; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; -import io.xpipe.app.process.ShellControl; -import io.xpipe.core.FilePath; import io.xpipe.core.FailableSupplier; +import io.xpipe.core.FilePath; import java.io.IOException; import java.util.Optional; diff --git a/app/src/main/java/io/xpipe/app/util/DesktopHelper.java b/app/src/main/java/io/xpipe/app/util/DesktopHelper.java index 75ffa102f..5e99dafb6 100644 --- a/app/src/main/java/io/xpipe/app/util/DesktopHelper.java +++ b/app/src/main/java/io/xpipe/app/util/DesktopHelper.java @@ -1,12 +1,12 @@ package io.xpipe.app.util; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.update.AppDistributionType; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.update.AppDistributionType; import io.xpipe.core.FileKind; import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import java.awt.*; import java.io.File; diff --git a/app/src/main/java/io/xpipe/app/util/DesktopShortcuts.java b/app/src/main/java/io/xpipe/app/util/DesktopShortcuts.java index 987646a31..569e8dd47 100644 --- a/app/src/main/java/io/xpipe/app/util/DesktopShortcuts.java +++ b/app/src/main/java/io/xpipe/app/util/DesktopShortcuts.java @@ -1,8 +1,8 @@ package io.xpipe.app.util; import io.xpipe.app.process.OsFileSystem; -import io.xpipe.core.OsType; import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import io.xpipe.core.XPipeInstallation; import java.nio.file.Files; diff --git a/app/src/main/java/io/xpipe/app/util/FileBridge.java b/app/src/main/java/io/xpipe/app/util/FileBridge.java index a801e9f54..ece1947dc 100644 --- a/app/src/main/java/io/xpipe/app/util/FileBridge.java +++ b/app/src/main/java/io/xpipe/app/util/FileBridge.java @@ -6,9 +6,9 @@ import io.xpipe.app.core.AppFileWatcher; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.core.OsType; import io.xpipe.core.FailableFunction; import io.xpipe.core.FailableSupplier; +import io.xpipe.core.OsType; import lombok.Getter; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/io/xpipe/app/util/FileOpener.java b/app/src/main/java/io/xpipe/app/util/FileOpener.java index f3648a8b9..5c4b03ff4 100644 --- a/app/src/main/java/io/xpipe/app/util/FileOpener.java +++ b/app/src/main/java/io/xpipe/app/util/FileOpener.java @@ -3,10 +3,10 @@ package io.xpipe.app.util; import io.xpipe.app.browser.file.BrowserFileOutput; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellDialects; +import io.xpipe.app.storage.DataStoreEntry; +import io.xpipe.core.OsType; import com.sun.jna.platform.win32.Shell32; import com.sun.jna.platform.win32.ShellAPI; diff --git a/app/src/main/java/io/xpipe/app/util/FileReference.java b/app/src/main/java/io/xpipe/app/util/FileReference.java index 37937b6bb..2d200f1d8 100644 --- a/app/src/main/java/io/xpipe/app/util/FileReference.java +++ b/app/src/main/java/io/xpipe/app/util/FileReference.java @@ -1,10 +1,10 @@ package io.xpipe.app.util; +import io.xpipe.app.ext.FileSystemStore; import io.xpipe.app.ext.LocalStore; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.FilePath; -import io.xpipe.app.ext.FileSystemStore; import lombok.Value; import lombok.experimental.SuperBuilder; diff --git a/app/src/main/java/io/xpipe/app/util/FixedHierarchyStore.java b/app/src/main/java/io/xpipe/app/util/FixedHierarchyStore.java index 4358f0f35..a42ff8ac7 100644 --- a/app/src/main/java/io/xpipe/app/util/FixedHierarchyStore.java +++ b/app/src/main/java/io/xpipe/app/util/FixedHierarchyStore.java @@ -1,8 +1,8 @@ package io.xpipe.app.util; -import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.FixedChildStore; +import io.xpipe.app.storage.DataStoreEntryRef; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/util/LocalShell.java b/app/src/main/java/io/xpipe/app/util/LocalShell.java index 09894f29a..d602b9801 100644 --- a/app/src/main/java/io/xpipe/app/util/LocalShell.java +++ b/app/src/main/java/io/xpipe/app/util/LocalShell.java @@ -3,8 +3,8 @@ package io.xpipe.app.util; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.process.*; - import io.xpipe.core.OsType; + import lombok.SneakyThrows; public class LocalShell { 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 80186b0a2..f5a6e75c3 100644 --- a/app/src/main/java/io/xpipe/app/util/PasswdFile.java +++ b/app/src/main/java/io/xpipe/app/util/PasswdFile.java @@ -1,8 +1,8 @@ package io.xpipe.app.util; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellControl; +import io.xpipe.core.OsType; import lombok.Getter; 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 4aff76b9e..e66fbf21e 100644 --- a/app/src/main/java/io/xpipe/app/util/ScanDialog.java +++ b/app/src/main/java/io/xpipe/app/util/ScanDialog.java @@ -5,10 +5,10 @@ import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.ext.ShellStore; -import io.xpipe.app.storage.DataStoreEntry; -import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.process.ShellTtyState; import io.xpipe.app.process.SystemState; +import io.xpipe.app.storage.DataStoreEntry; +import io.xpipe.app.storage.DataStoreEntryRef; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/util/ScanDialogAction.java b/app/src/main/java/io/xpipe/app/util/ScanDialogAction.java index c4b922f23..c856344c4 100644 --- a/app/src/main/java/io/xpipe/app/util/ScanDialogAction.java +++ b/app/src/main/java/io/xpipe/app/util/ScanDialogAction.java @@ -2,9 +2,9 @@ package io.xpipe.app.util; import io.xpipe.app.ext.ScanProvider; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellTtyState; +import io.xpipe.app.storage.DataStoreEntry; import javafx.collections.ObservableList; diff --git a/app/src/main/java/io/xpipe/app/util/ScriptHelper.java b/app/src/main/java/io/xpipe/app/util/ScriptHelper.java index 684a89247..6301096b4 100644 --- a/app/src/main/java/io/xpipe/app/util/ScriptHelper.java +++ b/app/src/main/java/io/xpipe/app/util/ScriptHelper.java @@ -1,11 +1,11 @@ package io.xpipe.app.util; import io.xpipe.app.issue.TrackEvent; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellDialect; import io.xpipe.app.process.ShellDialects; import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import io.xpipe.core.SecretValue; import lombok.SneakyThrows; diff --git a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java index ce7cf71f9..3623156d1 100644 --- a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java +++ b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java @@ -1,10 +1,10 @@ package io.xpipe.app.util; import io.xpipe.app.ext.ProcessControlProvider; +import io.xpipe.app.ext.ValidationException; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.InPlaceSecretValue; -import io.xpipe.app.ext.ValidationException; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/app/src/main/java/io/xpipe/app/util/ShellTemp.java b/app/src/main/java/io/xpipe/app/util/ShellTemp.java index 792e1cff8..54a897fbe 100644 --- a/app/src/main/java/io/xpipe/app/util/ShellTemp.java +++ b/app/src/main/java/io/xpipe/app/util/ShellTemp.java @@ -1,10 +1,10 @@ package io.xpipe.app.util; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellDialects; import io.xpipe.core.FilePath; +import io.xpipe.core.OsType; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/io/xpipe/app/util/Validators.java b/app/src/main/java/io/xpipe/app/util/Validators.java index 0539b1e21..bccbe6a8b 100644 --- a/app/src/main/java/io/xpipe/app/util/Validators.java +++ b/app/src/main/java/io/xpipe/app/util/Validators.java @@ -1,9 +1,9 @@ package io.xpipe.app.util; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.ValidationException; +import io.xpipe.app.storage.DataStoreEntryRef; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/vnc/CustomVncClient.java b/app/src/main/java/io/xpipe/app/vnc/CustomVncClient.java index f61310ce6..95590d16b 100644 --- a/app/src/main/java/io/xpipe/app/vnc/CustomVncClient.java +++ b/app/src/main/java/io/xpipe/app/vnc/CustomVncClient.java @@ -2,8 +2,8 @@ package io.xpipe.app.vnc; import io.xpipe.app.comp.base.TextFieldComp; import io.xpipe.app.prefs.ExternalApplicationHelper; -import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.OptionsBuilder; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; diff --git a/app/src/main/java/io/xpipe/app/vnc/RemminaVncClient.java b/app/src/main/java/io/xpipe/app/vnc/RemminaVncClient.java index 2afa511af..9f6c75a7e 100644 --- a/app/src/main/java/io/xpipe/app/vnc/RemminaVncClient.java +++ b/app/src/main/java/io/xpipe/app/vnc/RemminaVncClient.java @@ -1,9 +1,9 @@ package io.xpipe.app.vnc; import io.xpipe.app.prefs.ExternalApplicationType; +import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.util.RemminaHelper; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.app.process.CommandBuilder; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Builder; diff --git a/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java b/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java index 3abc560bc..836ac8f49 100644 --- a/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java +++ b/app/src/main/java/io/xpipe/app/vnc/TigerVncClient.java @@ -2,8 +2,8 @@ package io.xpipe.app.vnc; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.LocalShell; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Builder; diff --git a/app/src/main/java/io/xpipe/app/vnc/TightVncClient.java b/app/src/main/java/io/xpipe/app/vnc/TightVncClient.java index c0db3d643..6995b796c 100644 --- a/app/src/main/java/io/xpipe/app/vnc/TightVncClient.java +++ b/app/src/main/java/io/xpipe/app/vnc/TightVncClient.java @@ -1,8 +1,8 @@ package io.xpipe.app.vnc; import io.xpipe.app.prefs.ExternalApplicationType; -import io.xpipe.app.util.LocalShell; import io.xpipe.app.process.CommandBuilder; +import io.xpipe.app.util.LocalShell; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Builder; diff --git a/app/src/main/java/io/xpipe/app/vnc/VncBaseStore.java b/app/src/main/java/io/xpipe/app/vnc/VncBaseStore.java index 4cca47542..62e58a88d 100644 --- a/app/src/main/java/io/xpipe/app/vnc/VncBaseStore.java +++ b/app/src/main/java/io/xpipe/app/vnc/VncBaseStore.java @@ -1,7 +1,7 @@ package io.xpipe.app.vnc; -import io.xpipe.app.util.SecretRetrievalStrategy; import io.xpipe.app.ext.DataStore; +import io.xpipe.app.util.SecretRetrievalStrategy; public interface VncBaseStore extends DataStore { diff --git a/app/src/main/java/io/xpipe/app/vnc/VncLaunchConfig.java b/app/src/main/java/io/xpipe/app/vnc/VncLaunchConfig.java index 832ebd0a7..12345dac2 100644 --- a/app/src/main/java/io/xpipe/app/vnc/VncLaunchConfig.java +++ b/app/src/main/java/io/xpipe/app/vnc/VncLaunchConfig.java @@ -1,7 +1,7 @@ package io.xpipe.app.vnc; -import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.process.ShellControl; +import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.SecretValue; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java b/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java index bfb55d313..d2feb8b37 100644 --- a/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java +++ b/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java @@ -125,9 +125,11 @@ public class BeaconServer { throw new IllegalStateException(); } else { if (BeaconConfig.attachDebuggerToDaemon()) { - return FilePath.of(installationBase, XPipeInstallation.getDaemonDebugAttachScriptPath(osType)).toString(); + return FilePath.of(installationBase, XPipeInstallation.getDaemonDebugAttachScriptPath(osType)) + .toString(); } else { - return FilePath.of(installationBase, XPipeInstallation.getDaemonDebugScriptPath(osType)).toString(); + return FilePath.of(installationBase, XPipeInstallation.getDaemonDebugScriptPath(osType)) + .toString(); } } } diff --git a/beacon/src/main/java/io/xpipe/beacon/api/ConnectionAddExchange.java b/beacon/src/main/java/io/xpipe/beacon/api/ConnectionAddExchange.java index 0b977f835..98fee7800 100644 --- a/beacon/src/main/java/io/xpipe/beacon/api/ConnectionAddExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/api/ConnectionAddExchange.java @@ -1,8 +1,8 @@ package io.xpipe.beacon.api; -import com.fasterxml.jackson.databind.JsonNode; import io.xpipe.beacon.BeaconInterface; +import com.fasterxml.jackson.databind.JsonNode; import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/api/ShellStartExchange.java b/beacon/src/main/java/io/xpipe/beacon/api/ShellStartExchange.java index 729bdace1..d28e17c2e 100644 --- a/beacon/src/main/java/io/xpipe/beacon/api/ShellStartExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/api/ShellStartExchange.java @@ -2,8 +2,8 @@ package io.xpipe.beacon.api; import io.xpipe.beacon.BeaconInterface; import io.xpipe.core.FilePath; - import io.xpipe.core.OsType; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/core/src/main/java/io/xpipe/core/Deobfuscator.java b/core/src/main/java/io/xpipe/core/Deobfuscator.java index 5eeee89d9..f12388ebe 100644 --- a/core/src/main/java/io/xpipe/core/Deobfuscator.java +++ b/core/src/main/java/io/xpipe/core/Deobfuscator.java @@ -68,8 +68,7 @@ public class Deobfuscator { file.toString()) .redirectErrorStream(true); var active = proc.start(); - var out = new String(active.getInputStream().readAllBytes()) - .replaceAll("\r\n", "\n"); + var out = new String(active.getInputStream().readAllBytes()).replaceAll("\r\n", "\n"); var code = active.waitFor(); if (code == 0) { return out; diff --git a/core/src/main/java/io/xpipe/core/StreamCharset.java b/core/src/main/java/io/xpipe/core/StreamCharset.java index 88c39dc0d..e416c4283 100644 --- a/core/src/main/java/io/xpipe/core/StreamCharset.java +++ b/core/src/main/java/io/xpipe/core/StreamCharset.java @@ -15,30 +15,24 @@ import java.util.stream.Stream; @Value public class StreamCharset { - public static final StreamCharset UTF8 = - new StreamCharset(StandardCharsets.UTF_8, null); + public static final StreamCharset UTF8 = new StreamCharset(StandardCharsets.UTF_8, null); - public static final StreamCharset UTF8_BOM = new StreamCharset( - StandardCharsets.UTF_8, - new byte[] {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF}); + public static final StreamCharset UTF8_BOM = + new StreamCharset(StandardCharsets.UTF_8, new byte[] {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF}); // ====== // UTF-16 // ====== - public static final StreamCharset UTF16_BE = - new StreamCharset(StandardCharsets.UTF_16BE, null); + public static final StreamCharset UTF16_BE = new StreamCharset(StandardCharsets.UTF_16BE, null); - public static final StreamCharset UTF16_BE_BOM = new StreamCharset( - StandardCharsets.UTF_16BE, - new byte[] {(byte) 0xFE, (byte) 0xFF}); + public static final StreamCharset UTF16_BE_BOM = + new StreamCharset(StandardCharsets.UTF_16BE, new byte[] {(byte) 0xFE, (byte) 0xFF}); - public static final StreamCharset UTF16_LE = - new StreamCharset(StandardCharsets.UTF_16LE, null); + public static final StreamCharset UTF16_LE = new StreamCharset(StandardCharsets.UTF_16LE, null); - public static final StreamCharset UTF16_LE_BOM = new StreamCharset( - StandardCharsets.UTF_16LE, - new byte[] {(byte) 0xFF, (byte) 0xFE}); + public static final StreamCharset UTF16_LE_BOM = + new StreamCharset(StandardCharsets.UTF_16LE, new byte[] {(byte) 0xFF, (byte) 0xFE}); public static final StreamCharset UTF16 = UTF16_LE; @@ -49,34 +43,21 @@ public class StreamCharset { UTF8_BOM, UTF16, UTF16_BOM, - new StreamCharset( - StandardCharsets.US_ASCII, - null), - new StreamCharset( - StandardCharsets.ISO_8859_1, - null), - new StreamCharset( - Charset.forName("Windows-1251"), - null), - new StreamCharset( - Charset.forName("Windows-1252"), - null)); + new StreamCharset(StandardCharsets.US_ASCII, null), + new StreamCharset(StandardCharsets.ISO_8859_1, null), + new StreamCharset(Charset.forName("Windows-1251"), null), + new StreamCharset(Charset.forName("Windows-1252"), null)); // ====== // UTF-32 // ====== - public static final StreamCharset UTF32_LE = - new StreamCharset(Charset.forName("utf-32le"), null); - public static final StreamCharset UTF32_LE_BOM = new StreamCharset( - Charset.forName("utf-32le"), - new byte[] {0x00, 0x00, (byte) 0xFE, (byte) 0xFF}); - public static final StreamCharset UTF32_BE = - new StreamCharset(Charset.forName("utf-32be"), null); - public static final StreamCharset UTF32_BE_BOM = new StreamCharset( - Charset.forName("utf-32be"), - new byte[] { - (byte) 0xFF, (byte) 0xFE, 0x00, 0x00, - }); + public static final StreamCharset UTF32_LE = new StreamCharset(Charset.forName("utf-32le"), null); + public static final StreamCharset UTF32_LE_BOM = + new StreamCharset(Charset.forName("utf-32le"), new byte[] {0x00, 0x00, (byte) 0xFE, (byte) 0xFF}); + public static final StreamCharset UTF32_BE = new StreamCharset(Charset.forName("utf-32be"), null); + public static final StreamCharset UTF32_BE_BOM = new StreamCharset(Charset.forName("utf-32be"), new byte[] { + (byte) 0xFF, (byte) 0xFE, 0x00, 0x00, + }); private static final List RARE = List.of(UTF16_LE, UTF16_LE_BOM, UTF16_BE, UTF16_BE_BOM, UTF32_LE, UTF32_LE_BOM, UTF32_BE, UTF32_BE_BOM); diff --git a/core/src/main/java/io/xpipe/core/XPipeInstallation.java b/core/src/main/java/io/xpipe/core/XPipeInstallation.java index ab9a4600a..11a9342e6 100644 --- a/core/src/main/java/io/xpipe/core/XPipeInstallation.java +++ b/core/src/main/java/io/xpipe/core/XPipeInstallation.java @@ -43,8 +43,8 @@ public class XPipeInstallation { } } - return "\"" + FilePath.of(installationBase, XPipeInstallation.getDaemonExecutablePath(OsType.getLocal())) - + "\"" + modeOption + suffix; + return "\"" + FilePath.of(installationBase, XPipeInstallation.getDaemonExecutablePath(OsType.getLocal())) + "\"" + + modeOption + suffix; } public static String createExternalLaunchCommand(String command, String arguments, XPipeDaemonMode mode) { @@ -260,7 +260,8 @@ public class XPipeInstallation { } else if (type.equals(OsType.LINUX)) { return FilePath.of("scripts", "xpiped_debug.sh").toString(); } else { - return FilePath.of("Contents", "Resources", "scripts", "xpiped_debug.sh").toString(); + return FilePath.of("Contents", "Resources", "scripts", "xpiped_debug.sh") + .toString(); } } @@ -270,7 +271,8 @@ public class XPipeInstallation { } else if (type.equals(OsType.LINUX)) { return FilePath.of("scripts", "xpiped_debug_attach.sh").toString(); } else { - return FilePath.of("Contents", "Resources", "scripts", "xpiped_debug_attach.sh").toString(); + return FilePath.of("Contents", "Resources", "scripts", "xpiped_debug_attach.sh") + .toString(); } } diff --git a/core/src/main/resources/META-INF/services/io.xpipe.core.ModuleLayerLoader b/core/src/main/resources/META-INF/services/io.xpipe.core.ModuleLayerLoader index 392fd889a..bf6de11bf 100644 --- a/core/src/main/resources/META-INF/services/io.xpipe.core.ModuleLayerLoader +++ b/core/src/main/resources/META-INF/services/io.xpipe.core.ModuleLayerLoader @@ -1,2 +1 @@ -io.xpipe.core.JacksonMapper$Loader -io.xpipe.app.process.ShellDialects$Loader \ No newline at end of file +io.xpipe.core.JacksonMapper$Loader \ No newline at end of file diff --git a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStore.java b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStore.java index 15f9ffc67..6132a5042 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStore.java @@ -1,9 +1,9 @@ package io.xpipe.ext.base.desktop; +import io.xpipe.app.ext.DataStore; +import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.Validators; -import io.xpipe.app.process.CommandBuilder; -import io.xpipe.app.ext.DataStore; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Value; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java index 2b6feb028..9d0218e03 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java @@ -2,13 +2,13 @@ package io.xpipe.ext.base.desktop; import io.xpipe.app.browser.BrowserFullSessionModel; import io.xpipe.app.ext.*; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.comp.StoreChoiceComp; import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DocumentationLink; import io.xpipe.app.util.OptionsBuilder; -import io.xpipe.app.ext.DataStore; import io.xpipe.core.FailableRunnable; import javafx.beans.property.BooleanProperty; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopBaseStore.java b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopBaseStore.java index 4e6cd0353..c531985f0 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopBaseStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopBaseStore.java @@ -1,7 +1,7 @@ package io.xpipe.ext.base.desktop; -import io.xpipe.app.process.ShellDialect; import io.xpipe.app.ext.DataStore; +import io.xpipe.app.process.ShellDialect; public interface DesktopBaseStore extends DataStore { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStore.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStore.java index 8f18c837c..55d445a2b 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStore.java @@ -1,8 +1,8 @@ package io.xpipe.ext.base.identity; import io.xpipe.app.ext.DataStore; -import io.xpipe.app.util.*; import io.xpipe.app.ext.SelfReferentialStore; +import io.xpipe.app.util.*; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java index 6bccac0b6..b9b77c303 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java @@ -2,11 +2,11 @@ package io.xpipe.ext.base.identity; import io.xpipe.app.comp.Comp; import io.xpipe.app.ext.*; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.comp.StoreEntryWrapper; import io.xpipe.app.hub.comp.StoreSection; import io.xpipe.app.hub.comp.SystemStateComp; import io.xpipe.app.util.SecretRetrievalStrategy; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityValue.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityValue.java index 1f4add993..6034d446e 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityValue.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityValue.java @@ -1,5 +1,6 @@ package io.xpipe.ext.base.identity; +import io.xpipe.app.ext.ValidationException; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; @@ -7,7 +8,6 @@ import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.EncryptedValue; import io.xpipe.app.util.SecretRetrievalStrategy; import io.xpipe.app.util.Validators; -import io.xpipe.app.ext.ValidationException; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertHubLeafProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertHubLeafProvider.java index 477e25629..a2e157aec 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertHubLeafProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertHubLeafProvider.java @@ -2,23 +2,20 @@ package io.xpipe.ext.base.identity; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.core.window.AppDialog; import io.xpipe.app.core.window.AppMainWindow; -import io.xpipe.app.ext.DataStoreCreationCategory; import io.xpipe.app.hub.action.HubLeafProvider; import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.hub.action.StoreActionCategory; import io.xpipe.app.hub.comp.StoreCreationDialog; import io.xpipe.app.storage.DataStorage; -import io.xpipe.app.storage.DataStorageSyncHandler; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.EncryptedValue; import io.xpipe.app.util.LabelGraphic; import javafx.application.Platform; import javafx.beans.value.ObservableValue; - import javafx.scene.control.Button; + import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; @@ -77,11 +74,15 @@ public class LocalIdentityConvertHubLeafProvider implements HubLeafProvider {}); + StoreCreationDialog.showEdit(ref.get(), synced, ignored -> {}); // Ugly solution to sync key file if needed Platform.runLater(() -> { - var found = AppMainWindow.getInstance().getStage().getScene().getRoot().lookupAll(".git-sync-file-button"); + var found = AppMainWindow.getInstance() + .getStage() + .getScene() + .getRoot() + .lookupAll(".git-sync-file-button"); if (found.size() != 1) { return; } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityStoreProvider.java index 98dd6b313..a8be66a0c 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityStoreProvider.java @@ -1,12 +1,12 @@ package io.xpipe.ext.base.identity; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.storage.*; import io.xpipe.app.util.EncryptedValue; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.util.SecretRetrievalStrategy; import io.xpipe.app.util.SecretRetrievalStrategyHelper; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.Property; import javafx.beans.property.ReadOnlyObjectWrapper; @@ -45,7 +45,13 @@ public class LocalIdentityStoreProvider extends IdentityStoreProvider { .description("keyAuthenticationDescription") .longDescription("base:sshKey") .sub( - SshIdentityStrategyHelper.identity(new ReadOnlyObjectWrapper<>(DataStorage.get().local().ref()), identity, null, false, true), + SshIdentityStrategyHelper.identity( + new ReadOnlyObjectWrapper<>( + DataStorage.get().local().ref()), + identity, + null, + false, + true), identity) .bind( () -> { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStore.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStore.java index 3fa89d57c..23b4c5681 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStore.java @@ -1,12 +1,12 @@ package io.xpipe.ext.base.identity; +import io.xpipe.app.ext.InternalCacheDataStore; import io.xpipe.app.ext.UserScopeStore; +import io.xpipe.app.ext.ValidatableStore; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.pwman.PasswordManager; import io.xpipe.app.util.*; -import io.xpipe.app.ext.InternalCacheDataStore; -import io.xpipe.app.ext.ValidatableStore; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.EqualsAndHashCode; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java index b4a95bd8d..3c300bbb2 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java @@ -1,5 +1,6 @@ package io.xpipe.ext.base.identity; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.DataStoreCreationCategory; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.prefs.AppPrefs; @@ -8,7 +9,6 @@ import io.xpipe.app.storage.DataStorageUserHandler; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.OptionsBuilder; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.Property; import javafx.beans.property.SimpleBooleanProperty; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java index 06cd68350..7cafc3d27 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/SshIdentityStrategy.java @@ -1,18 +1,17 @@ package io.xpipe.ext.base.identity; +import io.xpipe.app.ext.ValidationException; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.core.OsType; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellDialects; import io.xpipe.app.storage.ContextualFileReference; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.util.SecretRetrievalStrategy; import io.xpipe.app.util.Validators; - import io.xpipe.core.FilePath; import io.xpipe.core.KeyValue; -import io.xpipe.app.ext.ValidationException; +import io.xpipe.core.OsType; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStore.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStore.java index f64b60331..0a18f22b5 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStore.java @@ -1,9 +1,9 @@ package io.xpipe.ext.base.identity; import io.xpipe.app.ext.UserScopeStore; +import io.xpipe.app.ext.ValidationException; import io.xpipe.app.util.EncryptedValue; import io.xpipe.app.util.SecretRetrievalStrategy; -import io.xpipe.app.ext.ValidationException; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.EqualsAndHashCode; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStoreProvider.java index 08bc9ec5b..e37193fd7 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStoreProvider.java @@ -1,12 +1,12 @@ package io.xpipe.ext.base.identity; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.DataStoreCreationCategory; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.hub.comp.StoreEntryWrapper; import io.xpipe.app.storage.*; import io.xpipe.app.util.*; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.*; @@ -68,7 +68,12 @@ public class SyncedIdentityStoreProvider extends IdentityStoreProvider { .longDescription("base:sshKey") .sub( SshIdentityStrategyHelper.identity( - new ReadOnlyObjectWrapper<>(DataStorage.get().local().ref()), identity, path -> perUser.get(), true, true), + new ReadOnlyObjectWrapper<>( + DataStorage.get().local().ref()), + identity, + path -> perUser.get(), + true, + true), identity) .check(val -> Validator.create(val, AppI18n.observable("keyNotSynced"), identity, i -> { var wrong = i instanceof SshIdentityStrategy.File f diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptStore.java b/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptStore.java index d499df013..05f1f8d83 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptStore.java @@ -1,8 +1,8 @@ package io.xpipe.ext.base.script; import io.xpipe.app.core.AppResources; -import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.process.ShellDialects; +import io.xpipe.app.storage.DataStoreEntryRef; import lombok.Getter; import lombok.Setter; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/RunHubBatchScriptActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/RunHubBatchScriptActionProvider.java index 55a6741e9..9d22581d0 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/RunHubBatchScriptActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/RunHubBatchScriptActionProvider.java @@ -3,9 +3,9 @@ package io.xpipe.ext.base.script; import io.xpipe.app.action.ActionProvider; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.hub.action.MultiStoreAction; +import io.xpipe.app.process.CommandControl; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.CommandDialog; -import io.xpipe.app.process.CommandControl; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/RunScriptActionProviderMenu.java b/ext/base/src/main/java/io/xpipe/ext/base/script/RunScriptActionProviderMenu.java index d162b779b..808340209 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/RunScriptActionProviderMenu.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/RunScriptActionProviderMenu.java @@ -9,11 +9,11 @@ import io.xpipe.app.hub.action.impl.RefreshActionProvider; import io.xpipe.app.hub.comp.StoreCategoryConfigComp; import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.prefs.AppPrefs; +import io.xpipe.app.process.ShellTtyState; +import io.xpipe.app.process.SystemState; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.app.process.ShellTtyState; -import io.xpipe.app.process.SystemState; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStore.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStore.java index f25830d8a..790c73894 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStore.java @@ -1,9 +1,9 @@ package io.xpipe.ext.base.script; -import io.xpipe.app.storage.DataStorage; -import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.ext.GroupStore; import io.xpipe.app.ext.SelfReferentialStore; +import io.xpipe.app.storage.DataStorage; +import io.xpipe.app.storage.DataStoreEntryRef; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.EqualsAndHashCode; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStoreProvider.java index 00b0fc4de..4b656af43 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStoreProvider.java @@ -2,12 +2,12 @@ package io.xpipe.ext.base.script; import io.xpipe.app.comp.Comp; import io.xpipe.app.ext.*; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DocumentationLink; import io.xpipe.app.util.OptionsBuilder; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreSetup.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreSetup.java index 7462f51ae..5c954d8dc 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreSetup.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreSetup.java @@ -1,14 +1,13 @@ package io.xpipe.ext.base.script; +import io.xpipe.app.ext.StatefulDataStore; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.process.*; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.ShellTemp; - import io.xpipe.core.FilePath; -import io.xpipe.app.ext.StatefulDataStore; import java.util.*; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStore.java b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStore.java index 71912c49c..4c9744b3e 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStore.java @@ -1,13 +1,13 @@ package io.xpipe.ext.base.script; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.SelfReferentialStore; +import io.xpipe.app.ext.ValidationException; +import io.xpipe.app.process.ShellControl; +import io.xpipe.app.process.ShellDialect; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.ScriptHelper; import io.xpipe.app.util.Validators; -import io.xpipe.app.process.ShellControl; -import io.xpipe.app.process.ShellDialect; -import io.xpipe.app.ext.ValidationException; -import io.xpipe.app.ext.SelfReferentialStore; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.EqualsAndHashCode; 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 f58550b80..baf5e7353 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 @@ -5,19 +5,19 @@ import io.xpipe.app.comp.base.IntegratedTextAreaComp; import io.xpipe.app.comp.base.ListSelectorComp; import io.xpipe.app.core.AppExtensionManager; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.DataStoreCreationCategory; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.EnabledParentStoreProvider; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.hub.comp.*; import io.xpipe.app.process.OsFileSystem; +import io.xpipe.app.process.ShellDialect; +import io.xpipe.app.process.ShellDialects; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*; import io.xpipe.core.OsType; -import io.xpipe.app.process.ShellDialect; -import io.xpipe.app.process.ShellDialects; -import io.xpipe.app.ext.DataStore; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; @@ -218,7 +218,8 @@ public class SimpleScriptStoreProvider implements EnabledParentStoreProvider, Da var os = st.getMinimumDialect() == ShellDialects.CMD || ShellDialects.isPowershell(st.getMinimumDialect()) ? OsType.WINDOWS : OsType.LINUX; - return OsFileSystem.of(os).makeFileSystemCompatible(name) + "." + st.getMinimumDialect().getScriptFileEnding(); + return OsFileSystem.of(os).makeFileSystemCompatible(name) + "." + + st.getMinimumDialect().getScriptFileEnding(); } @SneakyThrows diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStore.java b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStore.java index 44e162636..721062204 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStore.java @@ -1,9 +1,9 @@ package io.xpipe.ext.base.service; -import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.util.Validators; import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.GroupStore; +import io.xpipe.app.storage.DataStoreEntryRef; +import io.xpipe.app.util.Validators; import lombok.AccessLevel; import lombok.EqualsAndHashCode; 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 886f041ed..5e669d37c 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 @@ -2,6 +2,7 @@ package io.xpipe.ext.base.service; import io.xpipe.app.comp.Comp; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreUsageCategory; import io.xpipe.app.hub.comp.*; @@ -9,7 +10,6 @@ import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DocumentationLink; import io.xpipe.app.util.ThreadHelper; -import io.xpipe.app.ext.DataStore; import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleBooleanProperty; @@ -57,7 +57,8 @@ public abstract class AbstractServiceGroupStoreProvider implements DataStoreProv DataStorage.get().getStoreChildren(sec.getWrapper().getEntry()); for (DataStoreEntry child : children) { if (child.getStore() instanceof AbstractServiceStore serviceStore) { - if (serviceStore.getHost() != null && serviceStore.getHost().getStore().requiresTunnel()) { + if (serviceStore.getHost() != null + && serviceStore.getHost().getStore().requiresTunnel()) { return true; } } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStore.java b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStore.java index 864cd369a..d2915ad78 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStore.java @@ -1,5 +1,6 @@ package io.xpipe.ext.base.service; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.NetworkTunnelSession; import io.xpipe.app.ext.NetworkTunnelStore; import io.xpipe.app.ext.SingletonSessionStore; @@ -8,7 +9,6 @@ import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.HostHelper; import io.xpipe.app.util.LicenseProvider; import io.xpipe.app.util.Validators; -import io.xpipe.app.ext.DataStore; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java index 1961038bb..9087f7a66 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java @@ -2,6 +2,7 @@ package io.xpipe.ext.base.service; import io.xpipe.app.comp.Comp; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreUsageCategory; import io.xpipe.app.ext.SingletonSessionStoreProvider; @@ -10,7 +11,6 @@ import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DocumentationLink; import io.xpipe.app.util.StoreStateFormat; -import io.xpipe.app.ext.DataStore; import io.xpipe.core.FailableRunnable; import javafx.beans.binding.Bindings; 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 270ea9fd0..912fb573a 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 @@ -1,7 +1,7 @@ package io.xpipe.ext.base.service; -import io.xpipe.app.util.Validators; import io.xpipe.app.ext.DataStore; +import io.xpipe.app.util.Validators; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.*; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceGroupStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceGroupStoreProvider.java index 182908b31..caf3287ce 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceGroupStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceGroupStoreProvider.java @@ -1,8 +1,8 @@ package io.xpipe.ext.base.service; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; -import io.xpipe.app.ext.DataStore; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceStoreProvider.java index 9c7cf7d13..802aeb950 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceStoreProvider.java @@ -1,5 +1,6 @@ package io.xpipe.ext.base.service; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.DataStoreCreationCategory; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.ext.NetworkTunnelStore; @@ -8,7 +9,6 @@ import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.OptionsBuilder; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceCreatorStore.java b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceCreatorStore.java index 4fd62f275..dea3dfaf1 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceCreatorStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceCreatorStore.java @@ -1,7 +1,7 @@ package io.xpipe.ext.base.service; -import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.ext.DataStore; +import io.xpipe.app.storage.DataStoreEntryRef; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceGroupStore.java b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceGroupStore.java index 0f51f5ffa..3e9176105 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceGroupStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceGroupStore.java @@ -1,10 +1,10 @@ package io.xpipe.ext.base.service; +import io.xpipe.app.ext.DataStore; +import io.xpipe.app.ext.FixedChildStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.FixedHierarchyStore; import io.xpipe.app.util.Validators; -import io.xpipe.app.ext.DataStore; -import io.xpipe.app.ext.FixedChildStore; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.AccessLevel; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceGroupStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceGroupStoreProvider.java index e7c760128..a3d994127 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceGroupStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceGroupStoreProvider.java @@ -1,8 +1,8 @@ package io.xpipe.ext.base.service; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; -import io.xpipe.app.ext.DataStore; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStore.java b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStore.java index 89f1b797b..5b8521273 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStore.java @@ -1,10 +1,10 @@ package io.xpipe.ext.base.service; +import io.xpipe.app.ext.DataStore; +import io.xpipe.app.ext.FixedChildStore; import io.xpipe.app.ext.NetworkTunnelStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.Validators; -import io.xpipe.app.ext.DataStore; -import io.xpipe.app.ext.FixedChildStore; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.EqualsAndHashCode; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStoreProvider.java index 0ed51d961..baf5b7c34 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStoreProvider.java @@ -1,5 +1,6 @@ package io.xpipe.ext.base.service; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.ext.NetworkTunnelStore; import io.xpipe.app.hub.comp.StoreChoiceComp; @@ -7,7 +8,6 @@ import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.OptionsBuilder; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java index a25251805..ae775ce6c 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java @@ -1,5 +1,6 @@ package io.xpipe.ext.base.service; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.ext.NetworkTunnelStore; import io.xpipe.app.hub.comp.StoreChoiceComp; @@ -7,7 +8,6 @@ import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.OptionsBuilder; -import io.xpipe.app.ext.DataStore; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; 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 c92bf2474..9f77efb3e 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 @@ -1,11 +1,11 @@ package io.xpipe.ext.base.service; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.ext.SingletonSessionStore; +import io.xpipe.app.process.ShellScript; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.Validators; -import io.xpipe.app.process.ShellScript; -import io.xpipe.app.ext.DataStore; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Value; 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 46ff56c0f..8574fd8a9 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 @@ -3,6 +3,7 @@ package io.xpipe.ext.base.service; import io.xpipe.app.comp.base.IntegratedTextAreaComp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.*; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.comp.StoreChoiceComp; import io.xpipe.app.hub.comp.StoreSection; import io.xpipe.app.hub.comp.StoreViewState; @@ -12,7 +13,6 @@ import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.util.StoreStateFormat; -import io.xpipe.app.ext.DataStore; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java index b9450b026..10bffb027 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java @@ -1,13 +1,13 @@ package io.xpipe.ext.base.store; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.hub.action.BatchHubProvider; import io.xpipe.app.hub.action.HubLeafProvider; import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.hub.action.StoreActionCategory; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.app.ext.DataStore; import javafx.beans.value.ObservableValue; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusCommandView.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusCommandView.java index 8f6e31463..fbedefb70 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusCommandView.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusCommandView.java @@ -6,8 +6,8 @@ import io.xpipe.app.process.*; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.CommandViewBase; - import io.xpipe.ext.base.identity.IdentityValue; + import lombok.NonNull; import java.util.*; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStore.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStore.java index 7490b7c85..3c4a09e73 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStore.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStore.java @@ -1,11 +1,11 @@ package io.xpipe.ext.system.incus; import io.xpipe.app.ext.*; -import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.util.*; -import io.xpipe.app.process.ShellControl; import io.xpipe.app.ext.FixedChildStore; import io.xpipe.app.ext.StatefulDataStore; +import io.xpipe.app.process.ShellControl; +import io.xpipe.app.storage.DataStoreEntryRef; +import io.xpipe.app.util.*; import io.xpipe.ext.base.identity.IdentityValue; import io.xpipe.ext.base.store.PauseableStore; import io.xpipe.ext.base.store.StartableStore; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStoreProvider.java index fe239cab6..e0c29d9d4 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStoreProvider.java @@ -2,11 +2,11 @@ package io.xpipe.ext.system.incus; import io.xpipe.app.comp.Comp; import io.xpipe.app.ext.ContainerStoreState; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*; -import io.xpipe.app.ext.DataStore; import io.xpipe.ext.base.identity.IdentityChoice; import io.xpipe.ext.base.store.ShellStoreProvider; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStore.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStore.java index 83bb89e96..aa48266db 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStore.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStore.java @@ -1,14 +1,14 @@ package io.xpipe.ext.system.incus; +import io.xpipe.app.ext.DataStoreState; +import io.xpipe.app.ext.FixedChildStore; +import io.xpipe.app.ext.SelfReferentialStore; import io.xpipe.app.ext.ShellStore; +import io.xpipe.app.ext.StatefulDataStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.CommandSupport; import io.xpipe.app.util.FixedHierarchyStore; import io.xpipe.app.util.Validators; -import io.xpipe.app.ext.DataStoreState; -import io.xpipe.app.ext.FixedChildStore; -import io.xpipe.app.ext.StatefulDataStore; -import io.xpipe.app.ext.SelfReferentialStore; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.EqualsAndHashCode; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStoreProvider.java index 54aa9aa7d..53d42b460 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStoreProvider.java @@ -1,6 +1,7 @@ package io.xpipe.ext.system.incus; import io.xpipe.app.comp.Comp; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreUsageCategory; import io.xpipe.app.hub.comp.*; @@ -9,7 +10,6 @@ import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.BindingsHelper; import io.xpipe.app.util.DocumentationLink; -import io.xpipe.app.ext.DataStore; import javafx.beans.value.ObservableValue; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusScanProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusScanProvider.java index cab3955c5..0f25931e5 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusScanProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusScanProvider.java @@ -1,10 +1,10 @@ package io.xpipe.ext.system.incus; import io.xpipe.app.ext.ScanProvider; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.core.OsType; -import io.xpipe.app.process.ShellControl; public class IncusScanProvider extends ScanProvider { diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStore.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStore.java index ad407353b..cace04fc6 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStore.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStore.java @@ -1,14 +1,14 @@ package io.xpipe.ext.system.lxd; +import io.xpipe.app.ext.DataStoreState; +import io.xpipe.app.ext.FixedChildStore; +import io.xpipe.app.ext.SelfReferentialStore; import io.xpipe.app.ext.ShellStore; +import io.xpipe.app.ext.StatefulDataStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.CommandSupport; import io.xpipe.app.util.FixedHierarchyStore; import io.xpipe.app.util.Validators; -import io.xpipe.app.ext.DataStoreState; -import io.xpipe.app.ext.FixedChildStore; -import io.xpipe.app.ext.StatefulDataStore; -import io.xpipe.app.ext.SelfReferentialStore; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.EqualsAndHashCode; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStoreProvider.java index f0dcc2e83..f95e92a1e 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStoreProvider.java @@ -1,6 +1,7 @@ package io.xpipe.ext.system.lxd; import io.xpipe.app.comp.Comp; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreUsageCategory; import io.xpipe.app.hub.comp.*; @@ -9,7 +10,6 @@ import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.BindingsHelper; import io.xpipe.app.util.DocumentationLink; -import io.xpipe.app.ext.DataStore; import javafx.beans.value.ObservableValue; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCommandView.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCommandView.java index 6e1ac9837..fdef3a1a5 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCommandView.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCommandView.java @@ -6,8 +6,8 @@ import io.xpipe.app.process.*; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.CommandViewBase; - import io.xpipe.ext.base.identity.IdentityValue; + import lombok.NonNull; import java.util.*; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java index 0dad4b5d7..e86821f26 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java @@ -7,7 +7,6 @@ import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.ext.system.incus.IncusCommandView; import javafx.beans.value.ObservableValue; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java index 50770c1a5..9a1a3b57d 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java @@ -7,7 +7,6 @@ import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.LabelGraphic; -import io.xpipe.ext.system.incus.IncusCommandView; import javafx.beans.value.ObservableValue; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStore.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStore.java index 0723eedeb..25f077ce1 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStore.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStore.java @@ -1,11 +1,11 @@ package io.xpipe.ext.system.lxd; import io.xpipe.app.ext.*; -import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.util.*; -import io.xpipe.app.process.ShellControl; import io.xpipe.app.ext.FixedChildStore; import io.xpipe.app.ext.StatefulDataStore; +import io.xpipe.app.process.ShellControl; +import io.xpipe.app.storage.DataStoreEntryRef; +import io.xpipe.app.util.*; import io.xpipe.ext.base.identity.IdentityValue; import io.xpipe.ext.base.store.PauseableStore; import io.xpipe.ext.base.store.StartableStore; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStoreProvider.java index 6f2124a38..4bff41660 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStoreProvider.java @@ -2,11 +2,11 @@ package io.xpipe.ext.system.lxd; import io.xpipe.app.comp.Comp; import io.xpipe.app.ext.ContainerStoreState; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*; -import io.xpipe.app.ext.DataStore; import io.xpipe.ext.base.identity.IdentityChoice; import io.xpipe.ext.base.store.ShellStoreProvider; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdScanProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdScanProvider.java index 9c7f17367..56cc5a293 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdScanProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdScanProvider.java @@ -1,11 +1,11 @@ package io.xpipe.ext.system.lxd; import io.xpipe.app.ext.ScanProvider; +import io.xpipe.app.process.ProcessOutputException; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.core.OsType; -import io.xpipe.app.process.ProcessOutputException; -import io.xpipe.app.process.ShellControl; public class LxdScanProvider extends ScanProvider { diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStore.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStore.java index cb3ca5c1e..2e269042f 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStore.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStore.java @@ -2,12 +2,12 @@ package io.xpipe.ext.system.podman; import io.xpipe.app.ext.*; import io.xpipe.app.issue.ErrorEventFactory; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.CommandSupport; import io.xpipe.app.util.FixedHierarchyStore; import io.xpipe.app.util.Validators; -import io.xpipe.app.process.ShellControl; import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.EqualsAndHashCode; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStoreProvider.java index cf9ea2146..aaebf734c 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStoreProvider.java @@ -1,6 +1,7 @@ package io.xpipe.ext.system.podman; import io.xpipe.app.comp.Comp; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreUsageCategory; import io.xpipe.app.hub.comp.StoreEntryComp; @@ -11,7 +12,6 @@ import io.xpipe.app.hub.comp.SystemStateComp; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.BindingsHelper; import io.xpipe.app.util.DocumentationLink; -import io.xpipe.app.ext.DataStore; import javafx.beans.value.ObservableValue; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStore.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStore.java index d8440b0ce..219d687ef 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStore.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStore.java @@ -1,15 +1,15 @@ package io.xpipe.ext.system.podman; import io.xpipe.app.ext.*; +import io.xpipe.app.ext.FixedChildStore; +import io.xpipe.app.ext.InternalCacheDataStore; +import io.xpipe.app.ext.SelfReferentialStore; +import io.xpipe.app.ext.StatefulDataStore; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LicenseRequiredException; import io.xpipe.app.util.Validators; -import io.xpipe.app.process.ShellControl; -import io.xpipe.app.ext.FixedChildStore; -import io.xpipe.app.ext.InternalCacheDataStore; -import io.xpipe.app.ext.StatefulDataStore; -import io.xpipe.app.ext.SelfReferentialStore; import io.xpipe.ext.base.service.AbstractServiceStore; import io.xpipe.ext.base.service.FixedServiceCreatorStore; import io.xpipe.ext.base.service.MappedServiceStore; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStoreProvider.java index 710624129..8350b2b90 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStoreProvider.java @@ -2,12 +2,12 @@ package io.xpipe.ext.system.podman; import io.xpipe.app.comp.Comp; import io.xpipe.app.ext.ContainerStoreState; +import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*; -import io.xpipe.app.ext.DataStore; import io.xpipe.ext.base.service.FixedServiceGroupStore; import io.xpipe.ext.base.store.ShellStoreProvider; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanScanProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanScanProvider.java index bf0b4297c..2987e87fc 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanScanProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanScanProvider.java @@ -1,9 +1,9 @@ package io.xpipe.ext.system.podman; import io.xpipe.app.ext.ScanProvider; +import io.xpipe.app.process.ShellControl; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; -import io.xpipe.app.process.ShellControl; public class PodmanScanProvider extends ScanProvider { diff --git a/ext/system/src/main/java/module-info.java b/ext/system/src/main/java/module-info.java index 69ced3475..5088d1338 100644 --- a/ext/system/src/main/java/module-info.java +++ b/ext/system/src/main/java/module-info.java @@ -27,13 +27,16 @@ open module io.xpipe.ext.system { PodmanContainerStoreProvider, PodmanCmdStoreProvider; provides ActionProvider with - IncusContainerActionProviderMenu, IncusContainerConsoleActionProvider, + IncusContainerActionProviderMenu, + IncusContainerConsoleActionProvider, IncusContainerEditConfigActionProvider, - IncusContainerEditRunConfigActionProvider, LxdContainerConsoleActionProvider, + IncusContainerEditRunConfigActionProvider, + LxdContainerConsoleActionProvider, LxdContainerEditConfigActionProvider, LxdContainerEditRunConfigActionProvider, LxdContainerActionProviderMenu, - PodmanContainerActionProviderMenu, PodmanContainerInspectActionProvider, + PodmanContainerActionProviderMenu, + PodmanContainerInspectActionProvider, PodmanContainerAttachActionProvider, PodmanContainerLogsActionProvider; }