Changeset 3872

Timestamp:

Jul 23, 2008, 9:06:47 PM (13 years ago)

Author:

yura

Message:

• Constans in ColorPreferences? are renamed.

Location:

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui

Files:

• preferences/IColorPreferences.java (modified) (1 diff)
• preferences/SyntaxColoringPreferencePage.java (modified) (2 diffs)
• scanner/ColorScanner.java (modified) (2 diffs)

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/preferences/IColorPreferences.java

@@ -2 +2 @@
 
 public interface IColorPreferences {
-    public static final String SYMBOL = "Symbol";
-    public static final String KEYWORD = "Keyword";
-    public static final String IDENTIFIER_USE = "Identifier_use";
-    public static final String IDENTIFIER_DEFINITION = "Identifier_definition";
-    public static final String VARIABLE_TYPE = "Variable_type";
-    public static final String VARIABLE_DEFINITION = "Variable_definition";
-    public static final String VARIABLE_USE = "Variable_use";
-    public static final String COMMENT = "Comment";
-    public static final String OTHER_SYMBOLS = "Other_symbols";
+    public static final String SYMBOL = IPreferenceConstants.PREFIX + "symbol";
+    public static final String KEYWORD = IPreferenceConstants.PREFIX + "keyword";
+    public static final String IDENTIFIER_DEFINITION = IPreferenceConstants.PREFIX + "identifierDefinition";
+    public static final String IDENTIFIER_USE = IPreferenceConstants.PREFIX + "identifierUse";
+    public static final String VARIABLE_TYPE = IPreferenceConstants.PREFIX + "variableType";
+    public static final String VARIABLE_DEFINITION = IPreferenceConstants.PREFIX + "variableDefinition";
+    public static final String VARIABLE_USE = IPreferenceConstants.PREFIX + "variableUse";
+    public static final String COMMENT = IPreferenceConstants.PREFIX + "comment";
+    public static final String OTHER_SYMBOLS = IPreferenceConstants.PREFIX + "otherSymbols";
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/preferences/SyntaxColoringPreferencePage.java

@@ -89 +89 @@
         booleanStore = new HashMap<String, Boolean>(keys.length * 4);
         for (String k : keys) {
-            rgbStore.put(IPreferenceConstants.PREFIX + k + ".color", null); //$NON-NLS-1$
-            booleanStore.put(IPreferenceConstants.PREFIX + k + ".bold", null); //$NON-NLS-1$
-            booleanStore.put(IPreferenceConstants.PREFIX + k + ".italic", null); //$NON-NLS-1$
-            booleanStore.put(IPreferenceConstants.PREFIX + k + ".strikethrough", null); //$NON-NLS-1$
-            booleanStore.put(IPreferenceConstants.PREFIX + k + ".underlined", null); //$NON-NLS-1$
+            rgbStore.put(k + ".color", null); //$NON-NLS-1$
+            booleanStore.put(k + ".bold", null); //$NON-NLS-1$
+            booleanStore.put(k + ".italic", null); //$NON-NLS-1$
+            booleanStore.put(k + ".strikethrough", null); //$NON-NLS-1$
+            booleanStore.put(k + ".underlined", null); //$NON-NLS-1$
         }
         IPreferenceStore store = getPreferenceStore();
@@ -212 +212 @@
 
     private void setPreferenceName (String key) {
-        colorEditor.setPreferenceName(IPreferenceConstants.PREFIX + key + ".color"); //$NON-NLS-1$
-        boldEditor.setPreferenceName(IPreferenceConstants.PREFIX + key + ".bold"); //$NON-NLS-1$
-        italicEditor.setPreferenceName(IPreferenceConstants.PREFIX + key + ".italic"); //$NON-NLS-1$
-        strikeEditor.setPreferenceName(IPreferenceConstants.PREFIX + key + ".strikethrough"); //$NON-NLS-1$
-        underlinedEditor.setPreferenceName(IPreferenceConstants.PREFIX + key + ".underlined"); //$NON-NLS-1$
+        colorEditor.setPreferenceName(key + ".color"); //$NON-NLS-1$
+        boldEditor.setPreferenceName(key + ".bold"); //$NON-NLS-1$
+        italicEditor.setPreferenceName(key + ".italic"); //$NON-NLS-1$
+        strikeEditor.setPreferenceName(key + ".strikethrough"); //$NON-NLS-1$
+        underlinedEditor.setPreferenceName(key + ".underlined"); //$NON-NLS-1$
     }
 

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/scanner/ColorScanner.java

@@ -20 +20 @@
 import org.refal.rfpdt.editor.RfpEditor;
 import org.refal.rfpdt.ui.preferences.IColorPreferences;
-import org.refal.rfpdt.ui.preferences.IPreferenceConstants;
 
 public class ColorScanner implements ITokenScanner {
@@ -41 +40 @@
             return null;
         Color color = colorManager.getColor(
-                PreferenceConverter.getColor(store, IPreferenceConstants.PREFIX + key + ".color"));
-        int style = store.getBoolean(IPreferenceConstants.PREFIX + key + ".bold") ? SWT.BOLD : SWT.NORMAL;
-        if (store.getBoolean(IPreferenceConstants.PREFIX + key + ".italic"))
+                PreferenceConverter.getColor(store, key + ".color"));
+        int style = store.getBoolean(key + ".bold") ? SWT.BOLD : SWT.NORMAL;
+        if (store.getBoolean(key + ".italic"))
             style |= SWT.ITALIC;
-        if (store.getBoolean(IPreferenceConstants.PREFIX + key + ".strikethrough"))
+        if (store.getBoolean(key + ".strikethrough"))
             style |= TextAttribute.STRIKETHROUGH;
-        if (store.getBoolean(IPreferenceConstants.PREFIX + key + ".underlined"))
+        if (store.getBoolean(key + ".underlined"))
             style |= TextAttribute.UNDERLINE;
         return new TextAttribute(color, null, style);