diff --git a/app/src/main/java/io/xpipe/app/action/AbstractAction.java b/app/src/main/java/io/xpipe/app/action/AbstractAction.java index 1c087128e..8def3d4ed 100644 --- a/app/src/main/java/io/xpipe/app/action/AbstractAction.java +++ b/app/src/main/java/io/xpipe/app/action/AbstractAction.java @@ -152,7 +152,7 @@ public abstract class AbstractAction { return getDisplayName(); } - protected abstract void executeImpl() throws Exception; + public abstract void executeImpl() throws Exception; protected boolean beforeExecute() throws Exception { return true; diff --git a/app/src/main/java/io/xpipe/app/action/ActionConfigComp.java b/app/src/main/java/io/xpipe/app/action/ActionConfigComp.java index 2f71384d9..358331e81 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionConfigComp.java +++ b/app/src/main/java/io/xpipe/app/action/ActionConfigComp.java @@ -3,19 +3,18 @@ package io.xpipe.app.action; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.*; -import io.xpipe.app.comp.store.StoreChoiceComp; -import io.xpipe.app.comp.store.StoreListChoiceComp; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.action.BatchStoreAction; +import io.xpipe.app.hub.action.MultiStoreAction; +import io.xpipe.app.hub.action.StoreAction; +import io.xpipe.app.hub.comp.StoreChoiceComp; +import io.xpipe.app.hub.comp.StoreListChoiceComp; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.*; import io.xpipe.core.store.DataStore; -import javafx.application.Platform; import javafx.beans.property.*; import javafx.collections.FXCollections; import javafx.scene.layout.Region; -import org.kordamp.ikonli.javafx.FontIcon; - -import java.util.List; public class ActionConfigComp extends SimpleComp { diff --git a/app/src/main/java/io/xpipe/app/action/ActionConfirmComp.java b/app/src/main/java/io/xpipe/app/action/ActionConfirmComp.java index f741eb008..c9e4730ea 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionConfirmComp.java +++ b/app/src/main/java/io/xpipe/app/action/ActionConfirmComp.java @@ -3,8 +3,11 @@ package io.xpipe.app.action; import atlantafx.base.theme.Styles; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; -import io.xpipe.app.comp.store.StoreListChoiceComp; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.action.BatchStoreAction; +import io.xpipe.app.hub.action.MultiStoreAction; +import io.xpipe.app.hub.action.StoreAction; +import io.xpipe.app.hub.comp.StoreListChoiceComp; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.OptionsBuilder; import io.xpipe.core.store.DataStore; diff --git a/app/src/main/java/io/xpipe/app/action/ActionJacksonMapper.java b/app/src/main/java/io/xpipe/app/action/ActionJacksonMapper.java index 68929532d..8445a0525 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionJacksonMapper.java +++ b/app/src/main/java/io/xpipe/app/action/ActionJacksonMapper.java @@ -4,6 +4,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; +import io.xpipe.app.hub.action.BatchStoreAction; +import io.xpipe.app.hub.action.MultiStoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.core.store.DataStore; import io.xpipe.core.util.JacksonMapper; diff --git a/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java b/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java index e3b8118d8..901ff9468 100644 --- a/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java +++ b/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java @@ -4,11 +4,8 @@ import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.comp.base.InputGroupComp; -import io.xpipe.app.comp.base.TextAreaComp; import io.xpipe.app.comp.base.TextFieldComp; -import io.xpipe.app.comp.store.StoreCreationDialog; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.storage.DataStorage; import io.xpipe.app.util.*; import javafx.beans.property.Property; import javafx.beans.property.SimpleStringProperty; diff --git a/app/src/main/java/io/xpipe/app/action/BranchStoreActionProvider.java b/app/src/main/java/io/xpipe/app/action/BranchStoreActionProvider.java index 2889e0123..6936073c8 100644 --- a/app/src/main/java/io/xpipe/app/action/BranchStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/action/BranchStoreActionProvider.java @@ -1,5 +1,6 @@ package io.xpipe.app.action; +import io.xpipe.app.hub.action.StoreActionProvider; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.DataStore; diff --git a/app/src/main/java/io/xpipe/app/action/LeafStoreActionProvider.java b/app/src/main/java/io/xpipe/app/action/LeafStoreActionProvider.java index 0b3b24b1c..1d0d959e0 100644 --- a/app/src/main/java/io/xpipe/app/action/LeafStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/action/LeafStoreActionProvider.java @@ -1,11 +1,8 @@ package io.xpipe.app.action; -import io.xpipe.app.core.AppI18n; +import io.xpipe.app.hub.action.StoreActionProvider; import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.store.DataStore; -import io.xpipe.core.util.FailableConsumer; -import javafx.beans.value.ObservableValue; public interface LeafStoreActionProvider extends StoreActionProvider { diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java index d3434cb8d..be45c803c 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java @@ -7,8 +7,8 @@ import io.xpipe.app.browser.file.BrowserFileSystemTabComp; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.*; -import io.xpipe.app.comp.store.StoreEntryWrapper; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.ext.ShellStore; diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java index ab705e3ec..bfa3c5f20 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFullSessionComp.java @@ -6,8 +6,8 @@ import io.xpipe.app.browser.file.BrowserTransferComp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.*; -import io.xpipe.app.comp.store.StoreEntryWrapper; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.core.window.AppMainWindow; diff --git a/app/src/main/java/io/xpipe/app/action/BrowserAction.java b/app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java similarity index 97% rename from app/src/main/java/io/xpipe/app/action/BrowserAction.java rename to app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java index b6757b16f..ac423448d 100644 --- a/app/src/main/java/io/xpipe/app/action/BrowserAction.java +++ b/app/src/main/java/io/xpipe/app/browser/action/BrowserAction.java @@ -1,4 +1,4 @@ -package io.xpipe.app.action; +package io.xpipe.app.browser.action; import com.fasterxml.jackson.annotation.JsonIgnore; import io.xpipe.app.browser.BrowserFullSessionModel; @@ -6,6 +6,7 @@ import io.xpipe.app.browser.BrowserStoreSessionTab; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.core.AppLayoutModel; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.core.store.FilePath; import io.xpipe.core.store.FileSystemStore; import lombok.experimental.SuperBuilder; diff --git a/app/src/main/java/io/xpipe/app/browser/action/BrowserActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/BrowserActionProvider.java index ebd5c14f2..0a3b5e732 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/BrowserActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/BrowserActionProvider.java @@ -1,19 +1,9 @@ package io.xpipe.app.browser.action; -import io.xpipe.app.action.AbstractAction; import io.xpipe.app.action.ActionProvider; -import io.xpipe.app.action.BrowserAction; -import io.xpipe.app.action.StoreAction; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; -import io.xpipe.app.storage.DataStoreEntryRef; -import javafx.beans.value.ObservableValue; -import javafx.scene.Node; -import javafx.scene.control.MenuItem; -import javafx.scene.input.KeyCombination; -import lombok.SneakyThrows; - import java.util.List; public interface BrowserActionProvider extends ActionProvider { diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/ApplyFileEditActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/ApplyFileEditActionProvider.java index 2573d880f..6e15bb0c4 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/ApplyFileEditActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/ApplyFileEditActionProvider.java @@ -3,21 +3,13 @@ package io.xpipe.app.browser.action.impl; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.action.ActionProvider; import io.xpipe.app.browser.file.BrowserFileOutput; -import io.xpipe.app.comp.store.StoreCreationDialog; -import io.xpipe.app.comp.store.StoreViewState; -import io.xpipe.app.storage.DataStoreEntry; -import io.xpipe.core.store.DataStore; -import io.xpipe.core.store.FileEntry; -import io.xpipe.core.store.FilePath; import lombok.NonNull; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; import java.io.InputStream; -import java.io.OutputStream; import java.util.LinkedHashMap; import java.util.Map; -import java.util.UUID; public class ApplyFileEditActionProvider implements ActionProvider { diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/BrowseInNativeManagerActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/BrowseInNativeManagerActionProvider.java index f60a4f2ac..cb26969e8 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/BrowseInNativeManagerActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/BrowseInNativeManagerActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/ChgrpActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/ChgrpActionProvider.java index c26ff28ce..ff738543c 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/ChgrpActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/ChgrpActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/ChmodActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/ChmodActionProvider.java index 88e55f384..1bf712f33 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/ChmodActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/ChmodActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/ChownActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/ChownActionProvider.java index 3d8d8449f..759a3575c 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/ChownActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/ChownActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/DeleteActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/DeleteActionProvider.java index b79667404..b37bfae6c 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/DeleteActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/DeleteActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.*; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/NewDirectoryActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/NewDirectoryActionProvider.java index 496ae3206..3ac9ece2c 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/NewDirectoryActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/NewDirectoryActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.core.store.FileKind; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/NewFileActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/NewFileActionProvider.java index 0265b680f..d3cfc18ea 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/NewFileActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/NewFileActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.core.store.FileKind; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/NewLinkActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/NewLinkActionProvider.java index c158029a7..b06b70653 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/NewLinkActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/NewLinkActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.core.store.FileKind; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenDirectoryActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenDirectoryActionProvider.java index 6de99e10b..1e58bb10b 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenDirectoryActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenDirectoryActionProvider.java @@ -1,11 +1,10 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.core.store.FileKind; -import lombok.NonNull; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileDefaultActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileDefaultActionProvider.java index 0e9d122ed..da5960b84 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileDefaultActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileDefaultActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileOpener; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileNativeDetailsActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileNativeDetailsActionProvider.java index 86fe7db6d..f698cb965 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileNativeDetailsActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileNativeDetailsActionProvider.java @@ -1,9 +1,8 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; -import io.xpipe.app.browser.file.BrowserFileOpener; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.util.LocalShell; import io.xpipe.core.process.CommandBuilder; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileWithActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileWithActionProvider.java index 77ee94e91..a536d0ac5 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileWithActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenFileWithActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileOpener; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenTerminalActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenTerminalActionProvider.java index 5d47f34b8..b590525a9 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/OpenTerminalActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/OpenTerminalActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBackgroundActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBackgroundActionProvider.java index b372364ed..d06678858 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBackgroundActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBackgroundActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.issue.ErrorEvent; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBrowserActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBrowserActionProvider.java index e440b79bf..7744853a5 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBrowserActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInBrowserActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.util.CommandDialog; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInTerminalActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInTerminalActionProvider.java index e94d28a06..cbfa5aa97 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInTerminalActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/RunCommandInTerminalActionProvider.java @@ -1,6 +1,6 @@ package io.xpipe.app.browser.action.impl; -import io.xpipe.app.action.BrowserAction; +import io.xpipe.app.browser.action.BrowserAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.core.process.CommandBuilder; diff --git a/app/src/main/java/io/xpipe/app/browser/action/impl/TransferFilesActionProvider.java b/app/src/main/java/io/xpipe/app/browser/action/impl/TransferFilesActionProvider.java index cfc6309b4..426f6f18b 100644 --- a/app/src/main/java/io/xpipe/app/browser/action/impl/TransferFilesActionProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/action/impl/TransferFilesActionProvider.java @@ -4,12 +4,9 @@ import io.xpipe.app.action.AbstractAction; import io.xpipe.app.action.ActionProvider; import io.xpipe.app.action.StoreContextAction; import io.xpipe.app.browser.file.BrowserFileTransferOperation; -import io.xpipe.app.comp.store.StoreCreationDialog; -import io.xpipe.app.comp.store.StoreViewState; 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 io.xpipe.core.store.FileSystemStore; import lombok.NonNull; import lombok.experimental.SuperBuilder; @@ -18,7 +15,6 @@ import lombok.extern.jackson.Jacksonized; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.UUID; import java.util.stream.Collectors; public class TransferFilesActionProvider implements ActionProvider { diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java index 62685b8f1..d0b09206e 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java @@ -3,7 +3,7 @@ package io.xpipe.app.browser.file; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; import io.xpipe.app.comp.SimpleComp; -import io.xpipe.app.comp.store.*; +import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.PlatformThread; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListFilterComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListFilterComp.java index cb5222bea..0cdbbe311 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListFilterComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListFilterComp.java @@ -3,8 +3,8 @@ package io.xpipe.app.browser.file; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.FilterComp; import io.xpipe.app.comp.base.HorizontalComp; -import io.xpipe.app.comp.store.StoreCategoryWrapper; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreCategoryWrapper; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.util.DataStoreCategoryChoiceComp; 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 7041fa414..faaa8552b 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 @@ -1,6 +1,6 @@ package io.xpipe.app.browser.icon; -import io.xpipe.app.resources.AppResources; +import io.xpipe.app.core.AppResources; import io.xpipe.core.store.FileEntry; import io.xpipe.core.store.FileKind; 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 96e159d92..77eebdc20 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 @@ -1,6 +1,6 @@ package io.xpipe.app.browser.icon; -import io.xpipe.app.resources.AppResources; +import io.xpipe.app.core.AppResources; import io.xpipe.core.store.FileEntry; import io.xpipe.core.store.FileKind; diff --git a/app/src/main/java/io/xpipe/app/browser/menu/BrowserMenuLeafProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/BrowserMenuLeafProvider.java index 665b43c5f..9d85a7a02 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/BrowserMenuLeafProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/BrowserMenuLeafProvider.java @@ -1,8 +1,8 @@ package io.xpipe.app.browser.menu; import io.xpipe.app.action.AbstractAction; -import io.xpipe.app.action.BrowserAction; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.browser.action.BrowserAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.action.BrowserActionProviders; import io.xpipe.app.browser.file.BrowserEntry; diff --git a/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java b/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java index 0a27668a5..0e09da9aa 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java @@ -2,7 +2,7 @@ package io.xpipe.app.comp.base; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; diff --git a/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java b/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java index df77910b9..0d02924ca 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java @@ -6,8 +6,8 @@ import io.xpipe.app.core.*; import io.xpipe.app.core.window.AppDialog; import io.xpipe.app.core.window.AppMainWindow; import io.xpipe.app.issue.TrackEvent; -import io.xpipe.app.resources.AppImages; -import io.xpipe.app.resources.AppResources; +import io.xpipe.app.core.AppImages; +import io.xpipe.app.core.AppResources; import io.xpipe.app.util.LabelGraphic; import io.xpipe.app.util.PlatformThread; import io.xpipe.core.process.OsType; 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 a7c547626..3ad879204 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 @@ -4,7 +4,7 @@ import io.xpipe.app.browser.BrowserFullSessionModel; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; import io.xpipe.app.comp.SimpleCompStructure; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.util.DerivedObservableList; 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 b151962b0..3ea92664b 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 @@ -6,7 +6,7 @@ import io.xpipe.app.comp.SimpleCompStructure; import io.xpipe.app.core.AppProperties; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.app.resources.AppResources; +import io.xpipe.app.core.AppResources; import io.xpipe.app.util.Hyperlinks; import io.xpipe.app.util.MarkdownHelper; import io.xpipe.app.util.PlatformThread; @@ -16,7 +16,6 @@ import io.xpipe.core.process.OsType; import javafx.application.Platform; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; -import javafx.geometry.Insets; import javafx.scene.control.TextArea; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; diff --git a/app/src/main/java/io/xpipe/app/comp/base/PrettyImageComp.java b/app/src/main/java/io/xpipe/app/comp/base/PrettyImageComp.java index 089a24ca5..82e827187 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/PrettyImageComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/PrettyImageComp.java @@ -3,7 +3,7 @@ package io.xpipe.app.comp.base; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.app.resources.AppImages; +import io.xpipe.app.core.AppImages; import io.xpipe.app.util.PlatformThread; import io.xpipe.core.store.FileNames; diff --git a/app/src/main/java/io/xpipe/app/comp/base/PrettyImageHelper.java b/app/src/main/java/io/xpipe/app/comp/base/PrettyImageHelper.java index a8d91ae72..a1cd5ada3 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/PrettyImageHelper.java +++ b/app/src/main/java/io/xpipe/app/comp/base/PrettyImageHelper.java @@ -2,7 +2,7 @@ package io.xpipe.app.comp.base; import io.xpipe.app.comp.Comp; import io.xpipe.app.core.window.AppMainWindow; -import io.xpipe.app.resources.AppImages; +import io.xpipe.app.core.AppImages; import io.xpipe.app.util.BindingsHelper; import io.xpipe.core.store.FileNames; 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 219235c7d..df5040c0a 100644 --- a/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java +++ b/app/src/main/java/io/xpipe/app/core/AppExtensionManager.java @@ -4,14 +4,12 @@ import io.xpipe.app.ext.ExtensionException; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; -import io.xpipe.app.resources.AppResources; import io.xpipe.app.util.ModuleAccess; import io.xpipe.core.process.OsType; import io.xpipe.core.util.ModuleLayerLoader; import io.xpipe.core.util.XPipeInstallation; import lombok.Getter; -import lombok.Value; import java.lang.module.Configuration; import java.lang.module.ModuleFinder; @@ -19,7 +17,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.*; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import java.util.stream.Stream; 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 493063c31..b4b9e5cb7 100644 --- a/app/src/main/java/io/xpipe/app/core/AppFont.java +++ b/app/src/main/java/io/xpipe/app/core/AppFont.java @@ -1,7 +1,6 @@ package io.xpipe.app.core; import io.xpipe.app.issue.TrackEvent; -import io.xpipe.app.resources.AppResources; import io.xpipe.core.process.OsType; import javafx.scene.text.Font; diff --git a/app/src/main/java/io/xpipe/app/core/AppGreetingsDialog.java b/app/src/main/java/io/xpipe/app/core/AppGreetingsDialog.java index e6f8c3bc5..c1259fab7 100644 --- a/app/src/main/java/io/xpipe/app/core/AppGreetingsDialog.java +++ b/app/src/main/java/io/xpipe/app/core/AppGreetingsDialog.java @@ -6,7 +6,6 @@ import io.xpipe.app.comp.base.ModalButton; import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.core.window.AppDialog; -import io.xpipe.app.resources.AppResources; import javafx.beans.property.SimpleBooleanProperty; import javafx.geometry.Insets; diff --git a/app/src/main/java/io/xpipe/app/resources/AppImages.java b/app/src/main/java/io/xpipe/app/core/AppImages.java similarity index 98% rename from app/src/main/java/io/xpipe/app/resources/AppImages.java rename to app/src/main/java/io/xpipe/app/core/AppImages.java index 6112d25d2..482b2ffce 100644 --- a/app/src/main/java/io/xpipe/app/resources/AppImages.java +++ b/app/src/main/java/io/xpipe/app/core/AppImages.java @@ -1,6 +1,5 @@ -package io.xpipe.app.resources; +package io.xpipe.app.core; -import io.xpipe.app.core.AppExtensionManager; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; 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 3fee81449..9e011928d 100644 --- a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java +++ b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java @@ -3,7 +3,7 @@ package io.xpipe.app.core; import io.xpipe.app.browser.BrowserFullSessionComp; import io.xpipe.app.browser.BrowserFullSessionModel; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.StoreLayoutComp; +import io.xpipe.app.hub.comp.StoreLayoutComp; import io.xpipe.app.prefs.AppPrefsComp; import io.xpipe.app.update.AppDistributionType; import io.xpipe.app.util.*; diff --git a/app/src/main/java/io/xpipe/app/resources/AppResources.java b/app/src/main/java/io/xpipe/app/core/AppResources.java similarity index 97% rename from app/src/main/java/io/xpipe/app/resources/AppResources.java rename to app/src/main/java/io/xpipe/app/core/AppResources.java index 6854b7bbb..ec0bc9119 100644 --- a/app/src/main/java/io/xpipe/app/resources/AppResources.java +++ b/app/src/main/java/io/xpipe/app/core/AppResources.java @@ -1,7 +1,5 @@ -package io.xpipe.app.resources; +package io.xpipe.app.core; -import io.xpipe.app.core.AppExtensionManager; -import io.xpipe.app.core.AppProperties; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.core.util.FailableConsumer; import io.xpipe.modulefs.ModuleFileSystem; 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 e2eb14485..84bcd1356 100644 --- a/app/src/main/java/io/xpipe/app/core/AppStyle.java +++ b/app/src/main/java/io/xpipe/app/core/AppStyle.java @@ -3,7 +3,6 @@ package io.xpipe.app.core; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.app.resources.AppResources; import javafx.application.Platform; import javafx.scene.Scene; 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 04d75f3dd..b9f4411fd 100644 --- a/app/src/main/java/io/xpipe/app/core/AppTheme.java +++ b/app/src/main/java/io/xpipe/app/core/AppTheme.java @@ -5,7 +5,6 @@ import io.xpipe.app.ext.PrefsChoiceValue; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.app.resources.AppResources; import io.xpipe.app.util.ColorHelper; import io.xpipe.app.util.PlatformThread; import io.xpipe.core.process.OsType; 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 949ba9b0d..acd68c0cd 100644 --- a/app/src/main/java/io/xpipe/app/core/AppTrayIcon.java +++ b/app/src/main/java/io/xpipe/app/core/AppTrayIcon.java @@ -2,8 +2,6 @@ package io.xpipe.app.core; import io.xpipe.app.core.mode.OperationMode; import io.xpipe.app.issue.ErrorEvent; -import io.xpipe.app.resources.AppImages; -import io.xpipe.app.resources.AppResources; import io.xpipe.core.process.OsType; import java.awt.*; 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 4db34af55..fb013d185 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 @@ -5,7 +5,7 @@ import io.xpipe.app.comp.base.MarkdownComp; import io.xpipe.app.comp.base.ModalButton; import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.core.AppProperties; -import io.xpipe.app.resources.AppResources; +import io.xpipe.app.core.AppResources; import io.xpipe.app.util.WindowsRegistry; import io.xpipe.core.process.OsType; diff --git a/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java b/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java index a01f624d6..a6609599b 100644 --- a/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java +++ b/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java @@ -6,7 +6,7 @@ import io.xpipe.app.beacon.BlobManager; import io.xpipe.app.browser.BrowserFullSessionModel; import io.xpipe.app.browser.file.BrowserLocalFileSystem; import io.xpipe.app.browser.icon.BrowserIconManager; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.core.*; import io.xpipe.app.core.check.*; import io.xpipe.app.core.window.AppDialog; @@ -18,7 +18,6 @@ import io.xpipe.app.icon.SystemIconManager; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.pwman.KeePassXcPasswordManager; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.app.resources.*; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStorageSyncHandler; import io.xpipe.app.terminal.TerminalLauncherManager; diff --git a/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java b/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java index 40b22867d..ccc59b810 100644 --- a/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java +++ b/app/src/main/java/io/xpipe/app/core/window/AppMainWindow.java @@ -8,7 +8,7 @@ import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.CloseBehaviourDialog; -import io.xpipe.app.resources.AppImages; +import io.xpipe.app.core.AppImages; import io.xpipe.app.update.AppDistributionType; import io.xpipe.app.util.LicenseProvider; import io.xpipe.app.util.PlatformThread; diff --git a/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java b/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java index 0685f30a8..54fc493ed 100644 --- a/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java +++ b/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java @@ -2,8 +2,8 @@ package io.xpipe.app.core.window; import io.xpipe.app.core.*; import io.xpipe.app.issue.TrackEvent; -import io.xpipe.app.resources.AppImages; -import io.xpipe.app.resources.AppResources; +import io.xpipe.app.core.AppImages; +import io.xpipe.app.core.AppResources; import io.xpipe.app.util.InputHelper; import io.xpipe.app.util.PlatformInit; import io.xpipe.core.process.OsType; 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 3b64a55dd..b4beff14d 100644 --- a/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java +++ b/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java @@ -3,11 +3,11 @@ package io.xpipe.app.ext; import io.xpipe.app.action.ActionProvider; import io.xpipe.app.browser.BrowserFullSessionModel; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.StoreEntryComp; -import io.xpipe.app.comp.store.StoreEntryWrapper; -import io.xpipe.app.comp.store.StoreSection; +import io.xpipe.app.hub.comp.StoreEntryComp; +import io.xpipe.app.hub.comp.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreSection; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.resources.AppImages; +import io.xpipe.app.core.AppImages; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DocumentationLink; diff --git a/app/src/main/java/io/xpipe/app/ext/EnabledParentStoreProvider.java b/app/src/main/java/io/xpipe/app/ext/EnabledParentStoreProvider.java index 55048ac9e..a661680ae 100644 --- a/app/src/main/java/io/xpipe/app/ext/EnabledParentStoreProvider.java +++ b/app/src/main/java/io/xpipe/app/ext/EnabledParentStoreProvider.java @@ -1,9 +1,9 @@ package io.xpipe.app.ext; -import io.xpipe.app.comp.store.StoreEntryComp; -import io.xpipe.app.comp.store.StoreSection; -import io.xpipe.app.comp.store.StoreToggleComp; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreEntryComp; +import io.xpipe.app.hub.comp.StoreSection; +import io.xpipe.app.hub.comp.StoreToggleComp; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.BindingsHelper; 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 fcd808091..b857b3234 100644 --- a/app/src/main/java/io/xpipe/app/ext/SingletonSessionStoreProvider.java +++ b/app/src/main/java/io/xpipe/app/ext/SingletonSessionStoreProvider.java @@ -1,7 +1,7 @@ package io.xpipe.app.ext; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.*; +import io.xpipe.app.hub.comp.*; import io.xpipe.app.util.LabelGraphic; import io.xpipe.app.util.ThreadHelper; diff --git a/app/src/main/java/io/xpipe/app/action/BatchStoreAction.java b/app/src/main/java/io/xpipe/app/hub/action/BatchStoreAction.java similarity index 94% rename from app/src/main/java/io/xpipe/app/action/BatchStoreAction.java rename to app/src/main/java/io/xpipe/app/hub/action/BatchStoreAction.java index 733f566c0..c225fc82d 100644 --- a/app/src/main/java/io/xpipe/app/action/BatchStoreAction.java +++ b/app/src/main/java/io/xpipe/app/hub/action/BatchStoreAction.java @@ -1,6 +1,7 @@ -package io.xpipe.app.action; +package io.xpipe.app.hub.action; import com.fasterxml.jackson.databind.node.ObjectNode; +import io.xpipe.app.action.*; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.DataStore; @@ -20,7 +21,7 @@ public final class BatchStoreAction extends SerializableAct protected final List> actions; @Override - protected void executeImpl() throws Exception { + public void executeImpl() throws Exception { for (AbstractAction action : actions) { action.executeImpl(); } diff --git a/app/src/main/java/io/xpipe/app/action/BatchStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/BatchStoreActionProvider.java similarity index 89% rename from app/src/main/java/io/xpipe/app/action/BatchStoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/BatchStoreActionProvider.java index 229970d02..0013058bc 100644 --- a/app/src/main/java/io/xpipe/app/action/BatchStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/BatchStoreActionProvider.java @@ -1,5 +1,7 @@ -package io.xpipe.app.action; +package io.xpipe.app.hub.action; +import io.xpipe.app.action.AbstractAction; +import io.xpipe.app.action.ActionProvider; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.store.DataStore; diff --git a/app/src/main/java/io/xpipe/app/action/MultiStoreAction.java b/app/src/main/java/io/xpipe/app/hub/action/MultiStoreAction.java similarity index 88% rename from app/src/main/java/io/xpipe/app/action/MultiStoreAction.java rename to app/src/main/java/io/xpipe/app/hub/action/MultiStoreAction.java index 59a5c52de..967dbf6f4 100644 --- a/app/src/main/java/io/xpipe/app/action/MultiStoreAction.java +++ b/app/src/main/java/io/xpipe/app/hub/action/MultiStoreAction.java @@ -1,6 +1,9 @@ -package io.xpipe.app.action; +package io.xpipe.app.hub.action; import com.fasterxml.jackson.databind.node.ObjectNode; +import io.xpipe.app.action.ActionJacksonMapper; +import io.xpipe.app.action.SerializableAction; +import io.xpipe.app.action.StoreContextAction; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.store.DataStore; @@ -11,10 +14,9 @@ import lombok.experimental.SuperBuilder; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; @SuperBuilder -public abstract class MultiStoreAction extends SerializableAction implements StoreContextAction{ +public abstract class MultiStoreAction extends SerializableAction implements StoreContextAction { @Getter protected final List> refs; diff --git a/app/src/main/java/io/xpipe/app/action/StoreAction.java b/app/src/main/java/io/xpipe/app/hub/action/StoreAction.java similarity index 92% rename from app/src/main/java/io/xpipe/app/action/StoreAction.java rename to app/src/main/java/io/xpipe/app/hub/action/StoreAction.java index 8b06f7203..17440e250 100644 --- a/app/src/main/java/io/xpipe/app/action/StoreAction.java +++ b/app/src/main/java/io/xpipe/app/hub/action/StoreAction.java @@ -1,6 +1,9 @@ -package io.xpipe.app.action; +package io.xpipe.app.hub.action; import com.fasterxml.jackson.databind.node.ObjectNode; +import io.xpipe.app.action.ActionJacksonMapper; +import io.xpipe.app.action.SerializableAction; +import io.xpipe.app.action.StoreContextAction; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; diff --git a/app/src/main/java/io/xpipe/app/action/StoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/StoreActionProvider.java similarity index 88% rename from app/src/main/java/io/xpipe/app/action/StoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/StoreActionProvider.java index 120f210fb..829cc5e14 100644 --- a/app/src/main/java/io/xpipe/app/action/StoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/StoreActionProvider.java @@ -1,5 +1,6 @@ -package io.xpipe.app.action; +package io.xpipe.app.hub.action; +import io.xpipe.app.action.ActionProvider; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.store.DataStore; diff --git a/app/src/main/java/io/xpipe/app/action/AddStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/AddStoreActionProvider.java similarity index 82% rename from app/src/main/java/io/xpipe/app/action/AddStoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/AddStoreActionProvider.java index 0b4f2c327..7522c2d30 100644 --- a/app/src/main/java/io/xpipe/app/action/AddStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/AddStoreActionProvider.java @@ -1,12 +1,11 @@ -package io.xpipe.app.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.comp.store.StoreCreationDialog; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.action.AbstractAction; +import io.xpipe.app.action.ActionProvider; +import io.xpipe.app.hub.comp.StoreCreationDialog; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.core.store.DataStore; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/BrowseStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/BrowseStoreActionProvider.java similarity index 88% rename from ext/base/src/main/java/io/xpipe/ext/base/action/BrowseStoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/BrowseStoreActionProvider.java index 7fe05cdd5..aa5bb045a 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/BrowseStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/BrowseStoreActionProvider.java @@ -1,15 +1,11 @@ -package io.xpipe.ext.base.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.action.AbstractAction; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.browser.BrowserFullSessionModel; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.ext.ProcessControlProvider; -import io.xpipe.app.ext.ShellStore; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.store.FilePath; @@ -18,7 +14,6 @@ import io.xpipe.core.store.FileSystemStore; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/app/src/main/java/io/xpipe/app/action/CategoryConfigActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/CategoryConfigActionProvider.java similarity index 69% rename from app/src/main/java/io/xpipe/app/action/CategoryConfigActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/CategoryConfigActionProvider.java index 95fd1178b..ea56f9014 100644 --- a/app/src/main/java/io/xpipe/app/action/CategoryConfigActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/CategoryConfigActionProvider.java @@ -1,10 +1,10 @@ -package io.xpipe.app.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.comp.store.StoreCategoryConfigComp; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.action.ActionProvider; +import io.xpipe.app.hub.action.StoreAction; +import io.xpipe.app.hub.comp.StoreCategoryConfigComp; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStorage; -import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.core.store.DataStore; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; @@ -20,7 +20,7 @@ public class CategoryConfigActionProvider implements ActionProvider { public static class Action extends StoreAction { @Override - protected void executeImpl() throws Exception { + public void executeImpl() throws Exception { var category = DataStorage.get().getStoreCategory(ref.get()); var wrapper = StoreViewState.get() .getCategoryWrapper(category); diff --git a/app/src/main/java/io/xpipe/app/action/CategorySelectActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/CategorySelectActionProvider.java similarity index 71% rename from app/src/main/java/io/xpipe/app/action/CategorySelectActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/CategorySelectActionProvider.java index 0376acc64..db49901cb 100644 --- a/app/src/main/java/io/xpipe/app/action/CategorySelectActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/CategorySelectActionProvider.java @@ -1,11 +1,10 @@ -package io.xpipe.app.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.action.ActionProvider; +import io.xpipe.app.hub.action.StoreAction; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.storage.DataStorage; -import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.core.store.DataStore; -import lombok.Data; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; @@ -20,7 +19,7 @@ public class CategorySelectActionProvider implements ActionProvider { public static class Action extends StoreAction { @Override - protected void executeImpl() throws Exception { + public void executeImpl() throws Exception { var category = DataStorage.get().getStoreCategory(ref.get()); var wrapper = StoreViewState.get().getCategoryWrapper(category); wrapper.select(); diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/ChangeStoreIconActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/ChangeStoreIconActionProvider.java similarity index 83% rename from ext/base/src/main/java/io/xpipe/ext/base/action/ChangeStoreIconActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/ChangeStoreIconActionProvider.java index 9538d8210..13de34d09 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/ChangeStoreIconActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/ChangeStoreIconActionProvider.java @@ -1,12 +1,10 @@ -package io.xpipe.ext.base.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; -import io.xpipe.app.comp.store.StoreIconChoiceDialog; +import io.xpipe.app.hub.action.StoreAction; +import io.xpipe.app.hub.comp.StoreIconChoiceDialog; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.store.DataStore; @@ -14,8 +12,6 @@ import io.xpipe.core.store.DataStore; import javafx.application.Platform; import javafx.beans.value.ObservableValue; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/CloneStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/CloneStoreActionProvider.java similarity index 92% rename from ext/base/src/main/java/io/xpipe/ext/base/action/CloneStoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/CloneStoreActionProvider.java index b82d0ba83..39e648e57 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/CloneStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/CloneStoreActionProvider.java @@ -1,9 +1,8 @@ -package io.xpipe.ext.base.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; @@ -13,7 +12,6 @@ import io.xpipe.core.store.DataStore; import javafx.beans.value.ObservableValue; -import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/app/src/main/java/io/xpipe/app/action/EditStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/EditStoreActionProvider.java similarity index 87% rename from app/src/main/java/io/xpipe/app/action/EditStoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/EditStoreActionProvider.java index 723d41cff..711d73e2e 100644 --- a/app/src/main/java/io/xpipe/app/action/EditStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/EditStoreActionProvider.java @@ -1,7 +1,9 @@ -package io.xpipe.app.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.comp.store.StoreCreationDialog; +import io.xpipe.app.action.AbstractAction; +import io.xpipe.app.action.LeafStoreActionProvider; +import io.xpipe.app.hub.action.StoreAction; +import io.xpipe.app.hub.comp.StoreCreationDialog; import io.xpipe.app.core.AppI18n; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; diff --git a/app/src/main/java/io/xpipe/app/action/LaunchStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/LaunchStoreActionProvider.java similarity index 88% rename from app/src/main/java/io/xpipe/app/action/LaunchStoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/LaunchStoreActionProvider.java index cd8f5b2b4..8f8698353 100644 --- a/app/src/main/java/io/xpipe/app/action/LaunchStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/LaunchStoreActionProvider.java @@ -1,7 +1,9 @@ -package io.xpipe.app.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; +import io.xpipe.app.action.LeafStoreActionProvider; import io.xpipe.app.core.AppI18n; +import io.xpipe.app.hub.action.BatchStoreActionProvider; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.store.DataStore; @@ -21,7 +23,7 @@ public class LaunchStoreActionProvider implements LeafStoreActionProvider { @Override - protected void executeImpl() throws Exception { + public void executeImpl() throws Exception { var r = ref.get().getProvider().launch(ref.get()); r.run(); } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/RefreshChildrenStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshChildrenStoreActionProvider.java similarity index 91% rename from ext/base/src/main/java/io/xpipe/ext/base/action/RefreshChildrenStoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/RefreshChildrenStoreActionProvider.java index 69365fcd8..df3e67ad5 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/RefreshChildrenStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshChildrenStoreActionProvider.java @@ -1,19 +1,16 @@ -package io.xpipe.ext.base.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.action.AbstractAction; 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 io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/RefreshStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshStoreActionProvider.java similarity index 75% rename from ext/base/src/main/java/io/xpipe/ext/base/action/RefreshStoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/RefreshStoreActionProvider.java index b2e2b4046..fed5b6fca 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/RefreshStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshStoreActionProvider.java @@ -1,7 +1,7 @@ -package io.xpipe.ext.base.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.*; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.core.store.DataStore; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; @@ -15,7 +15,7 @@ public class RefreshStoreActionProvider implements ActionProvider { } @Jacksonized @SuperBuilder - static class Action extends StoreAction { +public static class Action extends StoreAction { @Override public void executeImpl() { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/SampleStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/SampleStoreActionProvider.java similarity index 97% rename from ext/base/src/main/java/io/xpipe/ext/base/action/SampleStoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/SampleStoreActionProvider.java index 9bdf34444..b1eaed14d 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/SampleStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/SampleStoreActionProvider.java @@ -1,10 +1,8 @@ -package io.xpipe.ext.base.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.action.AbstractAction; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/ScanBatchStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/ScanBatchStoreActionProvider.java similarity index 92% rename from ext/base/src/main/java/io/xpipe/ext/base/action/ScanBatchStoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/ScanBatchStoreActionProvider.java index e32a04ae7..18fecfeeb 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/ScanBatchStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/ScanBatchStoreActionProvider.java @@ -1,9 +1,8 @@ -package io.xpipe.ext.base.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.AbstractAction; -import io.xpipe.app.action.BatchStoreActionProvider; -import io.xpipe.app.action.MultiStoreAction; +import io.xpipe.app.hub.action.BatchStoreActionProvider; +import io.xpipe.app.hub.action.MultiStoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.storage.DataStoreEntryRef; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/ScanStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/ScanStoreActionProvider.java similarity index 92% rename from ext/base/src/main/java/io/xpipe/ext/base/action/ScanStoreActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/ScanStoreActionProvider.java index 77687e7ac..54f2f748b 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/ScanStoreActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/ScanStoreActionProvider.java @@ -1,12 +1,10 @@ -package io.xpipe.ext.base.action; +package io.xpipe.app.hub.action.impl; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.ext.ShellStore; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.app.util.ScanDialog; @@ -15,7 +13,6 @@ import io.xpipe.core.process.SystemState; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/XPipeUrlActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/XPipeUrlActionProvider.java similarity index 93% rename from ext/base/src/main/java/io/xpipe/ext/base/action/XPipeUrlActionProvider.java rename to app/src/main/java/io/xpipe/app/hub/action/impl/XPipeUrlActionProvider.java index 9026fbf5d..a8557ed98 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/XPipeUrlActionProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/XPipeUrlActionProvider.java @@ -1,4 +1,4 @@ -package io.xpipe.ext.base.action; +package io.xpipe.app.hub.action.impl; import io.xpipe.app.action.*; diff --git a/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java b/app/src/main/java/io/xpipe/app/hub/comp/DenseStoreEntryComp.java similarity index 98% rename from app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/DenseStoreEntryComp.java index 368a1d56d..70c867803 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/DenseStoreEntryComp.java @@ -1,9 +1,8 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.augment.GrowAugment; import io.xpipe.app.core.AppFontSizes; -import io.xpipe.app.util.PlatformThread; import io.xpipe.core.process.OsType; import javafx.beans.binding.Bindings; diff --git a/app/src/main/java/io/xpipe/app/comp/store/OsLogoComp.java b/app/src/main/java/io/xpipe/app/hub/comp/OsLogoComp.java similarity index 97% rename from app/src/main/java/io/xpipe/app/comp/store/OsLogoComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/OsLogoComp.java index f2edd3a85..daafdcb76 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/OsLogoComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/OsLogoComp.java @@ -1,9 +1,9 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.PrettyImageHelper; import io.xpipe.app.comp.base.StackComp; -import io.xpipe.app.resources.AppResources; +import io.xpipe.app.core.AppResources; import io.xpipe.core.process.SystemState; import io.xpipe.core.store.FileNames; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StandardStoreEntryComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StandardStoreEntryComp.java index d271277fc..5f6c92fb7 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StandardStoreEntryComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.core.AppFontSizes; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreActiveComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreActiveComp.java similarity index 97% rename from app/src/main/java/io/xpipe/app/comp/store/StoreActiveComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreActiveComp.java index d8bac8958..da2239e01 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreActiveComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreActiveComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.TooltipHelper; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreCategoryComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryComp.java index 55b7024ad..22ff01d65 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryConfigComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryConfigComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreCategoryConfigComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryConfigComp.java index 38b2466ff..f574ff0dd 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryConfigComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryConfigComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.ModalButton; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryListComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryListComp.java similarity index 97% rename from app/src/main/java/io/xpipe/app/comp/store/StoreCategoryListComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryListComp.java index 53452d931..92caf8881 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryListComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryListComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.ScrollComp; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryWrapper.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryWrapper.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreCategoryWrapper.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryWrapper.java index 661962e3b..8879cc15b 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryWrapper.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryWrapper.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.core.AppI18n; import io.xpipe.app.prefs.AppPrefs; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreChoiceComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreChoiceComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreChoiceComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreChoiceComp.java index 29c5117ea..8cfe41372 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreChoiceComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationComp.java similarity index 96% rename from app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreCreationComp.java index fc1d68db1..b152b6931 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationComp.java @@ -1,20 +1,16 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.augment.GrowAugment; import io.xpipe.app.comp.base.*; import io.xpipe.app.core.AppI18n; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.util.*; import javafx.application.Platform; -import javafx.beans.property.*; import javafx.beans.value.ObservableValue; import javafx.geometry.Insets; import javafx.scene.control.*; import javafx.scene.control.skin.ScrollPaneSkin; -import javafx.scene.input.KeyCode; -import javafx.scene.input.KeyEvent; import javafx.scene.layout.BorderPane; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationConsumer.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationConsumer.java similarity index 81% rename from app/src/main/java/io/xpipe/app/comp/store/StoreCreationConsumer.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreCreationConsumer.java index 622705c67..d2ee90ab0 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationConsumer.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationConsumer.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.storage.DataStoreEntry; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationDialog.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreCreationDialog.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java index 74356d7c8..09f809b53 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationDialog.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationDialog.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.base.ModalButton; import io.xpipe.app.comp.base.ModalOverlay; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationMenu.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationMenu.java similarity index 98% rename from app/src/main/java/io/xpipe/app/comp/store/StoreCreationMenu.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreCreationMenu.java index 6e47810f1..c80f41360 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationMenu.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationMenu.java @@ -1,9 +1,7 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; -import atlantafx.base.layout.ModalBox; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.action.ActionPickComp; -import io.xpipe.app.action.ActionShortcutComp; import io.xpipe.app.comp.base.ModalOverlay; import io.xpipe.app.comp.base.PrettyImageHelper; import io.xpipe.app.core.AppI18n; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationModel.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationModel.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreCreationModel.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreCreationModel.java index b55509f57..cea12f5b5 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationModel.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCreationModel.java @@ -1,6 +1,6 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; -import io.xpipe.app.action.LaunchStoreActionProvider; +import io.xpipe.app.hub.action.impl.LaunchStoreActionProvider; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.issue.ErrorEvent; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryBatchSelectComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryBatchSelectComp.java similarity index 98% rename from app/src/main/java/io/xpipe/app/comp/store/StoreEntryBatchSelectComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreEntryBatchSelectComp.java index ee68797be..fbf5c4453 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryBatchSelectComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryBatchSelectComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.util.BooleanScope; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreEntryComp.java index 7ed89c17b..a55d4f3e9 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryComp.java @@ -1,8 +1,8 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.action.BranchStoreActionProvider; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreActionProvider; +import io.xpipe.app.hub.action.StoreActionProvider; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.SimpleCompStructure; @@ -12,14 +12,13 @@ import io.xpipe.app.comp.base.*; import io.xpipe.app.core.*; import io.xpipe.app.action.ActionProvider; import io.xpipe.app.prefs.AppPrefs; -import io.xpipe.app.resources.AppResources; +import io.xpipe.app.core.AppResources; import io.xpipe.app.storage.DataStoreColor; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*; import io.xpipe.core.process.OsType; import javafx.beans.binding.Bindings; -import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ObservableDoubleValue; import javafx.css.PseudoClass; import javafx.geometry.Insets; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListComp.java index 5b8e768df..0ad199ffa 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListOverviewComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListOverviewComp.java index 2ac0bf1a7..c9982c21b 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListOverviewComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListStatusBarComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListStatusBarComp.java similarity index 98% rename from app/src/main/java/io/xpipe/app/comp/store/StoreEntryListStatusBarComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListStatusBarComp.java index ca3c03e29..c26183e0c 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListStatusBarComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryListStatusBarComp.java @@ -1,6 +1,6 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; -import io.xpipe.app.action.BatchStoreActionProvider; +import io.xpipe.app.hub.action.BatchStoreActionProvider; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.augment.ContextMenuAugment; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryWrapper.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreEntryWrapper.java index fe44e61b4..f03b2ce0b 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryWrapper.java @@ -1,15 +1,16 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.action.*; import io.xpipe.app.ext.LocalStore; import io.xpipe.app.ext.ShellStore; +import io.xpipe.app.hub.action.impl.EditStoreActionProvider; +import io.xpipe.app.hub.action.StoreActionProvider; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreColor; import io.xpipe.app.storage.DataStoreEntry; -import io.xpipe.app.util.BindingsHelper; import io.xpipe.app.util.PlatformThread; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.store.DataStore; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreIconChoiceComp.java similarity index 98% rename from app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreIconChoiceComp.java index 2b23b3d7f..09f26afaa 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreIconChoiceComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.*; @@ -6,7 +6,7 @@ import io.xpipe.app.core.AppI18n; import io.xpipe.app.icon.SystemIcon; import io.xpipe.app.icon.SystemIconCache; import io.xpipe.app.icon.SystemIconManager; -import io.xpipe.app.resources.AppImages; +import io.xpipe.app.core.AppImages; import io.xpipe.app.util.BooleanScope; import io.xpipe.app.util.LabelGraphic; import io.xpipe.app.util.ThreadHelper; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceDialog.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreIconChoiceDialog.java similarity index 98% rename from app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceDialog.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreIconChoiceDialog.java index 7d563aaae..9c823f130 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreIconChoiceDialog.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreIconChoiceDialog.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.base.*; import io.xpipe.app.icon.SystemIcon; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreIconComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreIconComp.java similarity index 98% rename from app/src/main/java/io/xpipe/app/comp/store/StoreIconComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreIconComp.java index de173e076..51a6a166b 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreIconComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreIconComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.PrettyImageHelper; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreIdentitiesIntroComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreIdentitiesIntroComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreIdentitiesIntroComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreIdentitiesIntroComp.java index 292f072b3..65b4153f3 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreIdentitiesIntroComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreIdentitiesIntroComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.core.AppFontSizes; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreIntroComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreIntroComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreIntroComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreIntroComp.java index 765a0a52c..d03f8a67d 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreIntroComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreIntroComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.PrettyImageHelper; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreLayoutComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreLayoutComp.java similarity index 98% rename from app/src/main/java/io/xpipe/app/comp/store/StoreLayoutComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreLayoutComp.java index 66024d840..1d2ef1379 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreLayoutComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreLayoutComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreListChoiceComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreListChoiceComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreListChoiceComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreListChoiceComp.java index 3c1e2175b..5108bac2b 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreListChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreListChoiceComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreNotFoundComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreNotFoundComp.java similarity index 88% rename from app/src/main/java/io/xpipe/app/comp/store/StoreNotFoundComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreNotFoundComp.java index 15b55fda0..9a2deee12 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreNotFoundComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreNotFoundComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreNotes.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreNotes.java similarity index 86% rename from app/src/main/java/io/xpipe/app/comp/store/StoreNotes.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreNotes.java index 343cfb7de..e14efe7da 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreNotes.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreNotes.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import lombok.Value; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreNotesComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreNotesComp.java index dce40d887..9df38126f 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreNotesComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreProviderChoiceComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreProviderChoiceComp.java similarity index 98% rename from app/src/main/java/io/xpipe/app/comp/store/StoreProviderChoiceComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreProviderChoiceComp.java index f04ab184f..84d984c00 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreProviderChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreProviderChoiceComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreQuickAccessButtonComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreQuickAccessButtonComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreQuickAccessButtonComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreQuickAccessButtonComp.java index 2df011739..843c83d93 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreQuickAccessButtonComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreQuickAccessButtonComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreScriptsIntroComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreScriptsIntroComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreScriptsIntroComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreScriptsIntroComp.java index 9e9ebd108..03ffa7b7d 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreScriptsIntroComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreScriptsIntroComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.core.AppCache; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreSection.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreSection.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreSection.java index cd7d1602f..a93250e27 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSection.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreSection.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.prefs.AppPrefs; @@ -8,7 +8,6 @@ import io.xpipe.app.util.BindingsHelper; import io.xpipe.app.util.DerivedObservableList; import javafx.beans.binding.Bindings; -import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ObservableBooleanValue; import javafx.beans.value.ObservableIntegerValue; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionBaseComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreSectionBaseComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreSectionBaseComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreSectionBaseComp.java index fd3754053..de52d1577 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionBaseComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreSectionBaseComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreSectionComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreSectionComp.java index 21a18603f..447f24ef5 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreSectionComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreSectionMiniComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreSectionMiniComp.java index ca258db5b..f33d87e86 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSectionMiniComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreSectionMiniComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreSidebarComp.java similarity index 98% rename from app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreSidebarComp.java index 92bc79d1b..df3f624eb 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSidebarComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreSidebarComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.SimpleComp; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreSortMode.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreSortMode.java index b8d5d9de5..19b6830e7 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreSortMode.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import java.time.Instant; import java.util.*; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreToggleComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreToggleComp.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreToggleComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreToggleComp.java index c546ba92e..e8e06c413 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreToggleComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreToggleComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.comp.base.ToggleSwitchComp; diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreViewState.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreViewState.java similarity index 99% rename from app/src/main/java/io/xpipe/app/comp/store/StoreViewState.java rename to app/src/main/java/io/xpipe/app/hub/comp/StoreViewState.java index f08199643..36e52bcba 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreViewState.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreViewState.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.core.AppCache; import io.xpipe.app.ext.DataStoreUsageCategory; diff --git a/app/src/main/java/io/xpipe/app/comp/store/SystemStateComp.java b/app/src/main/java/io/xpipe/app/hub/comp/SystemStateComp.java similarity index 98% rename from app/src/main/java/io/xpipe/app/comp/store/SystemStateComp.java rename to app/src/main/java/io/xpipe/app/hub/comp/SystemStateComp.java index 1ac1520d6..587ac4c2c 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/SystemStateComp.java +++ b/app/src/main/java/io/xpipe/app/hub/comp/SystemStateComp.java @@ -1,4 +1,4 @@ -package io.xpipe.app.comp.store; +package io.xpipe.app.hub.comp; import io.xpipe.app.comp.SimpleComp; import io.xpipe.app.util.BindingsHelper; diff --git a/app/src/main/java/io/xpipe/app/icon/SystemIconManager.java b/app/src/main/java/io/xpipe/app/icon/SystemIconManager.java index dbee3167c..c188ac88a 100644 --- a/app/src/main/java/io/xpipe/app/icon/SystemIconManager.java +++ b/app/src/main/java/io/xpipe/app/icon/SystemIconManager.java @@ -5,7 +5,7 @@ import io.xpipe.app.core.AppProperties; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.SupportedLocale; -import io.xpipe.app.resources.AppImages; +import io.xpipe.app.core.AppImages; import io.xpipe.app.storage.DataStorage; import io.xpipe.core.util.ValidationException; 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 864d52234..70287ba35 100644 --- a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java +++ b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java @@ -3,7 +3,7 @@ package io.xpipe.app.issue; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.*; import io.xpipe.app.core.*; -import io.xpipe.app.resources.AppResources; +import io.xpipe.app.core.AppResources; import javafx.beans.property.*; import javafx.collections.FXCollections; 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 9b7dc2e28..34786c732 100644 --- a/app/src/main/java/io/xpipe/app/prefs/TerminalCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/TerminalCategory.java @@ -2,8 +2,8 @@ package io.xpipe.app.prefs; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.*; -import io.xpipe.app.comp.store.StoreChoiceComp; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreChoiceComp; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.PrefsChoiceValue; import io.xpipe.app.ext.ProcessControlProvider; 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 43163d29a..b03266e41 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ThirdPartyDependency.java +++ b/app/src/main/java/io/xpipe/app/prefs/ThirdPartyDependency.java @@ -1,7 +1,7 @@ package io.xpipe.app.prefs; import io.xpipe.app.core.AppExtensionManager; -import io.xpipe.app.resources.AppResources; +import io.xpipe.app.core.AppResources; import org.apache.commons.io.FilenameUtils; 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 8b67c7d13..2491a6c29 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java @@ -1,6 +1,6 @@ package io.xpipe.app.storage; -import io.xpipe.app.comp.store.StoreSortMode; +import io.xpipe.app.hub.comp.StoreSortMode; import io.xpipe.app.core.AppProperties; import io.xpipe.app.ext.LocalStore; import io.xpipe.app.ext.NameableStore; 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 6d37aad41..2faea9d3e 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStoreCategory.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStoreCategory.java @@ -1,6 +1,6 @@ package io.xpipe.app.storage; -import io.xpipe.app.comp.store.StoreSortMode; +import io.xpipe.app.hub.comp.StoreSortMode; import io.xpipe.core.util.JacksonMapper; import com.fasterxml.jackson.core.JsonProcessingException; 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 83d24e186..c683ed8ed 100644 --- a/app/src/main/java/io/xpipe/app/storage/ImpersistentStorage.java +++ b/app/src/main/java/io/xpipe/app/storage/ImpersistentStorage.java @@ -1,6 +1,6 @@ package io.xpipe.app.storage; -import io.xpipe.app.comp.store.StoreSortMode; +import io.xpipe.app.hub.comp.StoreSortMode; import io.xpipe.app.ext.LocalStore; import io.xpipe.app.util.EncryptionKey; 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 f91b8d577..b2b420cbe 100644 --- a/app/src/main/java/io/xpipe/app/util/DataStoreCategoryChoiceComp.java +++ b/app/src/main/java/io/xpipe/app/util/DataStoreCategoryChoiceComp.java @@ -1,8 +1,8 @@ package io.xpipe.app.util; import io.xpipe.app.comp.SimpleComp; -import io.xpipe.app.comp.store.StoreCategoryWrapper; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreCategoryWrapper; +import io.xpipe.app.hub.comp.StoreViewState; import javafx.beans.property.Property; import javafx.beans.property.SimpleBooleanProperty; diff --git a/app/src/main/java/io/xpipe/app/util/ScanSingleDialogComp.java b/app/src/main/java/io/xpipe/app/util/ScanSingleDialogComp.java index 9deea4155..ff0072331 100644 --- a/app/src/main/java/io/xpipe/app/util/ScanSingleDialogComp.java +++ b/app/src/main/java/io/xpipe/app/util/ScanSingleDialogComp.java @@ -1,8 +1,8 @@ package io.xpipe.app.util; import io.xpipe.app.comp.base.ModalOverlayContentComp; -import io.xpipe.app.comp.store.StoreChoiceComp; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreChoiceComp; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.storage.DataStoreEntryRef; diff --git a/app/src/main/java/io/xpipe/app/util/StoreStateFormat.java b/app/src/main/java/io/xpipe/app/util/StoreStateFormat.java index 06ee77cb7..7c5c1a50a 100644 --- a/app/src/main/java/io/xpipe/app/util/StoreStateFormat.java +++ b/app/src/main/java/io/xpipe/app/util/StoreStateFormat.java @@ -1,6 +1,6 @@ package io.xpipe.app.util; -import io.xpipe.app.comp.store.StoreSection; +import io.xpipe.app.hub.comp.StoreSection; import io.xpipe.app.core.AppI18n; import io.xpipe.core.process.ShellDialects; import io.xpipe.core.process.ShellEnvironmentStoreState; diff --git a/app/src/main/java/module-info.java b/app/src/main/java/module-info.java index 2cbafbae8..b18d25154 100644 --- a/app/src/main/java/module-info.java +++ b/app/src/main/java/module-info.java @@ -1,6 +1,6 @@ import io.xpipe.app.action.ActionProvider; -import io.xpipe.app.action.EditStoreActionProvider; -import io.xpipe.app.action.LaunchStoreActionProvider; +import io.xpipe.app.hub.action.impl.EditStoreActionProvider; +import io.xpipe.app.hub.action.impl.LaunchStoreActionProvider; import io.xpipe.app.beacon.impl.*; import io.xpipe.app.browser.action.BrowserActionProvider; import io.xpipe.app.browser.action.impl.*; @@ -30,7 +30,7 @@ open module io.xpipe.app { exports io.xpipe.app.comp.base; exports io.xpipe.app.core.mode; exports io.xpipe.app.prefs; - exports io.xpipe.app.comp.store; + exports io.xpipe.app.hub.comp; exports io.xpipe.app.storage; exports io.xpipe.app.update; exports io.xpipe.app.ext; @@ -43,7 +43,6 @@ open module io.xpipe.app { exports io.xpipe.app.terminal; exports io.xpipe.app.browser.file; exports io.xpipe.app.core.window; - exports io.xpipe.app.resources; exports io.xpipe.app.comp; exports io.xpipe.app.icon; exports io.xpipe.app.pwman; @@ -54,6 +53,8 @@ open module io.xpipe.app { exports io.xpipe.app.browser.menu.impl; exports io.xpipe.app.browser.action.impl; exports io.xpipe.app.browser.menu.impl.compress; + exports io.xpipe.app.hub.action; + exports io.xpipe.app.hub.action.impl; requires com.sun.jna; requires com.sun.jna.platform; 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 47ecc8fed..d08687505 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 @@ -1,10 +1,9 @@ package io.xpipe.ext.base.desktop; -import io.xpipe.app.action.AbstractAction; import io.xpipe.app.browser.BrowserFullSessionModel; -import io.xpipe.app.comp.store.StoreChoiceComp; -import io.xpipe.app.comp.store.StoreEntryWrapper; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreChoiceComp; +import io.xpipe.app.hub.comp.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.ext.*; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentitySelectComp.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentitySelectComp.java index 9a31d09cf..cd0e4b17a 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentitySelectComp.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentitySelectComp.java @@ -4,9 +4,9 @@ import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.CompStructure; import io.xpipe.app.comp.SimpleCompStructure; import io.xpipe.app.comp.base.*; -import io.xpipe.app.comp.store.StoreCreationDialog; -import io.xpipe.app.comp.store.StoreEntryWrapper; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreCreationDialog; +import io.xpipe.app.hub.comp.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.core.AppFontSizes; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.DataStoreCreationCategory; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java index 83b012b11..9c03ea2ed 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityStoreProvider.java @@ -1,8 +1,10 @@ package io.xpipe.ext.base.identity; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.*; import io.xpipe.app.ext.*; +import io.xpipe.app.hub.comp.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreSection; +import io.xpipe.app.hub.comp.SystemStateComp; import io.xpipe.app.util.SecretRetrievalStrategy; import io.xpipe.core.store.DataStore; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertActionProvider.java index 2caff30e8..91f8c25df 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertActionProvider.java @@ -1,9 +1,8 @@ package io.xpipe.ext.base.identity; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; -import io.xpipe.app.comp.store.StoreCreationDialog; +import io.xpipe.app.hub.action.StoreAction; +import io.xpipe.app.hub.comp.StoreCreationDialog; import io.xpipe.app.core.AppI18n; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.ext.DataStoreCreationCategory; @@ -14,7 +13,6 @@ import io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityStoreProvider.java index 17254c9ec..b42e72e07 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityStoreProvider.java @@ -1,6 +1,6 @@ package io.xpipe.ext.base.identity; -import io.xpipe.app.comp.store.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreEntryWrapper; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.storage.*; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java index 38863f31e..cbc184785 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/PasswordManagerIdentityStoreProvider.java @@ -1,27 +1,19 @@ package io.xpipe.ext.base.identity; -import io.xpipe.app.comp.base.TextFieldComp; -import io.xpipe.app.comp.store.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreEntryWrapper; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.DataStoreCreationCategory; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.prefs.PasswordManagerTestComp; -import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; -import io.xpipe.app.util.EncryptedValue; import io.xpipe.app.util.OptionsBuilder; -import io.xpipe.app.util.SecretRetrievalStrategy; -import io.xpipe.app.util.SecretRetrievalStrategyHelper; import io.xpipe.core.store.DataStore; -import javafx.beans.binding.Bindings; import javafx.beans.property.Property; -import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; import java.util.List; -import java.util.UUID; public class PasswordManagerIdentityStoreProvider extends IdentityStoreProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStoreProvider.java index 5d6516ac3..0ba22a16c 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/SyncedIdentityStoreProvider.java @@ -1,6 +1,6 @@ package io.xpipe.ext.base.identity; -import io.xpipe.app.comp.store.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreEntryWrapper; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.DataStoreCreationCategory; import io.xpipe.app.ext.GuiDialog; 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 51ae013b9..aae8f4e8a 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptStore.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/PredefinedScriptStore.java @@ -1,6 +1,6 @@ package io.xpipe.ext.base.script; -import io.xpipe.app.resources.AppResources; +import io.xpipe.app.core.AppResources; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.core.process.ShellDialects; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/RunBackgroundScriptActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/RunBackgroundScriptActionProvider.java similarity index 83% rename from ext/base/src/main/java/io/xpipe/ext/base/action/RunBackgroundScriptActionProvider.java rename to ext/base/src/main/java/io/xpipe/ext/base/script/RunBackgroundScriptActionProvider.java index 350005086..7f4d397b1 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/RunBackgroundScriptActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/RunBackgroundScriptActionProvider.java @@ -1,11 +1,9 @@ -package io.xpipe.ext.base.action; +package io.xpipe.ext.base.script; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.ActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.storage.DataStoreEntryRef; -import io.xpipe.ext.base.script.SimpleScriptStore; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/RunFileScriptMenuProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/RunFileScriptMenuProvider.java index 922383039..083c885f3 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/RunFileScriptMenuProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/RunFileScriptMenuProvider.java @@ -8,7 +8,7 @@ import io.xpipe.app.browser.menu.MultiExecuteSelectionMenuProvider; import io.xpipe.app.browser.file.BrowserEntry; import io.xpipe.app.browser.file.BrowserFileSystemTabModel; import io.xpipe.app.comp.base.PrettyImageHelper; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.storage.DataStorage; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/RunHubBatchScriptActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/RunHubBatchScriptActionProvider.java similarity index 85% rename from ext/base/src/main/java/io/xpipe/ext/base/action/RunHubBatchScriptActionProvider.java rename to ext/base/src/main/java/io/xpipe/ext/base/script/RunHubBatchScriptActionProvider.java index 4d53274c6..1489dab79 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/RunHubBatchScriptActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/RunHubBatchScriptActionProvider.java @@ -1,18 +1,15 @@ -package io.xpipe.ext.base.action; +package io.xpipe.ext.base.script; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.ActionProvider; -import io.xpipe.app.action.MultiStoreAction; +import io.xpipe.app.hub.action.MultiStoreAction; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.CommandDialog; import io.xpipe.core.process.CommandControl; -import io.xpipe.ext.base.script.SimpleScriptStore; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; import java.util.LinkedHashMap; -import java.util.List; public class RunHubBatchScriptActionProvider implements ActionProvider { diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/RunHubScriptActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/RunHubScriptActionProvider.java similarity index 84% rename from ext/base/src/main/java/io/xpipe/ext/base/action/RunHubScriptActionProvider.java rename to ext/base/src/main/java/io/xpipe/ext/base/script/RunHubScriptActionProvider.java index 5c30501bf..284a33667 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/RunHubScriptActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/RunHubScriptActionProvider.java @@ -1,12 +1,10 @@ -package io.xpipe.ext.base.action; +package io.xpipe.ext.base.script; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.ActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.CommandDialog; -import io.xpipe.ext.base.script.SimpleScriptStore; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/RunScriptActionProviderMenu.java b/ext/base/src/main/java/io/xpipe/ext/base/script/RunScriptActionProviderMenu.java similarity index 98% rename from ext/base/src/main/java/io/xpipe/ext/base/action/RunScriptActionProviderMenu.java rename to ext/base/src/main/java/io/xpipe/ext/base/script/RunScriptActionProviderMenu.java index a84eb3f7a..d3a47da2c 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/RunScriptActionProviderMenu.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/RunScriptActionProviderMenu.java @@ -1,17 +1,20 @@ -package io.xpipe.ext.base.action; +package io.xpipe.ext.base.script; import io.xpipe.app.action.*; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.ProcessControlProvider; import io.xpipe.app.ext.ShellStore; +import io.xpipe.app.hub.action.BatchStoreActionProvider; +import io.xpipe.app.hub.action.StoreAction; +import io.xpipe.app.hub.action.impl.CategoryConfigActionProvider; +import io.xpipe.app.hub.action.impl.CategorySelectActionProvider; +import io.xpipe.app.hub.action.impl.RefreshStoreActionProvider; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.process.ShellTtyState; import io.xpipe.core.process.SystemState; -import io.xpipe.core.store.DataStore; -import io.xpipe.ext.base.script.ScriptHierarchy; import javafx.beans.property.SimpleStringProperty; import javafx.beans.value.ObservableValue; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/action/RunTerminalScriptActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/RunTerminalScriptActionProvider.java similarity index 85% rename from ext/base/src/main/java/io/xpipe/ext/base/action/RunTerminalScriptActionProvider.java rename to ext/base/src/main/java/io/xpipe/ext/base/script/RunTerminalScriptActionProvider.java index 6c657b5cb..885765ff3 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/action/RunTerminalScriptActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/RunTerminalScriptActionProvider.java @@ -1,12 +1,10 @@ -package io.xpipe.ext.base.action; +package io.xpipe.ext.base.script; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.ActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.ext.ShellStore; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.terminal.TerminalLauncher; -import io.xpipe.ext.base.script.SimpleScriptStore; 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 08e4e6a72..83f2a42f0 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 @@ -1,8 +1,8 @@ package io.xpipe.ext.base.script; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.*; import io.xpipe.app.ext.*; +import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DocumentationLink; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptQuickEditActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptQuickEditActionProvider.java index 0dc3e8a7e..fb9095756 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptQuickEditActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptQuickEditActionProvider.java @@ -1,21 +1,17 @@ package io.xpipe.ext.base.script; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; -import io.xpipe.app.comp.store.StoreCreationDialog; +import io.xpipe.app.hub.action.StoreAction; +import io.xpipe.app.hub.comp.StoreCreationDialog; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.FileOpener; -import io.xpipe.app.util.FixedHierarchyStore; import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.process.OsType; -import io.xpipe.core.store.DataStore; import javafx.beans.value.ObservableValue; -import lombok.Value; 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 5311647f8..62f91ef15 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 @@ -3,13 +3,13 @@ package io.xpipe.ext.base.script; import io.xpipe.app.comp.Comp; import io.xpipe.app.comp.base.IntegratedTextAreaComp; import io.xpipe.app.comp.base.ListSelectorComp; -import io.xpipe.app.comp.store.*; import io.xpipe.app.core.AppExtensionManager; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.DataStoreCreationCategory; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.EnabledParentStoreProvider; import io.xpipe.app.ext.GuiDialog; +import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStoreProvider.java index d24c092ad..13db5efa8 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceGroupStoreProvider.java @@ -1,10 +1,10 @@ package io.xpipe.ext.base.service; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.*; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreUsageCategory; +import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DocumentationLink; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java index c10f11355..726498587 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java @@ -1,12 +1,11 @@ package io.xpipe.ext.base.service; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.*; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.action.AbstractAction; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreUsageCategory; import io.xpipe.app.ext.SingletonSessionStoreProvider; +import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.DataStoreFormatter; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceStoreProvider.java index bdb9ce96b..347455636 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceStoreProvider.java @@ -1,7 +1,7 @@ package io.xpipe.ext.base.service; -import io.xpipe.app.comp.store.StoreChoiceComp; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreChoiceComp; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.ext.DataStoreCreationCategory; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.storage.DataStoreCategory; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStoreProvider.java index 74b75e440..5c58e8e35 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/FixedServiceStoreProvider.java @@ -1,7 +1,7 @@ package io.xpipe.ext.base.service; -import io.xpipe.app.comp.store.StoreChoiceComp; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreChoiceComp; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java index edd4fff3d..c6fb6b40e 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java @@ -1,7 +1,7 @@ package io.xpipe.ext.base.service; -import io.xpipe.app.comp.store.StoreChoiceComp; -import io.xpipe.app.comp.store.StoreViewState; +import io.xpipe.app.hub.comp.StoreChoiceComp; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.ext.GuiDialog; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStoreProvider.java index 653246b0d..cf649fcb8 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceControlStoreProvider.java @@ -1,9 +1,12 @@ package io.xpipe.ext.base.service; import io.xpipe.app.comp.base.IntegratedTextAreaComp; -import io.xpipe.app.comp.store.*; import io.xpipe.app.core.AppI18n; import io.xpipe.app.ext.*; +import io.xpipe.app.hub.comp.StoreChoiceComp; +import io.xpipe.app.hub.comp.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreSection; +import io.xpipe.app.hub.comp.StoreViewState; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategory; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceCopyAddressActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceCopyAddressActionProvider.java index 11e413c1d..ef0a72e9a 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceCopyAddressActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceCopyAddressActionProvider.java @@ -1,8 +1,7 @@ package io.xpipe.ext.base.service; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.storage.DataStoreEntryRef; @@ -11,7 +10,6 @@ import io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceRefreshActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceRefreshActionProvider.java index 1a0f084e3..a9373aba7 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceRefreshActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceRefreshActionProvider.java @@ -1,18 +1,15 @@ package io.xpipe.ext.base.service; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.action.BatchStoreActionProvider; +import io.xpipe.app.hub.action.BatchStoreActionProvider; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.action.AbstractAction; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/ShellStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/store/ShellStoreProvider.java index 1397e2d4d..eab7a33de 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/store/ShellStoreProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/store/ShellStoreProvider.java @@ -2,10 +2,10 @@ package io.xpipe.ext.base.store; import io.xpipe.app.browser.BrowserFullSessionModel; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.OsLogoComp; -import io.xpipe.app.comp.store.StoreEntryWrapper; -import io.xpipe.app.comp.store.StoreSection; -import io.xpipe.app.comp.store.SystemStateComp; +import io.xpipe.app.hub.comp.OsLogoComp; +import io.xpipe.app.hub.comp.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreSection; +import io.xpipe.app.hub.comp.SystemStateComp; import io.xpipe.app.ext.*; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseActionProvider.java index 924e6b103..06c2c931b 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseActionProvider.java @@ -1,17 +1,14 @@ package io.xpipe.ext.base.store; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.action.BatchStoreActionProvider; +import io.xpipe.app.hub.action.BatchStoreActionProvider; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.action.AbstractAction; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java index 76129ff68..f68368a6c 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java @@ -1,18 +1,15 @@ package io.xpipe.ext.base.store; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.action.BatchStoreActionProvider; +import io.xpipe.app.hub.action.BatchStoreActionProvider; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.action.AbstractAction; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.store.DataStore; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartActionProvider.java index 1858af3c8..fc39e81e2 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartActionProvider.java @@ -1,17 +1,14 @@ package io.xpipe.ext.base.store; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.action.BatchStoreActionProvider; +import io.xpipe.app.hub.action.BatchStoreActionProvider; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.action.AbstractAction; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopActionProvider.java index 9ffb2f12e..d6c6c7092 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopActionProvider.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopActionProvider.java @@ -1,17 +1,14 @@ package io.xpipe.ext.base.store; -import com.fasterxml.jackson.annotation.JsonTypeName; -import io.xpipe.app.action.BatchStoreActionProvider; +import io.xpipe.app.hub.action.BatchStoreActionProvider; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; -import io.xpipe.app.action.AbstractAction; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/base/src/main/java/module-info.java b/ext/base/src/main/java/module-info.java index b7c112495..80f81c3b2 100644 --- a/ext/base/src/main/java/module-info.java +++ b/ext/base/src/main/java/module-info.java @@ -1,10 +1,7 @@ import io.xpipe.app.action.ActionProvider; -import io.xpipe.app.browser.action.impl.*; -import io.xpipe.app.browser.menu.impl.*; -import io.xpipe.app.browser.menu.impl.compress.*; import io.xpipe.app.ext.DataStorageExtensionProvider; import io.xpipe.app.ext.DataStoreProvider; -import io.xpipe.ext.base.action.*; +import io.xpipe.app.hub.action.impl.*; import io.xpipe.ext.base.desktop.DesktopApplicationStoreProvider; import io.xpipe.ext.base.identity.*; import io.xpipe.ext.base.script.*; @@ -16,7 +13,6 @@ import io.xpipe.ext.base.store.StoreStopActionProvider; open module io.xpipe.ext.base { exports io.xpipe.ext.base; - exports io.xpipe.ext.base.action; exports io.xpipe.ext.base.script; exports io.xpipe.ext.base.store; exports io.xpipe.ext.base.desktop; @@ -35,10 +31,9 @@ open module io.xpipe.ext.base { requires org.kordamp.ikonli.javafx; requires atlantafx.base; - provides ActionProvider with ScanStoreActionProvider, ScanBatchStoreActionProvider, LocalIdentityConvertActionProvider, + provides ActionProvider with LocalIdentityConvertActionProvider, SimpleScriptQuickEditActionProvider, StoreStartActionProvider, StoreStopActionProvider, StorePauseActionProvider, - StoreRestartActionProvider, ServiceCopyAddressActionProvider, CloneStoreActionProvider, RefreshChildrenStoreActionProvider, - RunScriptActionProviderMenu, XPipeUrlActionProvider, BrowseStoreActionProvider, ChangeStoreIconActionProvider, + StoreRestartActionProvider, ServiceCopyAddressActionProvider, RunScriptActionProviderMenu, ServiceRefreshActionProvider, RunFileScriptMenuProvider; provides DataStoreProvider with FixedServiceGroupStoreProvider, CustomServiceGroupStoreProvider, CustomServiceStoreProvider, MappedServiceStoreProvider, FixedServiceStoreProvider, SimpleScriptStoreProvider, DesktopApplicationStoreProvider, diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerConsoleActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerConsoleActionProvider.java index 5b39c4103..bd87c3308 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerConsoleActionProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerConsoleActionProvider.java @@ -1,18 +1,15 @@ package io.xpipe.ext.system.incus; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.action.AbstractAction; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditConfigActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditConfigActionProvider.java index 47ac504f9..3b768fb12 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditConfigActionProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditConfigActionProvider.java @@ -1,18 +1,15 @@ package io.xpipe.ext.system.incus; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.action.AbstractAction; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditRunConfigActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditRunConfigActionProvider.java index 3a7efa5b4..9f12c8619 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditRunConfigActionProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditRunConfigActionProvider.java @@ -1,22 +1,19 @@ package io.xpipe.ext.system.incus; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.browser.BrowserFullSessionModel; import io.xpipe.app.browser.file.BrowserFileOpener; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.ext.ProcessControlProvider; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.store.FilePath; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStoreProvider.java index ecc69e0ee..e905dd9af 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerStoreProvider.java @@ -1,9 +1,9 @@ package io.xpipe.ext.system.incus; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.*; import io.xpipe.app.ext.ContainerStoreState; import io.xpipe.app.ext.GuiDialog; +import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*; import io.xpipe.core.store.DataStore; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStoreProvider.java index e749f3999..230abccc9 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusInstallStoreProvider.java @@ -1,9 +1,9 @@ package io.xpipe.ext.system.incus; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.*; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreUsageCategory; +import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStoreProvider.java index 02b645d08..066f05991 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdCmdStoreProvider.java @@ -1,9 +1,9 @@ package io.xpipe.ext.system.lxd; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.*; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreUsageCategory; +import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreCategory; import io.xpipe.app.storage.DataStoreEntry; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java index 207c83a37..1b183bf34 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java @@ -1,11 +1,9 @@ package io.xpipe.ext.system.lxd; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.action.AbstractAction; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.LabelGraphic; @@ -13,7 +11,6 @@ import io.xpipe.ext.system.incus.IncusCommandView; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java index f07bec83d..b0b6b25c8 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java @@ -1,11 +1,9 @@ package io.xpipe.ext.system.lxd; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.action.AbstractAction; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.LabelGraphic; @@ -13,7 +11,6 @@ import io.xpipe.ext.system.incus.IncusCommandView; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditRunConfigActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditRunConfigActionProvider.java index bb550f362..da35e4ab3 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditRunConfigActionProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditRunConfigActionProvider.java @@ -1,22 +1,19 @@ package io.xpipe.ext.system.lxd; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.browser.BrowserFullSessionModel; import io.xpipe.app.browser.file.BrowserFileOpener; import io.xpipe.app.core.AppI18n; import io.xpipe.app.core.AppLayoutModel; import io.xpipe.app.action.AbstractAction; import io.xpipe.app.ext.ProcessControlProvider; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.LabelGraphic; import io.xpipe.core.store.FilePath; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStoreProvider.java index 4ef3be8b8..dc7cb0afe 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerStoreProvider.java @@ -1,9 +1,9 @@ package io.xpipe.ext.system.lxd; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.*; import io.xpipe.app.ext.ContainerStoreState; import io.xpipe.app.ext.GuiDialog; +import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*; import io.xpipe.core.store.DataStore; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStoreProvider.java index 41eb1e214..6db5fc13b 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanCmdStoreProvider.java @@ -1,11 +1,11 @@ package io.xpipe.ext.system.podman; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.StoreEntryComp; -import io.xpipe.app.comp.store.StoreEntryWrapper; -import io.xpipe.app.comp.store.StoreSection; -import io.xpipe.app.comp.store.StoreToggleComp; -import io.xpipe.app.comp.store.SystemStateComp; +import io.xpipe.app.hub.comp.StoreEntryComp; +import io.xpipe.app.hub.comp.StoreEntryWrapper; +import io.xpipe.app.hub.comp.StoreSection; +import io.xpipe.app.hub.comp.StoreToggleComp; +import io.xpipe.app.hub.comp.SystemStateComp; import io.xpipe.app.ext.DataStoreProvider; import io.xpipe.app.ext.DataStoreUsageCategory; import io.xpipe.app.storage.DataStoreEntry; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerAttachActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerAttachActionProvider.java index 33ba3a561..fffb604f2 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerAttachActionProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerAttachActionProvider.java @@ -1,15 +1,13 @@ package io.xpipe.ext.system.podman; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerInspectActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerInspectActionProvider.java index 2937eae13..aec283116 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerInspectActionProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerInspectActionProvider.java @@ -1,18 +1,15 @@ package io.xpipe.ext.system.podman; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.action.AbstractAction; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.util.FileOpener; import io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerLogsActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerLogsActionProvider.java index 15f556496..5973df66e 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerLogsActionProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerLogsActionProvider.java @@ -1,18 +1,15 @@ package io.xpipe.ext.system.podman; -import com.fasterxml.jackson.annotation.JsonTypeName; import io.xpipe.app.action.LeafStoreActionProvider; -import io.xpipe.app.action.StoreAction; +import io.xpipe.app.hub.action.StoreAction; import io.xpipe.app.core.AppI18n; import io.xpipe.app.action.AbstractAction; -import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.storage.DataStoreEntryRef; import io.xpipe.app.terminal.TerminalLauncher; import io.xpipe.app.util.LabelGraphic; import javafx.beans.value.ObservableValue; -import lombok.Value; import lombok.experimental.SuperBuilder; import lombok.extern.jackson.Jacksonized; diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStoreProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStoreProvider.java index 9c9c2f78f..8d0606b69 100644 --- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStoreProvider.java +++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerStoreProvider.java @@ -1,9 +1,9 @@ package io.xpipe.ext.system.podman; import io.xpipe.app.comp.Comp; -import io.xpipe.app.comp.store.*; import io.xpipe.app.ext.ContainerStoreState; import io.xpipe.app.ext.GuiDialog; +import io.xpipe.app.hub.comp.*; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.storage.DataStoreEntry; import io.xpipe.app.util.*;