Move file type association to info service package

Col-E · Aug 12, 2023 · fa229f8 · fa229f8
1 parent 78cfa97
commit fa229f8
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/...ices/text/FileTypeAssociationService.java → ...ices/info/FileTypeAssociationService.java b/...ices/text/FileTypeAssociationService.java → ...ices/info/FileTypeAssociationService.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.services.text;
+package software.coley.recaf.services.info;
 
 import jakarta.annotation.Nonnull;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -14,7 +14,6 @@
 import software.coley.recaf.ui.control.richtext.syntax.RegexLanguages;
 import software.coley.recaf.ui.control.richtext.syntax.RegexRule;
 import software.coley.recaf.ui.control.richtext.syntax.RegexSyntaxHighlighter;
-import software.coley.recaf.util.StringUtil;
 
 import static software.coley.recaf.util.StringUtil.*;
 
@@ -66,10 +65,10 @@ public void configureEditorSyntax(@Nonnull Info info, @Nonnull Editor editor) {
 	 */
 	public void configureEditorSyntax(@Nonnull String fileExtension, @Nonnull Editor editor) {
 		String lowerExtension = fileExtension.toLowerCase();
-		String mappedExtension = config.getExtensionsToLangKeys().getOrDefault(lowerExtension, lowerExtension);
+		String languageKey = config.getExtensionsToLangKeys().getOrDefault(lowerExtension, lowerExtension);
 
-		String sheet = LanguageStylesheets.getLanguageStylesheet(mappedExtension);
-		RegexRule language = RegexLanguages.getLanguage(mappedExtension);
+		String sheet = LanguageStylesheets.getLanguageStylesheet(languageKey);
+		RegexRule language = RegexLanguages.getLanguage(languageKey);
 
 		ObservableList<String> stylesheets = editor.getStylesheets();
 		if (sheet != null && !stylesheets.contains(sheet))

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

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.text.FileTypeAssociationService;
+import software.coley.recaf.services.info.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/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.text.FileTypeAssociationService;
+import software.coley.recaf.services.info.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.text.FileTypeAssociationService;
+import software.coley.recaf.services.info.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.text.FileTypeAssociationService;
+import software.coley.recaf.services.info.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.text.FileTypeAssociationService;
+import software.coley.recaf.services.info.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.text.FileTypeAssociationService;
+import software.coley.recaf.services.info.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;