diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserBookmarkComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserBookmarkComp.java index a5b602c96..9904708a3 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserBookmarkComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserBookmarkComp.java @@ -1,6 +1,5 @@ package io.xpipe.app.browser; -import atlantafx.base.theme.Styles; import io.xpipe.app.comp.store.StoreEntryWrapper; import io.xpipe.app.comp.store.StoreSection; import io.xpipe.app.comp.store.StoreSectionMiniComp; @@ -14,6 +13,7 @@ import io.xpipe.app.fxcomps.impl.HorizontalComp; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DataStoreCategoryChoiceComp; + import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; @@ -25,6 +25,8 @@ import javafx.scene.control.Button; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; +import atlantafx.base.theme.Styles; + import java.util.List; import java.util.function.BiConsumer; import java.util.function.Predicate; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserBreadcrumbBar.java b/app/src/main/java/io/xpipe/app/browser/BrowserBreadcrumbBar.java index b2a1f2850..6b31779af 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserBreadcrumbBar.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserBreadcrumbBar.java @@ -1,10 +1,10 @@ package io.xpipe.app.browser; -import atlantafx.base.controls.Breadcrumbs; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.core.store.FileNames; + import javafx.scene.Node; import javafx.scene.control.Button; import javafx.scene.control.ButtonBase; @@ -12,6 +12,8 @@ import javafx.scene.control.Label; import javafx.scene.layout.Region; import javafx.util.Callback; +import atlantafx.base.controls.Breadcrumbs; + import java.util.ArrayList; public class BrowserBreadcrumbBar extends SimpleComp { diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java b/app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java index 6010fe912..fc4c0f786 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java @@ -6,10 +6,12 @@ import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.process.ProcessControlProvider; import io.xpipe.core.store.FileSystem; import io.xpipe.core.util.FailableRunnable; + import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.scene.input.ClipboardContent; import javafx.scene.input.Dragboard; + import lombok.SneakyThrows; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFilterComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserFilterComp.java index 65cbbd66a..e29b7a2c1 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFilterComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFilterComp.java @@ -1,17 +1,19 @@ package io.xpipe.app.browser; -import atlantafx.base.theme.Styles; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.impl.TextFieldComp; import io.xpipe.app.fxcomps.impl.TooltipAugment; + import javafx.beans.property.Property; import javafx.beans.property.SimpleBooleanProperty; import javafx.geometry.Pos; import javafx.scene.control.Button; import javafx.scene.control.TextField; import javafx.scene.layout.HBox; + +import atlantafx.base.theme.Styles; import org.kordamp.ikonli.javafx.FontIcon; public class BrowserFilterComp extends Comp { diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserGreetingComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserGreetingComp.java index 3fe6ba9fe..3ba8ba5d8 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserGreetingComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserGreetingComp.java @@ -1,14 +1,16 @@ package io.xpipe.app.browser; -import atlantafx.base.theme.Styles; import io.xpipe.app.core.AppFont; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.scene.control.Label; import javafx.scene.layout.Region; +import atlantafx.base.theme.Styles; + import java.time.LocalDateTime; public class BrowserGreetingComp extends SimpleComp { diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java b/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java index d77f573dd..716f2acf4 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java @@ -1,6 +1,5 @@ package io.xpipe.app.browser; -import atlantafx.base.theme.Styles; import io.xpipe.app.browser.file.BrowserContextMenu; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.browser.icon.FileIconManager; @@ -14,6 +13,7 @@ import io.xpipe.app.fxcomps.impl.StackComp; import io.xpipe.app.fxcomps.impl.TextFieldComp; import io.xpipe.app.util.BooleanScope; import io.xpipe.app.util.ThreadHelper; + import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleStringProperty; @@ -26,6 +26,8 @@ import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; import javafx.scene.input.MouseButton; import javafx.scene.layout.Region; + +import atlantafx.base.theme.Styles; import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java index e4522d3ad..ae9018305 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java @@ -11,11 +11,13 @@ import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.process.ShellControl; import io.xpipe.core.store.FileSystem; + import javafx.application.Platform; import javafx.collections.FXCollections; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; + import lombok.SneakyThrows; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserSavedState.java b/app/src/main/java/io/xpipe/app/browser/BrowserSavedState.java index 0d0794f0d..3328f780b 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserSavedState.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserSavedState.java @@ -1,6 +1,7 @@ package io.xpipe.app.browser; import javafx.collections.ObservableList; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserSavedStateImpl.java b/app/src/main/java/io/xpipe/app/browser/BrowserSavedStateImpl.java index 15bdb8c3d..82528ffd2 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserSavedStateImpl.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserSavedStateImpl.java @@ -1,5 +1,11 @@ package io.xpipe.app.browser; +import io.xpipe.app.core.AppCache; +import io.xpipe.core.util.JacksonMapper; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JavaType; @@ -7,10 +13,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.node.ObjectNode; -import io.xpipe.app.core.AppCache; -import io.xpipe.core.util.JacksonMapper; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; import lombok.SneakyThrows; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserSelectionListComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserSelectionListComp.java index e339be87a..e17120371 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserSelectionListComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserSelectionListComp.java @@ -10,6 +10,7 @@ import io.xpipe.app.fxcomps.impl.PrettyImageHelper; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.FileSystem; + import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; import javafx.collections.ObservableList; @@ -20,6 +21,7 @@ import javafx.scene.control.OverrunStyle; import javafx.scene.image.Image; import javafx.scene.layout.Region; import javafx.scene.paint.Color; + import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserStatusBarComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserStatusBarComp.java index c6a320798..94bef5cb0 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserStatusBarComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserStatusBarComp.java @@ -1,6 +1,5 @@ package io.xpipe.app.browser; -import atlantafx.base.controls.Spacer; import io.xpipe.app.browser.file.BrowserContextMenu; import io.xpipe.app.browser.file.BrowserFileListCompEntry; import io.xpipe.app.browser.fs.OpenFileSystemModel; @@ -12,10 +11,13 @@ import io.xpipe.app.fxcomps.augment.ContextMenuAugment; import io.xpipe.app.fxcomps.impl.LabelComp; import io.xpipe.app.fxcomps.util.BindingsHelper; import io.xpipe.app.util.HumanReadableFormat; + import javafx.beans.binding.Bindings; import javafx.scene.control.ToolBar; import javafx.scene.input.MouseButton; import javafx.scene.layout.Region; + +import atlantafx.base.controls.Spacer; import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java index 652431b1c..523204445 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserTransferComp.java @@ -12,6 +12,7 @@ import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.storage.DataStorage; import io.xpipe.core.process.OsType; import io.xpipe.core.store.FileNames; + import javafx.beans.binding.Bindings; import javafx.collections.FXCollections; import javafx.geometry.Insets; @@ -20,6 +21,7 @@ import javafx.scene.input.Dragboard; import javafx.scene.input.TransferMode; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.Region; + import org.kordamp.ikonli.javafx.FontIcon; import java.io.File; @@ -41,7 +43,7 @@ public class BrowserTransferComp extends SimpleComp { var syncItems = PlatformThread.sync(model.getItems()); var syncDownloaded = PlatformThread.sync(model.getDownloading()); var syncAllDownloaded = PlatformThread.sync(model.getAllDownloaded()); - + var background = new LabelComp(AppI18n.observable("transferDescription")) .apply(struc -> struc.get().setGraphic(new FontIcon("mdi2d-download-outline"))) .visible(Bindings.isEmpty(syncItems)); @@ -71,9 +73,8 @@ public class BrowserTransferComp extends SimpleComp { syncAllDownloaded)) .apply(struc -> struc.get().setMinHeight(150)) .grow(false, true); - var dragNotice = new LabelComp(syncAllDownloaded - .flatMap(aBoolean -> - aBoolean ? AppI18n.observable("dragLocalFiles") : AppI18n.observable("dragFiles"))) + var dragNotice = new LabelComp(syncAllDownloaded.flatMap( + aBoolean -> aBoolean ? AppI18n.observable("dragLocalFiles") : AppI18n.observable("dragFiles"))) .apply(struc -> struc.get().setGraphic(new FontIcon("mdi2h-hand-left"))) .hide(Bindings.isEmpty(syncItems)) .grow(true, false) diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserTransferModel.java b/app/src/main/java/io/xpipe/app/browser/BrowserTransferModel.java index e403aceec..41c2146a8 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserTransferModel.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserTransferModel.java @@ -8,6 +8,7 @@ import io.xpipe.app.util.BooleanScope; import io.xpipe.app.util.ShellTemp; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.FileSystem; + import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.Property; @@ -16,6 +17,7 @@ import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableBooleanValue; import javafx.collections.FXCollections; import javafx.collections.ObservableList; + import lombok.Value; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java index a13742ae2..891ca5dd0 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java @@ -1,6 +1,5 @@ package io.xpipe.app.browser; -import atlantafx.base.controls.Spacer; import io.xpipe.app.browser.session.BrowserSessionModel; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.comp.base.ListBoxViewComp; @@ -17,6 +16,7 @@ import io.xpipe.app.fxcomps.util.BindingsHelper; import io.xpipe.app.fxcomps.util.ListBindingsHelper; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.util.ThreadHelper; + import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; @@ -30,6 +30,8 @@ import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; +import atlantafx.base.controls.Spacer; + import java.util.List; public class BrowserWelcomeComp extends SimpleComp { @@ -97,8 +99,12 @@ public class BrowserWelcomeComp extends SimpleComp { var entryButton = entryButton(e, disable); var dirButton = dirButton(e, disable); return new HorizontalComp(List.of(entryButton, dirButton)).apply(struc -> { - ((Region) struc.get().getChildren().get(0)).prefHeightProperty().bind(struc.get().heightProperty()); - ((Region) struc.get().getChildren().get(1)).prefHeightProperty().bind(struc.get().heightProperty()); + ((Region) struc.get().getChildren().get(0)) + .prefHeightProperty() + .bind(struc.get().heightProperty()); + ((Region) struc.get().getChildren().get(1)) + .prefHeightProperty() + .bind(struc.get().heightProperty()); }); }) .apply(struc -> { 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 a496962ea..285959aa1 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 @@ -4,6 +4,7 @@ import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.core.util.ModuleLayerLoader; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCombination; diff --git a/app/src/main/java/io/xpipe/app/browser/action/LeafAction.java b/app/src/main/java/io/xpipe/app/browser/action/LeafAction.java index 5813546aa..c79413332 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/LeafAction.java +++ b/app/src/main/java/io/xpipe/app/browser/action/LeafAction.java @@ -7,8 +7,10 @@ import io.xpipe.app.fxcomps.util.Shortcuts; import io.xpipe.app.util.BooleanScope; import io.xpipe.app.util.LicenseProvider; import io.xpipe.app.util.ThreadHelper; + import javafx.scene.control.Button; import javafx.scene.control.MenuItem; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/browser/action/MultiExecuteAction.java b/app/src/main/java/io/xpipe/app/browser/action/MultiExecuteAction.java index acd027940..1be973367 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/MultiExecuteAction.java +++ b/app/src/main/java/io/xpipe/app/browser/action/MultiExecuteAction.java @@ -7,7 +7,9 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.TerminalLauncher; import io.xpipe.core.process.CommandBuilder; import io.xpipe.core.process.ShellControl; + import javafx.beans.value.ObservableValue; + import org.apache.commons.io.FilenameUtils; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserAlerts.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserAlerts.java index 413f777fd..41a975ab2 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserAlerts.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserAlerts.java @@ -4,6 +4,7 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppWindowHelper; import io.xpipe.core.store.FileKind; import io.xpipe.core.store.FileSystem; + import javafx.scene.control.Alert; import javafx.scene.control.ButtonBar; import javafx.scene.control.ButtonType; @@ -23,7 +24,9 @@ public class BrowserAlerts { } map.put(new ButtonType(AppI18n.get("replace"), ButtonBar.ButtonData.OTHER), FileConflictChoice.REPLACE); if (multiple) { - map.put(new ButtonType(AppI18n.get("replaceAll"), ButtonBar.ButtonData.OTHER), FileConflictChoice.REPLACE_ALL); + map.put( + new ButtonType(AppI18n.get("replaceAll"), ButtonBar.ButtonData.OTHER), + FileConflictChoice.REPLACE_ALL); } return AppWindowHelper.showBlockingAlert(alert -> { alert.setTitle(AppI18n.get("fileConflictAlertTitle")); diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java index edfd9cf14..538f11044 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java @@ -6,9 +6,11 @@ import io.xpipe.app.browser.action.LeafAction; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppFont; import io.xpipe.app.util.LicenseProvider; + import javafx.scene.control.ContextMenu; import javafx.scene.control.Menu; import javafx.scene.control.SeparatorMenuItem; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.ArrayList; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserEntry.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserEntry.java index 49f90ae74..14f523ce0 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserEntry.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserEntry.java @@ -5,6 +5,7 @@ import io.xpipe.app.browser.icon.BrowserIconFileType; import io.xpipe.core.store.FileKind; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.FileSystem; + import lombok.Getter; @Getter diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java index 71941f01e..ede8e24c0 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java @@ -1,7 +1,5 @@ package io.xpipe.app.browser.file; -import atlantafx.base.controls.Spacer; -import atlantafx.base.theme.Styles; import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.icon.FileIconManager; import io.xpipe.app.comp.base.LazyTextFieldComp; @@ -18,6 +16,7 @@ import io.xpipe.core.process.OsType; import io.xpipe.core.store.FileKind; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.FileSystem; + import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.property.*; @@ -39,6 +38,9 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; +import atlantafx.base.controls.Spacer; +import atlantafx.base.theme.Styles; + import java.time.Instant; import java.time.ZoneId; import java.util.ArrayList; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListCompEntry.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListCompEntry.java index 97dd5eefa..c6b5a4b39 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListCompEntry.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListCompEntry.java @@ -3,11 +3,13 @@ package io.xpipe.app.browser.file; import io.xpipe.app.browser.BrowserClipboard; import io.xpipe.app.browser.BrowserSelectionListComp; import io.xpipe.core.store.FileKind; + import javafx.geometry.Point2D; import javafx.scene.Node; import javafx.scene.control.TableView; import javafx.scene.image.Image; import javafx.scene.input.*; + import lombok.Getter; import java.io.File; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListModel.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListModel.java index 2510bbc10..5f2dd0003 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListModel.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListModel.java @@ -6,12 +6,14 @@ import io.xpipe.app.issue.ErrorEvent; import io.xpipe.core.store.FileKind; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.FileSystem; + import javafx.beans.property.Property; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; + import lombok.Getter; import java.util.ArrayList; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOverviewComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOverviewComp.java index 1f263631b..e364c8449 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOverviewComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileOverviewComp.java @@ -9,10 +9,12 @@ import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.augment.GrowAugment; import io.xpipe.app.fxcomps.impl.HorizontalComp; import io.xpipe.core.store.FileSystem; + import javafx.collections.ObservableList; import javafx.geometry.Pos; import javafx.scene.control.Button; import javafx.scene.layout.Region; + import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessButtonComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessButtonComp.java index 3a2fcbe8c..dd1c8a1b0 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessButtonComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessButtonComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.impl.IconButtonComp; import io.xpipe.app.util.InputHelper; + import javafx.application.Platform; import javafx.scene.control.Menu; import javafx.scene.layout.Region; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java index 382b6cced..a20a0e8ef 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserQuickAccessContextMenu.java @@ -7,6 +7,7 @@ import io.xpipe.app.util.BooleanAnimationTimer; import io.xpipe.app.util.InputHelper; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.store.FileKind; + import javafx.application.Platform; import javafx.beans.property.SimpleBooleanProperty; import javafx.geometry.Side; @@ -18,6 +19,7 @@ import javafx.scene.input.KeyCode; import javafx.scene.input.KeyEvent; import javafx.scene.input.MouseEvent; import javafx.scene.layout.Region; + import lombok.Getter; import java.util.ArrayList; @@ -35,6 +37,7 @@ public class BrowserQuickAccessContextMenu extends ContextMenu { private boolean expandBrowserActionMenuKey; private boolean keyBasedNavigation; private boolean closeBrowserActionMenuKey; + public BrowserQuickAccessContextMenu(Supplier base, OpenFileSystemModel model) { this.base = base; this.model = model; diff --git a/app/src/main/java/io/xpipe/app/browser/file/FileSystemHelper.java b/app/src/main/java/io/xpipe/app/browser/file/FileSystemHelper.java index 6698b962c..1dabdd698 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/FileSystemHelper.java +++ b/app/src/main/java/io/xpipe/app/browser/file/FileSystemHelper.java @@ -306,7 +306,9 @@ public class FileSystemHelper { AtomicLong transferred = new AtomicLong(); for (var e : flatFiles.entrySet()) { var sourceFile = e.getKey(); - var fixedRelPath = new FilePath(e.getValue()).fileSystemCompatible(target.getFileSystem().getShell().orElseThrow().getOsType()); + var fixedRelPath = new FilePath(e.getValue()) + .fileSystemCompatible( + target.getFileSystem().getShell().orElseThrow().getOsType()); var targetFile = FileNames.join(target.getPath(), fixedRelPath.toString()); if (sourceFile.getFileSystem().equals(target.getFileSystem())) { throw new IllegalStateException(); diff --git a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemCache.java b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemCache.java index d3f7b9f4c..48da3cf6c 100644 --- a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemCache.java +++ b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemCache.java @@ -3,6 +3,7 @@ package io.xpipe.app.browser.fs; import io.xpipe.app.util.ShellControlCache; import io.xpipe.core.process.ShellControl; import io.xpipe.core.process.ShellDialect; + import lombok.Getter; @Getter diff --git a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemComp.java b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemComp.java index 44759d78f..20cf63c2c 100644 --- a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemComp.java +++ b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemComp.java @@ -1,6 +1,5 @@ package io.xpipe.app.browser.fs; -import atlantafx.base.controls.Spacer; import io.xpipe.app.browser.BrowserFilterComp; import io.xpipe.app.browser.BrowserNavBar; import io.xpipe.app.browser.BrowserOverviewComp; @@ -16,6 +15,7 @@ import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.augment.ContextMenuAugment; import io.xpipe.app.fxcomps.impl.VerticalComp; import io.xpipe.app.fxcomps.util.Shortcuts; + import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Button; @@ -28,6 +28,8 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; + +import atlantafx.base.controls.Spacer; import org.kordamp.ikonli.javafx.FontIcon; import java.util.ArrayList; diff --git a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java index 6dba18830..009287861 100644 --- a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java +++ b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemModel.java @@ -22,8 +22,10 @@ import io.xpipe.core.process.ShellDialects; import io.xpipe.core.process.ShellOpenFunction; import io.xpipe.core.store.*; import io.xpipe.core.util.FailableConsumer; + import javafx.beans.binding.Bindings; import javafx.beans.property.*; + import lombok.Getter; import lombok.SneakyThrows; @@ -237,8 +239,9 @@ public final class OpenFileSystemModel extends BrowserSessionTab { - if (ShellDialects.getStartableDialects().stream() - .anyMatch(dialect -> adjustedPath.toLowerCase().startsWith(dialect.getExecutableName().toLowerCase()))) { + if (ShellDialects.getStartableDialects().stream().anyMatch(dialect -> adjustedPath + .toLowerCase() + .startsWith(dialect.getExecutableName().toLowerCase()))) { TerminalLauncher.open( entry.getEntry(), name, diff --git a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemSavedState.java b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemSavedState.java index 580c480f7..c617ef682 100644 --- a/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemSavedState.java +++ b/app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemSavedState.java @@ -1,5 +1,13 @@ package io.xpipe.app.browser.fs; +import io.xpipe.app.core.AppCache; +import io.xpipe.core.store.FileNames; +import io.xpipe.core.util.JacksonMapper; + +import javafx.application.Platform; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; + import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -11,12 +19,6 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import io.xpipe.app.core.AppCache; -import io.xpipe.core.store.FileNames; -import io.xpipe.core.util.JacksonMapper; -import javafx.application.Platform; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; import lombok.*; import lombok.extern.jackson.Jacksonized; diff --git a/app/src/main/java/io/xpipe/app/browser/icon/BrowserIconDirectoryType.java b/app/src/main/java/io/xpipe/app/browser/icon/BrowserIconDirectoryType.java index f947ccca9..9a3a45ae9 100644 --- a/app/src/main/java/io/xpipe/app/browser/icon/BrowserIconDirectoryType.java +++ b/app/src/main/java/io/xpipe/app/browser/icon/BrowserIconDirectoryType.java @@ -3,6 +3,7 @@ package io.xpipe.app.browser.icon; import io.xpipe.app.core.AppResources; import io.xpipe.core.store.FileKind; import io.xpipe.core.store.FileSystem; + import lombok.Getter; import java.io.BufferedReader; diff --git a/app/src/main/java/io/xpipe/app/browser/icon/BrowserIconFileType.java b/app/src/main/java/io/xpipe/app/browser/icon/BrowserIconFileType.java index 3d23c0337..afff37e3b 100644 --- a/app/src/main/java/io/xpipe/app/browser/icon/BrowserIconFileType.java +++ b/app/src/main/java/io/xpipe/app/browser/icon/BrowserIconFileType.java @@ -3,6 +3,7 @@ package io.xpipe.app.browser.icon; import io.xpipe.app.core.AppResources; import io.xpipe.core.store.FileKind; import io.xpipe.core.store.FileSystem; + import lombok.Getter; import java.io.BufferedReader; diff --git a/app/src/main/java/io/xpipe/app/browser/session/BrowserAbstractSessionModel.java b/app/src/main/java/io/xpipe/app/browser/session/BrowserAbstractSessionModel.java index 562f1e062..289d4cf46 100644 --- a/app/src/main/java/io/xpipe/app/browser/session/BrowserAbstractSessionModel.java +++ b/app/src/main/java/io/xpipe/app/browser/session/BrowserAbstractSessionModel.java @@ -2,12 +2,14 @@ package io.xpipe.app.browser.session; import io.xpipe.app.util.BooleanScope; import io.xpipe.app.util.ThreadHelper; + import javafx.beans.property.BooleanProperty; import javafx.beans.property.Property; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; + import lombok.Getter; @Getter diff --git a/app/src/main/java/io/xpipe/app/browser/session/BrowserChooserComp.java b/app/src/main/java/io/xpipe/app/browser/session/BrowserChooserComp.java index 8a3d03464..9d404c9c3 100644 --- a/app/src/main/java/io/xpipe/app/browser/session/BrowserChooserComp.java +++ b/app/src/main/java/io/xpipe/app/browser/session/BrowserChooserComp.java @@ -20,6 +20,7 @@ import io.xpipe.app.util.FileReference; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.store.FileSystemStore; import io.xpipe.core.store.ShellStore; + import javafx.beans.property.BooleanProperty; import javafx.collections.ListChangeListener; import javafx.geometry.Pos; @@ -50,9 +51,12 @@ public class BrowserChooserComp extends SimpleComp { .apply(struc -> struc.get().setPrefSize(1200, 700)) .apply(struc -> AppFont.normal(struc.get())); var window = AppWindowHelper.sideWindow( - AppI18n.get(save ? "saveFileTitle" : "openFileTitle"), stage -> { + AppI18n.get(save ? "saveFileTitle" : "openFileTitle"), + stage -> { return comp; - }, false, null); + }, + false, + null); model.setOnFinish(fileStores -> { file.accept(fileStores.size() > 0 ? fileStores.getFirst() : null); window.close(); @@ -137,8 +141,8 @@ public class BrowserChooserComp extends SimpleComp { selected.getChildren() .setAll(c.getList().stream() .map(s -> { - var field = - new TextField(s.getRawFileEntry().getPath()); + var field = new TextField( + s.getRawFileEntry().getPath()); field.setEditable(false); HBox.setHgrow(field, Priority.ALWAYS); return field; diff --git a/app/src/main/java/io/xpipe/app/browser/session/BrowserFileChooserModel.java b/app/src/main/java/io/xpipe/app/browser/session/BrowserFileChooserModel.java index 291002b56..9c681e599 100644 --- a/app/src/main/java/io/xpipe/app/browser/session/BrowserFileChooserModel.java +++ b/app/src/main/java/io/xpipe/app/browser/session/BrowserFileChooserModel.java @@ -10,10 +10,12 @@ import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.FileSystemStore; import io.xpipe.core.util.FailableFunction; + import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; + import lombok.Getter; import lombok.Setter; diff --git a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionComp.java b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionComp.java index 066ccba37..30a05b233 100644 --- a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionComp.java +++ b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionComp.java @@ -11,6 +11,7 @@ import io.xpipe.app.fxcomps.util.BindingsHelper; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.store.ShellStore; + import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.scene.layout.Region; @@ -38,7 +39,8 @@ public class BrowserSessionComp extends SimpleComp { return true; } - return storeEntryWrapper.getEntry().getProvider().browserAction(model,storeEntryWrapper.getEntry(), null) != null; + return storeEntryWrapper.getEntry().getProvider().browserAction(model, storeEntryWrapper.getEntry(), null) + != null; }; BiConsumer action = (w, busy) -> { ThreadHelper.runFailableAsync(() -> { diff --git a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionModel.java b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionModel.java index bd8f820e2..eb35a3c00 100644 --- a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionModel.java +++ b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionModel.java @@ -11,8 +11,10 @@ import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.FileSystemStore; import io.xpipe.core.util.FailableFunction; + import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; + import lombok.Getter; import java.util.ArrayList; diff --git a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionMultiTab.java b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionMultiTab.java index d8359fafc..df924374d 100644 --- a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionMultiTab.java +++ b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionMultiTab.java @@ -5,12 +5,14 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.util.BindingsHelper; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.DataStore; + import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; + import lombok.Getter; @Getter diff --git a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTab.java b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTab.java index 7afc6346f..f6c07d05b 100644 --- a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTab.java +++ b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTab.java @@ -4,8 +4,10 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.DataStore; + import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; + import lombok.Getter; @Getter diff --git a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTabsComp.java b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTabsComp.java index ecce9a155..e8a729b5a 100644 --- a/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTabsComp.java +++ b/app/src/main/java/io/xpipe/app/browser/session/BrowserSessionTabsComp.java @@ -1,7 +1,5 @@ package io.xpipe.app.browser.session; -import atlantafx.base.controls.RingProgressIndicator; -import atlantafx.base.theme.Styles; import io.xpipe.app.browser.BrowserWelcomeComp; import io.xpipe.app.comp.base.MultiContentComp; import io.xpipe.app.fxcomps.Comp; @@ -11,6 +9,7 @@ import io.xpipe.app.fxcomps.impl.TooltipAugment; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.util.BooleanScope; + import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleBooleanProperty; @@ -25,6 +24,9 @@ import javafx.scene.input.DragEvent; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; +import atlantafx.base.controls.RingProgressIndicator; +import atlantafx.base.theme.Styles; + import java.util.HashMap; import java.util.Map; import java.util.UUID; diff --git a/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java b/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java index ca1991628..de51a6489 100644 --- a/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java +++ b/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java @@ -9,6 +9,7 @@ import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; + import javafx.beans.binding.Bindings; import javafx.beans.value.ObservableValue; import javafx.scene.layout.BorderPane; diff --git a/app/src/main/java/io/xpipe/app/comp/DeveloperTabComp.java b/app/src/main/java/io/xpipe/app/comp/DeveloperTabComp.java index 181ebcc2c..a6d4d12e5 100644 --- a/app/src/main/java/io/xpipe/app/comp/DeveloperTabComp.java +++ b/app/src/main/java/io/xpipe/app/comp/DeveloperTabComp.java @@ -5,6 +5,7 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.issue.ErrorEvent; + import javafx.scene.layout.HBox; import javafx.scene.layout.Region; diff --git a/app/src/main/java/io/xpipe/app/comp/base/BackgroundImageComp.java b/app/src/main/java/io/xpipe/app/comp/base/BackgroundImageComp.java index 324aae28c..571a4f376 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/BackgroundImageComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/BackgroundImageComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.comp.base; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; + import javafx.beans.value.ChangeListener; import javafx.geometry.Rectangle2D; import javafx.scene.image.Image; diff --git a/app/src/main/java/io/xpipe/app/comp/base/BigIconButton.java b/app/src/main/java/io/xpipe/app/comp/base/BigIconButton.java index 874227f7e..ded5b634b 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/BigIconButton.java +++ b/app/src/main/java/io/xpipe/app/comp/base/BigIconButton.java @@ -1,6 +1,7 @@ package io.xpipe.app.comp.base; import io.xpipe.app.fxcomps.CompStructure; + import javafx.beans.value.ObservableValue; import javafx.geometry.Pos; import javafx.scene.Node; @@ -8,6 +9,7 @@ import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; + import lombok.Builder; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/comp/base/ButtonComp.java b/app/src/main/java/io/xpipe/app/comp/base/ButtonComp.java index dbaa87a16..85909f3c1 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/ButtonComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/ButtonComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.comp.base; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; + import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; @@ -10,6 +11,7 @@ import javafx.css.Size; import javafx.css.SizeUnits; import javafx.scene.Node; import javafx.scene.control.Button; + import lombok.Getter; import org.kordamp.ikonli.javafx.FontIcon; diff --git a/app/src/main/java/io/xpipe/app/comp/base/CountComp.java b/app/src/main/java/io/xpipe/app/comp/base/CountComp.java index 2861f3678..53b2131f8 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/CountComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/CountComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.binding.Bindings; import javafx.collections.ObservableList; import javafx.geometry.Pos; diff --git a/app/src/main/java/io/xpipe/app/comp/base/DialogComp.java b/app/src/main/java/io/xpipe/app/comp/base/DialogComp.java index 266ac0b7d..4af602f50 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/DialogComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/DialogComp.java @@ -1,11 +1,11 @@ package io.xpipe.app.comp.base; -import atlantafx.base.theme.Styles; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppWindowHelper; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; + import javafx.application.Platform; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ObservableValue; @@ -17,6 +17,8 @@ import javafx.scene.layout.Region; import javafx.scene.layout.VBox; import javafx.stage.Stage; +import atlantafx.base.theme.Styles; + import java.util.List; import java.util.function.Function; diff --git a/app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java b/app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java index 1834bf104..139202f52 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java @@ -5,11 +5,13 @@ import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.augment.ContextMenuAugment; import io.xpipe.app.fxcomps.util.ListBindingsHelper; + import javafx.css.Size; import javafx.css.SizeUnits; import javafx.scene.control.Button; import javafx.scene.control.ContextMenu; import javafx.scene.control.MenuItem; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/comp/base/ErrorOverlayComp.java b/app/src/main/java/io/xpipe/app/comp/base/ErrorOverlayComp.java index 169971d68..df140c60c 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/ErrorOverlayComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/ErrorOverlayComp.java @@ -3,12 +3,14 @@ package io.xpipe.app.comp.base; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.scene.control.TextArea; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; import javafx.scene.paint.Color; + import lombok.AccessLevel; import lombok.experimental.FieldDefaults; import org.kordamp.ikonli.javafx.FontIcon; diff --git a/app/src/main/java/io/xpipe/app/comp/base/FileDropOverlayComp.java b/app/src/main/java/io/xpipe/app/comp/base/FileDropOverlayComp.java index eb45a2c02..c3f3da78e 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/FileDropOverlayComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/FileDropOverlayComp.java @@ -4,11 +4,13 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.core.util.FailableConsumer; + import javafx.geometry.Pos; import javafx.scene.Node; import javafx.scene.input.Dragboard; import javafx.scene.input.TransferMode; import javafx.scene.layout.StackPane; + import lombok.Builder; import lombok.Value; import org.kordamp.ikonli.javafx.FontIcon; diff --git a/app/src/main/java/io/xpipe/app/comp/base/FontIconComp.java b/app/src/main/java/io/xpipe/app/comp/base/FontIconComp.java index 462e05ca7..57452da04 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/FontIconComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/FontIconComp.java @@ -3,9 +3,11 @@ package io.xpipe.app.comp.base; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; import javafx.scene.layout.StackPane; + import lombok.AllArgsConstructor; import lombok.Value; import org.kordamp.ikonli.javafx.FontIcon; diff --git a/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java b/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java index 7ed0e065e..b7de8d906 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/IntegratedTextAreaComp.java @@ -1,11 +1,11 @@ package io.xpipe.app.comp.base; -import atlantafx.base.theme.Styles; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.impl.IconButtonComp; import io.xpipe.app.fxcomps.impl.TextAreaComp; import io.xpipe.app.util.FileOpener; + import javafx.application.Platform; import javafx.beans.property.Property; import javafx.beans.value.ObservableValue; @@ -13,6 +13,8 @@ import javafx.scene.layout.AnchorPane; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; +import atlantafx.base.theme.Styles; + import java.nio.file.Files; public class IntegratedTextAreaComp extends SimpleComp { diff --git a/app/src/main/java/io/xpipe/app/comp/base/LazyTextFieldComp.java b/app/src/main/java/io/xpipe/app/comp/base/LazyTextFieldComp.java index 9ca87049d..5a4c98676 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/LazyTextFieldComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/LazyTextFieldComp.java @@ -3,11 +3,13 @@ package io.xpipe.app.comp.base; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.Property; import javafx.beans.property.SimpleStringProperty; import javafx.scene.control.TextField; import javafx.scene.input.KeyCode; import javafx.scene.layout.StackPane; + import lombok.Builder; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/comp/base/ListBoxViewComp.java b/app/src/main/java/io/xpipe/app/comp/base/ListBoxViewComp.java index f5210c6a3..b0d3ff8a0 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/ListBoxViewComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/ListBoxViewComp.java @@ -5,6 +5,7 @@ import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.ListBindingsHelper; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.application.Platform; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; diff --git a/app/src/main/java/io/xpipe/app/comp/base/ListSelectorComp.java b/app/src/main/java/io/xpipe/app/comp/base/ListSelectorComp.java index c605fffc4..3bafb76ad 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/ListSelectorComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/ListSelectorComp.java @@ -2,6 +2,7 @@ package io.xpipe.app.comp.base; import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.SimpleComp; + import javafx.beans.property.ListProperty; import javafx.geometry.Orientation; import javafx.scene.control.CheckBox; @@ -10,6 +11,7 @@ import javafx.scene.control.ScrollPane; import javafx.scene.control.Separator; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; + import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/comp/base/LoadingOverlayComp.java b/app/src/main/java/io/xpipe/app/comp/base/LoadingOverlayComp.java index dd38eeb9f..4f0c4526c 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/LoadingOverlayComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/LoadingOverlayComp.java @@ -1,12 +1,12 @@ package io.xpipe.app.comp.base; -import atlantafx.base.controls.RingProgressIndicator; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.ThreadHelper; + import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleDoubleProperty; @@ -14,6 +14,8 @@ import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.scene.layout.StackPane; +import atlantafx.base.controls.RingProgressIndicator; + public class LoadingOverlayComp extends Comp> { private static final double FPS = 30.0; diff --git a/app/src/main/java/io/xpipe/app/comp/base/MarkdownComp.java b/app/src/main/java/io/xpipe/app/comp/base/MarkdownComp.java index 41dbf7835..f8469ba8f 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/MarkdownComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/MarkdownComp.java @@ -10,6 +10,7 @@ import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.Hyperlinks; import io.xpipe.app.util.MarkdownHelper; + import javafx.application.Platform; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; @@ -18,6 +19,7 @@ import javafx.scene.layout.StackPane; import javafx.scene.paint.Color; import javafx.scene.web.WebEngine; import javafx.scene.web.WebView; + import lombok.SneakyThrows; import java.io.IOException; diff --git a/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java b/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java index 176c216da..39ad1acdf 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java @@ -1,12 +1,11 @@ package io.xpipe.app.comp.base; -import atlantafx.base.controls.ModalPane; -import atlantafx.base.layout.ModalBox; import io.xpipe.app.core.AppFont; import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.application.Platform; import javafx.beans.property.Property; import javafx.geometry.Insets; @@ -16,6 +15,9 @@ import javafx.scene.control.Label; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; + +import atlantafx.base.controls.ModalPane; +import atlantafx.base.layout.ModalBox; import lombok.Value; public class ModalOverlayComp extends SimpleComp { 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 acdd98d87..2eca57d72 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 @@ -3,6 +3,7 @@ package io.xpipe.app.comp.base; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.collections.MapChangeListener; diff --git a/app/src/main/java/io/xpipe/app/comp/base/OsLogoComp.java b/app/src/main/java/io/xpipe/app/comp/base/OsLogoComp.java index b54fd38cb..74cf6a2b0 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/OsLogoComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/OsLogoComp.java @@ -8,6 +8,7 @@ import io.xpipe.app.fxcomps.impl.StackComp; import io.xpipe.app.fxcomps.util.BindingsHelper; import io.xpipe.core.process.OsNameState; import io.xpipe.core.store.FileNames; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/comp/base/PopupMenuButtonComp.java b/app/src/main/java/io/xpipe/app/comp/base/PopupMenuButtonComp.java index 8143337d9..1325dbc0c 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/PopupMenuButtonComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/PopupMenuButtonComp.java @@ -1,14 +1,16 @@ package io.xpipe.app.comp.base; -import atlantafx.base.controls.Popover; -import atlantafx.base.theme.Styles; import io.xpipe.app.core.AppFont; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; + import javafx.beans.value.ObservableValue; import javafx.scene.control.Button; import javafx.scene.layout.Region; +import atlantafx.base.controls.Popover; +import atlantafx.base.theme.Styles; + public class PopupMenuButtonComp extends SimpleComp { private final ObservableValue name; 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 91c7b7d11..c4075ebd4 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 @@ -15,6 +15,7 @@ import io.xpipe.app.issue.UserReportComp; import io.xpipe.app.update.UpdateAvailableAlert; import io.xpipe.app.update.XPipeDistributionType; import io.xpipe.app.util.Hyperlinks; + import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; diff --git a/app/src/main/java/io/xpipe/app/comp/base/SideSplitPaneComp.java b/app/src/main/java/io/xpipe/app/comp/base/SideSplitPaneComp.java index 66fa7ffa9..be27910da 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/SideSplitPaneComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/SideSplitPaneComp.java @@ -2,8 +2,10 @@ package io.xpipe.app.comp.base; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; + import javafx.scene.control.SplitPane; import javafx.scene.layout.Region; + import lombok.Value; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/app/src/main/java/io/xpipe/app/comp/base/SimpleTitledPaneComp.java b/app/src/main/java/io/xpipe/app/comp/base/SimpleTitledPaneComp.java index cc8cd66a0..a2616b834 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/SimpleTitledPaneComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/SimpleTitledPaneComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.comp.base; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; + import javafx.beans.value.ObservableValue; import javafx.scene.control.TitledPane; diff --git a/app/src/main/java/io/xpipe/app/comp/base/StoreToggleComp.java b/app/src/main/java/io/xpipe/app/comp/base/StoreToggleComp.java index c6fd0ba7c..e5c64e30b 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/StoreToggleComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/StoreToggleComp.java @@ -5,11 +5,13 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.ThreadHelper; + import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ObservableBooleanValue; import javafx.scene.layout.Region; + import lombok.AllArgsConstructor; import lombok.Setter; @@ -22,6 +24,7 @@ public class StoreToggleComp extends SimpleComp { private final StoreSection section; private final BooleanProperty value; private final Consumer onChange; + @Setter private ObservableBooleanValue customVisibility = new SimpleBooleanProperty(true); diff --git a/app/src/main/java/io/xpipe/app/comp/base/SystemStateComp.java b/app/src/main/java/io/xpipe/app/comp/base/SystemStateComp.java index 15c8e6676..c9d0cabb2 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/SystemStateComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/SystemStateComp.java @@ -1,14 +1,16 @@ package io.xpipe.app.comp.base; -import atlantafx.base.theme.Styles; import io.xpipe.app.comp.store.StoreEntryWrapper; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.BindingsHelper; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.core.process.ShellStoreState; + import javafx.beans.value.ObservableValue; import javafx.geometry.Pos; import javafx.scene.layout.Region; + +import atlantafx.base.theme.Styles; import lombok.Getter; import org.kordamp.ikonli.javafx.FontIcon; import org.kordamp.ikonli.javafx.StackedFontIcon; @@ -27,9 +29,7 @@ public class SystemStateComp extends SimpleComp { var fi = new FontIcon(); fi.getStyleClass().add("inner-icon"); state.subscribe(s -> { - var i = s == State.FAILURE - ? "mdi2l-lightning-bolt" - : s == State.SUCCESS ? "mdal-check" : "mdsmz-remove"; + var i = s == State.FAILURE ? "mdi2l-lightning-bolt" : s == State.SUCCESS ? "mdal-check" : "mdsmz-remove"; PlatformThread.runLaterIfNeeded(() -> fi.setIconLiteral(i)); }); diff --git a/app/src/main/java/io/xpipe/app/comp/base/TileButtonComp.java b/app/src/main/java/io/xpipe/app/comp/base/TileButtonComp.java index 8b7867566..cd558e0ab 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/TileButtonComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/TileButtonComp.java @@ -5,6 +5,7 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; @@ -13,6 +14,7 @@ import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/app/src/main/java/io/xpipe/app/comp/base/TitledPaneComp.java b/app/src/main/java/io/xpipe/app/comp/base/TitledPaneComp.java index 1d9981c1a..3b8db8163 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/TitledPaneComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/TitledPaneComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.comp.base; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; + import javafx.beans.value.ObservableValue; import javafx.scene.control.TitledPane; diff --git a/app/src/main/java/io/xpipe/app/comp/base/ToggleSwitchComp.java b/app/src/main/java/io/xpipe/app/comp/base/ToggleSwitchComp.java index 110897b1f..05bd5bea6 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/ToggleSwitchComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/ToggleSwitchComp.java @@ -1,14 +1,16 @@ package io.xpipe.app.comp.base; -import atlantafx.base.controls.ToggleSwitch; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.Property; import javafx.beans.value.ObservableValue; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyEvent; import javafx.scene.layout.Region; +import atlantafx.base.controls.ToggleSwitch; + public class ToggleSwitchComp extends SimpleComp { private final Property selected; diff --git a/app/src/main/java/io/xpipe/app/comp/base/VBoxViewComp.java b/app/src/main/java/io/xpipe/app/comp/base/VBoxViewComp.java index 66bd134d1..49505413c 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/VBoxViewComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/VBoxViewComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.application.Platform; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; diff --git a/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java index e4e5bc287..ce4395aa5 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.core.AppFont; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.augment.GrowAugment; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.binding.Bindings; import javafx.geometry.HPos; import javafx.geometry.Insets; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java index af31f7bab..8d0f58e4d 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java @@ -1,6 +1,7 @@ package io.xpipe.app.comp.store; import io.xpipe.app.fxcomps.Comp; + import javafx.geometry.HPos; import javafx.geometry.Insets; import javafx.geometry.Pos; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryWrapper.java b/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryWrapper.java index 9d48725a0..c921d8013 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryWrapper.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryWrapper.java @@ -5,11 +5,13 @@ import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategory; + import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; + import lombok.Getter; import java.time.Duration; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java index d92ff13a7..7220f5e82 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java @@ -1,6 +1,5 @@ package io.xpipe.app.comp.store; -import atlantafx.base.controls.Spacer; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.comp.base.DialogComp; import io.xpipe.app.comp.base.ErrorOverlayComp; @@ -21,6 +20,7 @@ import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.ValidationException; + import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.property.*; @@ -32,6 +32,8 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; import javafx.stage.Stage; + +import atlantafx.base.controls.Spacer; import lombok.AccessLevel; import lombok.experimental.FieldDefaults; import net.synedra.validatorfx.GraphicDecorationStackPane; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationMenu.java b/app/src/main/java/io/xpipe/app/comp/store/StoreCreationMenu.java index 4b28606f6..32ae6c488 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationMenu.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreCreationMenu.java @@ -5,10 +5,12 @@ import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreProviders; import io.xpipe.app.fxcomps.impl.PrettyImageHelper; import io.xpipe.app.util.ScanAlert; + import javafx.scene.control.Menu; import javafx.scene.control.MenuButton; import javafx.scene.control.MenuItem; import javafx.scene.control.SeparatorMenuItem; + import org.kordamp.ikonli.javafx.FontIcon; public class StoreCreationMenu { diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java index 7ee778180..e4546cbb1 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java @@ -1,6 +1,5 @@ package io.xpipe.app.comp.store; -import atlantafx.base.theme.Styles; import io.xpipe.app.comp.base.LoadingOverlayComp; import io.xpipe.app.core.App; import io.xpipe.app.core.AppActionLinkDetector; @@ -19,6 +18,7 @@ import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreColor; import io.xpipe.app.update.XPipeDistributionType; import io.xpipe.app.util.*; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableDoubleValue; @@ -32,6 +32,8 @@ import javafx.scene.input.MouseEvent; import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; + +import atlantafx.base.theme.Styles; import org.kordamp.ikonli.javafx.FontIcon; import java.util.ArrayList; @@ -186,8 +188,7 @@ public abstract class StoreEntryComp extends SimpleComp { var imageComp = PrettyImageHelper.ofFixedSize(img, w, h); var storeIcon = imageComp.createRegion(); if (wrapper.getValidity().getValue().isUsable()) { - new TooltipAugment<>(wrapper.getEntry().getProvider().displayName()) - .augment(storeIcon); + new TooltipAugment<>(wrapper.getEntry().getProvider().displayName()).augment(storeIcon); } var stack = new StackPane(storeIcon); diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java index 979e8903f..1589df801 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java @@ -5,6 +5,7 @@ import io.xpipe.app.comp.base.MultiContentComp; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.impl.HorizontalComp; + import javafx.beans.binding.Bindings; import javafx.beans.value.ObservableValue; import javafx.geometry.Insets; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListStatusComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListStatusComp.java index f667c6079..962d06487 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListStatusComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListStatusComp.java @@ -12,6 +12,7 @@ import io.xpipe.app.fxcomps.util.BindingsHelper; import io.xpipe.app.fxcomps.util.ListBindingsHelper; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.process.OsType; + import javafx.beans.binding.Bindings; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; @@ -28,6 +29,7 @@ import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; import javafx.scene.text.TextAlignment; + import org.kordamp.ikonli.javafx.FontIcon; public class StoreEntryListStatusComp extends SimpleComp { diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java index a8ba919d8..8887d55aa 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java @@ -9,7 +9,9 @@ import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreColor; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.ThreadHelper; + import javafx.beans.property.*; + import lombok.Getter; import java.time.Duration; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreIntroComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreIntroComp.java index bc7689cd7..7b3602c23 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreIntroComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreIntroComp.java @@ -1,12 +1,12 @@ package io.xpipe.app.comp.store; -import atlantafx.base.theme.Styles; import io.xpipe.app.core.AppFont; import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.impl.PrettySvgComp; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.util.ScanAlert; + import javafx.beans.property.SimpleStringProperty; import javafx.geometry.Pos; import javafx.scene.control.Button; @@ -15,6 +15,8 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; + +import atlantafx.base.theme.Styles; import org.kordamp.ikonli.javafx.FontIcon; public class StoreIntroComp extends SimpleComp { diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreLayoutComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreLayoutComp.java index e31bd57d2..921825e65 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreLayoutComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreLayoutComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.comp.base.SideSplitPaneComp; import io.xpipe.app.core.AppActionLinkDetector; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.fxcomps.SimpleComp; + import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreNotFoundComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreNotFoundComp.java index 40bf45b5b..726f6694b 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreNotFoundComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreNotFoundComp.java @@ -1,6 +1,7 @@ package io.xpipe.app.comp.store; import io.xpipe.app.fxcomps.SimpleComp; + import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreProviderChoiceComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreProviderChoiceComp.java index 9c3de63d0..d7b1e4d80 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreProviderChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreProviderChoiceComp.java @@ -6,11 +6,13 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.util.JfxHelper; + import javafx.beans.property.Property; import javafx.scene.control.ComboBox; import javafx.scene.control.ListCell; import javafx.scene.input.KeyCode; import javafx.scene.layout.Region; + import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.experimental.FieldDefaults; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreQuickAccessButtonComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreQuickAccessButtonComp.java index 44e35a972..0a5dfa0bb 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreQuickAccessButtonComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreQuickAccessButtonComp.java @@ -5,6 +5,7 @@ import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.impl.IconButtonComp; import io.xpipe.app.fxcomps.impl.PrettyImageHelper; import io.xpipe.app.util.ContextMenuHelper; + import javafx.geometry.Side; import javafx.scene.control.Button; import javafx.scene.control.ContextMenu; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java b/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java index 68d050b44..f1d0ea4cf 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java @@ -6,6 +6,7 @@ import io.xpipe.app.fxcomps.util.ListBindingsHelper; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ObservableBooleanValue; @@ -13,6 +14,7 @@ import javafx.beans.value.ObservableStringValue; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.collections.ObservableList; + import lombok.Value; import java.util.Comparator; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java index 8c6a9b764..098d16890 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java @@ -10,6 +10,7 @@ import io.xpipe.app.fxcomps.impl.VerticalComp; import io.xpipe.app.fxcomps.util.ListBindingsHelper; import io.xpipe.app.storage.DataStoreColor; import io.xpipe.app.util.ThreadHelper; + import javafx.beans.binding.Bindings; import javafx.css.PseudoClass; import javafx.scene.control.Button; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java index dc22b86f8..011a6ade2 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java @@ -10,6 +10,7 @@ import io.xpipe.app.fxcomps.impl.PrettyImageHelper; import io.xpipe.app.fxcomps.impl.VerticalComp; import io.xpipe.app.fxcomps.util.ListBindingsHelper; import io.xpipe.app.storage.DataStoreColor; + import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java index 107e35e9b..e2b0396ed 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.impl.StoreCategoryListComp; import io.xpipe.app.fxcomps.impl.VerticalComp; + import javafx.scene.layout.Region; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java b/app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java index c779367ac..e1228db25 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java @@ -49,7 +49,14 @@ public interface StoreSortMode { StoreSortMode DATE_DESC = new StoreSortMode() { @Override public StoreSection representative(StoreSection s) { - return Stream.concat(s.getShownChildren().stream().filter(section -> section.getWrapper().getEntry().getValidity().isUsable()).map(this::representative), Stream.of(s)) + return Stream.concat( + s.getShownChildren().stream() + .filter(section -> section.getWrapper() + .getEntry() + .getValidity() + .isUsable()) + .map(this::representative), + Stream.of(s)) .max(Comparator.comparing( section -> section.getWrapper().getEntry().getLastAccess())) .orElseThrow(); @@ -70,7 +77,14 @@ public interface StoreSortMode { StoreSortMode DATE_ASC = new StoreSortMode() { @Override public StoreSection representative(StoreSection s) { - return Stream.concat(s.getShownChildren().stream().filter(section -> section.getWrapper().getEntry().getValidity().isUsable()).map(this::representative), Stream.of(s)) + return Stream.concat( + s.getShownChildren().stream() + .filter(section -> section.getWrapper() + .getEntry() + .getValidity() + .isUsable()) + .map(this::representative), + Stream.of(s)) .max(Comparator.comparing( section -> section.getWrapper().getEntry().getLastAccess())) .orElseThrow(); diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreViewState.java b/app/src/main/java/io/xpipe/app/comp/store/StoreViewState.java index 84f9816a2..24339c5df 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreViewState.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreViewState.java @@ -8,6 +8,7 @@ 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 javafx.application.Platform; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; @@ -15,6 +16,7 @@ import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; + import lombok.Getter; import java.util.*; diff --git a/app/src/main/java/io/xpipe/app/core/App.java b/app/src/main/java/io/xpipe/app/core/App.java index 855ac5f2b..0f85ac789 100644 --- a/app/src/main/java/io/xpipe/app/core/App.java +++ b/app/src/main/java/io/xpipe/app/core/App.java @@ -8,9 +8,11 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.update.XPipeDistributionType; import io.xpipe.app.util.LicenseProvider; import io.xpipe.core.process.OsType; + import javafx.application.Application; import javafx.beans.binding.Bindings; import javafx.stage.Stage; + import lombok.Getter; import lombok.SneakyThrows; diff --git a/app/src/main/java/io/xpipe/app/core/AppActionLinkDetector.java b/app/src/main/java/io/xpipe/app/core/AppActionLinkDetector.java index c2357fa64..f6acb71f6 100644 --- a/app/src/main/java/io/xpipe/app/core/AppActionLinkDetector.java +++ b/app/src/main/java/io/xpipe/app/core/AppActionLinkDetector.java @@ -1,6 +1,7 @@ package io.xpipe.app.core; import io.xpipe.app.launcher.LauncherInput; + import javafx.scene.control.Alert; import javafx.scene.input.Clipboard; import javafx.scene.input.DataFormat; diff --git a/app/src/main/java/io/xpipe/app/core/AppCache.java b/app/src/main/java/io/xpipe/app/core/AppCache.java index a13f2e159..6872a05c6 100644 --- a/app/src/main/java/io/xpipe/app/core/AppCache.java +++ b/app/src/main/java/io/xpipe/app/core/AppCache.java @@ -3,6 +3,7 @@ package io.xpipe.app.core; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.util.JsonConfigHelper; import io.xpipe.core.util.JacksonMapper; + import org.apache.commons.io.FileUtils; import java.io.IOException; diff --git a/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java b/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java index d198685bc..646456b18 100644 --- a/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java +++ b/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java @@ -7,6 +7,7 @@ import io.xpipe.core.process.ProcessControlProvider; import io.xpipe.core.util.ModuleHelper; import io.xpipe.core.util.ModuleLayerLoader; import io.xpipe.core.util.XPipeInstallation; + import lombok.Getter; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/core/AppFileWatcher.java b/app/src/main/java/io/xpipe/app/core/AppFileWatcher.java index b42bd9787..a607e5a43 100644 --- a/app/src/main/java/io/xpipe/app/core/AppFileWatcher.java +++ b/app/src/main/java/io/xpipe/app/core/AppFileWatcher.java @@ -3,6 +3,7 @@ package io.xpipe.app.core; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.util.ThreadHelper; + import lombok.Getter; import java.io.IOException; diff --git a/app/src/main/java/io/xpipe/app/core/AppFont.java b/app/src/main/java/io/xpipe/app/core/AppFont.java index 2ad6e05b1..92af9378c 100644 --- a/app/src/main/java/io/xpipe/app/core/AppFont.java +++ b/app/src/main/java/io/xpipe/app/core/AppFont.java @@ -2,6 +2,7 @@ package io.xpipe.app.core; import io.xpipe.app.issue.TrackEvent; import io.xpipe.core.process.OsType; + import javafx.scene.Node; import javafx.scene.text.Font; diff --git a/app/src/main/java/io/xpipe/app/core/AppGreetings.java b/app/src/main/java/io/xpipe/app/core/AppGreetings.java index 9f2f92486..8cb93ac9c 100644 --- a/app/src/main/java/io/xpipe/app/core/AppGreetings.java +++ b/app/src/main/java/io/xpipe/app/core/AppGreetings.java @@ -3,6 +3,7 @@ package io.xpipe.app.core; import io.xpipe.app.comp.base.MarkdownComp; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.fxcomps.Comp; + import javafx.beans.property.SimpleBooleanProperty; import javafx.geometry.Insets; import javafx.geometry.Pos; diff --git a/app/src/main/java/io/xpipe/app/core/AppI18n.java b/app/src/main/java/io/xpipe/app/core/AppI18n.java index 367dfad13..e6c1b66cd 100644 --- a/app/src/main/java/io/xpipe/app/core/AppI18n.java +++ b/app/src/main/java/io/xpipe/app/core/AppI18n.java @@ -11,10 +11,12 @@ import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.util.Translatable; import io.xpipe.core.util.ModuleHelper; import io.xpipe.core.util.XPipeInstallation; + import javafx.beans.binding.Bindings; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; + import lombok.SneakyThrows; import lombok.Value; import org.apache.commons.io.FilenameUtils; diff --git a/app/src/main/java/io/xpipe/app/core/AppImages.java b/app/src/main/java/io/xpipe/app/core/AppImages.java index 7a4dc4c6d..c2ab7b01c 100644 --- a/app/src/main/java/io/xpipe/app/core/AppImages.java +++ b/app/src/main/java/io/xpipe/app/core/AppImages.java @@ -2,8 +2,10 @@ package io.xpipe.app.core; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; + import javafx.scene.image.Image; import javafx.scene.image.WritableImage; + import org.apache.commons.io.FilenameUtils; import org.slf4j.LoggerFactory; diff --git a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java index ccfad3989..f9efb70be 100644 --- a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java +++ b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java @@ -6,9 +6,11 @@ import io.xpipe.app.comp.store.StoreLayoutComp; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.prefs.AppPrefsComp; import io.xpipe.app.util.LicenseProvider; + import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; + import lombok.Builder; import lombok.Data; import lombok.Getter; diff --git a/app/src/main/java/io/xpipe/app/core/AppLogs.java b/app/src/main/java/io/xpipe/app/core/AppLogs.java index f5b132946..efda9ad5f 100644 --- a/app/src/main/java/io/xpipe/app/core/AppLogs.java +++ b/app/src/main/java/io/xpipe/app/core/AppLogs.java @@ -4,6 +4,7 @@ import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.util.XPipeSession; import io.xpipe.core.util.Deobfuscator; + import lombok.Getter; import org.apache.commons.io.FileUtils; import org.slf4j.ILoggerFactory; diff --git a/app/src/main/java/io/xpipe/app/core/AppMainWindow.java b/app/src/main/java/io/xpipe/app/core/AppMainWindow.java index 5c4c60da1..42fd49517 100644 --- a/app/src/main/java/io/xpipe/app/core/AppMainWindow.java +++ b/app/src/main/java/io/xpipe/app/core/AppMainWindow.java @@ -7,6 +7,7 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.CloseBehaviourAlert; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.process.OsType; + import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.geometry.Rectangle2D; @@ -16,17 +17,18 @@ import javafx.scene.input.KeyEvent; import javafx.scene.layout.Region; import javafx.stage.Screen; import javafx.stage.Stage; + import lombok.Builder; import lombok.Getter; import lombok.Value; import lombok.extern.jackson.Jacksonized; -import javax.imageio.ImageIO; import java.io.IOException; import java.nio.file.Path; import java.time.Duration; import java.time.Instant; import java.time.temporal.ChronoUnit; +import javax.imageio.ImageIO; public class AppMainWindow { diff --git a/app/src/main/java/io/xpipe/app/core/AppProperties.java b/app/src/main/java/io/xpipe/app/core/AppProperties.java index 2efcc1f64..bdadfa6bb 100644 --- a/app/src/main/java/io/xpipe/app/core/AppProperties.java +++ b/app/src/main/java/io/xpipe/app/core/AppProperties.java @@ -4,6 +4,7 @@ import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.util.ModuleHelper; import io.xpipe.core.util.XPipeInstallation; + import lombok.Getter; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/core/AppSid.java b/app/src/main/java/io/xpipe/app/core/AppSid.java index 1149534f5..f175cad73 100644 --- a/app/src/main/java/io/xpipe/app/core/AppSid.java +++ b/app/src/main/java/io/xpipe/app/core/AppSid.java @@ -1,9 +1,10 @@ package io.xpipe.app.core; -import com.sun.jna.Function; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.core.process.OsType; + +import com.sun.jna.Function; import lombok.Getter; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/io/xpipe/app/core/AppSocketServer.java b/app/src/main/java/io/xpipe/app/core/AppSocketServer.java index 3bd6400ab..eb2ac1695 100644 --- a/app/src/main/java/io/xpipe/app/core/AppSocketServer.java +++ b/app/src/main/java/io/xpipe/app/core/AppSocketServer.java @@ -1,11 +1,5 @@ package io.xpipe.app.core; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.node.TextNode; import io.xpipe.app.exchange.MessageExchangeImpls; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; @@ -17,6 +11,13 @@ import io.xpipe.core.util.Deobfuscator; import io.xpipe.core.util.FailableRunnable; import io.xpipe.core.util.JacksonMapper; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/app/src/main/java/io/xpipe/app/core/AppStyle.java b/app/src/main/java/io/xpipe/app/core/AppStyle.java index 30f69d9f5..ac792051f 100644 --- a/app/src/main/java/io/xpipe/app/core/AppStyle.java +++ b/app/src/main/java/io/xpipe/app/core/AppStyle.java @@ -3,6 +3,7 @@ package io.xpipe.app.core; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; + import javafx.scene.Scene; import java.io.IOException; 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 9d60d8793..c126f0e03 100644 --- a/app/src/main/java/io/xpipe/app/core/AppTheme.java +++ b/app/src/main/java/io/xpipe/app/core/AppTheme.java @@ -1,12 +1,12 @@ package io.xpipe.app.core; -import atlantafx.base.theme.*; import io.xpipe.app.ext.PrefsChoiceValue; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.process.OsType; + import javafx.animation.*; import javafx.application.Application; import javafx.application.ColorScheme; @@ -22,6 +22,8 @@ import javafx.stage.Stage; import javafx.stage.Window; import javafx.stage.WindowEvent; import javafx.util.Duration; + +import atlantafx.base.theme.*; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.SneakyThrows; @@ -85,10 +87,10 @@ public class AppTheme { } try { -// var c = new WindowControl(stage); -// c.setWindowAttribute(20, AppPrefs.get().theme.getValue().isDark()); -// c.setWindowAttribute(34, 0xFFFFFFFEL); -// c.redraw(); + // var c = new WindowControl(stage); + // c.setWindowAttribute(20, AppPrefs.get().theme.getValue().isDark()); + // c.setWindowAttribute(34, 0xFFFFFFFEL); + // c.redraw(); } catch (Throwable e) { ErrorEvent.fromThrowable(e).handle(); } diff --git a/app/src/main/java/io/xpipe/app/core/AppTray.java b/app/src/main/java/io/xpipe/app/core/AppTray.java index ac117a4dd..a17d4ae3f 100644 --- a/app/src/main/java/io/xpipe/app/core/AppTray.java +++ b/app/src/main/java/io/xpipe/app/core/AppTray.java @@ -2,7 +2,9 @@ package io.xpipe.app.core; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.ErrorHandler; + import javafx.application.Platform; + import lombok.Getter; import lombok.SneakyThrows; diff --git a/app/src/main/java/io/xpipe/app/core/AppTrayIcon.java b/app/src/main/java/io/xpipe/app/core/AppTrayIcon.java index 741a75c96..5d1318b7a 100644 --- a/app/src/main/java/io/xpipe/app/core/AppTrayIcon.java +++ b/app/src/main/java/io/xpipe/app/core/AppTrayIcon.java @@ -4,11 +4,11 @@ import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.core.process.OsType; -import javax.imageio.ImageIO; import java.awt.*; import java.io.IOException; import java.lang.reflect.Field; import java.net.URL; +import javax.imageio.ImageIO; public class AppTrayIcon { diff --git a/app/src/main/java/io/xpipe/app/core/AppWindowHelper.java b/app/src/main/java/io/xpipe/app/core/AppWindowHelper.java index d2f1895ac..fe8870866 100644 --- a/app/src/main/java/io/xpipe/app/core/AppWindowHelper.java +++ b/app/src/main/java/io/xpipe/app/core/AppWindowHelper.java @@ -7,6 +7,7 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.InputHelper; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.process.OsType; + import javafx.application.Platform; import javafx.beans.value.ObservableValue; import javafx.css.PseudoClass; diff --git a/app/src/main/java/io/xpipe/app/core/check/AppAvCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppAvCheck.java index b90b314d5..8cfb6579d 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppAvCheck.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppAvCheck.java @@ -6,10 +6,12 @@ import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.util.PlatformState; import io.xpipe.app.util.WindowsRegistry; import io.xpipe.core.process.OsType; + import javafx.geometry.Insets; import javafx.scene.control.Alert; import javafx.scene.control.ButtonBar; import javafx.scene.control.ButtonType; + import lombok.Getter; import java.nio.file.Files; diff --git a/app/src/main/java/io/xpipe/app/core/check/AppFontLoadingCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppFontLoadingCheck.java index d3812b757..6f325591a 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppFontLoadingCheck.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppFontLoadingCheck.java @@ -4,6 +4,7 @@ import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.issue.ErrorAction; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.LogErrorHandler; + import javafx.scene.text.Font; public class AppFontLoadingCheck { diff --git a/app/src/main/java/io/xpipe/app/core/check/AppPtbCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppPtbCheck.java index 458fd1505..d45e89820 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppPtbCheck.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppPtbCheck.java @@ -2,6 +2,7 @@ package io.xpipe.app.core.check; import io.xpipe.app.core.AppProperties; import io.xpipe.app.core.AppWindowHelper; + import javafx.scene.control.Alert; public class AppPtbCheck { diff --git a/app/src/main/java/io/xpipe/app/core/mode/GuiMode.java b/app/src/main/java/io/xpipe/app/core/mode/GuiMode.java index c6d82c9a6..12c67af3d 100644 --- a/app/src/main/java/io/xpipe/app/core/mode/GuiMode.java +++ b/app/src/main/java/io/xpipe/app/core/mode/GuiMode.java @@ -12,6 +12,7 @@ import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.update.UpdateChangelogAlert; import io.xpipe.app.util.ThreadHelper; + import javafx.stage.Stage; public class GuiMode extends PlatformMode { diff --git a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java index 80a60fbf8..2ccf7a2f8 100644 --- a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java +++ b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java @@ -19,10 +19,11 @@ import io.xpipe.core.process.OsType; import io.xpipe.core.util.FailableRunnable; import io.xpipe.core.util.XPipeDaemonMode; import io.xpipe.core.util.XPipeInstallation; + import javafx.application.Platform; + import lombok.Getter; -import javax.imageio.ImageIO; import java.awt.*; import java.awt.desktop.AppReopenedEvent; import java.awt.desktop.AppReopenedListener; @@ -30,6 +31,7 @@ import java.awt.desktop.SystemEventListener; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; +import javax.imageio.ImageIO; public abstract class OperationMode { diff --git a/app/src/main/java/io/xpipe/app/core/mode/PlatformMode.java b/app/src/main/java/io/xpipe/app/core/mode/PlatformMode.java index 0e77b66e1..b5cb69efe 100644 --- a/app/src/main/java/io/xpipe/app/core/mode/PlatformMode.java +++ b/app/src/main/java/io/xpipe/app/core/mode/PlatformMode.java @@ -8,6 +8,7 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.update.UpdateAvailableAlert; import io.xpipe.app.util.PlatformState; import io.xpipe.app.util.ThreadHelper; + import javafx.application.Application; public abstract class PlatformMode extends OperationMode { diff --git a/app/src/main/java/io/xpipe/app/exchange/MessageExchangeImpl.java b/app/src/main/java/io/xpipe/app/exchange/MessageExchangeImpl.java index 4bf19c234..f73b7583a 100644 --- a/app/src/main/java/io/xpipe/app/exchange/MessageExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/exchange/MessageExchangeImpl.java @@ -8,6 +8,7 @@ import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; import io.xpipe.core.store.DataStoreId; + import lombok.NonNull; public interface MessageExchangeImpl extends MessageExchange { diff --git a/app/src/main/java/io/xpipe/app/exchange/cli/StoreAddExchangeImpl.java b/app/src/main/java/io/xpipe/app/exchange/cli/StoreAddExchangeImpl.java index 3ade3f85b..4a296fd3f 100644 --- a/app/src/main/java/io/xpipe/app/exchange/cli/StoreAddExchangeImpl.java +++ b/app/src/main/java/io/xpipe/app/exchange/cli/StoreAddExchangeImpl.java @@ -12,10 +12,12 @@ import io.xpipe.core.dialog.Choice; import io.xpipe.core.dialog.Dialog; import io.xpipe.core.dialog.QueryConverter; import io.xpipe.core.store.DataStore; + import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; + import lombok.SneakyThrows; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/ext/ActionProvider.java b/app/src/main/java/io/xpipe/app/ext/ActionProvider.java index e08ccf72f..2d1ddad43 100644 --- a/app/src/main/java/io/xpipe/app/ext/ActionProvider.java +++ b/app/src/main/java/io/xpipe/app/ext/ActionProvider.java @@ -4,6 +4,7 @@ import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.ModuleLayerLoader; + import javafx.beans.value.ObservableValue; import java.net.URI; diff --git a/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java b/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java index f784309d7..ae16cfc34 100644 --- a/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java +++ b/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java @@ -15,6 +15,7 @@ import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.core.dialog.Dialog; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.JacksonizedValue; + import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.Property; @@ -60,7 +61,8 @@ public interface DataStoreProvider { return null; } - default ActionProvider.Action browserAction(BrowserSessionModel sessionModel, DataStoreEntry store, BooleanProperty busy) { + default ActionProvider.Action browserAction( + BrowserSessionModel sessionModel, DataStoreEntry store, BooleanProperty busy) { return null; } diff --git a/app/src/main/java/io/xpipe/app/ext/DataStoreProviders.java b/app/src/main/java/io/xpipe/app/ext/DataStoreProviders.java index 0990e19bc..3b36cca63 100644 --- a/app/src/main/java/io/xpipe/app/ext/DataStoreProviders.java +++ b/app/src/main/java/io/xpipe/app/ext/DataStoreProviders.java @@ -1,12 +1,13 @@ package io.xpipe.app.ext; -import com.fasterxml.jackson.databind.jsontype.NamedType; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.JacksonMapper; import io.xpipe.core.util.ModuleLayerLoader; +import com.fasterxml.jackson.databind.jsontype.NamedType; + import java.util.List; import java.util.Optional; import java.util.ServiceLoader; diff --git a/app/src/main/java/io/xpipe/app/ext/GuiDialog.java b/app/src/main/java/io/xpipe/app/ext/GuiDialog.java index 2531e1e11..75a906fed 100644 --- a/app/src/main/java/io/xpipe/app/ext/GuiDialog.java +++ b/app/src/main/java/io/xpipe/app/ext/GuiDialog.java @@ -3,6 +3,7 @@ package io.xpipe.app.ext; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.util.SimpleValidator; import io.xpipe.app.util.Validator; + import lombok.AllArgsConstructor; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/ext/PrefsChoiceValue.java b/app/src/main/java/io/xpipe/app/ext/PrefsChoiceValue.java index e42f70bd2..e23e4a3bb 100644 --- a/app/src/main/java/io/xpipe/app/ext/PrefsChoiceValue.java +++ b/app/src/main/java/io/xpipe/app/ext/PrefsChoiceValue.java @@ -2,7 +2,9 @@ package io.xpipe.app.ext; import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.Translatable; + import javafx.beans.value.ObservableValue; + import lombok.SneakyThrows; import java.util.Arrays; diff --git a/app/src/main/java/io/xpipe/app/ext/PrefsHandler.java b/app/src/main/java/io/xpipe/app/ext/PrefsHandler.java index 1c634f30e..961f3ed24 100644 --- a/app/src/main/java/io/xpipe/app/ext/PrefsHandler.java +++ b/app/src/main/java/io/xpipe/app/ext/PrefsHandler.java @@ -1,6 +1,7 @@ package io.xpipe.app.ext; import io.xpipe.app.fxcomps.Comp; + import javafx.beans.property.Property; public interface PrefsHandler { diff --git a/app/src/main/java/io/xpipe/app/ext/ScanProvider.java b/app/src/main/java/io/xpipe/app/ext/ScanProvider.java index 671b8cc8c..3ed8260f4 100644 --- a/app/src/main/java/io/xpipe/app/ext/ScanProvider.java +++ b/app/src/main/java/io/xpipe/app/ext/ScanProvider.java @@ -5,6 +5,7 @@ import io.xpipe.core.process.ShellControl; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.FailableRunnable; import io.xpipe.core.util.ModuleLayerLoader; + import lombok.AllArgsConstructor; import lombok.Value; 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 57d3175c7..55f714ea1 100644 --- a/app/src/main/java/io/xpipe/app/ext/SingletonSessionStoreProvider.java +++ b/app/src/main/java/io/xpipe/app/ext/SingletonSessionStoreProvider.java @@ -8,6 +8,7 @@ import io.xpipe.app.comp.store.StoreSection; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.store.SingletonSessionStore; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ObservableBooleanValue; @@ -16,10 +17,12 @@ public interface SingletonSessionStoreProvider extends DataStoreProvider { @Override public default ObservableBooleanValue busy(StoreEntryWrapper wrapper) { - return Bindings.createBooleanBinding(() -> { - SingletonSessionStore s = wrapper.getEntry().getStore().asNeeded(); - return s.isEnabled() != s.isRunning(); - }, wrapper.getCache()); + return Bindings.createBooleanBinding( + () -> { + SingletonSessionStore s = wrapper.getEntry().getStore().asNeeded(); + return s.isEnabled() != s.isRunning(); + }, + wrapper.getCache()); } @Override @@ -51,18 +54,15 @@ public interface SingletonSessionStoreProvider extends DataStoreProvider { } public default Comp stateDisplay(StoreEntryWrapper w) { - return new SystemStateComp( - Bindings.createObjectBinding( - () -> { - SingletonSessionStore s = w.getEntry().getStore().asNeeded(); - if (!s.isEnabled()) { - return SystemStateComp.State.OTHER; - } + return new SystemStateComp(Bindings.createObjectBinding( + () -> { + SingletonSessionStore s = w.getEntry().getStore().asNeeded(); + if (!s.isEnabled()) { + return SystemStateComp.State.OTHER; + } - return s.isRunning() - ? SystemStateComp.State.SUCCESS - : SystemStateComp.State.FAILURE; - }, - w.getCache())); + return s.isRunning() ? SystemStateComp.State.SUCCESS : SystemStateComp.State.FAILURE; + }, + w.getCache())); } } diff --git a/app/src/main/java/io/xpipe/app/fxcomps/Comp.java b/app/src/main/java/io/xpipe/app/fxcomps/Comp.java index dce02a41a..2d580c719 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/Comp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/Comp.java @@ -1,12 +1,12 @@ package io.xpipe.app.fxcomps; -import atlantafx.base.controls.Spacer; import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.augment.Augment; import io.xpipe.app.fxcomps.augment.GrowAugment; import io.xpipe.app.fxcomps.impl.TooltipAugment; import io.xpipe.app.fxcomps.util.BindingsHelper; import io.xpipe.app.fxcomps.util.Shortcuts; + import javafx.application.Platform; import javafx.beans.value.ObservableValue; import javafx.geometry.Insets; @@ -19,6 +19,8 @@ import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; +import atlantafx.base.controls.Spacer; + import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/SimpleCompStructure.java b/app/src/main/java/io/xpipe/app/fxcomps/SimpleCompStructure.java index f137a50fe..460d6625a 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/SimpleCompStructure.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/SimpleCompStructure.java @@ -1,6 +1,7 @@ package io.xpipe.app.fxcomps; import javafx.scene.layout.Region; + import lombok.AllArgsConstructor; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/augment/Augment.java b/app/src/main/java/io/xpipe/app/fxcomps/augment/Augment.java index 71bbea20d..82e39b0a8 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/augment/Augment.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/augment/Augment.java @@ -2,6 +2,7 @@ package io.xpipe.app.fxcomps.augment; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; + import javafx.scene.Node; import javafx.scene.layout.Region; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/augment/ContextMenuAugment.java b/app/src/main/java/io/xpipe/app/fxcomps/augment/ContextMenuAugment.java index 66993e53f..ea9140504 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/augment/ContextMenuAugment.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/augment/ContextMenuAugment.java @@ -1,6 +1,7 @@ package io.xpipe.app.fxcomps.augment; import io.xpipe.app.fxcomps.CompStructure; + import javafx.event.ActionEvent; import javafx.geometry.Side; import javafx.scene.control.ButtonBase; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/augment/DragOverPseudoClassAugment.java b/app/src/main/java/io/xpipe/app/fxcomps/augment/DragOverPseudoClassAugment.java index 780a25d10..1984b218e 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/augment/DragOverPseudoClassAugment.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/augment/DragOverPseudoClassAugment.java @@ -1,6 +1,7 @@ package io.xpipe.app.fxcomps.augment; import io.xpipe.app.fxcomps.CompStructure; + import javafx.css.PseudoClass; import javafx.scene.input.DragEvent; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/augment/DraggableAugment.java b/app/src/main/java/io/xpipe/app/fxcomps/augment/DraggableAugment.java index 170b1b22a..288c27b6d 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/augment/DraggableAugment.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/augment/DraggableAugment.java @@ -1,6 +1,7 @@ package io.xpipe.app.fxcomps.augment; import io.xpipe.app.fxcomps.CompStructure; + import javafx.scene.Cursor; public class DraggableAugment> implements Augment { diff --git a/app/src/main/java/io/xpipe/app/fxcomps/augment/GrowAugment.java b/app/src/main/java/io/xpipe/app/fxcomps/augment/GrowAugment.java index 17198740b..7dbac0fa5 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/augment/GrowAugment.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/augment/GrowAugment.java @@ -1,6 +1,7 @@ package io.xpipe.app.fxcomps.augment; import io.xpipe.app.fxcomps.CompStructure; + import javafx.beans.binding.Bindings; import javafx.scene.Node; import javafx.scene.layout.Region; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/CharChoiceComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/CharChoiceComp.java index 668757c5b..a8f6edf2f 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/CharChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/CharChoiceComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.fxcomps.impl; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; + import javafx.beans.property.Property; import javafx.beans.value.ObservableValue; import javafx.geometry.Pos; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/CharComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/CharComp.java index 8c5c89301..272b7e764 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/CharComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/CharComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.Property; import javafx.scene.control.TextField; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoiceComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoiceComp.java index 3fa88469a..845e03add 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoiceComp.java @@ -7,12 +7,14 @@ import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.ListBindingsHelper; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.util.Translatable; + import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.scene.control.ComboBox; import javafx.util.StringConverter; + import lombok.AccessLevel; import lombok.experimental.FieldDefaults; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoicePaneComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoicePaneComp.java index 48ad40924..d5df1848a 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoicePaneComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoicePaneComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.Property; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; @@ -12,6 +13,7 @@ import javafx.scene.input.KeyCode; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; import javafx.util.StringConverter; + import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.experimental.FieldDefaults; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/CodeSnippetComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/CodeSnippetComp.java index 07a9cc377..673b2d83e 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/CodeSnippetComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/CodeSnippetComp.java @@ -5,6 +5,7 @@ import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.util.ClipboardHelper; + import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ObservableValue; import javafx.scene.control.Button; @@ -13,6 +14,7 @@ import javafx.scene.control.TextArea; import javafx.scene.input.ScrollEvent; import javafx.scene.layout.*; import javafx.scene.paint.Color; + import org.kordamp.ikonli.javafx.FontIcon; public class CodeSnippetComp extends Comp> { diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/ContextualFileReferenceChoiceComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/ContextualFileReferenceChoiceComp.java index d65e3d303..cc629fe40 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/ContextualFileReferenceChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/ContextualFileReferenceChoiceComp.java @@ -1,6 +1,5 @@ package io.xpipe.app.fxcomps.impl; -import atlantafx.base.theme.Styles; import io.xpipe.app.browser.session.BrowserChooserComp; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.core.AppI18n; @@ -16,6 +15,7 @@ import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.FileSystemStore; + import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; @@ -24,6 +24,8 @@ import javafx.beans.value.ObservableValue; import javafx.scene.control.Alert; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; + +import atlantafx.base.theme.Styles; import org.kordamp.ikonli.javafx.FontIcon; import java.nio.file.Files; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java index 0663f380c..89a22916c 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreChoiceComp.java @@ -1,7 +1,5 @@ package io.xpipe.app.fxcomps.impl; -import atlantafx.base.controls.Popover; -import atlantafx.base.theme.Styles; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.comp.store.*; import io.xpipe.app.core.AppFont; @@ -14,6 +12,7 @@ import io.xpipe.app.util.DataStoreCategoryChoiceComp; import io.xpipe.core.store.DataStore; import io.xpipe.core.store.LocalStore; import io.xpipe.core.store.ShellStore; + import javafx.beans.binding.Bindings; import javafx.beans.property.Property; import javafx.beans.property.SimpleBooleanProperty; @@ -25,6 +24,9 @@ import javafx.scene.control.MenuButton; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; + +import atlantafx.base.controls.Popover; +import atlantafx.base.theme.Styles; import lombok.RequiredArgsConstructor; import org.kordamp.ikonli.javafx.FontIcon; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreFlowChoiceComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreFlowChoiceComp.java index 8f98b608d..b73193409 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreFlowChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreFlowChoiceComp.java @@ -3,10 +3,12 @@ package io.xpipe.app.fxcomps.impl; import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.core.store.DataFlow; + import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; import javafx.scene.layout.Region; + import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreListChoiceComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreListChoiceComp.java index ce5084b66..3799e110c 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreListChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/DataStoreListChoiceComp.java @@ -6,6 +6,7 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.DataStore; + import javafx.beans.property.ListProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.geometry.Insets; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/FilterComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/FilterComp.java index f148fc6b9..1d8360b73 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/FilterComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/FilterComp.java @@ -5,12 +5,14 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.binding.Bindings; import javafx.beans.property.Property; import javafx.scene.Node; import javafx.scene.control.Label; import javafx.scene.control.TextField; import javafx.scene.layout.StackPane; + import lombok.Builder; import lombok.Value; import org.kordamp.ikonli.javafx.FontIcon; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/GrowPaneComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/GrowPaneComp.java index 97d6c0038..04c11b2d2 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/GrowPaneComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/GrowPaneComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.fxcomps.impl; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; + import javafx.scene.layout.BorderPane; import javafx.scene.layout.Pane; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/HorizontalComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/HorizontalComp.java index a5b648329..1ecb7883f 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/HorizontalComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/HorizontalComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.fxcomps.impl; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; + import javafx.geometry.Pos; import javafx.scene.layout.HBox; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/IconButtonComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/IconButtonComp.java index f96144e95..94c05144e 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/IconButtonComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/IconButtonComp.java @@ -1,15 +1,17 @@ package io.xpipe.app.fxcomps.impl; -import atlantafx.base.theme.Styles; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; import javafx.css.Size; import javafx.css.SizeUnits; import javafx.scene.control.Button; + +import atlantafx.base.theme.Styles; import org.kordamp.ikonli.javafx.FontIcon; public class IconButtonComp extends Comp> { diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/IntFieldComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/IntFieldComp.java index 0beffef90..6c6670015 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/IntFieldComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/IntFieldComp.java @@ -4,10 +4,12 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.Property; import javafx.beans.value.ChangeListener; import javafx.scene.control.TextField; import javafx.scene.input.KeyEvent; + import lombok.AccessLevel; import lombok.experimental.FieldDefaults; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/LabelComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/LabelComp.java index da1a559ad..98f29c110 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/LabelComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/LabelComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; import javafx.geometry.Pos; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java index 1021cd87e..223d0db1f 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/OptionsComp.java @@ -1,14 +1,12 @@ package io.xpipe.app.fxcomps.impl; -import atlantafx.base.controls.Popover; -import atlantafx.base.controls.Spacer; -import atlantafx.base.theme.Styles; import io.xpipe.app.comp.base.MarkdownComp; import io.xpipe.app.core.AppFont; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.Observable; import javafx.beans.binding.Bindings; import javafx.beans.value.ObservableValue; @@ -17,6 +15,10 @@ import javafx.geometry.Pos; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.layout.*; + +import atlantafx.base.controls.Popover; +import atlantafx.base.controls.Spacer; +import atlantafx.base.theme.Styles; import lombok.Getter; import java.util.ArrayList; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/PaneComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/PaneComp.java index 30fe2d467..b899d0e06 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/PaneComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/PaneComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.fxcomps.impl; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; + import javafx.scene.layout.Pane; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettyImageComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettyImageComp.java index cb4794b69..9ccaece83 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettyImageComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettyImageComp.java @@ -6,6 +6,7 @@ import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.store.FileNames; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettyImageHelper.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettyImageHelper.java index 8e979c071..7ab279cd0 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettyImageHelper.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettyImageHelper.java @@ -4,6 +4,7 @@ import io.xpipe.app.core.AppImages; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.util.BindingsHelper; import io.xpipe.core.store.FileNames; + import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettySvgComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettySvgComp.java index 461baa10d..71e141fed 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettySvgComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/PrettySvgComp.java @@ -5,6 +5,7 @@ import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.store.FileNames; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/SecretFieldComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/SecretFieldComp.java index 387e2ef03..c78b7d4ce 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/SecretFieldComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/SecretFieldComp.java @@ -6,6 +6,7 @@ import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.core.util.InPlaceSecretValue; + import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.scene.control.PasswordField; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/StackComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/StackComp.java index 04c85f832..2ee76fbe4 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/StackComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/StackComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.fxcomps.impl; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; + import javafx.geometry.Pos; import javafx.scene.layout.StackPane; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/StoreCategoryComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/StoreCategoryComp.java index 41c777c71..b63cf5fc9 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/StoreCategoryComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/StoreCategoryComp.java @@ -15,6 +15,7 @@ import io.xpipe.app.fxcomps.util.ListBindingsHelper; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.util.ContextMenuHelper; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleBooleanProperty; import javafx.css.PseudoClass; @@ -25,6 +26,7 @@ import javafx.scene.control.MenuItem; import javafx.scene.input.KeyCode; import javafx.scene.input.MouseButton; import javafx.scene.layout.Region; + import lombok.EqualsAndHashCode; import lombok.Value; import org.kordamp.ikonli.javafx.FontIcon; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/StoreCategoryListComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/StoreCategoryListComp.java index 4339903b3..4cff35efd 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/StoreCategoryListComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/StoreCategoryListComp.java @@ -2,6 +2,7 @@ package io.xpipe.app.fxcomps.impl; import io.xpipe.app.comp.store.StoreCategoryWrapper; import io.xpipe.app.fxcomps.SimpleComp; + import javafx.scene.layout.Region; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/StringSourceComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/StringSourceComp.java index 166d47090..08252bb2c 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/StringSourceComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/StringSourceComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.StringSource; import io.xpipe.core.store.ShellStore; + import javafx.beans.property.Property; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleObjectProperty; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/SvgView.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/SvgView.java index 10847b188..d8f1bec2c 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/SvgView.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/SvgView.java @@ -3,6 +3,7 @@ package io.xpipe.app.fxcomps.impl; import io.xpipe.app.core.AppProperties; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.value.ObservableValue; @@ -12,6 +13,7 @@ import javafx.scene.Node; import javafx.scene.layout.StackPane; import javafx.scene.paint.Color; import javafx.scene.web.WebView; + import lombok.Builder; import lombok.Getter; import lombok.SneakyThrows; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/TextAreaComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/TextAreaComp.java index f31825dae..e29b399b7 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/TextAreaComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/TextAreaComp.java @@ -3,11 +3,13 @@ package io.xpipe.app.fxcomps.impl; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.binding.Bindings; import javafx.beans.property.Property; import javafx.beans.property.SimpleStringProperty; import javafx.scene.control.TextArea; import javafx.scene.layout.AnchorPane; + import lombok.Builder; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/TextFieldComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/TextFieldComp.java index eea8bf4ca..073b461ae 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/TextFieldComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/TextFieldComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.Property; import javafx.beans.property.SimpleStringProperty; import javafx.scene.control.TextField; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/ToggleGroupComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/ToggleGroupComp.java index 9f590e33c..2581c900d 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/ToggleGroupComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/ToggleGroupComp.java @@ -1,16 +1,18 @@ package io.xpipe.app.fxcomps.impl; -import atlantafx.base.theme.Styles; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.Property; import javafx.beans.value.ObservableValue; import javafx.scene.control.ToggleButton; import javafx.scene.control.ToggleGroup; import javafx.scene.layout.HBox; +import atlantafx.base.theme.Styles; + import java.util.Map; public class ToggleGroupComp extends Comp> { diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/TooltipAugment.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/TooltipAugment.java index 2c681be7f..c498f208b 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/TooltipAugment.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/TooltipAugment.java @@ -5,6 +5,7 @@ import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.augment.Augment; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.fxcomps.util.Shortcuts; + import javafx.beans.binding.Bindings; import javafx.beans.value.ObservableValue; import javafx.scene.control.Tooltip; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/VerticalComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/VerticalComp.java index 2a6626ac5..5c6ec4c80 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/impl/VerticalComp.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/VerticalComp.java @@ -4,6 +4,7 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/util/BindingsHelper.java b/app/src/main/java/io/xpipe/app/fxcomps/util/BindingsHelper.java index 169f4ee65..9a59b6116 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/util/BindingsHelper.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/util/BindingsHelper.java @@ -1,9 +1,11 @@ package io.xpipe.app.fxcomps.util; import io.xpipe.app.util.ThreadHelper; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; + import lombok.Value; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/io/xpipe/app/fxcomps/util/PlatformThread.java b/app/src/main/java/io/xpipe/app/fxcomps/util/PlatformThread.java index 43513134e..20649d050 100644 --- a/app/src/main/java/io/xpipe/app/fxcomps/util/PlatformThread.java +++ b/app/src/main/java/io/xpipe/app/fxcomps/util/PlatformThread.java @@ -3,6 +3,7 @@ package io.xpipe.app.fxcomps.util; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.util.PlatformState; + import javafx.application.Platform; import javafx.beans.InvalidationListener; import javafx.beans.Observable; @@ -10,6 +11,7 @@ import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; + import lombok.NonNull; import java.util.*; diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java b/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java index 9fc1a9d51..5a1320983 100644 --- a/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java +++ b/app/src/main/java/io/xpipe/app/issue/ErrorDetailsComp.java @@ -4,9 +4,11 @@ import io.xpipe.app.core.AppFont; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.core.util.Deobfuscator; + import javafx.geometry.Insets; import javafx.scene.control.TextArea; import javafx.scene.layout.Region; + import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java b/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java index b58eab9b1..4086586b3 100644 --- a/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java +++ b/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java @@ -11,6 +11,7 @@ import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.augment.GrowAugment; import io.xpipe.app.util.LicenseRequiredException; import io.xpipe.app.util.PlatformState; + import javafx.application.Platform; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; @@ -24,6 +25,7 @@ import javafx.scene.layout.Region; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; import javafx.stage.Stage; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java b/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java index 9f8751154..9099461b9 100644 --- a/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java +++ b/app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java @@ -1,8 +1,5 @@ package io.xpipe.app.issue; -import io.sentry.*; -import io.sentry.protocol.SentryId; -import io.sentry.protocol.User; import io.xpipe.app.core.AppLogs; import io.xpipe.app.core.AppProperties; import io.xpipe.app.core.AppState; @@ -10,6 +7,10 @@ import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.update.XPipeDistributionType; import io.xpipe.app.util.LicenseProvider; + +import io.sentry.*; +import io.sentry.protocol.SentryId; +import io.sentry.protocol.User; import org.apache.commons.io.FileUtils; import java.io.ByteArrayInputStream; diff --git a/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java b/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java index 78f2649e3..7fe18d2d4 100644 --- a/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java +++ b/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java @@ -4,6 +4,7 @@ import io.xpipe.app.core.*; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.update.XPipeDistributionType; import io.xpipe.app.util.Hyperlinks; + import javafx.scene.control.Alert; import javafx.scene.control.ButtonBar; import javafx.scene.control.ButtonType; diff --git a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java index ee4dc2ed7..a80836d69 100644 --- a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java +++ b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java @@ -1,7 +1,5 @@ package io.xpipe.app.issue; -import atlantafx.base.controls.Popover; -import atlantafx.base.controls.Spacer; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.comp.base.ListSelectorComp; import io.xpipe.app.comp.base.MarkdownComp; @@ -9,6 +7,7 @@ import io.xpipe.app.comp.base.TitledPaneComp; import io.xpipe.app.core.*; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; + import javafx.beans.property.ListProperty; import javafx.beans.property.SimpleListProperty; import javafx.beans.property.SimpleStringProperty; @@ -23,6 +22,9 @@ import javafx.scene.control.TextField; import javafx.scene.layout.*; import javafx.stage.Stage; +import atlantafx.base.controls.Popover; +import atlantafx.base.controls.Spacer; + import java.nio.file.Files; import java.nio.file.Path; diff --git a/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java b/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java index 214abf3a0..b47f84e64 100644 --- a/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java +++ b/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java @@ -15,6 +15,7 @@ import io.xpipe.beacon.exchange.OpenExchange; import io.xpipe.core.process.OsType; import io.xpipe.core.util.XPipeDaemonMode; import io.xpipe.core.util.XPipeInstallation; + import lombok.SneakyThrows; import picocli.CommandLine; @@ -109,7 +110,8 @@ public class LauncherCommand implements Callable { // starting up or listening on another port if (!AppDataLock.lock()) { throw new IOException( - "Data directory " + AppProperties.get().getDataDir().toString() + " is already locked. Is another instance running?"); + "Data directory " + AppProperties.get().getDataDir().toString() + + " is already locked. Is another instance running?"); } } catch (Exception ex) { var cli = XPipeInstallation.getLocalDefaultCliExecutable(); diff --git a/app/src/main/java/io/xpipe/app/launcher/LauncherInput.java b/app/src/main/java/io/xpipe/app/launcher/LauncherInput.java index 87adc1579..382e0a4c7 100644 --- a/app/src/main/java/io/xpipe/app/launcher/LauncherInput.java +++ b/app/src/main/java/io/xpipe/app/launcher/LauncherInput.java @@ -7,6 +7,7 @@ import io.xpipe.app.ext.ActionProvider; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.storage.DataStorage; + import lombok.Getter; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/launcher/LauncherModeConverter.java b/app/src/main/java/io/xpipe/app/launcher/LauncherModeConverter.java index c8e82d242..aefb4eef8 100644 --- a/app/src/main/java/io/xpipe/app/launcher/LauncherModeConverter.java +++ b/app/src/main/java/io/xpipe/app/launcher/LauncherModeConverter.java @@ -1,6 +1,7 @@ package io.xpipe.app.launcher; import io.xpipe.core.util.XPipeDaemonMode; + import picocli.CommandLine; public class LauncherModeConverter implements CommandLine.ITypeConverter { diff --git a/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java b/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java index d4addda96..1e3c6039a 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java @@ -1,6 +1,5 @@ package io.xpipe.app.prefs; -import atlantafx.base.theme.Styles; import io.xpipe.app.comp.base.TileButtonComp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppProperties; @@ -11,11 +10,14 @@ import io.xpipe.app.fxcomps.impl.VerticalComp; import io.xpipe.app.util.Hyperlinks; import io.xpipe.app.util.JfxHelper; import io.xpipe.app.util.OptionsBuilder; + import javafx.beans.property.SimpleStringProperty; import javafx.geometry.Insets; import javafx.scene.control.ScrollPane; import javafx.scene.layout.Region; +import atlantafx.base.theme.Styles; + import java.util.List; public class AboutCategory extends AppPrefsCategory { @@ -103,8 +105,9 @@ public class AboutCategory extends AppPrefsCategory { var title = Comp.of(() -> { return JfxHelper.createNamedEntry( AppI18n.observable("xPipeClient"), - new SimpleStringProperty("Version " + AppProperties.get().getVersion() + " (" - + AppProperties.get().getArch() + ")"), + new SimpleStringProperty( + "Version " + AppProperties.get().getVersion() + " (" + + AppProperties.get().getArch() + ")"), "logo.png"); }) .styleClass(Styles.TEXT_BOLD); diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java index b54e05ad7..9b20fb49d 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java @@ -14,12 +14,14 @@ import io.xpipe.app.terminal.ExternalTerminalType; import io.xpipe.app.util.PasswordLockSecretValue; import io.xpipe.core.util.InPlaceSecretValue; import io.xpipe.core.util.ModuleHelper; + import javafx.beans.binding.Bindings; import javafx.beans.property.*; import javafx.beans.value.ObservableBooleanValue; import javafx.beans.value.ObservableDoubleValue; import javafx.beans.value.ObservableStringValue; import javafx.beans.value.ObservableValue; + import lombok.Getter; import lombok.Value; @@ -507,7 +509,9 @@ public class AppPrefs { public void selectCategory(String id) { AppLayoutModel.get().selectSettings(); - var found = categories.stream().filter(appPrefsCategory -> appPrefsCategory.getId().equals(id)).findFirst(); + var found = categories.stream() + .filter(appPrefsCategory -> appPrefsCategory.getId().equals(id)) + .findFirst(); found.ifPresent(appPrefsCategory -> { selectedCategory.setValue(appPrefsCategory); }); diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java index f5cbc92cc..bd8ea3c1f 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.prefs; import io.xpipe.app.core.AppFont; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.ScrollPane; diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsSidebarComp.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsSidebarComp.java index f8b0ad50e..7528d8cb1 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsSidebarComp.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsSidebarComp.java @@ -6,6 +6,7 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.impl.VerticalComp; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.css.PseudoClass; import javafx.geometry.Pos; import javafx.scene.control.Button; diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java index 18ead9fc7..87b0a0ef9 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java @@ -1,14 +1,15 @@ package io.xpipe.app.prefs; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.NullNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.node.TextNode; import io.xpipe.app.ext.PrefsChoiceValue; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.util.JsonConfigHelper; import io.xpipe.core.util.JacksonMapper; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.NullNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; import org.apache.commons.io.FileUtils; import java.nio.file.Path; diff --git a/app/src/main/java/io/xpipe/app/prefs/AppearanceCategory.java b/app/src/main/java/io/xpipe/app/prefs/AppearanceCategory.java index 09eb5645d..0434cb540 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppearanceCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppearanceCategory.java @@ -1,7 +1,5 @@ package io.xpipe.app.prefs; -import atlantafx.base.controls.ProgressSliderSkin; -import atlantafx.base.theme.Styles; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppTheme; @@ -11,8 +9,12 @@ import io.xpipe.app.fxcomps.impl.HorizontalComp; import io.xpipe.app.fxcomps.impl.IntFieldComp; import io.xpipe.app.util.Hyperlinks; import io.xpipe.app.util.OptionsBuilder; + import javafx.geometry.Pos; import javafx.scene.control.Slider; + +import atlantafx.base.controls.ProgressSliderSkin; +import atlantafx.base.theme.Styles; import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/prefs/ClearCacheAlert.java b/app/src/main/java/io/xpipe/app/prefs/ClearCacheAlert.java index 4907d4e08..a64de0201 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ClearCacheAlert.java +++ b/app/src/main/java/io/xpipe/app/prefs/ClearCacheAlert.java @@ -3,6 +3,7 @@ package io.xpipe.app.prefs; import io.xpipe.app.core.AppCache; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppWindowHelper; + import javafx.scene.control.Alert; public class ClearCacheAlert { diff --git a/app/src/main/java/io/xpipe/app/prefs/CloseBehaviour.java b/app/src/main/java/io/xpipe/app/prefs/CloseBehaviour.java index 325c21ed5..a05499bfa 100644 --- a/app/src/main/java/io/xpipe/app/prefs/CloseBehaviour.java +++ b/app/src/main/java/io/xpipe/app/prefs/CloseBehaviour.java @@ -2,6 +2,7 @@ package io.xpipe.app.prefs; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.ext.PrefsChoiceValue; + import lombok.Getter; @Getter diff --git a/app/src/main/java/io/xpipe/app/prefs/CloseBehaviourAlert.java b/app/src/main/java/io/xpipe/app/prefs/CloseBehaviourAlert.java index ae8d78a40..f6cd5f21e 100644 --- a/app/src/main/java/io/xpipe/app/prefs/CloseBehaviourAlert.java +++ b/app/src/main/java/io/xpipe/app/prefs/CloseBehaviourAlert.java @@ -5,6 +5,7 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppWindowHelper; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.ext.PrefsChoiceValue; + import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.scene.control.Alert; diff --git a/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java b/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java index 08fed8334..1e130845b 100644 --- a/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java @@ -1,6 +1,5 @@ package io.xpipe.app.prefs; -import atlantafx.base.theme.Styles; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.impl.HorizontalComp; @@ -10,9 +9,12 @@ import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.process.ProcessOutputException; + import javafx.beans.property.SimpleStringProperty; import javafx.geometry.Insets; import javafx.geometry.Pos; + +import atlantafx.base.theme.Styles; import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/prefs/EditorCategory.java b/app/src/main/java/io/xpipe/app/prefs/EditorCategory.java index caefd19ec..9aa7fa36c 100644 --- a/app/src/main/java/io/xpipe/app/prefs/EditorCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/EditorCategory.java @@ -10,8 +10,10 @@ import io.xpipe.app.fxcomps.impl.TextFieldComp; import io.xpipe.app.util.FileOpener; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.util.ThreadHelper; + import javafx.geometry.Insets; import javafx.geometry.Pos; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java index def490d46..d7d33acb1 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java +++ b/app/src/main/java/io/xpipe/app/prefs/ExternalApplicationType.java @@ -34,7 +34,7 @@ public abstract class ExternalApplicationType implements PrefsChoiceValue { return getId(); } - public static abstract class MacApplication extends ExternalApplicationType { + public abstract static class MacApplication extends ExternalApplicationType { protected final String applicationName; diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalPasswordManager.java b/app/src/main/java/io/xpipe/app/prefs/ExternalPasswordManager.java index 3e30ed963..e6e9d18af 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ExternalPasswordManager.java +++ b/app/src/main/java/io/xpipe/app/prefs/ExternalPasswordManager.java @@ -46,7 +46,6 @@ public interface ExternalPasswordManager extends PrefsChoiceValue { } }; - static ExternalPasswordManager LASTPASS = new ExternalPasswordManager() { @Override public String getTemplate() { @@ -76,5 +75,7 @@ public interface ExternalPasswordManager extends PrefsChoiceValue { } }; - static List ALL = Stream.of(ONEPASSWORD, BITWARDEN, DASHLANE, LASTPASS, MACOS_KEYCHAIN).filter(externalPasswordManager -> externalPasswordManager.isSelectable()).toList(); + static List ALL = Stream.of(ONEPASSWORD, BITWARDEN, DASHLANE, LASTPASS, MACOS_KEYCHAIN) + .filter(externalPasswordManager -> externalPasswordManager.isSelectable()) + .toList(); } diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java index 05fd12888..a502a97f3 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java +++ b/app/src/main/java/io/xpipe/app/prefs/ExternalRdpClientType.java @@ -5,6 +5,7 @@ import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.util.*; import io.xpipe.core.process.CommandBuilder; import io.xpipe.core.process.OsType; + import lombok.Value; import java.nio.file.Files; @@ -86,6 +87,7 @@ public interface ExternalRdpClientType extends PrefsChoiceValue { List WINDOWS_CLIENTS = List.of(MSTSC); List LINUX_CLIENTS = List.of(REMMINA); List MACOS_CLIENTS = List.of(MICROSOFT_REMOTE_DESKTOP_MACOS_APP); + @SuppressWarnings("TrivialFunctionalExpressionUsage") List ALL = ((Supplier>) () -> { var all = new ArrayList(); diff --git a/app/src/main/java/io/xpipe/app/prefs/PasswordManagerCategory.java b/app/src/main/java/io/xpipe/app/prefs/PasswordManagerCategory.java index 30cc22bd6..f99b5d505 100644 --- a/app/src/main/java/io/xpipe/app/prefs/PasswordManagerCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/PasswordManagerCategory.java @@ -1,6 +1,5 @@ package io.xpipe.app.prefs; -import atlantafx.base.theme.Styles; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.Comp; @@ -12,11 +11,14 @@ import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.process.CommandBuilder; import io.xpipe.core.process.CommandControl; import io.xpipe.core.store.LocalStore; + import javafx.beans.property.SimpleStringProperty; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.MenuButton; import javafx.scene.control.MenuItem; + +import atlantafx.base.theme.Styles; import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; @@ -33,7 +35,8 @@ public class PasswordManagerCategory extends AppPrefsCategory { var cb = new MenuButton(); cb.textProperty().bind(AppI18n.observable("templates")); ExternalPasswordManager.ALL.forEach(externalPasswordManager -> { - var m = new MenuItem(externalPasswordManager.toTranslatedString().getValue()); + var m = new MenuItem( + externalPasswordManager.toTranslatedString().getValue()); m.setOnAction(event -> { AppPrefs.get().passwordManagerCommand.set(externalPasswordManager.getTemplate()); event.consume(); @@ -67,7 +70,9 @@ public class PasswordManagerCategory extends AppPrefsCategory { }); }; - var c = new TextFieldComp(prefs.passwordManagerCommand, true).apply(struc -> struc.get().setPromptText("mypassmgr get $KEY")).minWidth(350); + var c = new TextFieldComp(prefs.passwordManagerCommand, true) + .apply(struc -> struc.get().setPromptText("mypassmgr get $KEY")) + .minWidth(350); var visit = createTemplateChoice(); var choice = new HorizontalComp(List.of(c, visit)).apply(struc -> { struc.get().setAlignment(Pos.CENTER_LEFT); diff --git a/app/src/main/java/io/xpipe/app/prefs/SshCategory.java b/app/src/main/java/io/xpipe/app/prefs/SshCategory.java index cb8750cad..ccd40c326 100644 --- a/app/src/main/java/io/xpipe/app/prefs/SshCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/SshCategory.java @@ -3,6 +3,7 @@ package io.xpipe.app.prefs; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.core.process.OsType; + import javafx.beans.property.SimpleBooleanProperty; public class SshCategory extends AppPrefsCategory { diff --git a/app/src/main/java/io/xpipe/app/prefs/StartupBehaviour.java b/app/src/main/java/io/xpipe/app/prefs/StartupBehaviour.java index 48f2471b3..b3cd2416a 100644 --- a/app/src/main/java/io/xpipe/app/prefs/StartupBehaviour.java +++ b/app/src/main/java/io/xpipe/app/prefs/StartupBehaviour.java @@ -3,6 +3,7 @@ package io.xpipe.app.prefs; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.ext.PrefsChoiceValue; import io.xpipe.core.util.XPipeDaemonMode; + import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/app/src/main/java/io/xpipe/app/prefs/SupportedLocale.java b/app/src/main/java/io/xpipe/app/prefs/SupportedLocale.java index 5ead1d653..2fe551e8a 100644 --- a/app/src/main/java/io/xpipe/app/prefs/SupportedLocale.java +++ b/app/src/main/java/io/xpipe/app/prefs/SupportedLocale.java @@ -2,8 +2,10 @@ package io.xpipe.app.prefs; import io.xpipe.app.core.AppProperties; import io.xpipe.app.ext.PrefsChoiceValue; + import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; + import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/app/src/main/java/io/xpipe/app/prefs/TerminalCategory.java b/app/src/main/java/io/xpipe/app/prefs/TerminalCategory.java index 5bfe1ec99..ba5613593 100644 --- a/app/src/main/java/io/xpipe/app/prefs/TerminalCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/TerminalCategory.java @@ -14,11 +14,13 @@ import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.util.TerminalLauncher; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.store.LocalStore; + import javafx.beans.binding.Bindings; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.ListCell; import javafx.scene.paint.Color; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/prefs/ThirdPartyDependency.java b/app/src/main/java/io/xpipe/app/prefs/ThirdPartyDependency.java index 6745c3b3b..b03266e41 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ThirdPartyDependency.java +++ b/app/src/main/java/io/xpipe/app/prefs/ThirdPartyDependency.java @@ -2,6 +2,7 @@ package io.xpipe.app.prefs; import io.xpipe.app.core.AppExtensionManager; import io.xpipe.app.core.AppResources; + import org.apache.commons.io.FilenameUtils; import java.nio.file.Files; diff --git a/app/src/main/java/io/xpipe/app/prefs/ThirdPartyDependencyListComp.java b/app/src/main/java/io/xpipe/app/prefs/ThirdPartyDependencyListComp.java index 5d48545ae..dff992aa9 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ThirdPartyDependencyListComp.java +++ b/app/src/main/java/io/xpipe/app/prefs/ThirdPartyDependencyListComp.java @@ -5,6 +5,7 @@ import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.SimpleCompStructure; import io.xpipe.app.util.Hyperlinks; + import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.*; diff --git a/app/src/main/java/io/xpipe/app/prefs/UpdateCheckComp.java b/app/src/main/java/io/xpipe/app/prefs/UpdateCheckComp.java index 339a77839..f04f9d94d 100644 --- a/app/src/main/java/io/xpipe/app/prefs/UpdateCheckComp.java +++ b/app/src/main/java/io/xpipe/app/prefs/UpdateCheckComp.java @@ -7,6 +7,7 @@ import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.update.UpdateAvailableAlert; import io.xpipe.app.update.XPipeDistributionType; import io.xpipe.app.util.ThreadHelper; + import javafx.beans.binding.Bindings; import javafx.beans.value.ObservableValue; import javafx.scene.layout.Region; diff --git a/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java b/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java index d592baf23..1e4b2b114 100644 --- a/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java @@ -7,7 +7,9 @@ import io.xpipe.app.util.LockChangeAlert; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.app.util.Validator; import io.xpipe.core.util.XPipeInstallation; + import javafx.beans.binding.Bindings; + import lombok.SneakyThrows; public class VaultCategory extends AppPrefsCategory { diff --git a/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java b/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java index 13b3eeb92..eb633259c 100644 --- a/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java +++ b/app/src/main/java/io/xpipe/app/storage/ContextualFileReference.java @@ -3,6 +3,7 @@ package io.xpipe.app.storage; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.process.ShellControl; import io.xpipe.core.store.FileNames; + import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.NonNull; diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java index 1c2c8f7c1..31836f300 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java @@ -1,7 +1,6 @@ package io.xpipe.app.storage; import io.xpipe.app.comp.store.StoreSortMode; -import io.xpipe.app.ext.DataStoreProviders; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.FixedHierarchyStore; @@ -11,7 +10,9 @@ import io.xpipe.core.store.DataStoreId; import io.xpipe.core.store.FixedChildStore; import io.xpipe.core.store.LocalStore; import io.xpipe.core.util.UuidHelper; + import javafx.util.Pair; + import lombok.Getter; import lombok.NonNull; import lombok.Setter; diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorageEncryption.java b/app/src/main/java/io/xpipe/app/storage/DataStorageEncryption.java index 509c18d31..fba1989f9 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorageEncryption.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorageEncryption.java @@ -1,14 +1,15 @@ package io.xpipe.app.storage; +import io.xpipe.app.issue.ErrorEvent; +import io.xpipe.app.prefs.AppPrefs; +import io.xpipe.core.util.InPlaceSecretValue; +import io.xpipe.core.util.JacksonMapper; + import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import io.xpipe.app.issue.ErrorEvent; -import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.core.util.InPlaceSecretValue; -import io.xpipe.core.util.JacksonMapper; import java.io.CharArrayReader; import java.io.CharArrayWriter; diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorageParser.java b/app/src/main/java/io/xpipe/app/storage/DataStorageParser.java index 3da3af7e7..eed8c8f95 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorageParser.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorageParser.java @@ -1,10 +1,11 @@ package io.xpipe.app.storage; -import com.fasterxml.jackson.databind.JsonNode; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.JacksonMapper; +import com.fasterxml.jackson.databind.JsonNode; + public class DataStorageParser { public static DataStore storeFromNode(JsonNode node) { diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorageWriter.java b/app/src/main/java/io/xpipe/app/storage/DataStorageWriter.java index 3d75f76aa..e018a68f0 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorageWriter.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorageWriter.java @@ -1,9 +1,10 @@ package io.xpipe.app.storage; -import com.fasterxml.jackson.databind.JsonNode; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.JacksonMapper; +import com.fasterxml.jackson.databind.JsonNode; + public class DataStorageWriter { public static JsonNode storeToNode(DataStore store) { diff --git a/app/src/main/java/io/xpipe/app/storage/DataStoreCategory.java b/app/src/main/java/io/xpipe/app/storage/DataStoreCategory.java index 6e4eeb191..acf346cb0 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStoreCategory.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStoreCategory.java @@ -1,11 +1,12 @@ package io.xpipe.app.storage; +import io.xpipe.app.comp.store.StoreSortMode; +import io.xpipe.core.util.JacksonMapper; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import io.xpipe.app.comp.store.StoreSortMode; -import io.xpipe.core.util.JacksonMapper; import lombok.EqualsAndHashCode; import lombok.NonNull; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/storage/DataStoreColor.java b/app/src/main/java/io/xpipe/app/storage/DataStoreColor.java index 5cdf7005f..c3250d7f8 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStoreColor.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStoreColor.java @@ -1,7 +1,8 @@ package io.xpipe.app.storage; -import com.fasterxml.jackson.annotation.JsonProperty; import javafx.scene.paint.Color; + +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; @Getter diff --git a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java index f3c3c7f77..acdc72630 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStoreEntry.java @@ -1,17 +1,18 @@ package io.xpipe.app.storage; +import io.xpipe.app.ext.DataStoreProvider; +import io.xpipe.app.ext.DataStoreProviders; +import io.xpipe.app.issue.ErrorEvent; +import io.xpipe.app.util.FixedHierarchyStore; +import io.xpipe.core.store.*; +import io.xpipe.core.util.JacksonMapper; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import io.xpipe.app.ext.DataStoreProvider; -import io.xpipe.app.ext.DataStoreProviders; -import io.xpipe.app.issue.ErrorEvent; -import io.xpipe.app.util.FixedHierarchyStore; -import io.xpipe.core.store.*; -import io.xpipe.core.util.JacksonMapper; import lombok.*; import lombok.experimental.NonFinal; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/io/xpipe/app/storage/DataStoreEntryRef.java b/app/src/main/java/io/xpipe/app/storage/DataStoreEntryRef.java index eeb16066a..f478e516c 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStoreEntryRef.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStoreEntryRef.java @@ -1,6 +1,7 @@ package io.xpipe.app.storage; import io.xpipe.core.store.DataStore; + import lombok.NonNull; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/storage/DataStoreSecret.java b/app/src/main/java/io/xpipe/app/storage/DataStoreSecret.java index 6efbfd90a..0c71cee99 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStoreSecret.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStoreSecret.java @@ -1,11 +1,12 @@ package io.xpipe.app.storage; -import com.fasterxml.jackson.core.TreeNode; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.PasswordLockSecretValue; import io.xpipe.app.util.VaultKeySecretValue; import io.xpipe.core.util.InPlaceSecretValue; import io.xpipe.core.util.SecretValue; + +import com.fasterxml.jackson.core.TreeNode; import lombok.Setter; import lombok.Value; import lombok.experimental.NonFinal; diff --git a/app/src/main/java/io/xpipe/app/storage/ImpersistentStorage.java b/app/src/main/java/io/xpipe/app/storage/ImpersistentStorage.java index 51b3be27f..e352def66 100644 --- a/app/src/main/java/io/xpipe/app/storage/ImpersistentStorage.java +++ b/app/src/main/java/io/xpipe/app/storage/ImpersistentStorage.java @@ -4,6 +4,7 @@ import io.xpipe.app.comp.store.StoreSortMode; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.core.store.LocalStore; + import org.apache.commons.io.FileUtils; import java.nio.file.Files; 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 fc750c188..b5477cdd7 100644 --- a/app/src/main/java/io/xpipe/app/storage/StandardStorage.java +++ b/app/src/main/java/io/xpipe/app/storage/StandardStorage.java @@ -5,6 +5,7 @@ import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.process.OsType; import io.xpipe.core.store.LocalStore; + import lombok.Getter; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java index 84d0296cf..a5c5ccb68 100644 --- a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java @@ -8,6 +8,7 @@ import io.xpipe.app.util.LocalShell; import io.xpipe.core.process.*; import io.xpipe.core.store.FilePath; import io.xpipe.core.util.FailableFunction; + import lombok.Getter; import lombok.Value; import lombok.With; diff --git a/app/src/main/java/io/xpipe/app/terminal/KittyTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/KittyTerminalType.java index a38d8fce6..a88f911d7 100644 --- a/app/src/main/java/io/xpipe/app/terminal/KittyTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/KittyTerminalType.java @@ -1,6 +1,5 @@ package io.xpipe.app.terminal; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; import io.xpipe.app.util.CommandSupport; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.ShellTemp; @@ -9,6 +8,8 @@ import io.xpipe.core.process.CommandBuilder; import io.xpipe.core.store.FilePath; import io.xpipe.core.util.XPipeInstallation; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; + public interface KittyTerminalType extends ExternalTerminalType { public static final ExternalTerminalType KITTY_LINUX = new Linux(); diff --git a/app/src/main/java/io/xpipe/app/test/ExtensionTest.java b/app/src/main/java/io/xpipe/app/test/ExtensionTest.java index 42ca5cb4f..4b6002d08 100644 --- a/app/src/main/java/io/xpipe/app/test/ExtensionTest.java +++ b/app/src/main/java/io/xpipe/app/test/ExtensionTest.java @@ -1,6 +1,7 @@ package io.xpipe.app.test; import io.xpipe.core.store.FileNames; + import lombok.SneakyThrows; import java.nio.file.Files; diff --git a/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java b/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java index b066f2e28..87c65d1bd 100644 --- a/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java +++ b/app/src/main/java/io/xpipe/app/test/LocalExtensionTest.java @@ -2,6 +2,7 @@ package io.xpipe.app.test; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.core.process.OsType; + import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeAll; diff --git a/app/src/main/java/io/xpipe/app/update/AppDownloads.java b/app/src/main/java/io/xpipe/app/update/AppDownloads.java index d947a52ec..27fa9550b 100644 --- a/app/src/main/java/io/xpipe/app/update/AppDownloads.java +++ b/app/src/main/java/io/xpipe/app/update/AppDownloads.java @@ -5,6 +5,7 @@ import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.util.HttpHelper; import io.xpipe.core.util.JacksonMapper; + import org.apache.commons.io.FileUtils; import org.kohsuke.github.GHRelease; import org.kohsuke.github.GHRepository; diff --git a/app/src/main/java/io/xpipe/app/update/AppInstaller.java b/app/src/main/java/io/xpipe/app/update/AppInstaller.java index 3335a05f4..f3f1f26b6 100644 --- a/app/src/main/java/io/xpipe/app/update/AppInstaller.java +++ b/app/src/main/java/io/xpipe/app/update/AppInstaller.java @@ -1,8 +1,5 @@ package io.xpipe.app.update; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.core.AppProperties; import io.xpipe.app.util.LocalShell; import io.xpipe.app.util.ScriptHelper; @@ -12,6 +9,10 @@ import io.xpipe.core.process.ShellDialects; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.LocalStore; import io.xpipe.core.util.XPipeInstallation; + +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Getter; import java.nio.file.Files; diff --git a/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java b/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java index bf5ab4653..1d0358217 100644 --- a/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java +++ b/app/src/main/java/io/xpipe/app/update/ChocoUpdater.java @@ -4,6 +4,7 @@ import io.xpipe.app.core.AppProperties; import io.xpipe.app.fxcomps.impl.CodeSnippet; import io.xpipe.app.fxcomps.impl.CodeSnippetComp; import io.xpipe.core.store.LocalStore; + import javafx.beans.property.SimpleObjectProperty; import javafx.scene.layout.Region; diff --git a/app/src/main/java/io/xpipe/app/update/GitHubUpdater.java b/app/src/main/java/io/xpipe/app/update/GitHubUpdater.java index b11eeb289..77fd593f3 100644 --- a/app/src/main/java/io/xpipe/app/update/GitHubUpdater.java +++ b/app/src/main/java/io/xpipe/app/update/GitHubUpdater.java @@ -1,7 +1,9 @@ package io.xpipe.app.update; import io.xpipe.app.core.AppProperties; + import javafx.scene.layout.Region; + import org.kohsuke.github.GHRelease; import java.nio.file.Files; diff --git a/app/src/main/java/io/xpipe/app/update/HomebrewUpdater.java b/app/src/main/java/io/xpipe/app/update/HomebrewUpdater.java index 8e091d57b..e90b78fc0 100644 --- a/app/src/main/java/io/xpipe/app/update/HomebrewUpdater.java +++ b/app/src/main/java/io/xpipe/app/update/HomebrewUpdater.java @@ -3,6 +3,7 @@ package io.xpipe.app.update; import io.xpipe.app.core.AppProperties; import io.xpipe.app.fxcomps.impl.CodeSnippet; import io.xpipe.app.fxcomps.impl.CodeSnippetComp; + import javafx.beans.property.SimpleObjectProperty; import javafx.scene.layout.Region; diff --git a/app/src/main/java/io/xpipe/app/update/PortableUpdater.java b/app/src/main/java/io/xpipe/app/update/PortableUpdater.java index ea2434355..26099771a 100644 --- a/app/src/main/java/io/xpipe/app/update/PortableUpdater.java +++ b/app/src/main/java/io/xpipe/app/update/PortableUpdater.java @@ -4,7 +4,9 @@ import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppProperties; import io.xpipe.app.util.Hyperlinks; + import javafx.scene.layout.Region; + import org.kohsuke.github.GHRelease; import java.time.Instant; diff --git a/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java b/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java index a2fb3f221..c4f6a9c51 100644 --- a/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java +++ b/app/src/main/java/io/xpipe/app/update/UpdateAvailableAlert.java @@ -3,6 +3,7 @@ package io.xpipe.app.update; import io.xpipe.app.comp.base.MarkdownComp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppWindowHelper; + import javafx.geometry.Insets; import javafx.scene.control.Alert; import javafx.scene.control.ButtonBar; diff --git a/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java b/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java index 16c34f165..ee9cc17f8 100644 --- a/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java +++ b/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java @@ -5,6 +5,7 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppWindowHelper; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.util.Hyperlinks; + import javafx.scene.control.Alert; import javafx.scene.control.ButtonBar; import javafx.scene.control.ButtonType; diff --git a/app/src/main/java/io/xpipe/app/update/UpdateHandler.java b/app/src/main/java/io/xpipe/app/update/UpdateHandler.java index 94b0257ee..09b36c502 100644 --- a/app/src/main/java/io/xpipe/app/update/UpdateHandler.java +++ b/app/src/main/java/io/xpipe/app/update/UpdateHandler.java @@ -8,11 +8,13 @@ import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.BooleanScope; import io.xpipe.app.util.ThreadHelper; + import javafx.beans.property.BooleanProperty; import javafx.beans.property.Property; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.scene.layout.Region; + import lombok.Builder; import lombok.Getter; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/update/XPipeDistributionType.java b/app/src/main/java/io/xpipe/app/update/XPipeDistributionType.java index 1b33b8570..410aa38a1 100644 --- a/app/src/main/java/io/xpipe/app/update/XPipeDistributionType.java +++ b/app/src/main/java/io/xpipe/app/update/XPipeDistributionType.java @@ -9,6 +9,7 @@ import io.xpipe.app.util.XPipeSession; import io.xpipe.core.process.OsType; import io.xpipe.core.util.ModuleHelper; import io.xpipe.core.util.XPipeInstallation; + import lombok.Getter; import java.util.Arrays; 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 7c61b6c04..e6c70db9c 100644 --- a/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java +++ b/app/src/main/java/io/xpipe/app/util/AppJacksonModule.java @@ -1,17 +1,18 @@ package io.xpipe.app.util; +import io.xpipe.app.storage.*; +import io.xpipe.app.terminal.ExternalTerminalType; +import io.xpipe.core.store.LocalStore; +import io.xpipe.core.util.EncryptedSecretValue; +import io.xpipe.core.util.JacksonMapper; +import io.xpipe.core.util.SecretValue; + import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import io.xpipe.app.storage.*; -import io.xpipe.app.terminal.ExternalTerminalType; -import io.xpipe.core.store.LocalStore; -import io.xpipe.core.util.EncryptedSecretValue; -import io.xpipe.core.util.JacksonMapper; -import io.xpipe.core.util.SecretValue; import java.io.IOException; import java.util.UUID; @@ -67,7 +68,10 @@ public class AppJacksonModule extends SimpleModule { @Override public ExternalTerminalType deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { var id = p.getValueAsString(); - return ExternalTerminalType.ALL.stream().filter(terminalType -> terminalType.getId().equals(id)).findFirst().orElse(null); + return ExternalTerminalType.ALL.stream() + .filter(terminalType -> terminalType.getId().equals(id)) + .findFirst() + .orElse(null); } } diff --git a/app/src/main/java/io/xpipe/app/util/AskpassAlert.java b/app/src/main/java/io/xpipe/app/util/AskpassAlert.java index f7dd71d26..dacde1add 100644 --- a/app/src/main/java/io/xpipe/app/util/AskpassAlert.java +++ b/app/src/main/java/io/xpipe/app/util/AskpassAlert.java @@ -6,6 +6,7 @@ import io.xpipe.app.core.AppTheme; import io.xpipe.app.core.AppWindowHelper; import io.xpipe.app.fxcomps.impl.SecretFieldComp; import io.xpipe.core.util.InPlaceSecretValue; + import javafx.animation.AnimationTimer; import javafx.application.Platform; import javafx.beans.property.SimpleObjectProperty; diff --git a/app/src/main/java/io/xpipe/app/util/BooleanScope.java b/app/src/main/java/io/xpipe/app/util/BooleanScope.java index 6e4c71910..8cb7e923b 100644 --- a/app/src/main/java/io/xpipe/app/util/BooleanScope.java +++ b/app/src/main/java/io/xpipe/app/util/BooleanScope.java @@ -2,6 +2,7 @@ package io.xpipe.app.util; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.core.util.FailableRunnable; + import javafx.beans.property.BooleanProperty; public class BooleanScope implements AutoCloseable { diff --git a/app/src/main/java/io/xpipe/app/util/ChainedValidator.java b/app/src/main/java/io/xpipe/app/util/ChainedValidator.java index b5dfc7c33..d211e3b15 100644 --- a/app/src/main/java/io/xpipe/app/util/ChainedValidator.java +++ b/app/src/main/java/io/xpipe/app/util/ChainedValidator.java @@ -7,6 +7,7 @@ import javafx.beans.property.ReadOnlyBooleanProperty; import javafx.beans.property.ReadOnlyBooleanWrapper; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.property.ReadOnlyObjectWrapper; + import net.synedra.validatorfx.Check; import net.synedra.validatorfx.ValidationMessage; import net.synedra.validatorfx.ValidationResult; diff --git a/app/src/main/java/io/xpipe/app/util/ClipboardHelper.java b/app/src/main/java/io/xpipe/app/util/ClipboardHelper.java index 20d72284d..8265da91e 100644 --- a/app/src/main/java/io/xpipe/app/util/ClipboardHelper.java +++ b/app/src/main/java/io/xpipe/app/util/ClipboardHelper.java @@ -1,6 +1,7 @@ package io.xpipe.app.util; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.scene.input.Clipboard; import javafx.scene.input.DataFormat; diff --git a/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java b/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java index c2bb5bb2c..aad686d37 100644 --- a/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java +++ b/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java @@ -1,6 +1,7 @@ package io.xpipe.app.util; import io.xpipe.app.fxcomps.Comp; + import javafx.application.Platform; import javafx.geometry.Side; import javafx.scene.Node; diff --git a/app/src/main/java/io/xpipe/app/util/DataStoreCategoryChoiceComp.java b/app/src/main/java/io/xpipe/app/util/DataStoreCategoryChoiceComp.java index 65410fa29..27df53d5a 100644 --- a/app/src/main/java/io/xpipe/app/util/DataStoreCategoryChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/util/DataStoreCategoryChoiceComp.java @@ -4,11 +4,13 @@ import io.xpipe.app.comp.store.StoreCategoryWrapper; import io.xpipe.app.comp.store.StoreViewState; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.Property; import javafx.geometry.Insets; import javafx.scene.control.ComboBox; import javafx.scene.control.ListCell; import javafx.scene.layout.Region; + import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/util/DataStoreFormatter.java b/app/src/main/java/io/xpipe/app/util/DataStoreFormatter.java index fbbcfdfc0..69a3d86c7 100644 --- a/app/src/main/java/io/xpipe/app/util/DataStoreFormatter.java +++ b/app/src/main/java/io/xpipe/app/util/DataStoreFormatter.java @@ -7,6 +7,7 @@ import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.core.process.ShellStoreState; import io.xpipe.core.store.DataStore; import io.xpipe.core.store.ShellStore; + import javafx.beans.value.ObservableValue; import java.util.function.IntFunction; diff --git a/app/src/main/java/io/xpipe/app/util/DialogHelper.java b/app/src/main/java/io/xpipe/app/util/DialogHelper.java index d8b3c3b42..b3c1060b1 100644 --- a/app/src/main/java/io/xpipe/app/util/DialogHelper.java +++ b/app/src/main/java/io/xpipe/app/util/DialogHelper.java @@ -7,6 +7,7 @@ import io.xpipe.core.store.*; import io.xpipe.core.util.NewLine; import io.xpipe.core.util.SecretValue; import io.xpipe.core.util.StreamCharset; + import lombok.Value; public class DialogHelper { 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 61debe35b..45613cc42 100644 --- a/app/src/main/java/io/xpipe/app/util/ExclusiveValidator.java +++ b/app/src/main/java/io/xpipe/app/util/ExclusiveValidator.java @@ -6,6 +6,7 @@ import javafx.beans.binding.StringBinding; import javafx.beans.property.ReadOnlyBooleanProperty; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.value.ObservableValue; + import net.synedra.validatorfx.Check; import net.synedra.validatorfx.ValidationResult; diff --git a/app/src/main/java/io/xpipe/app/util/FileBridge.java b/app/src/main/java/io/xpipe/app/util/FileBridge.java index ec17b119d..cad72323b 100644 --- a/app/src/main/java/io/xpipe/app/util/FileBridge.java +++ b/app/src/main/java/io/xpipe/app/util/FileBridge.java @@ -7,6 +7,7 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.process.OsType; import io.xpipe.core.util.FailableFunction; import io.xpipe.core.util.FailableSupplier; + import lombok.Getter; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/io/xpipe/app/util/FileOpener.java b/app/src/main/java/io/xpipe/app/util/FileOpener.java index fb4bf1391..8c5abee91 100644 --- a/app/src/main/java/io/xpipe/app/util/FileOpener.java +++ b/app/src/main/java/io/xpipe/app/util/FileOpener.java @@ -7,6 +7,7 @@ import io.xpipe.core.process.CommandControl; import io.xpipe.core.process.OsType; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.FileSystem; + import lombok.SneakyThrows; import java.io.FilterInputStream; diff --git a/app/src/main/java/io/xpipe/app/util/FileReference.java b/app/src/main/java/io/xpipe/app/util/FileReference.java index 36e374e69..51a922901 100644 --- a/app/src/main/java/io/xpipe/app/util/FileReference.java +++ b/app/src/main/java/io/xpipe/app/util/FileReference.java @@ -1,11 +1,12 @@ package io.xpipe.app.util; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.FileSystemStore; import io.xpipe.core.store.LocalStore; import io.xpipe.core.util.JacksonizedValue; + +import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Getter; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/app/src/main/java/io/xpipe/app/util/JfxHelper.java b/app/src/main/java/io/xpipe/app/util/JfxHelper.java index 64512f105..9f0f7d3eb 100644 --- a/app/src/main/java/io/xpipe/app/util/JfxHelper.java +++ b/app/src/main/java/io/xpipe/app/util/JfxHelper.java @@ -1,8 +1,8 @@ package io.xpipe.app.util; -import atlantafx.base.controls.Spacer; import io.xpipe.app.core.AppFont; import io.xpipe.app.fxcomps.impl.PrettyImageHelper; + import javafx.beans.value.ObservableValue; import javafx.geometry.Pos; import javafx.scene.control.Label; @@ -10,9 +10,12 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; +import atlantafx.base.controls.Spacer; + public class JfxHelper { - public static Region createNamedEntry(ObservableValue nameString, ObservableValue descString, String image) { + public static Region createNamedEntry( + ObservableValue nameString, ObservableValue descString, String image) { var header = new Label(); header.textProperty().bind(nameString); AppFont.header(header); diff --git a/app/src/main/java/io/xpipe/app/util/JsonConfigHelper.java b/app/src/main/java/io/xpipe/app/util/JsonConfigHelper.java index 4c07a20db..11546dedf 100644 --- a/app/src/main/java/io/xpipe/app/util/JsonConfigHelper.java +++ b/app/src/main/java/io/xpipe/app/util/JsonConfigHelper.java @@ -1,5 +1,8 @@ package io.xpipe.app.util; +import io.xpipe.app.issue.ErrorEvent; +import io.xpipe.core.util.JacksonMapper; + import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; @@ -7,8 +10,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import io.xpipe.app.issue.ErrorEvent; -import io.xpipe.core.util.JacksonMapper; import org.apache.commons.io.FileUtils; import java.io.IOException; diff --git a/app/src/main/java/io/xpipe/app/util/LicenseProvider.java b/app/src/main/java/io/xpipe/app/util/LicenseProvider.java index bb1bc20dc..dff946f95 100644 --- a/app/src/main/java/io/xpipe/app/util/LicenseProvider.java +++ b/app/src/main/java/io/xpipe/app/util/LicenseProvider.java @@ -3,6 +3,7 @@ package io.xpipe.app.util; import io.xpipe.app.ext.ExtensionException; import io.xpipe.app.fxcomps.Comp; import io.xpipe.core.util.ModuleLayerLoader; + import javafx.beans.value.ObservableValue; import java.util.ServiceLoader; diff --git a/app/src/main/java/io/xpipe/app/util/LicenseRequiredException.java b/app/src/main/java/io/xpipe/app/util/LicenseRequiredException.java index e3ac65449..53bae9864 100644 --- a/app/src/main/java/io/xpipe/app/util/LicenseRequiredException.java +++ b/app/src/main/java/io/xpipe/app/util/LicenseRequiredException.java @@ -1,6 +1,7 @@ package io.xpipe.app.util; import io.xpipe.app.core.AppI18n; + import lombok.Getter; @Getter @@ -9,7 +10,8 @@ public class LicenseRequiredException extends RuntimeException { private final LicensedFeature feature; public LicenseRequiredException(LicensedFeature feature) { - super(feature.getDisplayName() + " " + (feature.isPlural() ? AppI18n.get("areOnlySupported") : AppI18n.get("isOnlySupported"))); + super(feature.getDisplayName() + " " + + (feature.isPlural() ? AppI18n.get("areOnlySupported") : AppI18n.get("isOnlySupported"))); this.feature = feature; } diff --git a/app/src/main/java/io/xpipe/app/util/LocalShell.java b/app/src/main/java/io/xpipe/app/util/LocalShell.java index defb114f1..18f8f49e8 100644 --- a/app/src/main/java/io/xpipe/app/util/LocalShell.java +++ b/app/src/main/java/io/xpipe/app/util/LocalShell.java @@ -3,6 +3,7 @@ package io.xpipe.app.util; import io.xpipe.core.process.ProcessControlProvider; import io.xpipe.core.process.ShellControl; import io.xpipe.core.process.ShellDialects; + import lombok.Getter; public class LocalShell { diff --git a/app/src/main/java/io/xpipe/app/util/LockChangeAlert.java b/app/src/main/java/io/xpipe/app/util/LockChangeAlert.java index 3a6324351..ee7899a51 100644 --- a/app/src/main/java/io/xpipe/app/util/LockChangeAlert.java +++ b/app/src/main/java/io/xpipe/app/util/LockChangeAlert.java @@ -1,18 +1,20 @@ package io.xpipe.app.util; -import atlantafx.base.controls.Spacer; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppWindowHelper; import io.xpipe.app.fxcomps.impl.LabelComp; import io.xpipe.app.fxcomps.impl.SecretFieldComp; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.util.InPlaceSecretValue; + import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleObjectProperty; import javafx.scene.control.Alert; import javafx.scene.control.ButtonType; import javafx.scene.layout.VBox; +import atlantafx.base.controls.Spacer; + import java.util.Objects; public class LockChangeAlert { diff --git a/app/src/main/java/io/xpipe/app/util/MacOsPermissions.java b/app/src/main/java/io/xpipe/app/util/MacOsPermissions.java index c7ccb09fc..397353d3e 100644 --- a/app/src/main/java/io/xpipe/app/util/MacOsPermissions.java +++ b/app/src/main/java/io/xpipe/app/util/MacOsPermissions.java @@ -2,6 +2,7 @@ package io.xpipe.app.util; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppWindowHelper; + import javafx.application.Platform; import javafx.beans.property.SimpleBooleanProperty; import javafx.scene.control.Alert; diff --git a/app/src/main/java/io/xpipe/app/util/NamedCharacter.java b/app/src/main/java/io/xpipe/app/util/NamedCharacter.java index bfd2a28a1..cddadccdc 100644 --- a/app/src/main/java/io/xpipe/app/util/NamedCharacter.java +++ b/app/src/main/java/io/xpipe/app/util/NamedCharacter.java @@ -1,6 +1,7 @@ package io.xpipe.app.util; import io.xpipe.core.dialog.QueryConverter; + import lombok.Value; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/util/OptionsBuilder.java b/app/src/main/java/io/xpipe/app/util/OptionsBuilder.java index 5aea3330e..893b0839b 100644 --- a/app/src/main/java/io/xpipe/app/util/OptionsBuilder.java +++ b/app/src/main/java/io/xpipe/app/util/OptionsBuilder.java @@ -1,17 +1,19 @@ package io.xpipe.app.util; -import atlantafx.base.controls.Spacer; import io.xpipe.app.comp.base.ToggleSwitchComp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.impl.*; import io.xpipe.core.util.InPlaceSecretValue; + import javafx.beans.property.*; import javafx.beans.value.ObservableValue; import javafx.geometry.Orientation; import javafx.scene.control.Label; import javafx.scene.layout.Region; + +import atlantafx.base.controls.Spacer; import net.synedra.validatorfx.Check; import java.nio.file.InvalidPathException; diff --git a/app/src/main/java/io/xpipe/app/util/PasswordLockSecretValue.java b/app/src/main/java/io/xpipe/app/util/PasswordLockSecretValue.java index 1365dfe5a..ab9d1f7f2 100644 --- a/app/src/main/java/io/xpipe/app/util/PasswordLockSecretValue.java +++ b/app/src/main/java/io/xpipe/app/util/PasswordLockSecretValue.java @@ -1,15 +1,16 @@ package io.xpipe.app.util; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.util.AesSecretValue; import io.xpipe.core.util.InPlaceSecretValue; + +import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.EqualsAndHashCode; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; -import javax.crypto.SecretKey; import java.security.spec.InvalidKeySpecException; +import javax.crypto.SecretKey; @JsonTypeName("locked") @SuperBuilder diff --git a/app/src/main/java/io/xpipe/app/util/PlatformState.java b/app/src/main/java/io/xpipe/app/util/PlatformState.java index 401c6df2a..178baf0e1 100644 --- a/app/src/main/java/io/xpipe/app/util/PlatformState.java +++ b/app/src/main/java/io/xpipe/app/util/PlatformState.java @@ -5,7 +5,9 @@ import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.process.OsType; + import javafx.application.Platform; + import lombok.Getter; import lombok.Setter; @@ -75,12 +77,12 @@ public enum PlatformState { // Catch more than just the headless exception in case the graphics environment initialization completely // fails } catch (HeadlessException h) { - var msg = OsType.getLocal().equals(OsType.LINUX) ? "No X11 DISPLAY variable was set or no headful library support was found." + - "\n\n" + - "Please note that XPipe is a desktop application that should be run on your local workstation." + - " It is able to provide the full functionality for all integrations via remote server connections, e.g. via SSH." + - " You don't have to install XPipe on any system like a server, a WSL distribution, a hypervisor, etc.," + - " to have full access to that system, a shell connection to it is enough for XPipe to work from your local machine." + var msg = OsType.getLocal().equals(OsType.LINUX) + ? "No X11 DISPLAY variable was set or no headful library support was found." + "\n\n" + + "Please note that XPipe is a desktop application that should be run on your local workstation." + + " It is able to provide the full functionality for all integrations via remote server connections, e.g. via SSH." + + " You don't have to install XPipe on any system like a server, a WSL distribution, a hypervisor, etc.," + + " to have full access to that system, a shell connection to it is enough for XPipe to work from your local machine." : h.getMessage(); TrackEvent.warn(h.getMessage()); PlatformState.setCurrent(PlatformState.EXITED); diff --git a/app/src/main/java/io/xpipe/app/util/PrettyListView.java b/app/src/main/java/io/xpipe/app/util/PrettyListView.java index 63e0d8a25..a37214219 100644 --- a/app/src/main/java/io/xpipe/app/util/PrettyListView.java +++ b/app/src/main/java/io/xpipe/app/util/PrettyListView.java @@ -141,4 +141,4 @@ public class PrettyListView extends ListView { @Override public void selectNext() {} } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/xpipe/app/util/ProgressScope.java b/app/src/main/java/io/xpipe/app/util/ProgressScope.java index 1a7ad18bd..973e5881d 100644 --- a/app/src/main/java/io/xpipe/app/util/ProgressScope.java +++ b/app/src/main/java/io/xpipe/app/util/ProgressScope.java @@ -1,6 +1,7 @@ package io.xpipe.app.util; import io.xpipe.app.fxcomps.util.PlatformThread; + import javafx.beans.property.BooleanProperty; import javafx.beans.property.DoubleProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/app/src/main/java/io/xpipe/app/util/ProxyManagerProviderImpl.java b/app/src/main/java/io/xpipe/app/util/ProxyManagerProviderImpl.java index 976a90c18..686604dba 100644 --- a/app/src/main/java/io/xpipe/app/util/ProxyManagerProviderImpl.java +++ b/app/src/main/java/io/xpipe/app/util/ProxyManagerProviderImpl.java @@ -4,6 +4,7 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppWindowHelper; import io.xpipe.core.process.ShellControl; import io.xpipe.core.util.ProxyManagerProvider; + import javafx.scene.control.Alert; import java.util.Optional; diff --git a/app/src/main/java/io/xpipe/app/util/RdpConfig.java b/app/src/main/java/io/xpipe/app/util/RdpConfig.java index 8165af56a..6deca6f05 100644 --- a/app/src/main/java/io/xpipe/app/util/RdpConfig.java +++ b/app/src/main/java/io/xpipe/app/util/RdpConfig.java @@ -1,6 +1,7 @@ package io.xpipe.app.util; import io.xpipe.core.util.StreamCharset; + import lombok.Value; import java.io.BufferedInputStream; @@ -18,7 +19,8 @@ public class RdpConfig { Map content; public static RdpConfig parseFile(String file) throws Exception { - try (var in = new BufferedReader(StreamCharset.detectedReader(new BufferedInputStream(Files.newInputStream(Path.of(file)))))) { + try (var in = new BufferedReader( + StreamCharset.detectedReader(new BufferedInputStream(Files.newInputStream(Path.of(file)))))) { var content = in.lines().collect(Collectors.joining("\n")); return parseContent(content); } diff --git a/app/src/main/java/io/xpipe/app/util/ScanAlert.java b/app/src/main/java/io/xpipe/app/util/ScanAlert.java index 498646273..c2b0a5972 100644 --- a/app/src/main/java/io/xpipe/app/util/ScanAlert.java +++ b/app/src/main/java/io/xpipe/app/util/ScanAlert.java @@ -13,6 +13,7 @@ import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.process.ShellControl; import io.xpipe.core.store.ShellStore; + import javafx.application.Platform; import javafx.beans.property.*; import javafx.beans.value.ObservableValue; diff --git a/app/src/main/java/io/xpipe/app/util/ScriptHelper.java b/app/src/main/java/io/xpipe/app/util/ScriptHelper.java index 6bc9ae938..8ceab5852 100644 --- a/app/src/main/java/io/xpipe/app/util/ScriptHelper.java +++ b/app/src/main/java/io/xpipe/app/util/ScriptHelper.java @@ -4,6 +4,7 @@ import io.xpipe.app.issue.TrackEvent; import io.xpipe.core.process.*; import io.xpipe.core.store.FilePath; import io.xpipe.core.util.SecretValue; + import lombok.SneakyThrows; import java.util.List; diff --git a/app/src/main/java/io/xpipe/app/util/SecretManager.java b/app/src/main/java/io/xpipe/app/util/SecretManager.java index 3f7a15070..61bf2b4ec 100644 --- a/app/src/main/java/io/xpipe/app/util/SecretManager.java +++ b/app/src/main/java/io/xpipe/app/util/SecretManager.java @@ -29,7 +29,12 @@ public class SecretManager { } public static synchronized SecretQueryProgress expectAskpass( - UUID request, UUID storeId, List suppliers, SecretQuery fallback, List filters, CountDown countDown) { + UUID request, + UUID storeId, + List suppliers, + SecretQuery fallback, + List filters, + CountDown countDown) { var p = new SecretQueryProgress(request, storeId, suppliers, fallback, filters, countDown); progress.add(p); return p; @@ -56,7 +61,8 @@ public class SecretManager { } var uuid = UUID.randomUUID(); - var p = expectAskpass(uuid, secretId, List.of(strategy.query()), SecretQuery.prompt(false), List.of(), CountDown.of()); + var p = expectAskpass( + uuid, secretId, List.of(strategy.query()), SecretQuery.prompt(false), List.of(), CountDown.of()); p.preAdvance(sub); var r = p.process(prompt); completeRequest(uuid); diff --git a/app/src/main/java/io/xpipe/app/util/SecretQueryProgress.java b/app/src/main/java/io/xpipe/app/util/SecretQueryProgress.java index 8ac867490..b7578cac6 100644 --- a/app/src/main/java/io/xpipe/app/util/SecretQueryProgress.java +++ b/app/src/main/java/io/xpipe/app/util/SecretQueryProgress.java @@ -4,6 +4,7 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.process.CountDown; import io.xpipe.core.util.SecretReference; import io.xpipe.core.util.SecretValue; + import lombok.Getter; import lombok.NonNull; diff --git a/app/src/main/java/io/xpipe/app/util/SecretQueryResult.java b/app/src/main/java/io/xpipe/app/util/SecretQueryResult.java index a617dcb98..5ba63e644 100644 --- a/app/src/main/java/io/xpipe/app/util/SecretQueryResult.java +++ b/app/src/main/java/io/xpipe/app/util/SecretQueryResult.java @@ -1,6 +1,7 @@ package io.xpipe.app.util; import io.xpipe.core.util.SecretValue; + import lombok.Value; @Value diff --git a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java index 02db6adcf..2d5c3b1bf 100644 --- a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java +++ b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java @@ -1,13 +1,14 @@ package io.xpipe.app.util; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStoreSecret; import io.xpipe.core.store.LocalStore; import io.xpipe.core.util.InPlaceSecretValue; + +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; @@ -137,10 +138,11 @@ public interface SecretRetrievalStrategy { } if (r.lines().count() > 1 || r.isBlank()) { - throw ErrorEvent.expected(new IllegalArgumentException("Received not exactly one output line:\n" + r + "\n\n" + - "XPipe requires your password manager command to output only the raw password." + - " If the output includes any formatting, messages, or your password key either matched multiple entries or none," + - " you will have to change the command and/or password key.")); + throw ErrorEvent.expected( + new IllegalArgumentException("Received not exactly one output line:\n" + r + "\n\n" + + "XPipe requires your password manager command to output only the raw password." + + " If the output includes any formatting, messages, or your password key either matched multiple entries or none," + + " you will have to change the command and/or password key.")); } return new SecretQueryResult(InPlaceSecretValue.of(r), false); diff --git a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java index 5c8a20a82..6bdc87723 100644 --- a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java +++ b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java @@ -7,9 +7,11 @@ import io.xpipe.app.fxcomps.impl.SecretFieldComp; import io.xpipe.app.fxcomps.impl.TextFieldComp; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStoreSecret; + import javafx.beans.property.Property; import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleObjectProperty; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.Arrays; diff --git a/app/src/main/java/io/xpipe/app/util/ShellControlCache.java b/app/src/main/java/io/xpipe/app/util/ShellControlCache.java index 37d7e4b57..a1de55169 100644 --- a/app/src/main/java/io/xpipe/app/util/ShellControlCache.java +++ b/app/src/main/java/io/xpipe/app/util/ShellControlCache.java @@ -2,6 +2,7 @@ package io.xpipe.app.util; import io.xpipe.core.process.ShellControl; import io.xpipe.core.util.FailableSupplier; + import lombok.Getter; import java.util.HashMap; diff --git a/app/src/main/java/io/xpipe/app/util/ShellTemp.java b/app/src/main/java/io/xpipe/app/util/ShellTemp.java index eeacef7b9..795ee3b34 100644 --- a/app/src/main/java/io/xpipe/app/util/ShellTemp.java +++ b/app/src/main/java/io/xpipe/app/util/ShellTemp.java @@ -5,6 +5,7 @@ import io.xpipe.core.process.OsType; import io.xpipe.core.process.ShellControl; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.FilePath; + import org.apache.commons.io.FileUtils; import java.io.IOException; 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 cbbc9c68a..409a11e16 100644 --- a/app/src/main/java/io/xpipe/app/util/SimpleValidator.java +++ b/app/src/main/java/io/xpipe/app/util/SimpleValidator.java @@ -7,6 +7,7 @@ import javafx.beans.property.ReadOnlyBooleanWrapper; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.value.ChangeListener; + import net.synedra.validatorfx.Check; import net.synedra.validatorfx.Severity; import net.synedra.validatorfx.ValidationMessage; diff --git a/app/src/main/java/io/xpipe/app/util/StringSource.java b/app/src/main/java/io/xpipe/app/util/StringSource.java index 6be190226..b92a639be 100644 --- a/app/src/main/java/io/xpipe/app/util/StringSource.java +++ b/app/src/main/java/io/xpipe/app/util/StringSource.java @@ -3,6 +3,7 @@ package io.xpipe.app.util; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.storage.ContextualFileReference; import io.xpipe.core.store.ShellStore; + import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/util/TerminalLauncherManager.java b/app/src/main/java/io/xpipe/app/util/TerminalLauncherManager.java index 73e4fbb6a..ec318d303 100644 --- a/app/src/main/java/io/xpipe/app/util/TerminalLauncherManager.java +++ b/app/src/main/java/io/xpipe/app/util/TerminalLauncherManager.java @@ -7,6 +7,7 @@ import io.xpipe.core.process.ShellControl; import io.xpipe.core.process.TerminalInitScriptConfig; import io.xpipe.core.process.WorkingDirectoryFunction; import io.xpipe.core.store.FilePath; + import lombok.Setter; import lombok.Value; import lombok.experimental.NonFinal; diff --git a/app/src/main/java/io/xpipe/app/util/UnlockAlert.java b/app/src/main/java/io/xpipe/app/util/UnlockAlert.java index 5557a527f..f1c83eb14 100644 --- a/app/src/main/java/io/xpipe/app/util/UnlockAlert.java +++ b/app/src/main/java/io/xpipe/app/util/UnlockAlert.java @@ -8,6 +8,7 @@ import io.xpipe.app.fxcomps.impl.SecretFieldComp; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.util.InPlaceSecretValue; + import javafx.application.Platform; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleObjectProperty; diff --git a/app/src/main/java/io/xpipe/app/util/Validator.java b/app/src/main/java/io/xpipe/app/util/Validator.java index acea15b2c..94b56a858 100644 --- a/app/src/main/java/io/xpipe/app/util/Validator.java +++ b/app/src/main/java/io/xpipe/app/util/Validator.java @@ -2,12 +2,14 @@ package io.xpipe.app.util; import io.xpipe.app.core.AppI18n; import io.xpipe.core.util.FailableRunnable; + import javafx.beans.binding.StringBinding; import javafx.beans.property.ReadOnlyBooleanProperty; import javafx.beans.property.ReadOnlyListProperty; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.value.ObservableValue; import javafx.collections.ObservableList; + import net.synedra.validatorfx.Check; import net.synedra.validatorfx.ValidationResult; diff --git a/app/src/main/java/io/xpipe/app/util/VaultKeySecretValue.java b/app/src/main/java/io/xpipe/app/util/VaultKeySecretValue.java index 2fe8c632d..c86d2ccca 100644 --- a/app/src/main/java/io/xpipe/app/util/VaultKeySecretValue.java +++ b/app/src/main/java/io/xpipe/app/util/VaultKeySecretValue.java @@ -1,15 +1,16 @@ package io.xpipe.app.util; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.storage.DataStorage; import io.xpipe.core.util.AesSecretValue; import io.xpipe.core.util.InPlaceSecretValue; + +import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.EqualsAndHashCode; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; -import javax.crypto.SecretKey; import java.security.spec.InvalidKeySpecException; +import javax.crypto.SecretKey; @JsonTypeName("vault") @SuperBuilder diff --git a/app/src/main/java/io/xpipe/app/util/WindowControl.java b/app/src/main/java/io/xpipe/app/util/WindowControl.java index b4d900245..a36581d18 100644 --- a/app/src/main/java/io/xpipe/app/util/WindowControl.java +++ b/app/src/main/java/io/xpipe/app/util/WindowControl.java @@ -1,5 +1,7 @@ package io.xpipe.app.util; +import javafx.stage.Window; + import com.sun.jna.Library; import com.sun.jna.Native; import com.sun.jna.Pointer; @@ -7,7 +9,6 @@ import com.sun.jna.PointerType; import com.sun.jna.platform.win32.User32; import com.sun.jna.platform.win32.WinDef; import com.sun.jna.platform.win32.WinNT; -import javafx.stage.Window; import lombok.Getter; import java.lang.reflect.Method; @@ -40,15 +41,21 @@ public class WindowControl { } public void setWindowAttribute(int attribute, boolean attributeValue) { - DwmSupport.INSTANCE.DwmSetWindowAttribute(windowHandle, attribute, new WinDef.BOOLByReference(new WinDef.BOOL(attributeValue)), WinDef.BOOL.SIZE); + DwmSupport.INSTANCE.DwmSetWindowAttribute( + windowHandle, attribute, new WinDef.BOOLByReference(new WinDef.BOOL(attributeValue)), WinDef.BOOL.SIZE); } public void setWindowAttribute(int attribute, long attributeValue) { - DwmSupport.INSTANCE.DwmSetWindowAttribute(windowHandle, attribute, new WinDef.DWORDByReference(new WinDef.DWORD(attributeValue)), WinDef.DWORD.SIZE); + DwmSupport.INSTANCE.DwmSetWindowAttribute( + windowHandle, + attribute, + new WinDef.DWORDByReference(new WinDef.DWORD(attributeValue)), + WinDef.DWORD.SIZE); } public void redraw() { - User32.INSTANCE.RedrawWindow(windowHandle, null, null, new WinDef.DWORD(User32.RDW_FRAME | User32.RDW_VALIDATE)); + User32.INSTANCE.RedrawWindow( + windowHandle, null, null, new WinDef.DWORD(User32.RDW_FRAME | User32.RDW_VALIDATE)); } public interface DwmSupport extends Library { diff --git a/app/src/main/java/io/xpipe/app/util/WindowsRegistry.java b/app/src/main/java/io/xpipe/app/util/WindowsRegistry.java index 318e6cbae..5afb13160 100644 --- a/app/src/main/java/io/xpipe/app/util/WindowsRegistry.java +++ b/app/src/main/java/io/xpipe/app/util/WindowsRegistry.java @@ -1,11 +1,12 @@ package io.xpipe.app.util; -import com.sun.jna.platform.win32.Advapi32Util; -import com.sun.jna.platform.win32.WinReg; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.core.process.CommandBuilder; import io.xpipe.core.process.ShellControl; +import com.sun.jna.platform.win32.Advapi32Util; +import com.sun.jna.platform.win32.WinReg; + import java.util.Optional; public class WindowsRegistry { @@ -76,4 +77,4 @@ public class WindowsRegistry { return Optional.empty(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/xpipe/app/util/XPipeSession.java b/app/src/main/java/io/xpipe/app/util/XPipeSession.java index bde878670..c4e16b59c 100644 --- a/app/src/main/java/io/xpipe/app/util/XPipeSession.java +++ b/app/src/main/java/io/xpipe/app/util/XPipeSession.java @@ -1,6 +1,7 @@ package io.xpipe.app.util; import io.xpipe.app.core.AppCache; + import lombok.Value; import java.util.UUID; diff --git a/app/src/main/java/module-info.java b/app/src/main/java/module-info.java index 8146b449c..8faa5e355 100644 --- a/app/src/main/java/module-info.java +++ b/app/src/main/java/module-info.java @@ -1,4 +1,3 @@ -import com.fasterxml.jackson.databind.Module; import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.core.AppLogs; import io.xpipe.app.exchange.*; @@ -15,6 +14,8 @@ import io.xpipe.core.util.DataStateProvider; import io.xpipe.core.util.ModuleLayerLoader; import io.xpipe.core.util.ProxyFunction; import io.xpipe.core.util.ProxyManagerProvider; + +import com.fasterxml.jackson.databind.Module; import org.slf4j.spi.SLF4JServiceProvider; open module io.xpipe.app { @@ -114,7 +115,8 @@ open module io.xpipe.app { uses LicenseProvider; uses io.xpipe.app.util.LicensedFeature; - provides Module with AppJacksonModule; + provides Module with + AppJacksonModule; provides ModuleLayerLoader with MessageExchangeImpls.Loader, DataStoreProviders.Loader, diff --git a/beacon/src/main/java/io/xpipe/beacon/BeaconClient.java b/beacon/src/main/java/io/xpipe/beacon/BeaconClient.java index 724f92bf6..8ccf6b9e5 100644 --- a/beacon/src/main/java/io/xpipe/beacon/BeaconClient.java +++ b/beacon/src/main/java/io/xpipe/beacon/BeaconClient.java @@ -1,5 +1,11 @@ package io.xpipe.beacon; +import io.xpipe.beacon.exchange.MessageExchanges; +import io.xpipe.beacon.exchange.data.ClientErrorMessage; +import io.xpipe.beacon.exchange.data.ServerErrorMessage; +import io.xpipe.core.util.Deobfuscator; +import io.xpipe.core.util.JacksonMapper; + import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.core.JsonGenerator; @@ -8,11 +14,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; -import io.xpipe.beacon.exchange.MessageExchanges; -import io.xpipe.beacon.exchange.data.ClientErrorMessage; -import io.xpipe.beacon.exchange.data.ServerErrorMessage; -import io.xpipe.core.util.Deobfuscator; -import io.xpipe.core.util.JacksonMapper; import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/beacon/src/main/java/io/xpipe/beacon/BeaconConfig.java b/beacon/src/main/java/io/xpipe/beacon/BeaconConfig.java index 9b7113f87..4e21f3d54 100644 --- a/beacon/src/main/java/io/xpipe/beacon/BeaconConfig.java +++ b/beacon/src/main/java/io/xpipe/beacon/BeaconConfig.java @@ -1,6 +1,7 @@ package io.xpipe.beacon; import io.xpipe.core.util.XPipeInstallation; + import lombok.experimental.UtilityClass; import java.nio.charset.StandardCharsets; diff --git a/beacon/src/main/java/io/xpipe/beacon/BeaconConnection.java b/beacon/src/main/java/io/xpipe/beacon/BeaconConnection.java index b655d031f..509e6d71b 100644 --- a/beacon/src/main/java/io/xpipe/beacon/BeaconConnection.java +++ b/beacon/src/main/java/io/xpipe/beacon/BeaconConnection.java @@ -2,6 +2,7 @@ package io.xpipe.beacon; import io.xpipe.core.util.FailableBiConsumer; import io.xpipe.core.util.FailableConsumer; + import lombok.Getter; import java.io.IOException; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/AskpassExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/AskpassExchange.java index 6e5334474..8a1be7caa 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/AskpassExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/AskpassExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.core.util.SecretValue; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/DrainExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/DrainExchange.java index 93621749c..573b2ad6d 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/DrainExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/DrainExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.core.store.DataStoreId; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/FocusExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/FocusExchange.java index e8c77c1c9..f9082bda8 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/FocusExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/FocusExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.core.util.XPipeDaemonMode; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/LaunchExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/LaunchExchange.java index 646866af0..2b1e03cc2 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/LaunchExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/LaunchExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.core.store.DataStoreId; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/OpenExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/OpenExchange.java index 84a58e081..29533f64a 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/OpenExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/OpenExchange.java @@ -2,6 +2,7 @@ package io.xpipe.beacon.exchange; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/QueryStoreExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/QueryStoreExchange.java index 1553e8e19..e656a72e5 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/QueryStoreExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/QueryStoreExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.core.store.DataStore; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/SinkExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/SinkExchange.java index f79ff2b71..8f5f308ef 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/SinkExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/SinkExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.core.store.DataStoreId; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/StopExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/StopExchange.java index bb7498140..6ee1475ac 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/StopExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/StopExchange.java @@ -2,6 +2,7 @@ package io.xpipe.beacon.exchange; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; + import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/TerminalLaunchExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/TerminalLaunchExchange.java index 0f4571fc9..6f314a643 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/TerminalLaunchExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/TerminalLaunchExchange.java @@ -2,6 +2,7 @@ package io.xpipe.beacon.exchange; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/TerminalWaitExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/TerminalWaitExchange.java index 7dab79a91..a0cf98f9e 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/TerminalWaitExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/TerminalWaitExchange.java @@ -2,6 +2,7 @@ package io.xpipe.beacon.exchange; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/DialogExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/DialogExchange.java index c13f1b15c..dfa50dbc3 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/DialogExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/DialogExchange.java @@ -4,6 +4,7 @@ import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; import io.xpipe.core.dialog.DialogElement; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/EditStoreExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/EditStoreExchange.java index cbfc7669e..351dd69e7 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/EditStoreExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/EditStoreExchange.java @@ -4,6 +4,7 @@ import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; import io.xpipe.core.dialog.DialogReference; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListCollectionsExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListCollectionsExchange.java index b010c53b0..270f04470 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListCollectionsExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListCollectionsExchange.java @@ -4,6 +4,7 @@ import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; import io.xpipe.beacon.exchange.data.CollectionListEntry; + import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListEntriesExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListEntriesExchange.java index dec386260..f7a0a5773 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListEntriesExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListEntriesExchange.java @@ -4,6 +4,7 @@ import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; import io.xpipe.beacon.exchange.data.EntryListEntry; + import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListStoresExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListStoresExchange.java index da6a507ef..cb5377d69 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListStoresExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListStoresExchange.java @@ -4,6 +4,7 @@ import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; import io.xpipe.beacon.exchange.data.StoreListEntry; + import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ModeExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ModeExchange.java index 41c530f49..b9ad4cfd4 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ModeExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ModeExchange.java @@ -4,6 +4,7 @@ import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; import io.xpipe.core.util.XPipeDaemonMode; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ReadDrainExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ReadDrainExchange.java index 0c7b8a47a..1cc2bd2cb 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ReadDrainExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/ReadDrainExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange.cli; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RemoveCollectionExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RemoveCollectionExchange.java index 357c24579..bde33574d 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RemoveCollectionExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RemoveCollectionExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange.cli; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RemoveStoreExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RemoveStoreExchange.java index 95dd9732b..0c6dacf58 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RemoveStoreExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RemoveStoreExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange.cli; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RenameCollectionExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RenameCollectionExchange.java index 192fcc346..693179a7a 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RenameCollectionExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RenameCollectionExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange.cli; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RenameStoreExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RenameStoreExchange.java index 0a2712129..f7c9a98f0 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RenameStoreExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/RenameStoreExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange.cli; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StatusExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StatusExchange.java index 255a2570c..7d08abae0 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StatusExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StatusExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange.cli; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; + import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StoreAddExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StoreAddExchange.java index d0e4caff5..898a591b6 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StoreAddExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StoreAddExchange.java @@ -5,6 +5,7 @@ import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; import io.xpipe.core.dialog.DialogReference; import io.xpipe.core.store.DataStore; + import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StoreProviderListExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StoreProviderListExchange.java index ee5511dde..d7a173e90 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StoreProviderListExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/StoreProviderListExchange.java @@ -4,6 +4,7 @@ import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; import io.xpipe.beacon.exchange.data.ProviderEntry; + import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/VersionExchange.java b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/VersionExchange.java index 41a9c0504..14155cd77 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/cli/VersionExchange.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/cli/VersionExchange.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.exchange.cli; import io.xpipe.beacon.RequestMessage; import io.xpipe.beacon.ResponseMessage; import io.xpipe.beacon.exchange.MessageExchange; + import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; @@ -28,4 +29,4 @@ public class VersionExchange implements MessageExchange { String buildVersion; String jvmVersion; } -} \ No newline at end of file +} diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/data/ClientErrorMessage.java b/beacon/src/main/java/io/xpipe/beacon/exchange/data/ClientErrorMessage.java index 5abc922ee..09fd318ee 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/data/ClientErrorMessage.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/data/ClientErrorMessage.java @@ -1,6 +1,7 @@ package io.xpipe.beacon.exchange.data; import io.xpipe.beacon.ClientException; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/data/ServerErrorMessage.java b/beacon/src/main/java/io/xpipe/beacon/exchange/data/ServerErrorMessage.java index f238ec5ec..5e0e6e20e 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/data/ServerErrorMessage.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/data/ServerErrorMessage.java @@ -1,6 +1,7 @@ package io.xpipe.beacon.exchange.data; import io.xpipe.beacon.ServerException; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Value; diff --git a/beacon/src/main/java/io/xpipe/beacon/exchange/data/StoreListEntry.java b/beacon/src/main/java/io/xpipe/beacon/exchange/data/StoreListEntry.java index 65e8dbf4a..1853245ed 100644 --- a/beacon/src/main/java/io/xpipe/beacon/exchange/data/StoreListEntry.java +++ b/beacon/src/main/java/io/xpipe/beacon/exchange/data/StoreListEntry.java @@ -1,6 +1,7 @@ package io.xpipe.beacon.exchange.data; import io.xpipe.core.store.DataStoreId; + import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; diff --git a/beacon/src/main/java/io/xpipe/beacon/test/BeaconDaemonExtensionTest.java b/beacon/src/main/java/io/xpipe/beacon/test/BeaconDaemonExtensionTest.java index f4fb6d973..9e1e1cdba 100644 --- a/beacon/src/main/java/io/xpipe/beacon/test/BeaconDaemonExtensionTest.java +++ b/beacon/src/main/java/io/xpipe/beacon/test/BeaconDaemonExtensionTest.java @@ -3,6 +3,7 @@ package io.xpipe.beacon.test; import io.xpipe.core.process.OsType; import io.xpipe.core.util.JacksonMapper; import io.xpipe.core.util.XPipeDaemonMode; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/beacon/src/main/java/module-info.java b/beacon/src/main/java/module-info.java index 56dc388d9..64ed19851 100644 --- a/beacon/src/main/java/module-info.java +++ b/beacon/src/main/java/module-info.java @@ -1,9 +1,10 @@ -import com.fasterxml.jackson.databind.Module; import io.xpipe.beacon.BeaconJacksonModule; import io.xpipe.beacon.exchange.*; import io.xpipe.beacon.exchange.cli.*; import io.xpipe.core.util.ProxyFunction; +import com.fasterxml.jackson.databind.Module; + open module io.xpipe.beacon { exports io.xpipe.beacon; exports io.xpipe.beacon.exchange; diff --git a/build.gradle b/build.gradle index d324c44d5..0230e57d6 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ import java.util.stream.Stream plugins { id "io.codearte.nexus-staging" version "0.30.0" id 'org.gradlex.extra-java-module-info' version '1.8' apply false + id("com.diffplug.spotless") version "6.25.0" apply false } allprojects { subproject -> @@ -15,6 +16,18 @@ allprojects { subproject -> apply from: "$rootDir/modules.gradle" } +subprojects {subproject -> + apply plugin: 'com.diffplug.spotless' + spotless { + java { + palantirJavaFormat() + trimTrailingWhitespace() + endWithNewline() + importOrder('io.xpipe', 'javafx', '', 'java', '\\#') + } + } +} + def getArchName() { var arch = System.getProperty("os.arch").toLowerCase(Locale.ROOT) if (arch == 'amd64' || arch == 'x86_64') { diff --git a/core/src/main/java/io/xpipe/core/process/CommandBuilder.java b/core/src/main/java/io/xpipe/core/process/CommandBuilder.java index 85c5211f9..d34d36eb5 100644 --- a/core/src/main/java/io/xpipe/core/process/CommandBuilder.java +++ b/core/src/main/java/io/xpipe/core/process/CommandBuilder.java @@ -3,6 +3,7 @@ package io.xpipe.core.process; import io.xpipe.core.store.FilePath; import io.xpipe.core.util.FailableConsumer; import io.xpipe.core.util.FailableFunction; + import lombok.Getter; import lombok.SneakyThrows; diff --git a/core/src/main/java/io/xpipe/core/process/ProcessControl.java b/core/src/main/java/io/xpipe/core/process/ProcessControl.java index 44edc59a8..4db507a41 100644 --- a/core/src/main/java/io/xpipe/core/process/ProcessControl.java +++ b/core/src/main/java/io/xpipe/core/process/ProcessControl.java @@ -14,8 +14,7 @@ public interface ProcessControl extends AutoCloseable { void resetData(boolean cache); - String prepareTerminalOpen( - TerminalInitScriptConfig config, WorkingDirectoryFunction workingDirectory) + String prepareTerminalOpen(TerminalInitScriptConfig config, WorkingDirectoryFunction workingDirectory) throws Exception; void closeStdin() throws IOException; 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 92e2b5113..3515386e6 100644 --- a/core/src/main/java/io/xpipe/core/process/ShellControl.java +++ b/core/src/main/java/io/xpipe/core/process/ShellControl.java @@ -5,6 +5,7 @@ import io.xpipe.core.store.ShellStore; import io.xpipe.core.store.StatefulDataStore; import io.xpipe.core.util.FailableConsumer; import io.xpipe.core.util.FailableFunction; + import lombok.NonNull; import java.io.IOException; @@ -93,9 +94,7 @@ public interface ShellControl extends ProcessControl { ShellControl withErrorFormatter(Function formatter); String prepareIntermediateTerminalOpen( - String content, - TerminalInitScriptConfig config, - WorkingDirectoryFunction workingDirectory) + String content, TerminalInitScriptConfig config, WorkingDirectoryFunction workingDirectory) throws Exception; FilePath getSystemTemporaryDirectory(); @@ -199,7 +198,8 @@ public interface ShellControl extends ProcessControl { @Override public CommandBuilder prepareWithoutInitCommand() { - return CommandBuilder.of().addAll(sc -> sc.getShellDialect().getLaunchCommand().loginCommand(sc.getOsType())); + return CommandBuilder.of() + .addAll(sc -> sc.getShellDialect().getLaunchCommand().loginCommand(sc.getOsType())); } @Override diff --git a/core/src/main/java/io/xpipe/core/process/ShellDialect.java b/core/src/main/java/io/xpipe/core/process/ShellDialect.java index b858cdc24..2f1e222d8 100644 --- a/core/src/main/java/io/xpipe/core/process/ShellDialect.java +++ b/core/src/main/java/io/xpipe/core/process/ShellDialect.java @@ -1,12 +1,13 @@ package io.xpipe.core.process; -import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.xpipe.core.store.FilePath; import io.xpipe.core.store.FileSystem; import io.xpipe.core.util.NewLine; import io.xpipe.core.util.SecretValue; import io.xpipe.core.util.StreamCharset; +import com.fasterxml.jackson.annotation.JsonTypeInfo; + import java.nio.charset.Charset; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/io/xpipe/core/process/ShellLaunchCommand.java b/core/src/main/java/io/xpipe/core/process/ShellLaunchCommand.java index f69d23cec..d31448870 100644 --- a/core/src/main/java/io/xpipe/core/process/ShellLaunchCommand.java +++ b/core/src/main/java/io/xpipe/core/process/ShellLaunchCommand.java @@ -13,5 +13,4 @@ public interface ShellLaunchCommand { List loginCommand(OsType.Any os); List openCommand(); - } diff --git a/core/src/main/java/io/xpipe/core/process/ShellStoreState.java b/core/src/main/java/io/xpipe/core/process/ShellStoreState.java index 3b45daaa7..37eb565ab 100644 --- a/core/src/main/java/io/xpipe/core/process/ShellStoreState.java +++ b/core/src/main/java/io/xpipe/core/process/ShellStoreState.java @@ -1,6 +1,7 @@ package io.xpipe.core.process; import io.xpipe.core.store.DataStoreState; + import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/io/xpipe/core/process/WorkingDirectoryFunction.java b/core/src/main/java/io/xpipe/core/process/WorkingDirectoryFunction.java index 0e5c9376a..6ce049851 100644 --- a/core/src/main/java/io/xpipe/core/process/WorkingDirectoryFunction.java +++ b/core/src/main/java/io/xpipe/core/process/WorkingDirectoryFunction.java @@ -5,7 +5,7 @@ import io.xpipe.core.util.FailableFunction; public interface WorkingDirectoryFunction { - static WorkingDirectoryFunction of(FailableFunction path) { + static WorkingDirectoryFunction of(FailableFunction path) { return new WorkingDirectoryFunction() { @Override public boolean isFixed() { diff --git a/core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java b/core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java index e217ad459..d87ab0b7a 100644 --- a/core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java +++ b/core/src/main/java/io/xpipe/core/store/ConnectionFileSystem.java @@ -1,8 +1,9 @@ package io.xpipe.core.store; -import com.fasterxml.jackson.annotation.JsonIgnore; import io.xpipe.core.process.CommandBuilder; import io.xpipe.core.process.ShellControl; + +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; import java.io.InputStream; diff --git a/core/src/main/java/io/xpipe/core/store/DataStore.java b/core/src/main/java/io/xpipe/core/store/DataStore.java index 3fd37278d..0027b001d 100644 --- a/core/src/main/java/io/xpipe/core/store/DataStore.java +++ b/core/src/main/java/io/xpipe/core/store/DataStore.java @@ -1,8 +1,9 @@ package io.xpipe.core.store; -import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.xpipe.core.util.DataStateProvider; +import com.fasterxml.jackson.annotation.JsonTypeInfo; + @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") public interface DataStore { diff --git a/core/src/main/java/io/xpipe/core/store/DataStoreState.java b/core/src/main/java/io/xpipe/core/store/DataStoreState.java index 3a288f4b7..7b40db544 100644 --- a/core/src/main/java/io/xpipe/core/store/DataStoreState.java +++ b/core/src/main/java/io/xpipe/core/store/DataStoreState.java @@ -1,6 +1,7 @@ package io.xpipe.core.store; import io.xpipe.core.util.JacksonMapper; + import lombok.SneakyThrows; import lombok.experimental.SuperBuilder; 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 331c31d61..74b355848 100644 --- a/core/src/main/java/io/xpipe/core/store/FilePath.java +++ b/core/src/main/java/io/xpipe/core/store/FilePath.java @@ -1,6 +1,7 @@ package io.xpipe.core.store; import io.xpipe.core.process.OsType; + import lombok.EqualsAndHashCode; import lombok.NonNull; diff --git a/core/src/main/java/io/xpipe/core/store/FileSystem.java b/core/src/main/java/io/xpipe/core/store/FileSystem.java index f7e89216e..1439615cc 100644 --- a/core/src/main/java/io/xpipe/core/store/FileSystem.java +++ b/core/src/main/java/io/xpipe/core/store/FileSystem.java @@ -1,6 +1,7 @@ package io.xpipe.core.store; import io.xpipe.core.process.ShellControl; + import lombok.EqualsAndHashCode; import lombok.NonNull; import lombok.Value; diff --git a/core/src/main/java/io/xpipe/core/store/LocalStore.java b/core/src/main/java/io/xpipe/core/store/LocalStore.java index 0e9ac8d69..f9656abb6 100644 --- a/core/src/main/java/io/xpipe/core/store/LocalStore.java +++ b/core/src/main/java/io/xpipe/core/store/LocalStore.java @@ -1,11 +1,12 @@ package io.xpipe.core.store; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.core.process.ProcessControlProvider; import io.xpipe.core.process.ShellControl; import io.xpipe.core.process.ShellStoreState; import io.xpipe.core.util.JacksonizedValue; +import com.fasterxml.jackson.annotation.JsonTypeName; + @JsonTypeName("local") public class LocalStore extends JacksonizedValue implements ShellStore, StatefulDataStore { diff --git a/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java b/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java index 2d63f58d5..ba6bc6acb 100644 --- a/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java +++ b/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java @@ -1,8 +1,9 @@ package io.xpipe.core.store; -public interface SingletonSessionStore extends ExpandedLifecycleStore, InternalCacheDataStore { +public interface SingletonSessionStore + extends ExpandedLifecycleStore, InternalCacheDataStore { - static abstract class Session { + abstract static class Session { public abstract boolean isRunning(); @@ -25,7 +26,7 @@ public interface SingletonSessionStore } default boolean isEnabled() { - return getCache("sessionEnabled",Boolean.class,false); + return getCache("sessionEnabled", Boolean.class, false); } default void onSessionUpdate(boolean active) { @@ -62,7 +63,6 @@ public interface SingletonSessionStore } } - default void stopSessionIfNeeded() throws Exception { synchronized (this) { var ex = getSession(); diff --git a/core/src/main/java/io/xpipe/core/store/StatefulDataStore.java b/core/src/main/java/io/xpipe/core/store/StatefulDataStore.java index 0896c21e7..ff571c084 100644 --- a/core/src/main/java/io/xpipe/core/store/StatefulDataStore.java +++ b/core/src/main/java/io/xpipe/core/store/StatefulDataStore.java @@ -1,6 +1,7 @@ package io.xpipe.core.store; import io.xpipe.core.util.DataStateProvider; + import lombok.SneakyThrows; import java.util.Arrays; diff --git a/core/src/main/java/io/xpipe/core/util/AesSecretValue.java b/core/src/main/java/io/xpipe/core/util/AesSecretValue.java index db390afe9..ac4449e44 100644 --- a/core/src/main/java/io/xpipe/core/util/AesSecretValue.java +++ b/core/src/main/java/io/xpipe/core/util/AesSecretValue.java @@ -4,12 +4,6 @@ import lombok.EqualsAndHashCode; import lombok.SneakyThrows; import lombok.experimental.SuperBuilder; -import javax.crypto.Cipher; -import javax.crypto.SecretKey; -import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.GCMParameterSpec; -import javax.crypto.spec.PBEKeySpec; -import javax.crypto.spec.SecretKeySpec; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.security.NoSuchAlgorithmException; @@ -17,6 +11,12 @@ import java.security.SecureRandom; import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; import java.util.Random; +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.SecretKeyFactory; +import javax.crypto.spec.GCMParameterSpec; +import javax.crypto.spec.PBEKeySpec; +import javax.crypto.spec.SecretKeySpec; @SuperBuilder @EqualsAndHashCode(callSuper = true) diff --git a/core/src/main/java/io/xpipe/core/util/CoreJacksonModule.java b/core/src/main/java/io/xpipe/core/util/CoreJacksonModule.java index a670255df..73410a561 100644 --- a/core/src/main/java/io/xpipe/core/util/CoreJacksonModule.java +++ b/core/src/main/java/io/xpipe/core/util/CoreJacksonModule.java @@ -1,5 +1,14 @@ package io.xpipe.core.util; +import io.xpipe.core.dialog.BaseQueryElement; +import io.xpipe.core.dialog.BusyElement; +import io.xpipe.core.dialog.ChoiceElement; +import io.xpipe.core.dialog.HeaderElement; +import io.xpipe.core.process.OsType; +import io.xpipe.core.process.ShellDialect; +import io.xpipe.core.process.ShellDialects; +import io.xpipe.core.store.LocalStore; + import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; import com.fasterxml.jackson.core.JsonGenerator; @@ -12,14 +21,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.type.ArrayType; -import io.xpipe.core.dialog.BaseQueryElement; -import io.xpipe.core.dialog.BusyElement; -import io.xpipe.core.dialog.ChoiceElement; -import io.xpipe.core.dialog.HeaderElement; -import io.xpipe.core.process.OsType; -import io.xpipe.core.process.ShellDialect; -import io.xpipe.core.process.ShellDialects; -import io.xpipe.core.store.LocalStore; import java.io.IOException; import java.lang.reflect.WildcardType; diff --git a/core/src/main/java/io/xpipe/core/util/InPlaceSecretValue.java b/core/src/main/java/io/xpipe/core/util/InPlaceSecretValue.java index b083d9e53..6f3f47204 100644 --- a/core/src/main/java/io/xpipe/core/util/InPlaceSecretValue.java +++ b/core/src/main/java/io/xpipe/core/util/InPlaceSecretValue.java @@ -5,9 +5,9 @@ import lombok.EqualsAndHashCode; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; -import javax.crypto.SecretKey; import java.security.spec.InvalidKeySpecException; import java.util.Random; +import javax.crypto.SecretKey; @JsonTypeName("default") @SuperBuilder diff --git a/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java b/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java index c5a4083b1..abcdf3445 100644 --- a/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java +++ b/core/src/main/java/io/xpipe/core/util/XPipeInstallation.java @@ -2,6 +2,7 @@ package io.xpipe.core.util; import io.xpipe.core.process.*; import io.xpipe.core.store.FileNames; + import lombok.Getter; import lombok.SneakyThrows; diff --git a/core/src/test/java/io/xpipe/core/test/DataStoreIdTest.java b/core/src/test/java/io/xpipe/core/test/DataStoreIdTest.java index 9a1f963ce..e05468ef5 100644 --- a/core/src/test/java/io/xpipe/core/test/DataStoreIdTest.java +++ b/core/src/test/java/io/xpipe/core/test/DataStoreIdTest.java @@ -1,6 +1,7 @@ package io.xpipe.core.test; import io.xpipe.core.store.DataStoreId; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/BrowseStoreAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/BrowseStoreAction.java index c4572d251..a713ac2a0 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/BrowseStoreAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/action/BrowseStoreAction.java @@ -7,8 +7,10 @@ import io.xpipe.app.ext.ActionProvider; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.ShellStore; + import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ObservableValue; + import lombok.Value; public class BrowseStoreAction implements ActionProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/CloneStoreAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/CloneStoreAction.java index 509761bbb..7a30122dc 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/CloneStoreAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/action/CloneStoreAction.java @@ -6,7 +6,9 @@ import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.DataStore; + import javafx.beans.value.ObservableValue; + import lombok.Value; public class CloneStoreAction implements ActionProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/DeleteStoreChildrenAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/DeleteStoreChildrenAction.java index f57fbf488..7d46ea3c4 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/DeleteStoreChildrenAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/action/DeleteStoreChildrenAction.java @@ -7,7 +7,9 @@ import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.FixedHierarchyStore; import io.xpipe.core.store.DataStore; + import javafx.beans.value.ObservableValue; + import lombok.Value; public class DeleteStoreChildrenAction implements ActionProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/EditStoreAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/EditStoreAction.java index 0e0aa7254..073555117 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/EditStoreAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/action/EditStoreAction.java @@ -6,7 +6,9 @@ import io.xpipe.app.ext.ActionProvider; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.DataStore; + import javafx.beans.value.ObservableValue; + import lombok.Value; public class EditStoreAction implements ActionProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/LaunchAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/LaunchAction.java index 178ca98bf..5d4793ce5 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/LaunchAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/action/LaunchAction.java @@ -10,7 +10,9 @@ import io.xpipe.core.store.DataStore; import io.xpipe.core.store.LaunchableStore; import io.xpipe.core.store.ShellStore; import io.xpipe.ext.base.script.ScriptStore; + import javafx.beans.value.ObservableValue; + import lombok.Value; public class LaunchAction implements ActionProvider { @@ -41,8 +43,9 @@ public class LaunchAction implements ActionProvider { @Override public boolean isApplicable(DataStoreEntryRef o) { - return o.get().getValidity().isUsable() && ( - o.getStore() instanceof LaunchableStore || o.get().getProvider().launchAction(o.get()) != null); + return o.get().getValidity().isUsable() + && (o.getStore() instanceof LaunchableStore + || o.get().getProvider().launchAction(o.get()) != null); } @Override @@ -73,8 +76,9 @@ public class LaunchAction implements ActionProvider { @Override public boolean isApplicable(DataStoreEntryRef o) { - return o.get().getValidity().isUsable() && ( - o.getStore() instanceof LaunchableStore || o.get().getProvider().launchAction(o.get()) != null); + return o.get().getValidity().isUsable() + && (o.getStore() instanceof LaunchableStore + || o.get().getProvider().launchAction(o.get()) != null); } }; } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/RefreshStoreChildrenAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/RefreshStoreChildrenAction.java index 895f324ae..0c6e07485 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/RefreshStoreChildrenAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/action/RefreshStoreChildrenAction.java @@ -6,7 +6,9 @@ import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.FixedHierarchyStore; + import javafx.beans.value.ObservableValue; + import lombok.Value; public class RefreshStoreChildrenAction implements ActionProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/SampleAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/SampleAction.java index 9880669fd..7ee0bb28e 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/SampleAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/action/SampleAction.java @@ -9,7 +9,9 @@ import io.xpipe.core.process.ShellControl; import io.xpipe.core.process.ShellDialects; import io.xpipe.core.store.LocalStore; import io.xpipe.core.store.ShellStore; + import javafx.beans.value.ObservableValue; + import lombok.Value; import java.io.BufferedReader; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/ScanAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/ScanAction.java index 9ba46c34c..a8227fa28 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/ScanAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/action/ScanAction.java @@ -6,7 +6,9 @@ import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.ScanAlert; import io.xpipe.core.store.ShellStore; + import javafx.beans.value.ObservableValue; + import lombok.Value; public class ScanAction implements ActionProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/ShareStoreAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/ShareStoreAction.java index 61420e415..8aba7de93 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/ShareStoreAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/action/ShareStoreAction.java @@ -8,7 +8,9 @@ import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.ClipboardHelper; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.InPlaceSecretValue; + import javafx.beans.value.ObservableValue; + import lombok.Value; public class ShareStoreAction implements ActionProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/XPipeUrlAction.java b/ext/base/src/main/java/io/xpipe/ext/base/action/XPipeUrlAction.java index f38d12fe8..e4d1c038b 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/XPipeUrlAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/action/XPipeUrlAction.java @@ -8,6 +8,7 @@ import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.InPlaceSecretValue; import io.xpipe.core.util.JacksonMapper; + import lombok.Value; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java index 5b6a2ddca..a6f12b695 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/BackAction.java @@ -4,11 +4,13 @@ import io.xpipe.app.browser.action.LeafAction; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/BrowseInNativeManagerAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/BrowseInNativeManagerAction.java index d6212caac..f136b2d07 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/BrowseInNativeManagerAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/BrowseInNativeManagerAction.java @@ -8,6 +8,7 @@ import io.xpipe.core.process.OsType; import io.xpipe.core.process.ShellControl; import io.xpipe.core.process.ShellDialect; import io.xpipe.core.store.FileKind; + import javafx.beans.value.ObservableValue; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/ChmodAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/ChmodAction.java index 4d8c958da..7f3d2cf38 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/ChmodAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/ChmodAction.java @@ -7,9 +7,11 @@ import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; import io.xpipe.core.process.CommandBuilder; import io.xpipe.core.process.OsType; + import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; import javafx.scene.Node; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyAction.java index d88268b4c..194c3de41 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyAction.java @@ -5,11 +5,13 @@ import io.xpipe.app.browser.action.LeafAction; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyPathAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyPathAction.java index fd792d9a9..3fc3c8e8e 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyPathAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/CopyPathAction.java @@ -10,6 +10,7 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.ClipboardHelper; import io.xpipe.core.store.FileKind; import io.xpipe.core.store.FileNames; + import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; import javafx.scene.input.KeyCode; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/DeleteAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/DeleteAction.java index b5a86ea68..eeca754d1 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/DeleteAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/DeleteAction.java @@ -7,11 +7,13 @@ import io.xpipe.app.browser.file.FileSystemHelper; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; import io.xpipe.core.store.FileKind; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/DeleteLinkAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/DeleteLinkAction.java index be7e0e62e..3f749058c 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/DeleteLinkAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/DeleteLinkAction.java @@ -6,8 +6,10 @@ import io.xpipe.app.browser.file.FileSystemHelper; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; import io.xpipe.core.store.FileKind; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java index 50c1d7f8a..b9af1979b 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java @@ -7,8 +7,10 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.FileOpener; import io.xpipe.core.store.FileKind; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/FileTypeAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/FileTypeAction.java index 44363cc63..9a9da7c51 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/FileTypeAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/FileTypeAction.java @@ -5,6 +5,7 @@ import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.browser.icon.BrowserIconFileType; import io.xpipe.app.browser.icon.BrowserIcons; + import javafx.scene.Node; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/FollowLinkAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/FollowLinkAction.java index 6c2f92582..a3e42296e 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/FollowLinkAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/FollowLinkAction.java @@ -6,8 +6,10 @@ import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; import io.xpipe.core.store.FileKind; import io.xpipe.core.store.FileNames; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java index 0aa860955..a193c6df0 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/ForwardAction.java @@ -4,11 +4,13 @@ import io.xpipe.app.browser.action.LeafAction; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/JarAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/JarAction.java index 12e13b85d..36bcf580c 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/JarAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/JarAction.java @@ -7,6 +7,7 @@ import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.browser.icon.BrowserIconFileType; import io.xpipe.core.process.CommandBuilder; import io.xpipe.core.process.ShellControl; + import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/JavapAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/JavapAction.java index 2d30c0162..c88abe333 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/JavapAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/JavapAction.java @@ -5,6 +5,7 @@ import io.xpipe.app.browser.action.ToFileCommandAction; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.browser.icon.BrowserIconFileType; + import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/NewItemAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/NewItemAction.java index eb5a17411..1b9a0d40b 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/NewItemAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/NewItemAction.java @@ -11,10 +11,12 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.core.process.OsType; + import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.control.TextField; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenDirectoryAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenDirectoryAction.java index b2e9e7dbc..f7f6f361b 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenDirectoryAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenDirectoryAction.java @@ -5,11 +5,13 @@ import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; import io.xpipe.core.store.FileKind; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenDirectoryInNewTabAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenDirectoryInNewTabAction.java index 541be09ea..01286ced4 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenDirectoryInNewTabAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenDirectoryInNewTabAction.java @@ -6,8 +6,10 @@ import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.browser.session.BrowserSessionModel; import io.xpipe.app.core.AppI18n; import io.xpipe.core.store.FileKind; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenFileDefaultAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenFileDefaultAction.java index 132fc2ec5..63ff54317 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenFileDefaultAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenFileDefaultAction.java @@ -6,11 +6,13 @@ import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.FileOpener; import io.xpipe.core.store.FileKind; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenFileWithAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenFileWithAction.java index 5a30be795..865a4c635 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenFileWithAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenFileWithAction.java @@ -7,11 +7,13 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.util.FileOpener; import io.xpipe.core.process.OsType; import io.xpipe.core.store.FileKind; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenNativeFileDetailsAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenNativeFileDetailsAction.java index ea4519ad3..bda7c0204 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenNativeFileDetailsAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenNativeFileDetailsAction.java @@ -8,6 +8,7 @@ import io.xpipe.app.util.LocalShell; import io.xpipe.core.process.OsType; import io.xpipe.core.process.ShellControl; import io.xpipe.core.store.FileNames; + import javafx.beans.value.ObservableValue; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenTerminalAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenTerminalAction.java index f80fb474c..ee8d09f0b 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenTerminalAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/OpenTerminalAction.java @@ -6,11 +6,13 @@ import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.core.store.FileKind; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/PasteAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/PasteAction.java index 4c4051970..48f1809dc 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/PasteAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/PasteAction.java @@ -6,11 +6,13 @@ import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; import io.xpipe.core.store.FileKind; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/RefreshDirectoryAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/RefreshDirectoryAction.java index 2afec70bb..ff7f9cf96 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/RefreshDirectoryAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/RefreshDirectoryAction.java @@ -4,11 +4,13 @@ import io.xpipe.app.browser.action.LeafAction; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/RenameAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/RenameAction.java index 72883f5fe..e47d697e9 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/RenameAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/RenameAction.java @@ -5,11 +5,13 @@ import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.core.AppI18n; import io.xpipe.core.store.FileKind; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/RunAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/RunAction.java index 4bc60f1ea..7905d96c3 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/RunAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/RunAction.java @@ -10,8 +10,10 @@ import io.xpipe.core.process.ShellControl; import io.xpipe.core.process.ShellDialects; import io.xpipe.core.store.FileKind; import io.xpipe.core.store.FileSystem; + import javafx.beans.value.ObservableValue; import javafx.scene.Node; + import org.kordamp.ikonli.javafx.FontIcon; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/UnzipAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/UnzipAction.java index 2acc313e7..259fd9c79 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/UnzipAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/UnzipAction.java @@ -6,6 +6,7 @@ import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.browser.icon.BrowserIconFileType; import io.xpipe.core.process.OsType; import io.xpipe.core.store.FileNames; + import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; 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 4ad57bcf8..530357e90 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStore.java @@ -1,12 +1,13 @@ package io.xpipe.ext.base.desktop; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.storage.ContextualFileReference; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.Validators; import io.xpipe.core.process.CommandBuilder; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.JacksonizedValue; + +import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Getter; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; @@ -29,7 +30,9 @@ public class DesktopApplicationStore extends JacksonizedValue implements DataSto } public String getFullCommand() { - var builder = CommandBuilder.of().addFile(path.toAbsoluteFilePath(null)).add(arguments != null ? " " + arguments : ""); + var builder = CommandBuilder.of() + .addFile(path.toAbsoluteFilePath(null)) + .add(arguments != null ? " " + arguments : ""); builder = desktop.getStore().getUsedDialect().launchAsnyc(builder); return builder.buildSimple(); } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java index b46dbc14d..2e1564ac2 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopApplicationStoreProvider.java @@ -12,6 +12,7 @@ import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DataStoreFormatter; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.core.store.DataStore; + import javafx.beans.property.BooleanProperty; import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; @@ -22,7 +23,8 @@ import java.util.List; public class DesktopApplicationStoreProvider implements DataStoreProvider { @Override - public ActionProvider.Action browserAction(BrowserSessionModel sessionModel, DataStoreEntry store, BooleanProperty busy) { + public ActionProvider.Action browserAction( + BrowserSessionModel sessionModel, DataStoreEntry store, BooleanProperty busy) { return launchAction(store); } @@ -72,7 +74,8 @@ public class DesktopApplicationStoreProvider implements DataStoreProvider { entry, host, DesktopBaseStore.class, - desktopStoreDataStoreEntryRef -> desktopStoreDataStoreEntryRef.getStore().supportsDesktopAccess(), + desktopStoreDataStoreEntryRef -> + desktopStoreDataStoreEntryRef.getStore().supportsDesktopAccess(), StoreViewState.get().getAllConnectionsCategory()), host) .nonNull() @@ -83,7 +86,11 @@ public class DesktopApplicationStoreProvider implements DataStoreProvider { .addString(args) .bind( () -> { - return DesktopApplicationStore.builder().desktop(host.get()).path(ContextualFileReference.of(path.get())).arguments(args.get()).build(); + return DesktopApplicationStore.builder() + .desktop(host.get()) + .path(ContextualFileReference.of(path.get())) + .arguments(args.get()) + .build(); }, store) .buildDialog(); @@ -113,6 +120,4 @@ public class DesktopApplicationStoreProvider implements DataStoreProvider { public List> getStoreClasses() { return List.of(DesktopApplicationStore.class); } - - } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStore.java b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStore.java index db2c28986..06fc8bfad 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStore.java @@ -1,11 +1,12 @@ package io.xpipe.ext.base.desktop; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.Validators; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.JacksonizedValue; import io.xpipe.ext.base.SelfReferentialStore; + +import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Getter; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStoreProvider.java index be50f0833..50a2b9723 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopCommandStoreProvider.java @@ -12,6 +12,7 @@ import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DataStoreFormatter; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.core.store.DataStore; + import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.Property; @@ -23,7 +24,8 @@ import java.util.List; public class DesktopCommandStoreProvider implements DataStoreProvider { @Override - public ActionProvider.Action browserAction(BrowserSessionModel sessionModel, DataStoreEntry store, BooleanProperty busy) { + public ActionProvider.Action browserAction( + BrowserSessionModel sessionModel, DataStoreEntry store, BooleanProperty busy) { return launchAction(store); } @@ -43,7 +45,7 @@ public class DesktopCommandStoreProvider implements DataStoreProvider { if (baseActivate != null) { baseActivate.execute(); } - s.getEnvironment().getStore().runDesktopTerminal(store.getName(),s.getScript()); + s.getEnvironment().getStore().runDesktopTerminal(store.getName(), s.getScript()); } }; } @@ -72,7 +74,8 @@ public class DesktopCommandStoreProvider implements DataStoreProvider { entry, env, DesktopEnvironmentStore.class, - desktopStoreDataStoreEntryRef -> desktopStoreDataStoreEntryRef.getStore().supportsDesktopAccess(), + desktopStoreDataStoreEntryRef -> + desktopStoreDataStoreEntryRef.getStore().supportsDesktopAccess(), StoreViewState.get().getAllConnectionsCategory()), env) .nonNull() @@ -84,9 +87,15 @@ public class DesktopCommandStoreProvider implements DataStoreProvider { "commands", Bindings.createStringBinding( () -> { - return env.getValue() != null && env.getValue().getStore().getDialect() != null - ? env.getValue().getStore().getDialect() - .getScriptFileEnding() + return env.getValue() != null + && env.getValue() + .getStore() + .getDialect() + != null + ? env.getValue() + .getStore() + .getDialect() + .getScriptFileEnding() : "sh"; }, env)), @@ -94,7 +103,10 @@ public class DesktopCommandStoreProvider implements DataStoreProvider { .nonNull() .bind( () -> { - return DesktopCommandStore.builder().environment(env.get()).script(script.get()).build(); + return DesktopCommandStore.builder() + .environment(env.get()) + .script(script.get()) + .build(); }, store) .buildDialog(); @@ -124,6 +136,4 @@ public class DesktopCommandStoreProvider implements DataStoreProvider { public List> getStoreClasses() { return List.of(DesktopCommandStore.class); } - - } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStore.java b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStore.java index 1872bc6e8..ad2379eb8 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStore.java @@ -1,6 +1,5 @@ package io.xpipe.ext.base.desktop; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.terminal.ExternalTerminalType; import io.xpipe.app.util.Validators; @@ -11,6 +10,8 @@ import io.xpipe.core.store.FilePath; import io.xpipe.core.util.JacksonizedValue; import io.xpipe.ext.base.SelfReferentialStore; import io.xpipe.ext.base.script.ScriptStore; + +import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Getter; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; @@ -52,7 +53,9 @@ public class DesktopEnvironmentStore extends JacksonizedValue simpleScriptStore.getMinimumDialect().isCompatibleTo(dialect) && simpleScriptStore.getExecutionType().runInTerminal()) .toList(); - var initCommands = new ArrayList<>(filtered.stream().map(simpleScriptStore -> simpleScriptStore.getCommands()).toList()); + var initCommands = new ArrayList<>(filtered.stream() + .map(simpleScriptStore -> simpleScriptStore.getCommands()) + .toList()); if (initScript != null) { initCommands.add(initScript); } @@ -87,10 +90,16 @@ public class DesktopEnvironmentStore extends JacksonizedValue public void runDesktopTerminal(String name, String script) throws Exception { var launchCommand = terminal.remoteLaunchCommand(); - var toExecute = (script != null ? getMergedInitCommands(script + "\n" + dialect.getPauseCommand() + "\n" + dialect.getNormalExitCommand()): getMergedInitCommands(null)); + var toExecute = (script != null + ? getMergedInitCommands( + script + "\n" + dialect.getPauseCommand() + "\n" + dialect.getNormalExitCommand()) + : getMergedInitCommands(null)); var scriptFile = base.getStore().createScript(dialect, toExecute); - var launchScriptFile = base.getStore().createScript(dialect, dialect.prepareTerminalInitFileOpenCommand(dialect, null, scriptFile.toString())); - var launchConfig = new ExternalTerminalType.LaunchConfiguration(null, name, name, launchScriptFile, getUsedDialect()); + var launchScriptFile = base.getStore() + .createScript( + dialect, dialect.prepareTerminalInitFileOpenCommand(dialect, null, scriptFile.toString())); + var launchConfig = + new ExternalTerminalType.LaunchConfiguration(null, name, name, launchScriptFile, getUsedDialect()); base.getStore().runDesktopScript(name, launchCommand.apply(launchConfig)); } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStoreProvider.java index d4f3f463f..d5d5cc34e 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/desktop/DesktopEnvironmentStoreProvider.java @@ -18,9 +18,11 @@ import io.xpipe.app.util.DataStoreFormatter; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.core.store.DataStore; import io.xpipe.ext.base.script.ScriptStore; + import javafx.beans.binding.Bindings; import javafx.beans.property.*; import javafx.collections.FXCollections; + import lombok.SneakyThrows; import java.util.ArrayList; @@ -29,7 +31,8 @@ import java.util.List; public class DesktopEnvironmentStoreProvider implements DataStoreProvider { @Override - public ActionProvider.Action browserAction(BrowserSessionModel sessionModel, DataStoreEntry store, BooleanProperty busy) { + public ActionProvider.Action browserAction( + BrowserSessionModel sessionModel, DataStoreEntry store, BooleanProperty busy) { return launchAction(store); } @@ -44,7 +47,10 @@ public class DesktopEnvironmentStoreProvider implements DataStoreProvider { @Override public void execute() throws Exception { DesktopEnvironmentStore s = store.getStore().asNeeded(); - var a = s.getBase().get().getProvider().activateAction(s.getBase().get()); + var a = s.getBase() + .get() + .getProvider() + .activateAction(s.getBase().get()); if (a != null) { a.execute(); } @@ -63,7 +69,10 @@ public class DesktopEnvironmentStoreProvider implements DataStoreProvider { @Override public void execute() throws Exception { DesktopEnvironmentStore s = store.getStore().asNeeded(); - var a = s.getBase().get().getProvider().activateAction(s.getBase().get()); + var a = s.getBase() + .get() + .getProvider() + .activateAction(s.getBase().get()); if (a != null) { a.execute(); } @@ -91,10 +100,10 @@ public class DesktopEnvironmentStoreProvider implements DataStoreProvider { var host = new SimpleObjectProperty<>(st.getBase()); var terminal = new SimpleObjectProperty<>(st.getTerminal()); var dialect = new SimpleObjectProperty<>(st.getDialect()); - var scripts = new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>(st.getEffectiveScripts()))); + var scripts = + new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>(st.getEffectiveScripts()))); var initScript = new SimpleStringProperty(st.getInitScript()); - Comp dialectChoice = (Comp) Class.forName( AppExtensionManager.getInstance() .getExtendedLayer() @@ -111,12 +120,16 @@ public class DesktopEnvironmentStoreProvider implements DataStoreProvider { entry, host, DesktopBaseStore.class, - desktopStoreDataStoreEntryRef -> desktopStoreDataStoreEntryRef.getStore().supportsDesktopAccess(), + desktopStoreDataStoreEntryRef -> + desktopStoreDataStoreEntryRef.getStore().supportsDesktopAccess(), StoreViewState.get().getAllConnectionsCategory()), host) .nonNull() .nameAndDescription("desktopTerminal") - .addComp(ChoiceComp.ofTranslatable(terminal, ExternalTerminalType.getTypes(st.getUsedOsType(), true, false),true), terminal) + .addComp( + ChoiceComp.ofTranslatable( + terminal, ExternalTerminalType.getTypes(st.getUsedOsType(), true, false), true), + terminal) .nonNull() .nameAndDescription("desktopShellDialect") .addComp(dialectChoice, dialect) @@ -138,16 +151,20 @@ public class DesktopEnvironmentStoreProvider implements DataStoreProvider { Bindings.createStringBinding( () -> { return dialect.getValue() != null - ? dialect - .getValue() - .getScriptFileEnding() + ? dialect.getValue().getScriptFileEnding() : "sh"; }, dialect)), initScript) .bind( () -> { - return DesktopEnvironmentStore.builder().base(host.get()).terminal(terminal.get()).dialect(dialect.get()).scripts(scripts.get()).initScript(initScript.get()).build(); + return DesktopEnvironmentStore.builder() + .base(host.get()) + .terminal(terminal.get()) + .dialect(dialect.get()) + .scripts(scripts.get()) + .initScript(initScript.get()) + .build(); }, store) .buildDialog(); @@ -177,6 +194,4 @@ public class DesktopEnvironmentStoreProvider implements DataStoreProvider { public List> getStoreClasses() { return List.of(DesktopEnvironmentStore.class); } - - } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptGroup.java b/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptGroup.java index ca29a718d..dfc07e472 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptGroup.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptGroup.java @@ -1,6 +1,7 @@ package io.xpipe.ext.base.script; import io.xpipe.app.storage.DataStoreEntryRef; + import lombok.Getter; import lombok.Setter; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptStore.java b/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptStore.java index 89d6c54c9..01f12123a 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptStore.java @@ -3,6 +3,7 @@ package io.xpipe.ext.base.script; import io.xpipe.app.core.AppResources; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.process.ShellDialects; + import lombok.Getter; import lombok.Setter; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStore.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStore.java index 72c2e8ef8..c7578bd7b 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStore.java @@ -1,10 +1,11 @@ package io.xpipe.ext.base.script; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.ext.base.GroupStore; import io.xpipe.ext.base.SelfReferentialStore; + +import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Getter; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStoreProvider.java index a9ea35f9a..8da4056d6 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptGroupStoreProvider.java @@ -11,10 +11,12 @@ import io.xpipe.app.fxcomps.impl.DataStoreChoiceComp; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.core.store.DataStore; + import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; + import lombok.SneakyThrows; import java.util.List; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStore.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStore.java index 548b6c2bb..50aa290af 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStore.java @@ -14,6 +14,7 @@ import io.xpipe.core.store.DataStoreState; import io.xpipe.core.store.FileNames; import io.xpipe.core.store.StatefulDataStore; import io.xpipe.core.util.JacksonizedValue; + import lombok.*; import lombok.experimental.FieldDefaults; import lombok.experimental.SuperBuilder; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreTypeChoiceComp.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreTypeChoiceComp.java index b8eee04cd..1e8490297 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreTypeChoiceComp.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStoreTypeChoiceComp.java @@ -3,10 +3,12 @@ package io.xpipe.ext.base.script; import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.impl.ToggleGroupComp; + import javafx.beans.property.Property; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; import javafx.scene.layout.Region; + import lombok.EqualsAndHashCode; import lombok.Value; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStore.java b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStore.java index 8f4b4034c..eccdc3e2b 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStore.java @@ -1,12 +1,13 @@ package io.xpipe.ext.base.script; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.ScriptHelper; import io.xpipe.app.util.Validators; import io.xpipe.core.process.ScriptSnippet; import io.xpipe.core.process.ShellControl; import io.xpipe.core.process.ShellDialect; + +import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Getter; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStoreProvider.java index df426f3a3..5aca6448d 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptStoreProvider.java @@ -19,6 +19,7 @@ import io.xpipe.app.util.OptionsBuilder; import io.xpipe.core.process.ShellDialect; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.Identifiers; + import javafx.beans.binding.Bindings; import javafx.beans.property.Property; import javafx.beans.property.SimpleListProperty; @@ -26,6 +27,7 @@ import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; + import lombok.SneakyThrows; import java.nio.charset.StandardCharsets; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseAction.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseAction.java index cf924cbda..27a2cf3c6 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseAction.java @@ -3,7 +3,9 @@ package io.xpipe.ext.base.store; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ActionProvider; import io.xpipe.app.storage.DataStoreEntryRef; + import javafx.beans.value.ObservableValue; + import lombok.Value; public class StorePauseAction implements ActionProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartAction.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartAction.java index 90121ef5a..db645c63d 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartAction.java @@ -3,7 +3,9 @@ package io.xpipe.ext.base.store; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ActionProvider; import io.xpipe.app.storage.DataStoreEntryRef; + import javafx.beans.value.ObservableValue; + import lombok.Value; public class StoreStartAction implements ActionProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopAction.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopAction.java index 362525109..1b8392ed8 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopAction.java @@ -3,7 +3,9 @@ package io.xpipe.ext.base.store; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ActionProvider; import io.xpipe.app.storage.DataStoreEntryRef; + import javafx.beans.value.ObservableValue; + import lombok.Value; public class StoreStopAction implements ActionProvider { diff --git a/ext/base/src/main/java/module-info.java b/ext/base/src/main/java/module-info.java index 626327f2e..447e8f0ad 100644 --- a/ext/base/src/main/java/module-info.java +++ b/ext/base/src/main/java/module-info.java @@ -3,11 +3,11 @@ import io.xpipe.app.ext.ActionProvider; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.ext.base.action.*; import io.xpipe.ext.base.browser.*; +import io.xpipe.ext.base.desktop.DesktopApplicationStoreProvider; import io.xpipe.ext.base.desktop.DesktopCommandStoreProvider; import io.xpipe.ext.base.desktop.DesktopEnvironmentStoreProvider; import io.xpipe.ext.base.script.ScriptGroupStoreProvider; import io.xpipe.ext.base.script.SimpleScriptStoreProvider; -import io.xpipe.ext.base.desktop.DesktopApplicationStoreProvider; import io.xpipe.ext.base.store.StorePauseAction; import io.xpipe.ext.base.store.StoreStartAction; import io.xpipe.ext.base.store.StoreStopAction; @@ -59,7 +59,8 @@ open module io.xpipe.ext.base { StoreStopAction, StoreStartAction, StorePauseAction, - CloneStoreAction, RefreshStoreChildrenAction, + CloneStoreAction, + RefreshStoreChildrenAction, ScanAction, LaunchAction, XPipeUrlAction, @@ -67,6 +68,9 @@ open module io.xpipe.ext.base { DeleteStoreChildrenAction, BrowseStoreAction; provides DataStoreProvider with - SimpleScriptStoreProvider, DesktopEnvironmentStoreProvider, DesktopApplicationStoreProvider, DesktopCommandStoreProvider, + SimpleScriptStoreProvider, + DesktopEnvironmentStoreProvider, + DesktopApplicationStoreProvider, + DesktopCommandStoreProvider, ScriptGroupStoreProvider; }