Further package separation of info services

Col-E · Aug 12, 2023 · 0af8548 · 0af8548
1 parent fa229f8
commit 0af8548
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 18 deletions.
diff --git a/...ices/info/FileTypeAssociationService.java → ...sociation/FileTypeAssociationService.java b/...ices/info/FileTypeAssociationService.java → ...sociation/FileTypeAssociationService.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.services.info;
+package software.coley.recaf.services.info.association;
 
 import jakarta.annotation.Nonnull;
 import jakarta.enterprise.context.ApplicationScoped;

diff --git a/...nfo/FileTypeAssociationServiceConfig.java → ...ion/FileTypeAssociationServiceConfig.java b/...nfo/FileTypeAssociationServiceConfig.java → ...ion/FileTypeAssociationServiceConfig.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.services.info;
+package software.coley.recaf.services.info.association;
 
 import jakarta.annotation.Nonnull;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -9,6 +9,7 @@
 import software.coley.recaf.config.BasicMapConfigValue;
 import software.coley.recaf.config.ConfigGroups;
 import software.coley.recaf.services.ServiceConfig;
+import software.coley.recaf.services.info.association.FileTypeAssociationService;
 import software.coley.recaf.ui.LanguageStylesheets;
 import software.coley.recaf.ui.control.richtext.syntax.RegexLanguages;
 

diff --git a/...caf/services/info/ResourceSummarizer.java → ...ices/info/summary/ResourceSummarizer.java b/...caf/services/info/ResourceSummarizer.java → ...ices/info/summary/ResourceSummarizer.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.services.info;
+package software.coley.recaf.services.info.summary;
 
 import jakarta.annotation.Nonnull;
 import software.coley.recaf.workspace.model.Workspace;

diff --git a/...services/info/ResourceSummaryService.java → .../info/summary/ResourceSummaryService.java b/...services/info/ResourceSummaryService.java → .../info/summary/ResourceSummaryService.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.services.info;
+package software.coley.recaf.services.info.summary;
 
 import jakarta.annotation.Nonnull;
 import jakarta.enterprise.context.ApplicationScoped;

diff --git a/...es/info/ResourceSummaryServiceConfig.java → ...summary/ResourceSummaryServiceConfig.java b/...es/info/ResourceSummaryServiceConfig.java → ...summary/ResourceSummaryServiceConfig.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.services.info;
+package software.coley.recaf.services.info.summary;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;

diff --git a/.../recaf/services/info/SummaryConsumer.java → ...ervices/info/summary/SummaryConsumer.java b/.../recaf/services/info/SummaryConsumer.java → ...ervices/info/summary/SummaryConsumer.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.services.info;
+package software.coley.recaf.services.info.summary;
 
 import javafx.scene.Node;
 

diff --git a/...es/info/builtin/EntryPointSummarizer.java → ...summary/builtin/EntryPointSummarizer.java b/...es/info/builtin/EntryPointSummarizer.java → ...summary/builtin/EntryPointSummarizer.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.services.info.builtin;
+package software.coley.recaf.services.info.summary.builtin;
 
 import atlantafx.base.theme.Styles;
 import jakarta.annotation.Nonnull;
@@ -10,8 +10,8 @@
 import software.coley.recaf.info.member.MethodMember;
 import software.coley.recaf.services.cell.IconProviderService;
 import software.coley.recaf.services.cell.TextProviderService;
-import software.coley.recaf.services.info.ResourceSummarizer;
-import software.coley.recaf.services.info.SummaryConsumer;
+import software.coley.recaf.services.info.summary.ResourceSummarizer;
+import software.coley.recaf.services.info.summary.SummaryConsumer;
 import software.coley.recaf.services.navigation.Actions;
 import software.coley.recaf.ui.control.BoundLabel;
 import software.coley.recaf.util.Lang;

diff --git a/recaf-ui/src/main/java/software/coley/recaf/ui/pane/ScriptManagerPane.java b/recaf-ui/src/main/java/software/coley/recaf/ui/pane/ScriptManagerPane.java
@@ -32,7 +32,7 @@
 import software.coley.recaf.services.script.ScriptFile;
 import software.coley.recaf.services.script.ScriptManager;
 import software.coley.recaf.services.script.ScriptManagerConfig;
-import software.coley.recaf.services.info.FileTypeAssociationService;
+import software.coley.recaf.services.info.association.FileTypeAssociationService;
 import software.coley.recaf.services.window.WindowFactory;
 import software.coley.recaf.ui.config.KeybindingConfig;
 import software.coley.recaf.ui.control.ActionButton;

diff --git a/recaf-ui/src/main/java/software/coley/recaf/ui/pane/WorkspaceInformationPane.java b/recaf-ui/src/main/java/software/coley/recaf/ui/pane/WorkspaceInformationPane.java
@@ -18,9 +18,9 @@
 import software.coley.recaf.path.WorkspacePathNode;
 import software.coley.recaf.services.cell.IconProviderService;
 import software.coley.recaf.services.cell.TextProviderService;
-import software.coley.recaf.services.info.ResourceSummarizer;
-import software.coley.recaf.services.info.ResourceSummaryService;
-import software.coley.recaf.services.info.SummaryConsumer;
+import software.coley.recaf.services.info.summary.ResourceSummarizer;
+import software.coley.recaf.services.info.summary.ResourceSummaryService;
+import software.coley.recaf.services.info.summary.SummaryConsumer;
 import software.coley.recaf.services.navigation.Navigable;
 import software.coley.recaf.workspace.model.Workspace;
 import software.coley.recaf.workspace.model.resource.WorkspaceResource;

diff --git a/recaf-ui/src/main/java/software/coley/recaf/ui/pane/editing/AbstractDecompilePane.java b/recaf-ui/src/main/java/software/coley/recaf/ui/pane/editing/AbstractDecompilePane.java
@@ -38,7 +38,7 @@
 import software.coley.recaf.services.navigation.Navigable;
 import software.coley.recaf.services.navigation.UpdatableNavigable;
 import software.coley.recaf.services.source.AstMappingVisitor;
-import software.coley.recaf.services.info.FileTypeAssociationService;
+import software.coley.recaf.services.info.association.FileTypeAssociationService;
 import software.coley.recaf.ui.control.BoundLabel;
 import software.coley.recaf.ui.control.richtext.Editor;
 import software.coley.recaf.ui.control.richtext.bracket.BracketMatchGraphicFactory;

diff --git a/...-ui/src/main/java/software/coley/recaf/ui/pane/editing/android/AndroidDecompilerPane.java b/...-ui/src/main/java/software/coley/recaf/ui/pane/editing/android/AndroidDecompilerPane.java
@@ -7,7 +7,7 @@
 import software.coley.recaf.services.decompile.DecompilerManager;
 import software.coley.recaf.services.navigation.Actions;
 import software.coley.recaf.services.source.AstResolveResult;
-import software.coley.recaf.services.info.FileTypeAssociationService;
+import software.coley.recaf.services.info.association.FileTypeAssociationService;
 import software.coley.recaf.ui.config.KeybindingConfig;
 import software.coley.recaf.ui.control.richtext.Editor;
 import software.coley.recaf.ui.control.richtext.search.SearchBar;

diff --git a/recaf-ui/src/main/java/software/coley/recaf/ui/pane/editing/binary/DecodingXmlPane.java b/recaf-ui/src/main/java/software/coley/recaf/ui/pane/editing/binary/DecodingXmlPane.java
@@ -13,7 +13,7 @@
 import software.coley.recaf.services.navigation.FileNavigable;
 import software.coley.recaf.services.navigation.Navigable;
 import software.coley.recaf.services.navigation.UpdatableNavigable;
-import software.coley.recaf.services.info.FileTypeAssociationService;
+import software.coley.recaf.services.info.association.FileTypeAssociationService;
 import software.coley.recaf.ui.control.richtext.Editor;
 import software.coley.recaf.ui.control.richtext.bracket.BracketMatchGraphicFactory;
 import software.coley.recaf.ui.control.richtext.bracket.SelectedBracketTracking;

diff --git a/recaf-ui/src/main/java/software/coley/recaf/ui/pane/editing/jvm/JvmDecompilerPane.java b/recaf-ui/src/main/java/software/coley/recaf/ui/pane/editing/jvm/JvmDecompilerPane.java
@@ -31,7 +31,7 @@
 import software.coley.recaf.services.phantom.PhantomGenerationException;
 import software.coley.recaf.services.phantom.PhantomGenerator;
 import software.coley.recaf.services.source.AstResolveResult;
-import software.coley.recaf.services.info.FileTypeAssociationService;
+import software.coley.recaf.services.info.association.FileTypeAssociationService;
 import software.coley.recaf.ui.config.KeybindingConfig;
 import software.coley.recaf.ui.control.BoundLabel;
 import software.coley.recaf.ui.control.FontIconView;

diff --git a/recaf-ui/src/main/java/software/coley/recaf/ui/pane/editing/text/TextPane.java b/recaf-ui/src/main/java/software/coley/recaf/ui/pane/editing/text/TextPane.java
@@ -11,7 +11,7 @@
 import software.coley.recaf.services.navigation.FileNavigable;
 import software.coley.recaf.services.navigation.Navigable;
 import software.coley.recaf.services.navigation.UpdatableNavigable;
-import software.coley.recaf.services.info.FileTypeAssociationService;
+import software.coley.recaf.services.info.association.FileTypeAssociationService;
 import software.coley.recaf.ui.config.KeybindingConfig;
 import software.coley.recaf.ui.control.richtext.Editor;
 import software.coley.recaf.ui.control.richtext.bracket.BracketMatchGraphicFactory;