From 3add2eac2112ecda9ee5ced81ff261410180f853 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sat, 14 Mar 2026 20:31:26 +0000 Subject: [PATCH] Cleanup --- .../app/action/QuickConnectProvider.java | 4 -- .../io/xpipe/app/beacon/AppBeaconServer.java | 1 - .../io/xpipe/app/comp/base/AppLayoutComp.java | 1 - .../ContextualFileReferenceChoiceComp.java | 1 - .../xpipe/app/comp/base/MultiContentComp.java | 1 - .../io/xpipe/app/core/AppOpenArguments.java | 3 +- .../main/java/io/xpipe/app/core/AppTheme.java | 8 --- .../io/xpipe/app/cred/GpgAgentStrategy.java | 1 - .../app/cred/OtherExternalAgentStrategy.java | 2 +- .../io/xpipe/app/cred/PageantStrategy.java | 3 +- .../cred/PasswordManagerAgentStrategy.java | 5 +- .../io/xpipe/app/cred/SshAgentKeyList.java | 4 -- .../xpipe/app/cred/SshAgentKeyListComp.java | 2 - .../io/xpipe/app/cred/SshAgentTestComp.java | 6 -- .../app/cred/SshIdentityAgentStrategy.java | 13 ----- .../app/ext/NetworkContainerStoreState.java | 1 - .../xpipe/app/hub/comp/StoreCategoryComp.java | 5 -- .../app/hub/comp/StoreCategoryConfigComp.java | 4 -- .../app/hub/comp/StoreEntryFilterCompBar.java | 6 -- .../hub/comp/StoreEntryListOverviewComp.java | 4 -- .../app/hub/comp/StoreFilterFieldComp.java | 4 -- .../xpipe/app/hub/comp/StoreFilterState.java | 2 - .../app/hub/comp/StoreFilterStateComp.java | 10 ++-- .../app/hub/comp/StoreIconChoiceComp.java | 2 - .../app/hub/comp/StoreListChoiceComp.java | 1 - .../io/xpipe/app/hub/comp/StoreNotesComp.java | 3 - .../xpipe/app/hub/comp/StoreQuickConnect.java | 21 ------- .../io/xpipe/app/hub/comp/StoreSection.java | 1 - .../app/hub/comp/StoreSectionBaseComp.java | 1 - .../io/xpipe/app/platform/OptionsBuilder.java | 1 - .../io/xpipe/app/platform/PlatformState.java | 1 - .../app/prefs/PasswordManagerTestComp.java | 1 - .../app/pwman/DashlanePasswordManager.java | 11 ---- .../pwman/HashicorpVaultPasswordManager.java | 8 +-- .../app/pwman/PasswordManagerCommand.java | 3 +- .../app/pwman/PasswordManagerKeyStrategy.java | 2 +- .../app/pwman/ProtonPasswordManager.java | 9 --- .../xpipe/app/pwman/PsonoPasswordManager.java | 2 +- .../app/pwman/WindowsCredentialManager.java | 4 +- .../app/terminal/TerminalDockHubManager.java | 3 - .../xpipe/app/terminal/TerminalDockView.java | 1 - .../terminal/TerminalPaneConfiguration.java | 2 - .../io/xpipe/app/vnc/ExternalVncClient.java | 1 - .../base/desktop/DesktopApplicationStore.java | 1 - .../base/identity/IdentityStoreProvider.java | 1 - .../ext/base/identity/MultiIdentityStore.java | 9 +-- .../identity/MultiIdentityStoreProvider.java | 11 ---- .../MultiIdentitySwitchBranchProvider.java | 1 - .../PasswordManagerIdentityStore.java | 2 +- .../identity/SyncedIdentityStoreProvider.java | 2 - .../ext/base/script/ScriptStoreSetup.java | 2 +- .../service/AbstractServiceGroupStore.java | 3 - .../img/connectionsCategory_icon-16-dark.png | Bin 424 -> 455 bytes .../img/connectionsCategory_icon-16.png | Bin 441 -> 447 bytes .../img/connectionsCategory_icon-24-dark.png | Bin 498 -> 615 bytes .../img/connectionsCategory_icon-24.png | Bin 492 -> 634 bytes .../img/connectionsCategory_icon-40-dark.png | Bin 641 -> 828 bytes .../img/connectionsCategory_icon-40.png | Bin 650 -> 820 bytes .../img/connectionsCategory_icon-80-dark.png | Bin 1125 -> 1256 bytes .../img/connectionsCategory_icon-80.png | Bin 1128 -> 1282 bytes .../ext/system/incus/IncusCommandView.java | 3 - .../incus/IncusContainerStoreProvider.java | 2 - .../xpipe/ext/system/lxd/LxdCommandView.java | 3 - .../system/lxd/LxdContainerStoreProvider.java | 2 - img/base/connectionsCategory_icon-dark.svg | 53 ++++++++++-------- img/base/connectionsCategory_icon.svg | 51 +++++++++-------- 66 files changed, 74 insertions(+), 241 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/action/QuickConnectProvider.java b/app/src/main/java/io/xpipe/app/action/QuickConnectProvider.java index 270722813..ac32d8c93 100644 --- a/app/src/main/java/io/xpipe/app/action/QuickConnectProvider.java +++ b/app/src/main/java/io/xpipe/app/action/QuickConnectProvider.java @@ -1,12 +1,8 @@ package io.xpipe.app.action; import io.xpipe.app.ext.DataStore; -import io.xpipe.app.ext.DataStoreProvider; -import io.xpipe.app.ext.DataStoreProviders; -import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; -import java.net.URI; import java.util.List; import java.util.Objects; import java.util.Optional; diff --git a/app/src/main/java/io/xpipe/app/beacon/AppBeaconServer.java b/app/src/main/java/io/xpipe/app/beacon/AppBeaconServer.java index aba10904d..a65fdb7f9 100644 --- a/app/src/main/java/io/xpipe/app/beacon/AppBeaconServer.java +++ b/app/src/main/java/io/xpipe/app/beacon/AppBeaconServer.java @@ -2,7 +2,6 @@ package io.xpipe.app.beacon; import io.xpipe.app.beacon.mcp.AppMcpServer; import io.xpipe.app.core.AppLocalTemp; -import io.xpipe.app.core.AppProperties; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; diff --git a/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java b/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java index 4b46ef291..17fd809bc 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java @@ -22,7 +22,6 @@ import javafx.scene.input.KeyEvent; import javafx.scene.layout.BorderPane; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; -import org.bouncycastle.math.raw.Mod; import java.time.Duration; import java.util.ArrayList; 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 6c8fd9309..09603a8e4 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 @@ -27,7 +27,6 @@ import javafx.scene.control.ListCell; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; -import lombok.NonNull; import lombok.Setter; import lombok.Value; import org.kordamp.ikonli.javafx.FontIcon; diff --git a/app/src/main/java/io/xpipe/app/comp/base/MultiContentComp.java b/app/src/main/java/io/xpipe/app/comp/base/MultiContentComp.java index 5a231d408..d70f00a9d 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/MultiContentComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/MultiContentComp.java @@ -2,7 +2,6 @@ package io.xpipe.app.comp.base; import io.xpipe.app.comp.BaseRegionBuilder; import io.xpipe.app.comp.SimpleRegionBuilder; -import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.platform.PlatformThread; import javafx.application.Platform; diff --git a/app/src/main/java/io/xpipe/app/core/AppOpenArguments.java b/app/src/main/java/io/xpipe/app/core/AppOpenArguments.java index 186e26d8e..5b05b6e23 100644 --- a/app/src/main/java/io/xpipe/app/core/AppOpenArguments.java +++ b/app/src/main/java/io/xpipe/app/core/AppOpenArguments.java @@ -1,7 +1,6 @@ package io.xpipe.app.core; import io.xpipe.app.action.AbstractAction; -import io.xpipe.app.action.ActionProvider; import io.xpipe.app.action.LauncherUrlProvider; import io.xpipe.app.browser.action.impl.OpenDirectoryActionProvider; import io.xpipe.app.core.mode.AppOperationMode; @@ -86,7 +85,7 @@ public class AppOpenArguments { if (found.isPresent()) { AbstractAction a; try { - a = ((LauncherUrlProvider) found.get()).createAction(uri); + a = found.get().createAction(uri); } catch (Exception e) { ErrorEventFactory.fromThrowable(e).omit().expected().handle(); return List.of(); diff --git a/app/src/main/java/io/xpipe/app/core/AppTheme.java b/app/src/main/java/io/xpipe/app/core/AppTheme.java index 24d75dece..4977eca06 100644 --- a/app/src/main/java/io/xpipe/app/core/AppTheme.java +++ b/app/src/main/java/io/xpipe/app/core/AppTheme.java @@ -9,10 +9,6 @@ import io.xpipe.app.platform.PlatformThread; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.OsType; -import javafx.animation.Interpolator; -import javafx.animation.KeyFrame; -import javafx.animation.KeyValue; -import javafx.animation.Timeline; import javafx.application.Application; import javafx.application.ColorScheme; import javafx.application.Platform; @@ -21,12 +17,8 @@ import javafx.beans.value.ObservableValue; import javafx.collections.MapChangeListener; import javafx.css.PseudoClass; import javafx.scene.Node; -import javafx.scene.image.Image; -import javafx.scene.image.ImageView; -import javafx.scene.layout.Pane; import javafx.scene.paint.Color; import javafx.stage.Stage; -import javafx.util.Duration; import atlantafx.base.theme.*; import lombok.AllArgsConstructor; diff --git a/app/src/main/java/io/xpipe/app/cred/GpgAgentStrategy.java b/app/src/main/java/io/xpipe/app/cred/GpgAgentStrategy.java index 59b797ede..e6423708f 100644 --- a/app/src/main/java/io/xpipe/app/cred/GpgAgentStrategy.java +++ b/app/src/main/java/io/xpipe/app/cred/GpgAgentStrategy.java @@ -4,7 +4,6 @@ import io.xpipe.app.comp.base.TextFieldComp; import io.xpipe.app.core.AppSystemInfo; import io.xpipe.app.platform.OptionsBuilder; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.app.process.LocalShell; import io.xpipe.app.process.ShellControl; import io.xpipe.app.util.LicenseProvider; import io.xpipe.core.FilePath; diff --git a/app/src/main/java/io/xpipe/app/cred/OtherExternalAgentStrategy.java b/app/src/main/java/io/xpipe/app/cred/OtherExternalAgentStrategy.java index a8b3203bc..abaa6722e 100644 --- a/app/src/main/java/io/xpipe/app/cred/OtherExternalAgentStrategy.java +++ b/app/src/main/java/io/xpipe/app/cred/OtherExternalAgentStrategy.java @@ -56,7 +56,7 @@ public class OtherExternalAgentStrategy implements SshIdentityAgentStrategy { } @Override - public FilePath determinetAgentSocketLocation(ShellControl parent) throws Exception { + public FilePath determinetAgentSocketLocation(ShellControl parent) { return null; } diff --git a/app/src/main/java/io/xpipe/app/cred/PageantStrategy.java b/app/src/main/java/io/xpipe/app/cred/PageantStrategy.java index 5135e0e51..d3780ded6 100644 --- a/app/src/main/java/io/xpipe/app/cred/PageantStrategy.java +++ b/app/src/main/java/io/xpipe/app/cred/PageantStrategy.java @@ -5,7 +5,6 @@ import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.platform.OptionsBuilder; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.app.process.LocalShell; import io.xpipe.app.process.ShellControl; import io.xpipe.app.util.LocalExec; import io.xpipe.core.FilePath; @@ -96,7 +95,7 @@ public class PageantStrategy implements SshIdentityAgentStrategy { } @Override - public FilePath determinetAgentSocketLocation(ShellControl sc) throws Exception { + public FilePath determinetAgentSocketLocation(ShellControl sc) { if (sc.isLocal() && sc.getOsType() == OsType.WINDOWS) { return FilePath.of(getPageantWindowsPipe()); } diff --git a/app/src/main/java/io/xpipe/app/cred/PasswordManagerAgentStrategy.java b/app/src/main/java/io/xpipe/app/cred/PasswordManagerAgentStrategy.java index dd9571c9c..0c11eaddc 100644 --- a/app/src/main/java/io/xpipe/app/cred/PasswordManagerAgentStrategy.java +++ b/app/src/main/java/io/xpipe/app/cred/PasswordManagerAgentStrategy.java @@ -7,7 +7,6 @@ import io.xpipe.app.comp.base.LabelComp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ValidationException; import io.xpipe.app.platform.OptionsBuilder; -import io.xpipe.app.platform.Validator; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.process.CommandBuilder; import io.xpipe.app.process.ShellControl; @@ -18,8 +17,6 @@ import io.xpipe.core.FilePath; import io.xpipe.core.KeyValue; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; -import javafx.beans.property.ReadOnlyBooleanWrapper; -import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleStringProperty; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -113,7 +110,7 @@ public class PasswordManagerAgentStrategy implements SshIdentityAgentStrategy { } @Override - public FilePath determinetAgentSocketLocation(ShellControl parent) throws Exception { + public FilePath determinetAgentSocketLocation(ShellControl parent) { var config = getConfig(); return config != null ? FilePath.of(config.getDefaultSocketLocation()) : null; } diff --git a/app/src/main/java/io/xpipe/app/cred/SshAgentKeyList.java b/app/src/main/java/io/xpipe/app/cred/SshAgentKeyList.java index f603b211d..047730ad9 100644 --- a/app/src/main/java/io/xpipe/app/cred/SshAgentKeyList.java +++ b/app/src/main/java/io/xpipe/app/cred/SshAgentKeyList.java @@ -3,15 +3,11 @@ package io.xpipe.app.cred; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.process.CommandBuilder; -import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import lombok.Value; -import java.time.Instant; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.regex.Pattern; import java.util.stream.Collectors; diff --git a/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java b/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java index 8ecb8e451..d1a460995 100644 --- a/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java +++ b/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java @@ -4,7 +4,6 @@ import atlantafx.base.controls.Popover; import atlantafx.base.theme.Styles; import io.xpipe.app.comp.SimpleRegionBuilder; import io.xpipe.app.comp.base.ButtonComp; -import io.xpipe.app.comp.base.IconButtonComp; import io.xpipe.app.comp.base.InputGroupComp; import io.xpipe.app.comp.base.TextFieldComp; import io.xpipe.app.core.AppI18n; @@ -14,7 +13,6 @@ import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.ThreadHelper; import javafx.application.Platform; -import javafx.beans.property.Property; import javafx.beans.property.StringProperty; import javafx.beans.value.ObservableValue; import javafx.geometry.Insets; diff --git a/app/src/main/java/io/xpipe/app/cred/SshAgentTestComp.java b/app/src/main/java/io/xpipe/app/cred/SshAgentTestComp.java index 9137bc162..9bf35b7bb 100644 --- a/app/src/main/java/io/xpipe/app/cred/SshAgentTestComp.java +++ b/app/src/main/java/io/xpipe/app/cred/SshAgentTestComp.java @@ -4,8 +4,6 @@ import atlantafx.base.controls.Popover; import atlantafx.base.theme.Styles; import io.xpipe.app.comp.SimpleRegionBuilder; import io.xpipe.app.comp.base.ButtonComp; -import io.xpipe.app.comp.base.InputGroupComp; -import io.xpipe.app.comp.base.TextFieldComp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.platform.LabelGraphic; @@ -13,7 +11,6 @@ import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.ThreadHelper; import javafx.application.Platform; -import javafx.beans.property.StringProperty; import javafx.beans.value.ObservableValue; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -21,9 +18,6 @@ import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; -import org.kordamp.ikonli.javafx.FontIcon; - -import java.util.List; public class SshAgentTestComp extends SimpleRegionBuilder { diff --git a/app/src/main/java/io/xpipe/app/cred/SshIdentityAgentStrategy.java b/app/src/main/java/io/xpipe/app/cred/SshIdentityAgentStrategy.java index 7aa992736..e0dcc1d22 100644 --- a/app/src/main/java/io/xpipe/app/cred/SshIdentityAgentStrategy.java +++ b/app/src/main/java/io/xpipe/app/cred/SshIdentityAgentStrategy.java @@ -1,20 +1,7 @@ package io.xpipe.app.cred; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.xpipe.app.ext.ValidationException; -import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.process.CommandBuilder; -import io.xpipe.app.process.OsFileSystem; import io.xpipe.app.process.ShellControl; -import io.xpipe.app.secret.SecretNoneStrategy; -import io.xpipe.app.secret.SecretRetrievalStrategy; import io.xpipe.core.FilePath; -import io.xpipe.core.KeyValue; -import io.xpipe.core.OsType; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; public interface SshIdentityAgentStrategy extends SshIdentityStrategy { diff --git a/app/src/main/java/io/xpipe/app/ext/NetworkContainerStoreState.java b/app/src/main/java/io/xpipe/app/ext/NetworkContainerStoreState.java index b9cdc44c3..483e3f61e 100644 --- a/app/src/main/java/io/xpipe/app/ext/NetworkContainerStoreState.java +++ b/app/src/main/java/io/xpipe/app/ext/NetworkContainerStoreState.java @@ -1,6 +1,5 @@ package io.xpipe.app.ext; -import io.xpipe.app.process.ShellStoreState; import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryComp.java index e7ef2073f..ea5b650cf 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryComp.java @@ -11,7 +11,6 @@ import io.xpipe.app.platform.LabelGraphic; import io.xpipe.app.platform.MenuHelper; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; -import io.xpipe.app.storage.DataStoreCategoryConfig; import io.xpipe.app.storage.DataStoreColor; import io.xpipe.app.util.DesktopHelper; import io.xpipe.core.OsType; @@ -31,17 +30,13 @@ import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyEvent; import javafx.scene.input.MouseButton; -import javafx.scene.layout.Background; import javafx.scene.layout.HBox; import javafx.scene.layout.Region; -import javafx.scene.layout.StackPane; -import javafx.scene.paint.Color; import lombok.EqualsAndHashCode; import lombok.Value; import org.kordamp.ikonli.javafx.FontIcon; -import java.awt.*; import java.util.Arrays; import java.util.Comparator; import java.util.List; 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 0dd4bc4f3..e3876aea2 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 @@ -2,7 +2,6 @@ package io.xpipe.app.hub.comp; import io.xpipe.app.comp.RegionBuilder; import io.xpipe.app.comp.SimpleRegionBuilder; -import io.xpipe.app.comp.base.ChoiceComp; import io.xpipe.app.comp.base.ModalButton; import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.comp.base.ToggleGroupComp; @@ -11,20 +10,17 @@ import io.xpipe.app.ext.DataStore; import io.xpipe.app.platform.OptionsBuilder; 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 javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; -import javafx.scene.control.ListCell; import javafx.scene.control.ScrollPane; import javafx.scene.layout.Region; import lombok.AllArgsConstructor; import java.util.LinkedHashMap; -import java.util.function.Supplier; @AllArgsConstructor public class StoreCategoryConfigComp extends SimpleRegionBuilder { diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryFilterCompBar.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryFilterCompBar.java index b41530b8e..6d3f175a0 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryFilterCompBar.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryFilterCompBar.java @@ -1,15 +1,9 @@ package io.xpipe.app.hub.comp; -import atlantafx.base.theme.Styles; -import io.xpipe.app.comp.BaseRegionBuilder; import io.xpipe.app.comp.SimpleRegionBuilder; -import io.xpipe.app.comp.base.IconButtonComp; -import io.xpipe.app.comp.base.InputGroupComp; import io.xpipe.app.util.ObservableSubscriber; import javafx.scene.layout.Region; -import java.util.List; - public class StoreEntryFilterCompBar extends SimpleRegionBuilder { private final ObservableSubscriber filterTrigger; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListOverviewComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListOverviewComp.java index 06822fff1..b7d9dc4e0 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListOverviewComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListOverviewComp.java @@ -1,6 +1,5 @@ package io.xpipe.app.hub.comp; -import atlantafx.base.controls.Spacer; import io.xpipe.app.comp.BaseRegionBuilder; import io.xpipe.app.comp.RegionBuilder; import io.xpipe.app.comp.SimpleRegionBuilder; @@ -14,9 +13,7 @@ import io.xpipe.app.platform.MenuHelper; import io.xpipe.app.util.ObservableSubscriber; import io.xpipe.core.OsType; -import javafx.application.Platform; import javafx.beans.binding.Bindings; -import javafx.beans.property.SimpleStringProperty; import javafx.css.PseudoClass; import javafx.geometry.Insets; import javafx.geometry.Orientation; @@ -24,7 +21,6 @@ import javafx.geometry.Pos; import javafx.scene.control.Label; import javafx.scene.control.Separator; import javafx.scene.layout.HBox; -import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; import javafx.scene.text.TextAlignment; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterFieldComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterFieldComp.java index 41efdd454..6cd3f5f0b 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterFieldComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterFieldComp.java @@ -10,7 +10,6 @@ import io.xpipe.app.comp.base.IconButtonComp; import io.xpipe.app.comp.base.InputGroupComp; import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.core.AppOpenArguments; import io.xpipe.app.platform.PlatformThread; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.ObservableSubscriber; @@ -18,11 +17,8 @@ import javafx.beans.binding.Bindings; import javafx.geometry.Bounds; import javafx.scene.Cursor; import javafx.scene.input.KeyCode; -import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyEvent; import javafx.scene.layout.Region; -import javafx.stage.PopupWindow; -import lombok.val; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterState.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterState.java index 914b550d1..9ff7b3ca0 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterState.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterState.java @@ -2,7 +2,6 @@ package io.xpipe.app.hub.comp; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.type.TypeFactory; -import io.xpipe.app.action.AbstractAction; import io.xpipe.app.action.LauncherUrlProvider; import io.xpipe.app.action.QuickConnectProvider; import io.xpipe.app.core.AppCache; @@ -13,7 +12,6 @@ import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javafx.beans.value.ObservableBooleanValue; import javafx.beans.value.ObservableStringValue; -import javafx.collections.ObservableList; import lombok.Getter; import java.net.URI; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterStateComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterStateComp.java index e0663ccc6..4922b76dd 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterStateComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreFilterStateComp.java @@ -1,7 +1,6 @@ package io.xpipe.app.hub.comp; import atlantafx.base.theme.Styles; -import io.xpipe.app.action.LauncherUrlProvider; import io.xpipe.app.action.QuickConnectProvider; import io.xpipe.app.comp.RegionBuilder; import io.xpipe.app.comp.SimpleRegionBuilder; @@ -39,20 +38,21 @@ public class StoreFilterStateComp extends SimpleRegionBuilder { var searches = state.getRecentSearches().getList(); var searchesEmpty = Bindings.isEmpty(searches); - var searchesList = new ListBoxViewComp(searches, searches, s -> createButton(s, s), false); + var searchesList = new ListBoxViewComp<>(searches, searches, s -> createButton(s, s), false); var searchesPlaceholders = FXCollections.observableList(List.of(AppI18n.get("recentSearchesDescriptionNames"), AppI18n.get("recentSearchesDescriptionTags"), AppI18n.get("recentSearchesDescriptionTypes"))); - var searchesEmptyList = new ListBoxViewComp(searchesPlaceholders, searchesPlaceholders, s -> createButton(s, null), false); + var searchesEmptyList = new ListBoxViewComp<>(searchesPlaceholders, searchesPlaceholders, s -> createButton(s, null), false); var quickConnections = state.getRecentQuickConnections().getList(); var quickConnectionsEmpty = Bindings.isEmpty(quickConnections); - var quickConnectionsList = new ListBoxViewComp(quickConnections, quickConnections, s -> createButton(s, s), false); + var quickConnectionsList = new ListBoxViewComp<>(quickConnections, quickConnections, s -> createButton(s, s), false); var quickConnectionsPlaceholders = FXCollections.observableArrayList(QuickConnectProvider.getAll().stream() .map(p -> p.getPlaceholder()) .toList()); - var quickConnectionsEmptyList = new ListBoxViewComp(quickConnectionsPlaceholders, quickConnectionsPlaceholders, s -> createButton(s, s.split(" ")[0] + " "), false); + var quickConnectionsEmptyList = new ListBoxViewComp<>(quickConnectionsPlaceholders, quickConnectionsPlaceholders, + s -> createButton(s, s.split(" ")[0] + " "), false); var options = new OptionsBuilder() .addComp(new LabelComp(AppI18n.observable("recentSearches"))) diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreIconChoiceComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreIconChoiceComp.java index 4603e76e9..a79d01802 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreIconChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreIconChoiceComp.java @@ -8,7 +8,6 @@ import io.xpipe.app.icon.SystemIcon; import io.xpipe.app.icon.SystemIconManager; import io.xpipe.app.platform.LabelGraphic; import io.xpipe.app.platform.PlatformThread; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.BooleanScope; import io.xpipe.app.util.ThreadHelper; @@ -27,7 +26,6 @@ import lombok.Getter; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; import static atlantafx.base.theme.Styles.TEXT_SMALL; 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 40c92f5bd..0af71524b 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 @@ -4,7 +4,6 @@ import io.xpipe.app.comp.BaseRegionBuilder; import io.xpipe.app.comp.RegionBuilder; import io.xpipe.app.comp.SimpleRegionBuilder; import io.xpipe.app.comp.base.*; -import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.DataStore; import io.xpipe.app.storage.DataStoreEntryRef; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreNotesComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreNotesComp.java index cca7dcd4e..00bf3879e 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreNotesComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreNotesComp.java @@ -3,12 +3,9 @@ package io.xpipe.app.hub.comp; import io.xpipe.app.comp.*; import io.xpipe.app.comp.base.*; import io.xpipe.app.core.AppFontSizes; -import io.xpipe.app.platform.BindingsHelper; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.util.FileOpener; -import javafx.application.Platform; -import javafx.beans.property.Property; import javafx.beans.property.ReadOnlyStringWrapper; import javafx.beans.property.SimpleStringProperty; import javafx.scene.control.Button; diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreQuickConnect.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreQuickConnect.java index b8445eb7f..01515c47b 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreQuickConnect.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreQuickConnect.java @@ -2,34 +2,13 @@ package io.xpipe.app.hub.comp; import io.xpipe.app.action.QuickConnectProvider; import io.xpipe.app.core.AppCache; -import io.xpipe.app.core.AppI18n; -import io.xpipe.app.core.mode.AppOperationMode; import io.xpipe.app.ext.*; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.platform.DerivedObservableList; -import io.xpipe.app.platform.PlatformThread; -import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; -import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; -import io.xpipe.app.storage.StorageListener; -import io.xpipe.app.util.GlobalTimer; import io.xpipe.app.util.ThreadHelper; -import javafx.application.Platform; -import javafx.beans.Observable; -import javafx.beans.binding.Bindings; -import javafx.beans.property.*; -import javafx.beans.value.ObservableIntegerValue; -import javafx.beans.value.ObservableValue; -import javafx.collections.FXCollections; -import javafx.collections.ListChangeListener; -import lombok.Getter; -import org.apache.commons.lang3.StringUtils; -import java.time.Duration; import java.util.*; -import java.util.function.Predicate; -import java.util.stream.Collectors; public class StoreQuickConnect { diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreSection.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreSection.java index 529377794..8c96540c8 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreSection.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreSection.java @@ -18,7 +18,6 @@ import lombok.Getter; import java.util.ArrayList; import java.util.List; import java.util.Set; -import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; @Getter diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreSectionBaseComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreSectionBaseComp.java index 6557ca531..0d33e6508 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreSectionBaseComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreSectionBaseComp.java @@ -20,7 +20,6 @@ import javafx.scene.layout.VBox; import java.util.ArrayList; import java.util.Arrays; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; import java.util.function.Function; diff --git a/app/src/main/java/io/xpipe/app/platform/OptionsBuilder.java b/app/src/main/java/io/xpipe/app/platform/OptionsBuilder.java index 87c2482c7..3fb682fa2 100644 --- a/app/src/main/java/io/xpipe/app/platform/OptionsBuilder.java +++ b/app/src/main/java/io/xpipe/app/platform/OptionsBuilder.java @@ -75,7 +75,6 @@ public class OptionsBuilder { private BaseRegionBuilder lastCompHeadReference; private ObservableValue lastNameReference; private boolean focusFirstIncomplete = true; - private boolean focusEnabled = true; private final BooleanProperty mappingUpdate = new SimpleBooleanProperty(); diff --git a/app/src/main/java/io/xpipe/app/platform/PlatformState.java b/app/src/main/java/io/xpipe/app/platform/PlatformState.java index 101e48c48..d20dc874c 100644 --- a/app/src/main/java/io/xpipe/app/platform/PlatformState.java +++ b/app/src/main/java/io/xpipe/app/platform/PlatformState.java @@ -12,7 +12,6 @@ import javafx.scene.text.Font; import lombok.Getter; import lombok.Setter; import lombok.SneakyThrows; -import org.apache.commons.lang3.SystemUtils; import java.awt.*; import java.util.concurrent.CountDownLatch; diff --git a/app/src/main/java/io/xpipe/app/prefs/PasswordManagerTestComp.java b/app/src/main/java/io/xpipe/app/prefs/PasswordManagerTestComp.java index 8358faf38..a902aaaa9 100644 --- a/app/src/main/java/io/xpipe/app/prefs/PasswordManagerTestComp.java +++ b/app/src/main/java/io/xpipe/app/prefs/PasswordManagerTestComp.java @@ -15,7 +15,6 @@ import javafx.geometry.Pos; import javafx.scene.input.KeyCode; import javafx.scene.layout.Region; -import atlantafx.base.theme.Styles; import org.kordamp.ikonli.javafx.FontIcon; import java.time.Duration; 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 881239394..3ccfd6f61 100644 --- a/app/src/main/java/io/xpipe/app/pwman/DashlanePasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/DashlanePasswordManager.java @@ -1,31 +1,20 @@ package io.xpipe.app.pwman; import com.fasterxml.jackson.databind.JsonNode; -import io.xpipe.app.comp.base.ButtonComp; -import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.platform.OptionsBuilder; -import io.xpipe.app.platform.OptionsChoiceBuilder; import io.xpipe.app.prefs.PasswordManagerTestComp; import io.xpipe.app.process.*; import io.xpipe.app.terminal.TerminalLaunch; -import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.JacksonMapper; import com.fasterxml.jackson.annotation.JsonTypeName; -import javafx.application.Platform; import javafx.beans.property.Property; -import javafx.beans.property.SimpleObjectProperty; -import javafx.geometry.Insets; -import javafx.scene.layout.Region; import lombok.Builder; import lombok.extern.jackson.Jacksonized; -import org.kordamp.ikonli.javafx.FontIcon; -import java.util.List; import java.util.Optional; -import java.util.concurrent.atomic.AtomicReference; @JsonTypeName("dashlane") @Builder diff --git a/app/src/main/java/io/xpipe/app/pwman/HashicorpVaultPasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/HashicorpVaultPasswordManager.java index 8a690aa59..aa76213b5 100644 --- a/app/src/main/java/io/xpipe/app/pwman/HashicorpVaultPasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/HashicorpVaultPasswordManager.java @@ -1,6 +1,5 @@ package io.xpipe.app.pwman; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.JsonNode; @@ -14,9 +13,7 @@ import io.xpipe.app.platform.OptionsBuilder; import io.xpipe.app.platform.OptionsChoiceBuilder; import io.xpipe.app.prefs.PasswordManagerTestComp; import io.xpipe.app.process.*; -import io.xpipe.app.secret.SecretQueryState; import io.xpipe.app.terminal.TerminalLaunch; -import io.xpipe.app.util.AskpassAlert; import io.xpipe.app.util.HttpHelper; import io.xpipe.core.*; import javafx.beans.property.Property; @@ -26,15 +23,12 @@ import lombok.Builder; import lombok.Getter; import lombok.ToString; import lombok.Value; -import lombok.experimental.NonFinal; import lombok.extern.jackson.Jacksonized; import java.io.IOException; import java.net.URI; import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import java.nio.charset.StandardCharsets; -import java.time.Duration; import java.util.*; @Getter @@ -114,7 +108,7 @@ public class HashicorpVaultPasswordManager implements PasswordManager { InPlaceSecretValue token; @Override - public String retrieveToken(HashicorpVaultPasswordManager pwman) throws Exception { + public String retrieveToken(HashicorpVaultPasswordManager pwman) { if (token == null) { return null; } 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 bf7f8f454..f7f048017 100644 --- a/app/src/main/java/io/xpipe/app/pwman/PasswordManagerCommand.java +++ b/app/src/main/java/io/xpipe/app/pwman/PasswordManagerCommand.java @@ -10,7 +10,6 @@ import io.xpipe.app.platform.BindingsHelper; import io.xpipe.app.platform.MenuHelper; import io.xpipe.app.platform.OptionsBuilder; import io.xpipe.app.prefs.ExternalApplicationHelper; -import io.xpipe.app.process.LocalShell; import io.xpipe.app.process.ShellControl; import io.xpipe.app.process.ShellScript; import io.xpipe.app.storage.DataStorage; @@ -34,7 +33,7 @@ public class PasswordManagerCommand implements PasswordManager { ShellScript script; @Override - public boolean selectInitial() throws Exception { + public boolean selectInitial() { return false; } diff --git a/app/src/main/java/io/xpipe/app/pwman/PasswordManagerKeyStrategy.java b/app/src/main/java/io/xpipe/app/pwman/PasswordManagerKeyStrategy.java index cd649aa57..9cfd7b302 100644 --- a/app/src/main/java/io/xpipe/app/pwman/PasswordManagerKeyStrategy.java +++ b/app/src/main/java/io/xpipe/app/pwman/PasswordManagerKeyStrategy.java @@ -29,7 +29,7 @@ public interface PasswordManagerKeyStrategy { @Value @Builder - public class OptionsConfig { + class OptionsConfig { boolean allowSocketChoice; Path defaultSocketLocation; diff --git a/app/src/main/java/io/xpipe/app/pwman/ProtonPasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/ProtonPasswordManager.java index eb36baae4..ebefba156 100644 --- a/app/src/main/java/io/xpipe/app/pwman/ProtonPasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/ProtonPasswordManager.java @@ -1,8 +1,6 @@ package io.xpipe.app.pwman; import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.databind.JsonNode; -import io.xpipe.app.core.AppCache; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppSystemInfo; import io.xpipe.app.ext.ProcessControlProvider; @@ -12,21 +10,14 @@ import io.xpipe.app.platform.OptionsChoiceBuilder; import io.xpipe.app.prefs.PasswordManagerTestComp; import io.xpipe.app.process.*; import io.xpipe.app.terminal.TerminalLaunch; -import io.xpipe.app.util.DocumentationLink; -import io.xpipe.app.util.ThreadHelper; -import io.xpipe.core.JacksonMapper; import io.xpipe.core.OsType; import javafx.beans.property.*; -import javafx.collections.FXCollections; import lombok.Builder; import lombok.Getter; import lombok.extern.jackson.Jacksonized; import java.nio.file.Path; -import java.util.LinkedHashMap; import java.util.List; -import java.util.SequencedMap; -import java.util.regex.Pattern; @JsonTypeName("protonPass") @Builder 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 21017f3b2..10061b476 100644 --- a/app/src/main/java/io/xpipe/app/pwman/PsonoPasswordManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/PsonoPasswordManager.java @@ -120,7 +120,7 @@ public class PsonoPasswordManager implements PasswordManager { .sensitive(); var r = JacksonMapper.getDefault().readTree(cmd.readStdoutOrThrow()); var username = Optional.of(r.required("username")).filter(n -> !n.isNull()).map(JsonNode::textValue).orElse(null); - var password = Optional.of(r.required("password")).filter(n -> !n.isNull()).map(JsonNode::textValue).orElse(null);; + var password = Optional.of(r.required("password")).filter(n -> !n.isNull()).map(JsonNode::textValue).orElse(null); return Result.of(Credentials.of(username, password), null); } catch (Exception e) { ErrorEventFactory.fromThrowable(e).handle(); diff --git a/app/src/main/java/io/xpipe/app/pwman/WindowsCredentialManager.java b/app/src/main/java/io/xpipe/app/pwman/WindowsCredentialManager.java index 0b13b3e10..1af8f72f4 100644 --- a/app/src/main/java/io/xpipe/app/pwman/WindowsCredentialManager.java +++ b/app/src/main/java/io/xpipe/app/pwman/WindowsCredentialManager.java @@ -8,8 +8,6 @@ import io.xpipe.app.process.LocalShell; import com.fasterxml.jackson.annotation.JsonTypeName; import javafx.beans.property.Property; import lombok.Builder; -import lombok.Getter; -import lombok.Value; import lombok.extern.jackson.Jacksonized; @JsonTypeName("windowsCredentialManager") @@ -25,7 +23,7 @@ public class WindowsCredentialManager implements PasswordManager { } @Override - public boolean selectInitial() throws Exception { + public boolean selectInitial() { return false; } diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubManager.java b/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubManager.java index 8a9f4da45..87288ca70 100644 --- a/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubManager.java +++ b/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubManager.java @@ -20,10 +20,7 @@ import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.collections.ListChangeListener; -import javafx.stage.Screen; import lombok.Getter; -import org.kordamp.ikonli.Ikon; -import org.kordamp.ikonli.Ikonli; import org.kordamp.ikonli.javafx.FontIcon; import org.kordamp.ikonli.materialdesign2.MaterialDesignC; diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalDockView.java b/app/src/main/java/io/xpipe/app/terminal/TerminalDockView.java index 8c39ed75e..33fb713ac 100644 --- a/app/src/main/java/io/xpipe/app/terminal/TerminalDockView.java +++ b/app/src/main/java/io/xpipe/app/terminal/TerminalDockView.java @@ -7,7 +7,6 @@ import io.xpipe.app.util.GlobalTimer; import io.xpipe.app.util.Rect; import io.xpipe.app.util.ThreadHelper; -import lombok.Getter; import java.time.Duration; import java.util.HashSet; diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalPaneConfiguration.java b/app/src/main/java/io/xpipe/app/terminal/TerminalPaneConfiguration.java index 646b12499..254e8be90 100644 --- a/app/src/main/java/io/xpipe/app/terminal/TerminalPaneConfiguration.java +++ b/app/src/main/java/io/xpipe/app/terminal/TerminalPaneConfiguration.java @@ -7,8 +7,6 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.process.*; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; -import io.xpipe.app.util.LicenseProvider; -import io.xpipe.app.util.LicenseRequiredException; import io.xpipe.core.FilePath; import io.xpipe.core.OsType; diff --git a/app/src/main/java/io/xpipe/app/vnc/ExternalVncClient.java b/app/src/main/java/io/xpipe/app/vnc/ExternalVncClient.java index 171aa6715..44252ae4c 100644 --- a/app/src/main/java/io/xpipe/app/vnc/ExternalVncClient.java +++ b/app/src/main/java/io/xpipe/app/vnc/ExternalVncClient.java @@ -3,7 +3,6 @@ package io.xpipe.app.vnc; import io.xpipe.app.ext.PrefsValue; import io.xpipe.app.platform.ClipboardHelper; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.app.rdp.*; import io.xpipe.core.OsType; import com.fasterxml.jackson.annotation.JsonTypeInfo; 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 bde10596b..dbfb2e085 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 @@ -11,7 +11,6 @@ import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; -import java.util.Collections; import java.util.List; @Value 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 8f637ac1e..d6779749d 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 @@ -8,7 +8,6 @@ import io.xpipe.app.hub.comp.SystemStateComp; import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleObjectProperty; -import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentityStore.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentityStore.java index ee16ffe09..d0377bc7f 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentityStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentityStore.java @@ -1,20 +1,13 @@ package io.xpipe.ext.base.identity; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.core.AppCache; import io.xpipe.app.cred.SshIdentityStrategy; import io.xpipe.app.cred.UsernameStrategy; -import io.xpipe.app.ext.DataStoreDependencies; -import io.xpipe.app.ext.InternalCacheDataStore; import io.xpipe.app.ext.StatefulDataStore; -import io.xpipe.app.ext.ValidationException; import io.xpipe.app.issue.ErrorEventFactory; -import io.xpipe.app.secret.EncryptedValue; import io.xpipe.app.secret.SecretRetrievalStrategy; import io.xpipe.app.storage.DataStorage; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.util.Validators; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.Value; @@ -81,7 +74,7 @@ public class MultiIdentityStore extends IdentityStore implements StatefulDataSto } @Override - public void checkComplete() throws Throwable { + public void checkComplete() { getSelectedOrThrow(); } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentityStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentityStoreProvider.java index f4cf55bb1..b3e0205f2 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentityStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentityStoreProvider.java @@ -1,26 +1,15 @@ package io.xpipe.ext.base.identity; -import io.xpipe.app.cred.NoIdentityStrategy; -import io.xpipe.app.cred.SshIdentityStrategyChoiceConfig; import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.hub.comp.StoreListChoiceComp; import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.platform.OptionsBuilder; -import io.xpipe.app.platform.OptionsChoiceBuilder; -import io.xpipe.app.secret.EncryptedValue; -import io.xpipe.app.secret.SecretNoneStrategy; -import io.xpipe.app.secret.SecretRetrievalStrategy; -import io.xpipe.app.secret.SecretStrategyChoiceConfig; -import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.util.DocumentationLink; import javafx.beans.property.Property; import javafx.beans.property.SimpleListProperty; -import javafx.beans.property.SimpleObjectProperty; -import javafx.beans.property.SimpleStringProperty; import javafx.collections.FXCollections; import java.util.ArrayList; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentitySwitchBranchProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentitySwitchBranchProvider.java index 27f18c787..1e6e86dc3 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentitySwitchBranchProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/MultiIdentitySwitchBranchProvider.java @@ -6,7 +6,6 @@ import io.xpipe.app.hub.action.HubLeafProvider; import io.xpipe.app.hub.action.HubMenuItemProvider; import io.xpipe.app.hub.action.StoreActionCategory; import io.xpipe.app.platform.LabelGraphic; -import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.ThreadHelper; import javafx.beans.property.ReadOnlyStringWrapper; 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 a92c663e5..907ad1f68 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 @@ -184,7 +184,7 @@ public class PasswordManagerIdentityStore extends IdentityStore } @Override - public List configOptions(ShellControl sc) throws Exception { + public List configOptions(ShellControl sc) { var r = retrieve(); if (r == null || r.getSshKey() == null || r.getSshKey().getPrivateKey() == null) { return List.of(); 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 91613e41a..f32729beb 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 @@ -2,13 +2,11 @@ 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.platform.OptionsBuilder; import io.xpipe.app.platform.OptionsChoiceBuilder; import io.xpipe.app.platform.Validator; -import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.VaultAuthentication; import io.xpipe.app.secret.EncryptedValue; import io.xpipe.app.secret.SecretNoneStrategy; 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 3d1e93ab9..77fe3891a 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 @@ -81,7 +81,7 @@ public class ScriptStoreSetup { FilePath dir; @Override - public Optional terminalContent(ShellControl shellControl) throws Exception { + public Optional terminalContent(ShellControl shellControl) { if (dir == null) { dir = initScriptsDirectory(shellControl, finalBringFlattened); } 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 a7e4fc944..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,7 +1,6 @@ package io.xpipe.ext.base.service; import io.xpipe.app.ext.DataStore; -import io.xpipe.app.ext.DataStoreDependencies; import io.xpipe.app.ext.GroupStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.Validators; @@ -13,8 +12,6 @@ import lombok.ToString; import lombok.experimental.FieldDefaults; import lombok.experimental.SuperBuilder; -import java.util.List; - @Getter @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE) @SuperBuilder diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/connectionsCategory_icon-16-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/connectionsCategory_icon-16-dark.png index b6af3232199f87d972a840648bfcc45a4ab1c6c3..aa3f4daa01a548686336c0183ee82612f9abada0 100644 GIT binary patch delta 344 zcmV-e0jK_`1IGi9cz-%cL_t(Ijiu8+N&`U@$MNsmKcq-03lV~iAi)C&l0c?N;~n%6 z9za4Y)C*W>ZQ~V!$Q;0+HexA=WHtnBgpC`PXOl!s;%*?X8XmmQydTVnsF z-F|S+1+xg#veqWeX0ucTSZnudwHgb6h#aV@Uj!sc@-jXD0aW!E$cu1mjJW}D&MgJr zMC4yURX^u@GoaV&g`VfV=dCUxyVlyOG3IIkNYgX`4)cIX^?^m8+wFcg8jYj8N#FNV zW6bN)2(4DDJW(Exp9^mP0IExYdcFQ-t=%lxAe-+603wpcaU28i7 qs;44yHy8}kRREv_oB_zX-}wixqjAvmyp2r&0000EE delta 313 zcmV-90mlBv1E>R#cz+v7L_t(IjjfYCO2j}M#ox>%8&-qj%A#u_X>6i+0V^AYE$p`P z0D`9ocm$jE3IRJWU}I~!#bgp#kj1ZLvzRSnoUscD7MZB8d&T?xzxb0VicY1JV*u-D zr<4$KVMr;*jIp8PIFmMM&bdn|y@L=UX<50H5F#;3H}ctF$A3D~3C=dw9^f4p08j#Y z+xDs=pZ7X|-RG<~1(F&d-s~>7()>&ZF#US^D9yj^VBhmQ@2PdG6U+M4o`c2nWKO=ztrEe?SB2B@!mB$R8CxOZc0Khud3vzUu0E7I{odJ^{ z00mqTrOYM(F*3~8()@J?6u_Kw?zRmFL2v+IPQoxeQA*w5m+$-yXWMV1Q6EO}00000 LNkvXXu0mjfi=K~F diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/connectionsCategory_icon-16.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/connectionsCategory_icon-16.png index 476dd3869ab8ca0c3c3a78696b60f3c898d754ec..2c1f1a68124fa96dd5035bb95f25e25cfe4cd560 100644 GIT binary patch delta 336 zcmV-W0k8hK1HS{1cz-fUL_t(Ijir;lN&`_4g}>RoCdI9V2qI)JSXc)^LjFqML2GLt zz{Wy-0Sm2ddm5hiS6ilCL2weRE^!xpvMx$|9)ES21D30To+ywP{-HOOl z5x{%@0c_?1dP%+Bce~x*C<3Hun$CL$Ktx8)x%D`XKZ^iURVo#0tu@&Mr>c7AoEt3z iu-2A=GXPojoPPoBaC*hn+*-^40000 delta 330 zcmV-Q0k!_W1Gxi`cz-NOL_t(Ijh)l6PQp+W2H^i(3Z|h6kpvZEOli1@Y5E2%Oc)&; zU3>r^!@vAJ8fFPY}J*L8^k>T~Y+2gVwwIId};nX=3iQ_`nVC^K!q> z`|=+5nj}uMDih=7IF8SonUxJ33Y+KUhMxzms1MMh^zDnX>JW&({VHn<#^!p5)b5-DH zz6jgd*>Po79|VCmHa0TgIM19qWV+q%gIcZjxD3#0wcY}k#(Pr$@C^vd06=fDF$MU( zzX@!X1g2^V*nivGy9Qh@5|U-vR=eFkSO}1`3fwOO0K33qfOGC;mSyjXq*p4H*E8oP z8%dIUcFw&i0;Fl`b-P_JNs_}(r}Jelu(Y(aF6nL&VC>yB;Kf`((!QDPmH{M1lfD1) zncf4|iiAiy^nL&KLV%=;z-kcyI5%tJq+i7&;7O76ByvfP{{)QgP2cyAfTJS731!M} zGMBI5gQTh=0_@(XMnIFskaan*`$`3Ko;yD)<2Z0JUoI zoqeQjzA%`y3L*xpW?{j+>Mi11xoj{f>OBS(bQe|_M*YPD^L@jd;moL5EY?L)G%INk zXvR;@C2b^0G9P}xr+`&6EBT;HYBRH$TrNlWvGdh@K0oOL{(qS`j?K)51KyA2#3vlU z%#MNPz&E%uVP&Cde5X^EX?206mLA_M^&i$0kZRCmBQ64@b>Ihq^awn-@PqfY-%=&G zUhJC$yxpk3Z*u$WR`&LmtP89$)9`${(*0CZa9^%3WU`F82p)Le1ctuW{{D#4G*}BV zuX`>qy>R)X;Cybm=LCN_rJKdxm6`&Xbr>3T5yDWd6p|!acmu2;b_ZbgQ7Hfb002ovPDHLkV1m86x26C9 diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/connectionsCategory_icon-24.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/connectionsCategory_icon-24.png index 7091b59b44d1709706e92d31f5bee4cabdda5005..c37139e512fc5bc967fb0ec92c2a803d0855e0bb 100644 GIT binary patch delta 525 zcmV+o0`mRr1NsDzcz^9lL_t(YiM`daYZFl%2k`Ir<=SjwpwPuZxPx01M1n|%O9CzE z=Fs5c-yo>iS!WkPgwnkr2K@t?Av9#nBw8sK6BR@wK@cRE_U?UMOo&Mna#!kid+)*b zb3g95M@cx#IOB_aKEKrK^)6(yS*9(t)_w`Ya4=kRIDzMRw|^z=063Sn{BM4f+-kL2 z&qjdn`zuiteU|hvo6WxH_xm<&dnS`vC%J2kxe|uqfdc?>9A5?yx7+RKr+j(uz@_oMDL~RM zl3&vRlD<#wO@9IPdVL$fb{gQMOaaAWal=}BBT0$1cBj#394-V%S|fQs31E!b1F#qX z;I*U=NdN$EW*tlcj^q5W*1k;$td>fpRmX8U)oS(UTp)^~EdX~D0sw%)V6X|`)m%W* zdy;!;007@6H~#-;8U(>TlA8&8I{W+kcNPLjx&YP^0)M$#2UCDC<`ICWN!p_*I+_cR z9Nn9>TCE45mjpN=wAKm$hQH-c0M2`!=bf?`zVEL9xCr1QFm`3SuDc81rlh(tX6DHA zBFO=8UD9Ev(^;1kj{uT%UH6u?_A1GxGyut1(m^hld)aI@kN=tAtnvq%KF&L_iay=| P0000L_t(YiM^IRFGN8UhMzMoN}HRgP~FHXwvcS1mmpF50cdF? zi`qxEHBqRjMXAtGt29X1Y-3R-L;3k_~f)LIxQ9ge)2EBe4XGF>&!Cr)w&86DFm&G`sqZX3uK2t6A-cnPHE*4huj z-Pw2r2zH~|Kjczruj`)PE+1IW%hPMEHu;h(Na?9|^19$7cae33S?8 z`ejv&?F0K>f?x9QLw3L|Fc=yvsR-OeX0{_~DM=DSKKj7Cq-sM zDt2(yr7j}k;;4f|XtxfEgJ4I&MT)DFAt_E`i-KFFlptno1-R zOYR=Ie}ijlYe^CL0^o8dU=31c=9`vf&DRQbD<~o_v4{H!;3+fza2#hhXjN}-?*tXrTlv)CiWahMGSqp&ckVGPp z1b_&DQm1hMV1HRw1;9K2Xsw59^#h<%N&^59Ii1G2;s5|M>ssN+DRw89%c=44aqTtZ zN7CtZ(?#(F8e^VpZEd~wpH!bhp>W0+^RH1a^f&6z13kBRXJ_YqUteE7XvEyyT*VmE zu;&RJ8ynjIun~Z%F4=6hY0ndw&*z7=)))Q6F!N?Mn}3}@esV9KKq8tDkzD(%y3hOu z;99Hm-F--uQrr8FLcWEFHcv9|3Cv_N(*UO161AD`-r{1h_z-{z5>TyHUyP29E;Z|W z0s-6*k^4TI>H$4HuK+X!cJ~&G$R`o`6R^SdY99BvH49+YSI!C3-CJBN7T*SRNIn~5 z?zS@M34dhf7!eKlW2#GktApLW#aio0W}fl;OGV^wtFxZKk&%%_0E=yl+DPcP*!{?iwu`pl zDu^KHSgH;pbP+p=v`#|wfAD3J;BG{4aOnl}B6W!EQb`4)r03_*TY}OY47rzcggnbl z@+=?jbFv&ENvG49v)0}Q&I2>}Ne^g<$fGEV>Hq@JY&Mrg=)Im`ZS&pJ;MUpr7 zIw_i}S~JFc_Mx)Yo)(dtKruniNvqYW0~df#{eJ&kxm^D41Gk?zjtlvG{sV9Zs2ldq z9IE=%Hx8gwD($FhE%{n84F3>cJedy4M)I67UK#(8DR9ypa+SvxUtKpsB~yX$zPmbK z8&x}jh*lM@q<@b3Ge?1uz~Cni9_XCdu)CtjvrGj8*>crRV0Z2EIGaL8byR z&WWACjVBkkf$da5VNkl<{JAVL{0YF5Obyw}daUAXNu@WuqC?Zk;0M~VEmj6$&HzZX$o!0z%f=IDg zY`ZAF!13|%M#Kh^v#l^p^YO()N#~$dr#no!{ol+X^)2R!HYahiRB`FwsBz-&*P9@F1joXuwMi%2$1fa|)?3Wb8*uI>vIk!t|% z2Cni%)3lcW+5-D~i$&z4QtEe@0FuA_>YYyUJb?K?MaN8kZ*eA*d4q5c$){W{ce|U$ zPVe9;l7BM$JZDW6LG0ADA)LhV$Rw|W0-S+wdbGcjzK&fX@4~hL2*MTH=4%^~@Ie}Dhp`uh5AeXP|bx@nqY vByWny#fWTW5m~Tp`)hNdB`{8j{b%MMP{QS*c)|+U00000NkvXXu0mjfMPpJr delta 542 zcmV+(0^$9%28soccYgu>NklAcds>AoQZK*{k}=>}=*ErN22HXM zuRst%(4~kjMCeBBO1y#SJ-F52-W0(_6KOy*_*smbN-Bs=o!3RDSfz7n$P8zMJe!%} zUCa-jGiPx|R26`7x!g3y+yu@53;4+h=&0(0FbvxOqN-FXm48K5z3U0JS5#FO!!TTu zQmNE5#yp7!Z$zXOMbTRyDq~DZRj&cZV`Ni;AZP=1;B}!;INj^@zWKoI#9CV%kH;^8 z3eYxeuQ^2Ip>G^Ozu(^wkyiXzHT?b{K6o zqA%8ZjaJg!34a7r1HG6wYIj8B5ReGWeZ{#4IxALKniF}HC16YCi)-!#u656?0;{Qt zCQR-to&l$ga}6Fj*}kEe3t0k0wDYlBzmqiIZ=<%LwX{*Y6Tx?J#!;j>XrJ0hR$&^{TbD=+CqrYi%(;Wd-Qu`Un_k# gf%}8O;1?OdFNWi+6ugI}Pyhe`07*qoM6N<$g5V(swg3PC diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/connectionsCategory_icon-80-dark.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/connectionsCategory_icon-80-dark.png index 1f2db0ffdb99b0553ed21b2e68b2b9378fc1c2b2..f0a8a45e724fef85f8a6474f1039860474a0abea 100644 GIT binary patch delta 1152 zcmV-`1b_SG2GsBV|)$IVij(-&>#0nH*1q!hOh1}Lo zt?&B}0(gX(PbsBNF!MmCf^~sE0bFI~&m713FrUwR2kAryIgP1Ss}C^qTL4Z8L-q*pE>FTz!5z?F^Lr@#0nJB z&W{QIV|8^kH#$1n7hl56%uFp!Kas$pp`mZ<_4-|sZDfUwjg6DDv$Jly{rY0>=_Xd7 z5GzoK6@Mti3KSxmg#kQAM8}OJ=`zh`Gx1mFR)_>vDwR(p{rdqsgoRjvLaaa`qGRCN z+S)5hDaTZpPNB8FJU>7GaVNGd5=cZZGqZFiKMXDb=!if&goRjvLaaa`R-h2+1n?6P zW&Rd7A__XSZRw@lQMuhM5j%v1Sb;*UKq0A*fq(1k>!U<8V=_!P*xlXzZgFw(*R=gp z3)EVd|GST_r*RzT831pm?Qe&$5GzoK6)40C6k-JmNj(cIr7k;;bHZepZqRHtwn}`iGqu2lg@s=Lyk;;^T6v5S$# z3e4y8KNC^-$(>Q(_a8HuFVk#pZXO5lM1QzVYyEXxZPFgt0PsMPIl&bh98hncL|AqawD&+{Jgeg8{lJ{x|I zh?d62#{P-x*K+wg-}f&7IBzy;&++}hz`#AJ1OiZ==e)Wu@)DIz)t;F{TNnP-KFPPdW=9B>Ix00@Gh$jnbO^TPnj0B$!BGD|c7`~l!o zW`3_&EPj5FP6rkkB?yAyTCLVM=Z2+H>2K^UFxeKV1zPs7*TO=qKp|G3kbeOO$~viM S@dN$<0000lzLPPb`^l`1 zH7$udw3H(MshkwQWKt`4K&as*m(#UQ-bu?JS?sfk;9-+rl368mAl#rb)u;Q!^~_oG zWOcr+KVaf3&bTMKbd{A;kzwEC&kp_xvzF;I{1Doyz3I5`B>S!tU%8C?WG1n@KH+Fs zIq9(EN%6-(<2;KFS#EEsU$iGz(DLrf61#bG=l=ctzu%@##q(0e)~Ms2aSR_$99Zb! zGR?zI_uS6KD)#5U<}p|3buF5|s@r;>#q(vJbU$$+ND|Z384jvy0iB#7MlWwyBz(NQ z@|b+Ddb?y=h>gITxShLd);zxaTKB`jyU#X@toik=U$}hJGed^?Kfl}(3PaKiWLD%S z|JyY=mQ$^1v-24vE2Da~eQWPAt*`%(#r0rL{{Ogx(>4eRuQoBThPPMxbKT)wNH5zOSj;%j)O%V583A=zV`5vz+8(&~Mz<0(UCJ;(NCx{)qjV zV;l0LzSK7HSxxj_)_=bqUcAp(^ZNGw@D25_hTjP+f@C*{`a_?;D)_($b&G-JcsgIp(Ps(4CWJ-UkB zbCQY2Ii71C|AZJKPS3TznzgkrTzsvZ$?UVjCwzAaPu%L@681@b@}38CHV2-tol|^S zsc7Gm3teB@F05m&&?^5RcGCE6-uFj!vL|M!crLz~Gw;R8)93x~avUyrw!g>mp4!jm z-crYX?f)d69CW;s&s4E{Q_I(9y&7HjnAz6t08)$}tQrm-s9ns@IEVZ2hW}MR^39ba z+&-EX?hmdqZo1?ztI~Y-?Ahs_=O)h)o~YjN>wiPt{5xuup)S`LfLZB>>&>?Y|JaH* VnVSAovf0M~1fH&bF6*2UngAaG)K>ri diff --git a/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/connectionsCategory_icon-80.png b/ext/base/src/main/resources/io/xpipe/ext/base/resources/img/connectionsCategory_icon-80.png index 890f3c5861434fd458b72f588fe2c1b4c9307ccc..3aee47645dea4ec6a7e97360618b31acd4802124 100644 GIT binary patch delta 1179 zcmV;M1Z4Z@2!aZbcYg$RNklUu&8(vPhLbtL|9~1WDyZo&^@>(@!&x$o&<{^B{78_7V)4JtVtSES1qjAuH7c= zcJg~3yiCI+P3KLTKYgFu{PN!L&8PWgX407-F*B6#m|h1MbbnN!5EUpy1qxAtLSmg3 zX0zE?wOW1581n=(rvMyh=6Dyg9VkTf4}h!8yui#~Rw|YCj`}(|jd5M~Q6l;XKuVZ% zP^b~nha)2+?<_Ab-)dL5r@)DciB|z!#NnLoi=O8_S*=z#S{1aF;=1nB06y5OZism( z7K_bgv)Ptkb$=~Cfv)SGAfgh0G2gHS@HsQj8Dsv4HfwLO){X+0CZd-BobbO!M6Z-e zrAtA5Ed@?aPF`f@*L*`a0h}$D%kvRs?n|borta`OZyvxI-|#hKOrlsU-fXT9oSH;L z%>0ahjG505yF36`Sy}np7;_dt%{P1}GiQV90|mOSn|}b1@D0^#wc6$AV)i%1V(}_~ zFZ^TH+6RJa0|i=ZPd4v!eSLj9ns|c&GymYH-Bijx*ZSTnnljW}4qKGmi$< z9oEy6$WVboRG^TKe@qBsc6Rp2=H}*5{1KLxmg-^pL;|VVRG<(QC`5D=HpaZn%txaN(@TsoEq`@xhe%*9m-|N2KMd#; z7NP=$s6Zj2@4%UvnYXO9PE=vK$dy8&@O3wKEE34fZxWGc9|r+5Uk1<>fjWhSs6Zhq zP>2c?B02yNQF%aaal6*79g76!^ZCPayIV_i3V#bxfkITEkkH?O*=+V0Gv6O&m|oCm zG=5%OTwDv=A6lTb_B4QjzunDooEHIn9JXJlun-j}LtQd1vVOu zBY#A6ca&kejkR`c@2dTwQ&@-!6ruu!s6Zj14VVRG^SRfy{iXY5TT=iPKl?de6p~z$KtsEql_u@Rpm&WCr0b ztjJ*IQ~qshZQx>LfdUhW#BTunPwpJs*nik~DzbEaPAZi;N<_~#4Sye08z?ZB%X!TF zRnzdLWHLGQx3gt3nYib9p8)Xxzo+gvPT*5nEth^8A0I#EIL?pQeX@O>h~Bl<&aJMl zRwGN@2c*;Kv3kA!Fo3tQd)X%dc)wgOp9|`1yZoK&x)+G(d~`7fl3$E5_Z5r9e}98s zY%7q6Ofs4Ll!%_|TD<<|cL0x+%jI8N6|_AMWM*5bRGw$%*8$v!I$fVL&&+4q$pboE z0u%s}$>d$em=^#%4&XF^+vOSi3J<`a0KT=>epabezU!o^V}Z@2)9JCTt*xOsH(Xm= tyUxsZzkQ(vD*vO`!a`J_5EUroKNL{=Xh=sm!N>pr002ovPDHLkV1oEBEkghR delta 1023 zcmZqTdciTFyq@{Cr;B4q#hkZu?Q^74C63L1E~R8H#9|~67*P|?*5-X>ik?eSW0*(4 z6~8s1;$aS1KaDRMi3EmfT6-s^c1mMK5oK2{t-P+zj>em_E2XJo5HzDMPsD zx{eb;lT=PCO?u{^6t|%Gohm~&!?RT?!E=st(%cXl(_Ir^>o$iVX9;F&XLtp7H39Iz~BIB;EKdU^Ac^9=u1X*^l+VM)gu zR)feQ9o5PWmtV%nDDTwfIb825@-(;O#K)B@SDuerdu{H2`}Z#dT`yK_zisRFNvGks zQ9F}hq{`0zvuU4AC&fRjGH2K$aQtIcX`%ac1D@v|b^YwBOa~S=JegS2+#zFL`G11S zNvV^-|&rbQXYt)^}IiS({TlV0X*;y~21wz6rj<9GMHUgQG4DY*b z|9|Mov$tPvI<`qlP4V8pJ$~P_%dd1ll=YvV9P{n1ysAcx>;ZARz1v!*&Tvpw3+Utw zNn!#q@7>+j z+Ee={vN3SkiLz9io;TzY_#=3r7>oaQYc&G6&bIC#O^ z4u({w$jYu?0R_SfEGE{!`FQHl6&}Hp{zm&G8FtKCJ7G@$qKrMeBEBkgEh?P!`KHuK zZN`SFcXm#`oA*7V^x`YW_1CT2?kuqujO27l(X2N*xj9kdmd2CcEr}NDO6gvFx`GGR z8SsQNo_WT1Po;9v#f&-kS29a3){uJtwd(l0)2Gk-$9hjn`M1Bv@t(p@;hYMdqG|sm zp8V6Ocz)+MgJ1Z}4afF~AOCpV;h89qa%Z^56dFB7iq13u3ZSzm9lZRErU7koXZ2iypS8=E7r%fGe7$UqTJz2f!cH$jo`x+JT T6PEuu7=Xaj)z4*}Q$iB}GbrrV 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 aa802aaea..b8db1385a 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 @@ -1,8 +1,6 @@ package io.xpipe.ext.system.incus; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import io.xpipe.app.ext.ContainerStoreState; import io.xpipe.app.ext.NetworkContainerStoreState; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.process.*; @@ -17,7 +15,6 @@ import lombok.Value; import java.util.*; import java.util.function.Consumer; import java.util.function.Supplier; -import java.util.stream.Collectors; public class IncusCommandView extends CommandViewBase { 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 3791a3d5b..49073fdf1 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 @@ -4,7 +4,6 @@ import io.xpipe.app.comp.BaseRegionBuilder; import io.xpipe.app.ext.ContainerStoreState; import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.GuiDialog; -import io.xpipe.app.ext.ShellStore; import io.xpipe.app.hub.comp.*; import io.xpipe.app.platform.BindingsHelper; import io.xpipe.app.platform.OptionsBuilder; @@ -14,7 +13,6 @@ import io.xpipe.ext.base.identity.IdentityChoiceBuilder; import io.xpipe.ext.base.store.ShellStoreProvider; import javafx.beans.property.Property; -import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.SimpleObjectProperty; 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 f8d96e3dd..10aa1060c 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 @@ -1,8 +1,6 @@ package io.xpipe.ext.system.lxd; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import io.xpipe.app.ext.ContainerStoreState; import io.xpipe.app.ext.NetworkContainerStoreState; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.process.*; @@ -17,7 +15,6 @@ import lombok.Value; import java.util.*; import java.util.function.Consumer; import java.util.function.Supplier; -import java.util.stream.Collectors; public class LxdCommandView extends CommandViewBase { 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 218e450c6..c6e2e84d2 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 @@ -4,7 +4,6 @@ import io.xpipe.app.comp.BaseRegionBuilder; import io.xpipe.app.ext.ContainerStoreState; import io.xpipe.app.ext.DataStore; import io.xpipe.app.ext.GuiDialog; -import io.xpipe.app.ext.ShellStore; import io.xpipe.app.hub.comp.*; import io.xpipe.app.platform.BindingsHelper; import io.xpipe.app.platform.OptionsBuilder; @@ -14,7 +13,6 @@ import io.xpipe.ext.base.identity.IdentityChoiceBuilder; import io.xpipe.ext.base.store.ShellStoreProvider; import javafx.beans.property.Property; -import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; diff --git a/img/base/connectionsCategory_icon-dark.svg b/img/base/connectionsCategory_icon-dark.svg index 9a82bf1dd..7f789e4cf 100644 --- a/img/base/connectionsCategory_icon-dark.svg +++ b/img/base/connectionsCategory_icon-dark.svg @@ -15,16 +15,16 @@ xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">.cls-1{fill:#606161;}identityidentity + width="130.2903" + height="16.287502" + x="38.743805" + y="51.056995" /> diff --git a/img/base/connectionsCategory_icon.svg b/img/base/connectionsCategory_icon.svg index f84047eaa..8cd0201ab 100644 --- a/img/base/connectionsCategory_icon.svg +++ b/img/base/connectionsCategory_icon.svg @@ -22,9 +22,9 @@ inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" - inkscape:zoom="0.69729115" - inkscape:cx="-114.72969" - inkscape:cy="169.94336" + inkscape:zoom="2.7891646" + inkscape:cx="98.595831" + inkscape:cy="115.98455" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="-8" @@ -36,27 +36,32 @@ id="style2411">.cls-1{fill:#606161;}identityidentity + width="130.2903" + height="16.287502" + x="38.743805" + y="51.056995" />