From 218d7e39dbbb3ad492a58867e89c8f6e227af75d Mon Sep 17 00:00:00 2001 From: crschnick Date: Tue, 24 Jun 2025 22:17:08 +0000 Subject: [PATCH] Reformat --- .../xpipe/app/action/ActionConfirmComp.java | 5 --- .../xpipe/app/action/ActionJacksonMapper.java | 3 +- .../xpipe/app/action/ActionShortcutComp.java | 12 +++---- .../app/beacon/impl/ActionExchangeImpl.java | 1 - .../beacon/impl/CategoryInfoExchangeImpl.java | 3 +- .../impl/CategoryQueryExchangeImpl.java | 3 +- .../impl/CategoryRemoveExchangeImpl.java | 3 +- .../impl/ConnectionQueryExchangeImpl.java | 3 +- .../impl/SecretDecryptExchangeImpl.java | 7 ++-- .../impl/SecretEncryptExchangeImpl.java | 7 ++-- .../app/browser/action/BrowserAction.java | 1 - .../browser/file/BrowserBreadcrumbBar.java | 4 ++- .../app/browser/file/BrowserFileOutput.java | 4 +-- .../file/BrowserFileSystemTabModel.java | 3 +- .../app/browser/file/BrowserTransferComp.java | 6 ++-- .../browser/file/BrowserTransferModel.java | 10 +++--- .../menu/MultiExecuteMenuProvider.java | 7 ++-- .../menu/impl/NewItemMenuProvider.java | 36 +++++++++++++++---- .../menu/impl/compress/ZipActionProvider.java | 23 +++++++++--- .../io/xpipe/app/comp/base/OptionsComp.java | 3 +- .../xpipe/app/comp/base/SideMenuBarComp.java | 2 +- .../app/core/check/AppGnomeScaleDialog.java | 6 ++-- .../java/io/xpipe/app/ext/ShellSession.java | 3 +- .../ext/SingletonSessionStoreProvider.java | 5 ++- .../app/hub/action/BatchStoreAction.java | 8 +++-- .../app/hub/action/MultiStoreAction.java | 7 ++-- .../hub/action/impl/ToggleActionProvider.java | 1 + .../xpipe/app/hub/comp/StoreCreationComp.java | 23 +++++++----- .../io/xpipe/app/hub/comp/StoreEntryComp.java | 3 +- .../io/xpipe/app/hub/comp/StoreViewState.java | 3 +- .../java/io/xpipe/app/issue/ErrorAction.java | 2 -- .../io/xpipe/app/issue/GuiErrorHandler.java | 16 +++++---- .../xpipe/app/storage/DataStorageQuery.java | 1 - .../io/xpipe/app/storage/StandardStorage.java | 10 +++--- .../io/xpipe/app/util/AppJacksonModule.java | 1 - .../io/xpipe/app/util/ExclusiveValidator.java | 1 - .../io/xpipe/app/util/SimpleValidator.java | 1 - app/src/main/java/module-info.java | 3 +- .../io/xpipe/beacon/api/ActionExchange.java | 2 +- .../beacon/api/CategoryInfoExchange.java | 3 +- .../beacon/api/CategoryQueryExchange.java | 1 + .../beacon/api/CategoryRemoveExchange.java | 1 + .../beacon/api/SecretDecryptExchange.java | 3 +- .../beacon/api/SecretEncryptExchange.java | 3 +- .../io/xpipe/core/process/ShellControl.java | 3 +- .../core/process/WrapperShellControl.java | 3 +- .../java/io/xpipe/core/store/FileNames.java | 1 - .../java/io/xpipe/core/store/FilePath.java | 3 +- .../PasswordManagerIdentityStore.java | 3 +- .../PasswordManagerIdentityStoreProvider.java | 2 -- .../ext/base/identity/UsernameStrategy.java | 30 ++++++++-------- ext/base/src/main/java/module-info.java | 12 ++++--- 52 files changed, 187 insertions(+), 123 deletions(-) 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 d247e5dfa..bc4991dd8 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionConfirmComp.java +++ b/app/src/main/java/io/xpipe/app/action/ActionConfirmComp.java @@ -2,8 +2,6 @@ package io.xpipe.app.action; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; -import io.xpipe.app.core.AppFont; -import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.hub.action.BatchStoreAction; import io.xpipe.app.hub.action.MultiStoreAction; import io.xpipe.app.hub.action.StoreAction; @@ -18,11 +16,8 @@ import javafx.collections.FXCollections; import javafx.scene.control.Label; import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.GridPane; -import javafx.scene.layout.Priority; import javafx.scene.layout.Region; -import atlantafx.base.theme.Styles; - import java.util.List; import java.util.Map; 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 aee0711bf..f579bb22b 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionJacksonMapper.java +++ b/app/src/main/java/io/xpipe/app/action/ActionJacksonMapper.java @@ -1,7 +1,5 @@ package io.xpipe.app.action; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.SerializationFeature; import io.xpipe.app.hub.action.BatchStoreAction; import io.xpipe.app.hub.action.MultiStoreAction; import io.xpipe.app.hub.action.StoreAction; @@ -9,6 +7,7 @@ import io.xpipe.core.store.DataStore; import io.xpipe.core.util.JacksonMapper; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java b/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java index c80a374aa..2c2b723e7 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java +++ b/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java @@ -10,7 +10,6 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.update.AppDistributionType; import io.xpipe.app.util.*; -import javafx.beans.binding.Bindings; import javafx.beans.property.Property; import javafx.beans.property.SimpleStringProperty; import javafx.scene.layout.Region; @@ -33,7 +32,8 @@ public class ActionShortcutComp extends SimpleComp { protected Region createSimple() { var options = new OptionsBuilder(); options.nameAndDescription("actionDesktopShortcut").addComp(createDesktopComp()); - options.nameAndDescription(AppDistributionType.get().isSupportsUrls() ? "actionUrlShortcut" : "actionUrlShortcutDisabled") + options.nameAndDescription( + AppDistributionType.get().isSupportsUrls() ? "actionUrlShortcut" : "actionUrlShortcutDisabled") .addComp(createUrlComp()) .disable(!AppDistributionType.get().isSupportsUrls()); options.nameAndDescription("actionApiCall").addComp(createApiComp()); @@ -93,10 +93,10 @@ public class ActionShortcutComp extends SimpleComp { prop.bind(text); var copyButton = new ButtonComp(null, new FontIcon("mdi2c-clipboard-multiple-outline"), () -> { - if (action.getValue() instanceof SerializableAction sa) { - ClipboardHelper.copyUrl(sa.toNode().toPrettyString()); - } - }) + if (action.getValue() instanceof SerializableAction sa) { + ClipboardHelper.copyUrl(sa.toNode().toPrettyString()); + } + }) .grow(false, true) .tooltipKey("copyBody"); var field = new TextFieldComp(prop, true); diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/ActionExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/ActionExchangeImpl.java index 3d60d32af..913ace5d9 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/ActionExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/ActionExchangeImpl.java @@ -25,7 +25,6 @@ public class ActionExchangeImpl extends ActionExchange { return Response.builder().build(); } - private boolean checkPermission() { var cache = AppCache.getBoolean("externalActionPermitted", false); if (cache) { diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/CategoryInfoExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/CategoryInfoExchangeImpl.java index cc4d0d70e..53f65117d 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/CategoryInfoExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/CategoryInfoExchangeImpl.java @@ -1,11 +1,12 @@ package io.xpipe.app.beacon.impl; -import com.sun.net.httpserver.HttpExchange; import io.xpipe.app.storage.DataStorage; import io.xpipe.beacon.BeaconClientException; import io.xpipe.beacon.api.CategoryInfoExchange; import io.xpipe.core.util.JacksonMapper; +import com.sun.net.httpserver.HttpExchange; + import java.util.ArrayList; import java.util.UUID; diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/CategoryQueryExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/CategoryQueryExchangeImpl.java index 99e320dd9..f79dd0de4 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/CategoryQueryExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/CategoryQueryExchangeImpl.java @@ -1,10 +1,11 @@ package io.xpipe.app.beacon.impl; -import com.sun.net.httpserver.HttpExchange; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStorageQuery; import io.xpipe.beacon.api.CategoryQueryExchange; +import com.sun.net.httpserver.HttpExchange; + public class CategoryQueryExchangeImpl extends CategoryQueryExchange { @Override diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/CategoryRemoveExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/CategoryRemoveExchangeImpl.java index 85f96c079..3085fad4f 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/CategoryRemoveExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/CategoryRemoveExchangeImpl.java @@ -1,11 +1,12 @@ package io.xpipe.app.beacon.impl; -import com.sun.net.httpserver.HttpExchange; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.beacon.BeaconClientException; import io.xpipe.beacon.api.CategoryRemoveExchange; +import com.sun.net.httpserver.HttpExchange; + import java.util.ArrayList; import java.util.UUID; diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/ConnectionQueryExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/ConnectionQueryExchangeImpl.java index 4286168ab..37dfdc5f1 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/ConnectionQueryExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/ConnectionQueryExchangeImpl.java @@ -10,7 +10,8 @@ public class ConnectionQueryExchangeImpl extends ConnectionQueryExchange { @Override public Object handle(HttpExchange exchange, Request msg) { - var found = DataStorageQuery.queryEntry(msg.getCategoryFilter(), msg.getConnectionFilter(), msg.getTypeFilter()); + var found = + DataStorageQuery.queryEntry(msg.getCategoryFilter(), msg.getConnectionFilter(), msg.getTypeFilter()); return Response.builder() .found(found.stream().map(entry -> entry.getUuid()).toList()) .build(); diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/SecretDecryptExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/SecretDecryptExchangeImpl.java index 30b7b220c..0be181103 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/SecretDecryptExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/SecretDecryptExchangeImpl.java @@ -1,10 +1,11 @@ package io.xpipe.app.beacon.impl; -import com.sun.net.httpserver.HttpExchange; import io.xpipe.app.storage.DataStorageSecret; import io.xpipe.beacon.BeaconClientException; import io.xpipe.beacon.api.SecretDecryptExchange; +import com.sun.net.httpserver.HttpExchange; + import java.io.IOException; public class SecretDecryptExchangeImpl extends SecretDecryptExchange { @@ -16,8 +17,6 @@ public class SecretDecryptExchangeImpl extends SecretDecryptExchange { throw new BeaconClientException("Unable to parse secret"); } - return Response.builder() - .decrypted(new String(secret.getSecret())) - .build(); + return Response.builder().decrypted(new String(secret.getSecret())).build(); } } diff --git a/app/src/main/java/io/xpipe/app/beacon/impl/SecretEncryptExchangeImpl.java b/app/src/main/java/io/xpipe/app/beacon/impl/SecretEncryptExchangeImpl.java index 0cd2e04d5..e073538d1 100644 --- a/app/src/main/java/io/xpipe/app/beacon/impl/SecretEncryptExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/beacon/impl/SecretEncryptExchangeImpl.java @@ -1,17 +1,16 @@ package io.xpipe.app.beacon.impl; -import com.sun.net.httpserver.HttpExchange; import io.xpipe.app.storage.DataStorageSecret; import io.xpipe.beacon.api.SecretEncryptExchange; import io.xpipe.core.util.InPlaceSecretValue; +import com.sun.net.httpserver.HttpExchange; + public class SecretEncryptExchangeImpl extends SecretEncryptExchange { @Override public Object handle(HttpExchange exchange, Request msg) { var secret = DataStorageSecret.ofCurrentSecret(InPlaceSecretValue.of(msg.getValue())); - return Response.builder() - .encrypted(secret.serialize(true)) - .build(); + return Response.builder().encrypted(secret.serialize(true)).build(); } } 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 2e2fb0234..980d7e216 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 @@ -6,7 +6,6 @@ import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.hub.action.StoreAction; -import io.xpipe.core.store.FileEntry; import io.xpipe.core.store.FilePath; import io.xpipe.core.store.FileSystemStore; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserBreadcrumbBar.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserBreadcrumbBar.java index 07f2f4be4..4c2dd8979 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserBreadcrumbBar.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserBreadcrumbBar.java @@ -27,7 +27,9 @@ public class BrowserBreadcrumbBar extends SimpleComp { @Override protected Region createSimple() { Callback, ButtonBase> crumbFactory = crumb -> { - var name = crumb.getValue().equals("/") ? "/" : FilePath.of(crumb.getValue()).getFileName(); + var name = crumb.getValue().equals("/") + ? "/" + : FilePath.of(crumb.getValue()).getFileName(); var btn = new Button(name, null); btn.setMnemonicParsing(false); btn.setFocusTraversable(false); diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOutput.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOutput.java index f623bf0d5..fb37f29db 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOutput.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOutput.java @@ -26,9 +26,7 @@ public interface BrowserFileOutput { } @Override - public void onFinish() { - - } + public void onFinish() {} }; } 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 4fb2a1f9c..a9af996b0 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 @@ -158,7 +158,8 @@ public final class BrowserFileSystemTabModel extends BrowserStoreSessionTab entries) throws Exception { - refreshFileEntriesSync(entries.stream().map(BrowserEntry::getRawFileEntry).collect(Collectors.toList())); + refreshFileEntriesSync( + entries.stream().map(BrowserEntry::getRawFileEntry).collect(Collectors.toList())); } public void refreshFileEntriesSync(List entries) throws Exception { diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java index 6e3098194..40c5d9c49 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java @@ -69,8 +69,10 @@ public class BrowserTransferComp extends SimpleComp { return entry.getFileName(); } - var hideProgress = - sourceItem.get().getDownloadFinished().get(); + var hideProgress = sourceItem + .get() + .getDownloadFinished() + .get(); var share = p.getTransferred() * 100 / p.getTotal(); var progressSuffix = hideProgress ? "" : " " + share + "%"; return entry.getFileName() + progressSuffix; 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 83f6bc3d1..e0b9ba8a9 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 @@ -86,8 +86,9 @@ public class BrowserTransferModel { public void clear(boolean delete) { List toClear; synchronized (items) { - toClear = - items.stream().filter(item -> item.getDownloadFinished().get()).toList(); + toClear = items.stream() + .filter(item -> item.getDownloadFinished().get()) + .toList(); if (toClear.isEmpty()) { return; } @@ -172,8 +173,9 @@ public class BrowserTransferModel { public void transferToDownloads() throws Exception { List toMove; synchronized (items) { - toMove = - items.stream().filter(item -> item.getDownloadFinished().get()).toList(); + toMove = items.stream() + .filter(item -> item.getDownloadFinished().get()) + .toList(); if (toMove.isEmpty()) { return; } 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 890fa6ca6..040c53cb1 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 @@ -36,8 +36,7 @@ public abstract class MultiExecuteMenuProvider implements BrowserMenuBranchProvi model.openTerminalSync( entry.getRawFileEntry().getName(), model.getCurrentDirectory() != null - ? model.getCurrentDirectory() - .getPath() + ? model.getCurrentDirectory().getPath() : null, cmd, entries.size() == 1); @@ -93,8 +92,8 @@ public abstract class MultiExecuteMenuProvider implements BrowserMenuBranchProvi } sc.command(cmd) - .withWorkingDirectory(model.getCurrentDirectory() - .getPath()) + .withWorkingDirectory( + model.getCurrentDirectory().getPath()) .execute(); } model.refreshBrowserEntriesSync(entries); 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 b716a3b0e..13ee67f10 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 @@ -67,8 +67,16 @@ public class NewItemMenuProvider implements BrowserMenuBranchProvider { return; } - var fixedFiles = entries.stream().map(browserEntry -> browserEntry.getRawFileEntry().getKind() == FileKind.DIRECTORY ? - browserEntry.getRawFileEntry().getPath() : browserEntry.getRawFileEntry().getPath().getParent()) + var fixedFiles = entries.stream() + .map(browserEntry -> + browserEntry.getRawFileEntry().getKind() == FileKind.DIRECTORY + ? browserEntry + .getRawFileEntry() + .getPath() + : browserEntry + .getRawFileEntry() + .getPath() + .getParent()) .toList(); var builder = NewFileActionProvider.Action.builder(); builder.initFiles(model, fixedFiles); @@ -106,8 +114,16 @@ public class NewItemMenuProvider implements BrowserMenuBranchProvider { return; } - var fixedFiles = entries.stream().map(browserEntry -> browserEntry.getRawFileEntry().getKind() == FileKind.DIRECTORY ? - browserEntry.getRawFileEntry().getPath() : browserEntry.getRawFileEntry().getPath().getParent()) + var fixedFiles = entries.stream() + .map(browserEntry -> + browserEntry.getRawFileEntry().getKind() == FileKind.DIRECTORY + ? browserEntry + .getRawFileEntry() + .getPath() + : browserEntry + .getRawFileEntry() + .getPath() + .getParent()) .toList(); var builder = NewDirectoryActionProvider.Action.builder(); builder.initFiles(model, fixedFiles); @@ -150,8 +166,16 @@ public class NewItemMenuProvider implements BrowserMenuBranchProvider { return; } - var fixedFiles = entries.stream().map(browserEntry -> browserEntry.getRawFileEntry().getKind() == FileKind.DIRECTORY ? - browserEntry.getRawFileEntry().getPath() : browserEntry.getRawFileEntry().getPath().getParent()) + var fixedFiles = entries.stream() + .map(browserEntry -> + browserEntry.getRawFileEntry().getKind() == FileKind.DIRECTORY + ? browserEntry + .getRawFileEntry() + .getPath() + : browserEntry + .getRawFileEntry() + .getPath() + .getParent()) .toList(); var builder = NewLinkActionProvider.Action.builder(); builder.initFiles(model, fixedFiles); 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 3e133dbdf..9cbecc867 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 @@ -35,10 +35,15 @@ public class ZipActionProvider implements BrowserActionProvider { var sc = model.getFileSystem().getShell().orElseThrow(); if (sc.getOsType() == OsType.WINDOWS) { var base = model.getCurrentDirectory().getPath(); - var command = CommandBuilder.of().add("Compress-Archive", "-Force", "-DestinationPath").addFile(target).add("-Path"); + var command = CommandBuilder.of() + .add("Compress-Archive", "-Force", "-DestinationPath") + .addFile(target) + .add("-Path"); for (int i = 0; i < getEntries().size(); i++) { - var rel = getEntries().get(i).getRawFileEntry().getPath().relativize(base); - if (getEntries().get(i).getRawFileEntry().getKind() == FileKind.DIRECTORY && directoryContentOnly) { + var rel = + getEntries().get(i).getRawFileEntry().getPath().relativize(base); + if (getEntries().get(i).getRawFileEntry().getKind() == FileKind.DIRECTORY + && directoryContentOnly) { command.addQuoted(rel.toDirectory().toWindows() + "*"); } else { command.addFile(rel.toWindows()); @@ -59,7 +64,10 @@ public class ZipActionProvider implements BrowserActionProvider { var command = CommandBuilder.of().add("zip", "-q", "-y", "-r", "-"); for (BrowserEntry entry : getEntries()) { var base = target.getParent(); - var rel = entry.getRawFileEntry().getPath().relativize(base).toUnix(); + var rel = entry.getRawFileEntry() + .getPath() + .relativize(base) + .toUnix(); if (entry.getRawFileEntry().getKind() == FileKind.DIRECTORY && directoryContentOnly) { command.add("."); } else { @@ -69,7 +77,12 @@ public class ZipActionProvider implements BrowserActionProvider { command.add(">").addFile(target); if (directoryContentOnly) { - sc.command(command).withWorkingDirectory(getEntries().getFirst().getRawFileEntry().getPath()).execute(); + sc.command(command) + .withWorkingDirectory(getEntries() + .getFirst() + .getRawFileEntry() + .getPath()) + .execute(); } else { sc.command(command).execute(); } diff --git a/app/src/main/java/io/xpipe/app/comp/base/OptionsComp.java b/app/src/main/java/io/xpipe/app/comp/base/OptionsComp.java index 3e5392bc2..c616ac319 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/OptionsComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/OptionsComp.java @@ -5,10 +5,9 @@ import io.xpipe.app.comp.CompStructure; import io.xpipe.app.comp.SimpleCompStructure; import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.util.BindingsHelper; -import io.xpipe.app.util.Check; import io.xpipe.app.util.Hyperlinks; - import io.xpipe.app.util.Validator; + import javafx.application.Platform; import javafx.beans.Observable; import javafx.beans.binding.Bindings; diff --git a/app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java b/app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java index 5f8c72514..4bfd5d5ea 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java @@ -11,8 +11,8 @@ import io.xpipe.app.update.AppDistributionType; import io.xpipe.app.update.UpdateAvailableDialog; import io.xpipe.app.util.Hyperlinks; import io.xpipe.app.util.PlatformThread; - import io.xpipe.app.util.ThreadHelper; + import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; diff --git a/app/src/main/java/io/xpipe/app/core/check/AppGnomeScaleDialog.java b/app/src/main/java/io/xpipe/app/core/check/AppGnomeScaleDialog.java index e679da791..608f92c92 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppGnomeScaleDialog.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppGnomeScaleDialog.java @@ -42,9 +42,9 @@ public class AppGnomeScaleDialog { return; } - var content = AppDialog.dialogText("You are running XPipe with a high display scaling on a Wayland system." + - " Due to xwayland limitations, this might result in a blurry window." + - " See below for a possible fix."); + var content = AppDialog.dialogText("You are running XPipe with a high display scaling on a Wayland system." + + " Due to xwayland limitations, this might result in a blurry window." + + " See below for a possible fix."); var modal = ModalOverlay.of("waylandScalingTitle", content); modal.addButton(ModalButton.ok(() -> { AppCache.update("gnomeScaleNoticeShown", true); diff --git a/app/src/main/java/io/xpipe/app/ext/ShellSession.java b/app/src/main/java/io/xpipe/app/ext/ShellSession.java index 476d3290f..189adc41b 100644 --- a/app/src/main/java/io/xpipe/app/ext/ShellSession.java +++ b/app/src/main/java/io/xpipe/app/ext/ShellSession.java @@ -27,7 +27,8 @@ public class ShellSession extends Session { try { shellControl.start(); - var supportsAliveCheck = shellControl.getShellDialect().getDumbMode().supportsAnyPossibleInteraction(); + var supportsAliveCheck = + shellControl.getShellDialect().getDumbMode().supportsAnyPossibleInteraction(); if (supportsAliveCheck) { startAliveListener(); } diff --git a/app/src/main/java/io/xpipe/app/ext/SingletonSessionStoreProvider.java b/app/src/main/java/io/xpipe/app/ext/SingletonSessionStoreProvider.java index e9f27e85d..218255850 100644 --- a/app/src/main/java/io/xpipe/app/ext/SingletonSessionStoreProvider.java +++ b/app/src/main/java/io/xpipe/app/ext/SingletonSessionStoreProvider.java @@ -41,7 +41,10 @@ public interface SingletonSessionStoreProvider extends DataStoreProvider { var t = new StoreToggleComp(null, g, sec, enabled, newState -> { SingletonSessionStore s = sec.getWrapper().getEntry().getStore().asNeeded(); if (s.isSessionEnabled() != newState) { - var action = ToggleActionProvider.Action.builder().ref(sec.getWrapper().getEntry().ref()).enabled(newState).build(); + var action = ToggleActionProvider.Action.builder() + .ref(sec.getWrapper().getEntry().ref()) + .enabled(newState) + .build(); action.executeAsync(); } }); 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 969b6acee..1d097dfba 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 @@ -24,8 +24,12 @@ public final class BatchStoreAction extends SerializableAct @Override public String getShortcutName() { - var names = actions.size() > 3 ? actions.size() + "..." : actions.stream().map(a -> DataStorage.get().getStoreEntryDisplayName(a.getRef().get())).collect( - Collectors.joining(", ")); + var names = actions.size() > 3 + ? actions.size() + "..." + : actions.stream() + .map(a -> DataStorage.get() + .getStoreEntryDisplayName(a.getRef().get())) + .collect(Collectors.joining(", ")); return names + " (" + getDisplayName() + ")"; } 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 04c0bf0fb..36d98f3b2 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 @@ -26,8 +26,11 @@ public abstract class MultiStoreAction extends Serializable @Override public String getShortcutName() { - var names = refs.size() > 3 ? refs.size() + "..." : refs.stream().map(ref -> DataStorage.get().getStoreEntryDisplayName(ref.get())).collect( - Collectors.joining(", ")); + var names = refs.size() > 3 + ? refs.size() + "..." + : refs.stream() + .map(ref -> DataStorage.get().getStoreEntryDisplayName(ref.get())) + .collect(Collectors.joining(", ")); return names + " (" + getDisplayName() + ")"; } diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/ToggleActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/ToggleActionProvider.java index a0977a1b0..47a72a50d 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/impl/ToggleActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/ToggleActionProvider.java @@ -3,6 +3,7 @@ package io.xpipe.app.hub.action.impl; import io.xpipe.app.action.ActionProvider; import io.xpipe.app.ext.SingletonSessionStore; 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/comp/StoreCreationComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationComp.java index 0d70cf034..161835b75 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationComp.java @@ -35,17 +35,22 @@ public class StoreCreationComp extends ModalOverlayContentComp { private Region createStoreProperties(Comp providerComp, Validator providerVal, Validator propVal) { var nameKey = model.storeTypeNameKey(); - var built = new OptionsBuilder(propVal).addComp(providerComp, model.getStore()).name(nameKey + "Name").description( - nameKey + "NameDescription").addString(model.getName(), false).nonNull().check( - val -> Validator.create(val, AppI18n.observable("readOnlyStoreError"), model.getName(), s -> { - var same = s != null && model.getExistingEntry() != null && DataStorage.get().getEffectiveReadOnlyState( - model.getExistingEntry()) && s.equals(model.getExistingEntry().getName()); + var built = new OptionsBuilder(propVal) + .addComp(providerComp, model.getStore()) + .name(nameKey + "Name") + .description(nameKey + "NameDescription") + .addString(model.getName(), false) + .nonNull() + .check(val -> Validator.create(val, AppI18n.observable("readOnlyStoreError"), model.getName(), s -> { + var same = s != null + && model.getExistingEntry() != null + && DataStorage.get().getEffectiveReadOnlyState(model.getExistingEntry()) + && s.equals(model.getExistingEntry().getName()); return !same; - })).buildComp(); + })) + .buildComp(); var comp = new OptionsComp(built.getEntries(), new ChainedValidator(List.of(providerVal, propVal))); - return comp - .styleClass("store-creator-options") - .createRegion(); + return comp.styleClass("store-creator-options").createRegion(); } private Region createLayout() { diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryComp.java index cd7ffd1f0..1a43251d4 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryComp.java @@ -372,7 +372,8 @@ public abstract class StoreEntryComp extends SimpleComp { items.add(item); } - if (cat == StoreActionCategory.CONFIGURATION && getWrapper().getEntry().getValidity() != DataStoreEntry.Validity.LOAD_FAILED) { + if (cat == StoreActionCategory.CONFIGURATION + && getWrapper().getEntry().getValidity() != DataStoreEntry.Validity.LOAD_FAILED) { var rename = new MenuItem(AppI18n.get("rename"), new FontIcon("mdal-edit")); rename.setOnAction(event -> { name.requestFocus(); diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreViewState.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreViewState.java index b1ba5f3b4..fcbf5faaa 100644 --- a/app/src/main/java/io/xpipe/app/hub/comp/StoreViewState.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreViewState.java @@ -318,7 +318,8 @@ public class StoreViewState { // Some entries might already be removed again var wrappers = Arrays.stream(entry) .map(StoreEntryWrapper::new) - .filter(storeEntryWrapper -> DataStorage.get().getStoreEntries().contains(storeEntryWrapper.getEntry())) + .filter(storeEntryWrapper -> + DataStorage.get().getStoreEntries().contains(storeEntryWrapper.getEntry())) .toList(); wrappers.forEach(StoreEntryWrapper::update); diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorAction.java b/app/src/main/java/io/xpipe/app/issue/ErrorAction.java index 03eddb508..e8cdacb96 100644 --- a/app/src/main/java/io/xpipe/app/issue/ErrorAction.java +++ b/app/src/main/java/io/xpipe/app/issue/ErrorAction.java @@ -4,8 +4,6 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.Hyperlinks; import io.xpipe.core.util.FailableSupplier; -import java.util.function.Supplier; - public interface ErrorAction { static ErrorAction openDocumentation(String link) { diff --git a/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java b/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java index 0709e38cf..3badd9135 100644 --- a/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java +++ b/app/src/main/java/io/xpipe/app/issue/GuiErrorHandler.java @@ -5,7 +5,6 @@ import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.util.LabelGraphic; import io.xpipe.app.util.LicenseProvider; import io.xpipe.app.util.LicenseRequiredException; -import io.xpipe.app.util.ThreadHelper; import java.time.Duration; import java.util.stream.Stream; @@ -29,11 +28,16 @@ public class GuiErrorHandler extends GuiErrorHandlerBase implements ErrorHandler if (event.isOmitted()) { ErrorAction.ignore().handle(event); if (AppLayoutModel.get() != null) { - AppLayoutModel.get().showQueueEntry( - new AppLayoutModel.QueueEntry(AppI18n.observable("errorOccurred"), new LabelGraphic.IconGraphic("mdoal-error_outline"), - () -> { - handleGui(event); - }), Duration.ofSeconds(10), true); + AppLayoutModel.get() + .showQueueEntry( + new AppLayoutModel.QueueEntry( + AppI18n.observable("errorOccurred"), + new LabelGraphic.IconGraphic("mdoal-error_outline"), + () -> { + handleGui(event); + }), + Duration.ofSeconds(10), + true); } return; } diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorageQuery.java b/app/src/main/java/io/xpipe/app/storage/DataStorageQuery.java index 01fe7723b..6fb82095b 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorageQuery.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorageQuery.java @@ -19,7 +19,6 @@ public class DataStorageQuery { return found; } - public static List queryCategory(String categoryFilter) { if (DataStorage.get() == null) { return List.of(); diff --git a/app/src/main/java/io/xpipe/app/storage/StandardStorage.java b/app/src/main/java/io/xpipe/app/storage/StandardStorage.java index 952dbda51..b91e79a45 100644 --- a/app/src/main/java/io/xpipe/app/storage/StandardStorage.java +++ b/app/src/main/java/io/xpipe/app/storage/StandardStorage.java @@ -312,10 +312,12 @@ public class StandardStorage extends DataStorage { filterPerUserEntries(storeEntries.keySet()); // Only add new stores if really necessary - laterAddedEntries.stream().filter(dataStoreEntry -> storeEntries.containsKey(dataStoreEntry)).forEach(e -> { - storeEntries.remove(e); - addStoreEntryIfNotPresent(e); - }); + laterAddedEntries.stream() + .filter(dataStoreEntry -> storeEntries.containsKey(dataStoreEntry)) + .forEach(e -> { + storeEntries.remove(e); + addStoreEntryIfNotPresent(e); + }); deleteLeftovers(); 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 f1dfed2b0..4b9fbb0da 100644 --- a/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java +++ b/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java @@ -1,6 +1,5 @@ package io.xpipe.app.util; -import io.xpipe.app.ext.LocalStore; import io.xpipe.app.pwman.PasswordManager; import io.xpipe.app.storage.*; import io.xpipe.app.terminal.ExternalTerminalType; diff --git a/app/src/main/java/io/xpipe/app/util/ExclusiveValidator.java b/app/src/main/java/io/xpipe/app/util/ExclusiveValidator.java index c12b85c01..bb3155eac 100644 --- a/app/src/main/java/io/xpipe/app/util/ExclusiveValidator.java +++ b/app/src/main/java/io/xpipe/app/util/ExclusiveValidator.java @@ -11,7 +11,6 @@ import net.synedra.validatorfx.ValidationResult; import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.Map; public final class ExclusiveValidator implements Validator { diff --git a/app/src/main/java/io/xpipe/app/util/SimpleValidator.java b/app/src/main/java/io/xpipe/app/util/SimpleValidator.java index 2a7c49827..e2d7c6822 100644 --- a/app/src/main/java/io/xpipe/app/util/SimpleValidator.java +++ b/app/src/main/java/io/xpipe/app/util/SimpleValidator.java @@ -14,7 +14,6 @@ import net.synedra.validatorfx.ValidationResult; import java.util.Collection; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; public class SimpleValidator implements Validator { diff --git a/app/src/main/java/module-info.java b/app/src/main/java/module-info.java index 98b9915af..42d19d3f7 100644 --- a/app/src/main/java/module-info.java +++ b/app/src/main/java/module-info.java @@ -139,7 +139,8 @@ open module io.xpipe.app { OpenFileWithMenuProvider, OpenDirectoryMenuProvider, OpenDirectoryInNewTabMenuProvider, - ScanHubLeafProvider, RefreshActionProvider, + ScanHubLeafProvider, + RefreshActionProvider, ToggleActionProvider, OpenTerminalMenuProvider, OpenNativeFileDetailsMenuProvider, diff --git a/beacon/src/main/java/io/xpipe/beacon/api/ActionExchange.java b/beacon/src/main/java/io/xpipe/beacon/api/ActionExchange.java index 712f1f04b..4f9e42b09 100644 --- a/beacon/src/main/java/io/xpipe/beacon/api/ActionExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/api/ActionExchange.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/CategoryInfoExchange.java b/beacon/src/main/java/io/xpipe/beacon/api/CategoryInfoExchange.java index d01982471..10cfb4a87 100644 --- a/beacon/src/main/java/io/xpipe/beacon/api/CategoryInfoExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/api/CategoryInfoExchange.java @@ -1,8 +1,9 @@ package io.xpipe.beacon.api; -import com.fasterxml.jackson.databind.JsonNode; import io.xpipe.beacon.BeaconInterface; import io.xpipe.core.store.StorePath; + +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/CategoryQueryExchange.java b/beacon/src/main/java/io/xpipe/beacon/api/CategoryQueryExchange.java index 3c17b2b2a..9d3a28949 100644 --- a/beacon/src/main/java/io/xpipe/beacon/api/CategoryQueryExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/api/CategoryQueryExchange.java @@ -1,6 +1,7 @@ package io.xpipe.beacon.api; import io.xpipe.beacon.BeaconInterface; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/api/CategoryRemoveExchange.java b/beacon/src/main/java/io/xpipe/beacon/api/CategoryRemoveExchange.java index 6e623ea67..60b0429d7 100644 --- a/beacon/src/main/java/io/xpipe/beacon/api/CategoryRemoveExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/api/CategoryRemoveExchange.java @@ -1,6 +1,7 @@ package io.xpipe.beacon.api; import io.xpipe.beacon.BeaconInterface; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/api/SecretDecryptExchange.java b/beacon/src/main/java/io/xpipe/beacon/api/SecretDecryptExchange.java index b9804dba8..5d59175d6 100644 --- a/beacon/src/main/java/io/xpipe/beacon/api/SecretDecryptExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/api/SecretDecryptExchange.java @@ -1,7 +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/SecretEncryptExchange.java b/beacon/src/main/java/io/xpipe/beacon/api/SecretEncryptExchange.java index 589f52d86..9a8fa2619 100644 --- a/beacon/src/main/java/io/xpipe/beacon/api/SecretEncryptExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/api/SecretEncryptExchange.java @@ -1,7 +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/core/src/main/java/io/xpipe/core/process/ShellControl.java b/core/src/main/java/io/xpipe/core/process/ShellControl.java index 7a157f82b..94f382fa8 100644 --- a/core/src/main/java/io/xpipe/core/process/ShellControl.java +++ b/core/src/main/java/io/xpipe/core/process/ShellControl.java @@ -179,7 +179,8 @@ public interface ShellControl extends ProcessControl { ShellSecurityPolicy getEffectiveSecurityPolicy(); - String buildElevatedCommand(CommandConfiguration input, String prefix, UUID requestId, CountDown countDown, String user) + String buildElevatedCommand( + CommandConfiguration input, String prefix, UUID requestId, CountDown countDown, String user) throws Exception; void restart() throws Exception; diff --git a/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java b/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java index 7b7ad3d36..4fb1e92e4 100644 --- a/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java +++ b/core/src/main/java/io/xpipe/core/process/WrapperShellControl.java @@ -323,7 +323,8 @@ public class WrapperShellControl implements ShellControl { } @Override - public String buildElevatedCommand(CommandConfiguration input, String prefix, UUID requestId, CountDown countDown, String user) + public String buildElevatedCommand( + CommandConfiguration input, String prefix, UUID requestId, CountDown countDown, String user) throws Exception { return parent.buildElevatedCommand(input, prefix, requestId, countDown, user); } diff --git a/core/src/main/java/io/xpipe/core/store/FileNames.java b/core/src/main/java/io/xpipe/core/store/FileNames.java index 01ae15a19..6307c59d3 100644 --- a/core/src/main/java/io/xpipe/core/store/FileNames.java +++ b/core/src/main/java/io/xpipe/core/store/FileNames.java @@ -80,7 +80,6 @@ public class FileNames { return file.substring(0, file.length() - getFileName(file).length() - 1); } - public static String normalize(String file) { var backslash = file.contains("\\"); return backslash ? toWindows(file) : toUnix(file); diff --git a/core/src/main/java/io/xpipe/core/store/FilePath.java b/core/src/main/java/io/xpipe/core/store/FilePath.java index 0b273d182..f9c4e7715 100644 --- a/core/src/main/java/io/xpipe/core/store/FilePath.java +++ b/core/src/main/java/io/xpipe/core/store/FilePath.java @@ -48,7 +48,8 @@ public final class FilePath { return false; } FilePath filePath = (FilePath) o; - return Objects.equals(normalize().removeTrailingSlash().value, filePath.normalize().removeTrailingSlash().value); + return Objects.equals( + normalize().removeTrailingSlash().value, filePath.normalize().removeTrailingSlash().value); } @Override 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 1339f2949..94a2dd5b9 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 @@ -24,7 +24,8 @@ import java.time.Instant; @Value @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class PasswordManagerIdentityStore extends IdentityStore implements InternalCacheDataStore, ValidatableStore, UserScopeStore { +public class PasswordManagerIdentityStore extends IdentityStore + implements InternalCacheDataStore, ValidatableStore, UserScopeStore { String key; boolean perUser; 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 ecebacfb0..e0f60bef4 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 @@ -4,7 +4,6 @@ import io.xpipe.app.ext.DataStoreCreationCategory; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.PasswordManagerTestComp; -import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStorageUserHandler; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; @@ -16,7 +15,6 @@ import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleStringProperty; import java.util.List; -import java.util.UUID; public class PasswordManagerIdentityStoreProvider extends IdentityStoreProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/UsernameStrategy.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/UsernameStrategy.java index fdb8b1193..0ffc86f07 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/UsernameStrategy.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/UsernameStrategy.java @@ -1,9 +1,9 @@ package io.xpipe.ext.base.identity; import io.xpipe.core.util.FailableSupplier; + import lombok.EqualsAndHashCode; import lombok.ToString; -import lombok.Value; import java.util.Optional; @@ -65,7 +65,7 @@ public interface UsernameStrategy { } } - final class Dynamic implements UsernameStrategy { + final class Dynamic implements UsernameStrategy { private final FailableSupplier username; @@ -73,22 +73,22 @@ public interface UsernameStrategy { this.username = username; } - @Override - public int hashCode() { - return getClass().hashCode(); - } + @Override + public int hashCode() { + return getClass().hashCode(); + } - @Override - public boolean equals(Object obj) { - return obj instanceof Dynamic; - } + @Override + public boolean equals(Object obj) { + return obj instanceof Dynamic; + } - @Override - public String toString() { - return ""; - } + @Override + public String toString() { + return ""; + } - @Override + @Override public boolean hasUser() { return true; } diff --git a/ext/base/src/main/java/module-info.java b/ext/base/src/main/java/module-info.java index b150982b1..db43d4152 100644 --- a/ext/base/src/main/java/module-info.java +++ b/ext/base/src/main/java/module-info.java @@ -30,16 +30,20 @@ open module io.xpipe.ext.base { requires org.kordamp.ikonli.javafx; requires atlantafx.base; - provides ActionProvider with LocalIdentityConvertHubLeafProvider, + provides ActionProvider with + LocalIdentityConvertHubLeafProvider, RunBackgroundScriptActionProvider, RunHubBatchScriptActionProvider, RunHubScriptActionProvider, - RunTerminalScriptActionProvider, SimpleScriptQuickEditHubLeafProvider, + RunTerminalScriptActionProvider, + SimpleScriptQuickEditHubLeafProvider, StoreStartActionProvider, StoreStopActionProvider, StorePauseActionProvider, - StoreRestartActionProvider, ServiceCopyAddressHubLeafProvider, - RunScriptActionProviderMenu, ServiceRefreshHubProvider, + StoreRestartActionProvider, + ServiceCopyAddressHubLeafProvider, + RunScriptActionProviderMenu, + ServiceRefreshHubProvider, RunFileScriptMenuProvider; provides DataStoreProvider with FixedServiceGroupStoreProvider,