Optimize the preferences panel

elbelife · May 14, 2019 · 72192e4 · 72192e4
1 parent c878ce7
commit 72192e4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 22 deletions.
diff --git a/...l/ClassFileViewerPreferencesProvider.java → ...assFileDecompilerPreferencesProvider.java b/...l/ClassFileViewerPreferencesProvider.java → ...assFileDecompilerPreferencesProvider.java
@@ -13,15 +13,15 @@
 import java.awt.*;
 import java.util.Map;
 
-public class ClassFileViewerPreferencesProvider extends JPanel implements PreferencesPanel {
-    protected static final String ESCAPE_UNICODE_CHARACTERS = "ClassFileViewerPreferences.escapeUnicodeCharacters";
-    protected static final String REALIGN_LINE_NUMBERS = "ClassFileViewerPreferences.realignLineNumbers";
+public class ClassFileDecompilerPreferencesProvider extends JPanel implements PreferencesPanel {
+    protected static final String ESCAPE_UNICODE_CHARACTERS = "ClassFileDecompilerPreferences.escapeUnicodeCharacters";
+    protected static final String REALIGN_LINE_NUMBERS = "ClassFileDecompilerPreferences.realignLineNumbers";
 
     protected PreferencesPanel.PreferencesPanelChangeListener listener = null;
     protected JCheckBox escapeUnicodeCharactersCheckBox;
     protected JCheckBox realignLineNumbersCheckBox;
 
-    public ClassFileViewerPreferencesProvider() {
+    public ClassFileDecompilerPreferencesProvider() {
         super(new GridLayout(0,1));
 
         escapeUnicodeCharactersCheckBox = new JCheckBox("Escape unicode characters");
@@ -32,7 +32,7 @@ public ClassFileViewerPreferencesProvider() {
     }
 
     // --- PreferencesPanel --- //
-    @Override public String getPreferencesGroupTitle() { return "Viewer"; }
+    @Override public String getPreferencesGroupTitle() { return "Decompiler"; }
     @Override public String getPreferencesPanelTitle() { return "Class file"; }
     @Override public JComponent getPanel() { return this; }
 

diff --git a/.../src/main/java/org/jd/gui/service/preferencespanel/ClassFileSaverPreferencesProvider.java b/.../src/main/java/org/jd/gui/service/preferencespanel/ClassFileSaverPreferencesProvider.java
@@ -14,26 +14,18 @@
 import java.util.Map;
 
 public class ClassFileSaverPreferencesProvider extends JPanel implements PreferencesPanel {
-    protected static final String ESCAPE_UNICODE_CHARACTERS = "ClassFileSaverPreferences.escapeUnicodeCharacters";
-    protected static final String REALIGN_LINE_NUMBERS = "ClassFileSaverPreferences.realignLineNumbers";
     protected static final String WRITE_LINE_NUMBERS = "ClassFileSaverPreferences.writeLineNumbers";
     protected static final String WRITE_METADATA = "ClassFileSaverPreferences.writeMetadata";
 
-    protected JCheckBox escapeUnicodeCharactersCheckBox;
-    protected JCheckBox realignLineNumbersCheckBox;
     protected JCheckBox writeLineNumbersCheckBox;
     protected JCheckBox writeMetadataCheckBox;
 
     public ClassFileSaverPreferencesProvider() {
         super(new GridLayout(0,1));
 
-        escapeUnicodeCharactersCheckBox = new JCheckBox("Escape unicode characters");
-        realignLineNumbersCheckBox = new JCheckBox("Realign line numbers");
         writeLineNumbersCheckBox = new JCheckBox("Write original line numbers");
         writeMetadataCheckBox = new JCheckBox("Write metadata");
 
-        add(escapeUnicodeCharactersCheckBox);
-        add(realignLineNumbersCheckBox);
         add(writeLineNumbersCheckBox);
         add(writeMetadataCheckBox);
     }
@@ -49,16 +41,12 @@ public ClassFileSaverPreferencesProvider() {
 
     @Override
     public void loadPreferences(Map<String, String> preferences) {
-        escapeUnicodeCharactersCheckBox.setSelected("true".equals(preferences.get(ESCAPE_UNICODE_CHARACTERS)));
-        realignLineNumbersCheckBox.setSelected(!"false".equals(preferences.get(REALIGN_LINE_NUMBERS)));
         writeLineNumbersCheckBox.setSelected(!"false".equals(preferences.get(WRITE_LINE_NUMBERS)));
         writeMetadataCheckBox.setSelected(!"false".equals(preferences.get(WRITE_METADATA)));
     }
 
     @Override
     public void savePreferences(Map<String, String> preferences) {
-        preferences.put(ESCAPE_UNICODE_CHARACTERS, Boolean.toString(escapeUnicodeCharactersCheckBox.isSelected()));
-        preferences.put(REALIGN_LINE_NUMBERS, Boolean.toString(realignLineNumbersCheckBox.isSelected()));
         preferences.put(WRITE_LINE_NUMBERS, Boolean.toString(writeLineNumbersCheckBox.isSelected()));
         preferences.put(WRITE_METADATA, Boolean.toString(writeMetadataCheckBox.isSelected()));
     }

diff --git a/services/src/main/java/org/jd/gui/service/sourcesaver/ClassFileSourceSaverProvider.java b/services/src/main/java/org/jd/gui/service/sourcesaver/ClassFileSourceSaverProvider.java
@@ -26,8 +26,8 @@
 import java.util.jar.Manifest;
 
 public class ClassFileSourceSaverProvider extends AbstractSourceSaverProvider {
-    protected static final String ESCAPE_UNICODE_CHARACTERS = "ClassFileSaverPreferences.escapeUnicodeCharacters";
-    protected static final String REALIGN_LINE_NUMBERS = "ClassFileSaverPreferences.realignLineNumbers";
+    protected static final String ESCAPE_UNICODE_CHARACTERS = "ClassFileDecompilerPreferences.escapeUnicodeCharacters";
+    protected static final String REALIGN_LINE_NUMBERS = "ClassFileDecompilerPreferences.realignLineNumbers";
     protected static final String WRITE_LINE_NUMBERS = "ClassFileSaverPreferences.writeLineNumbers";
     protected static final String WRITE_METADATA = "ClassFileSaverPreferences.writeMetadata";
 

diff --git a/services/src/main/java/org/jd/gui/view/component/ClassFilePage.java b/services/src/main/java/org/jd/gui/view/component/ClassFilePage.java
@@ -26,8 +26,8 @@
 import java.util.Map;
 
 public class ClassFilePage extends TypePage {
-    protected static final String ESCAPE_UNICODE_CHARACTERS   = "ClassFileViewerPreferences.escapeUnicodeCharacters";
-    protected static final String REALIGN_LINE_NUMBERS        = "ClassFileViewerPreferences.realignLineNumbers";
+    protected static final String ESCAPE_UNICODE_CHARACTERS   = "ClassFileDecompilerPreferences.escapeUnicodeCharacters";
+    protected static final String REALIGN_LINE_NUMBERS        = "ClassFileDecompilerPreferences.realignLineNumbers";
 
     protected static final ClassFileToJavaSourceDecompiler DECOMPILER = new ClassFileToJavaSourceDecompiler();
 

diff --git a/services/src/main/resources/META-INF/services/org.jd.gui.spi.PreferencesPanel b/services/src/main/resources/META-INF/services/org.jd.gui.spi.PreferencesPanel
@@ -1,4 +1,4 @@
 org.jd.gui.service.preferencespanel.DirectoryIndexerPreferencesProvider
 org.jd.gui.service.preferencespanel.ClassFileSaverPreferencesProvider
-org.jd.gui.service.preferencespanel.ClassFileViewerPreferencesProvider
+org.jd.gui.service.preferencespanel.ClassFileDecompilerPreferencesProvider
 org.jd.gui.service.preferencespanel.ViewerPreferencesProvider