Changeset 3873 for devel-tools/trunk

Timestamp:

Jul 23, 2008, 9:14:59 PM (12 years ago)

Author:

yura

Message:

• IColorPreferences and IPreferenceConstants are merged.

Location:

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

Files:

• editor/PresentationVisitor.java (modified) (5 diffs)
• editor/RfpPresentationReconciler.java (modified) (3 diffs)
• ui/preferences/IColorPreferences.java (deleted)
• ui/preferences/IPreferenceConstants.java (modified) (1 diff)
• ui/preferences/SyntaxColoringPreferencePage.java (modified) (1 diff)
• ui/scanner/ColorScanner.java (modified) (3 diffs)

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

@@ -49 +49 @@
 import org.refal.rfpdt.compiler.RfpResource;
 import org.refal.rfpdt.compiler.SrcPosition;
-import org.refal.rfpdt.ui.preferences.IColorPreferences;
+import org.refal.rfpdt.ui.preferences.IPreferenceConstants;
 import org.refal.rfpdt.ui.scanner.ColorScanner;
 
@@ -71 +71 @@
             if (textAttribute == null)
                 return null;
-            StyleRange styleRange = new StyleRange(offset, length, textAttribute.getForeground(), textAttribute.getBackground());
+            StyleRange styleRange = new StyleRange(offset, length, textAttribute.getForeground(), textAttribute
+                    .getBackground());
             int style = textAttribute.getStyle();
             styleRange.fontStyle = style & (SWT.BOLD | SWT.ITALIC);
@@ -90 +91 @@
 
     private void addAstNameStyle (AstNode name, String key) {
-        if (! rfpResource.equals(name.pos.rfpResource))
+        if (!rfpResource.equals(name.pos.rfpResource))
             return;
         styleRangeList.add(new StylePosition(name.pos, key));
@@ -102 +103 @@
     private void visitObjectDefinition (AstName name) {
         if (name != null)
-            addAstNameStyle(name, IColorPreferences.IDENTIFIER_DEFINITION);
+            addAstNameStyle(name, IPreferenceConstants.IDENTIFIER_DEFINITION);
     }
 
     private void visitObjectUse (AstName name) {
         if (name != null && name.identifier.length() < name.pos.charEnd - name.pos.charStart)
-            addAstNameStyle(name, IColorPreferences.IDENTIFIER_USE);
+            addAstNameStyle(name, IPreferenceConstants.IDENTIFIER_USE);
     }
 
     private void visitVariableDefinition (AstName name) {
         if (name != null)
-            addAstNameStyle(name, IColorPreferences.VARIABLE_DEFINITION);
+            addAstNameStyle(name, IPreferenceConstants.VARIABLE_DEFINITION);
     }
 
@@ -121 +122 @@
     private void visitSymbol (AstWordSymbol astWordSymbol) {
         if (astWordSymbol.word.length() == astWordSymbol.pos.charEnd - astWordSymbol.pos.charStart)
-            addAstNameStyle(astWordSymbol, IColorPreferences.SYMBOL);
+            addAstNameStyle(astWordSymbol, IPreferenceConstants.SYMBOL);
     }
 

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

@@ -8 +8 @@
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
-import org.refal.rfpdt.ui.preferences.IColorPreferences;
+import org.refal.rfpdt.ui.preferences.IPreferenceConstants;
 import org.refal.rfpdt.ui.scanner.ColorScanner;
 
@@ -27 +27 @@
         setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
         multiLineComment = new NonRuleBasedDamagerRepairer(ColorScanner.getTextAttribute(store,
-                IColorPreferences.COMMENT));
+                IPreferenceConstants.COMMENT));
         setDamager(multiLineComment, IRfpPartitions.MULTI_LINE_COMMENT);
         setRepairer(multiLineComment, IRfpPartitions.MULTI_LINE_COMMENT);
         singleLineComment = new NonRuleBasedDamagerRepairer(ColorScanner.getTextAttribute(store,
-                IColorPreferences.COMMENT));
+                IPreferenceConstants.COMMENT));
         setDamager(singleLineComment, IRfpPartitions.SINGLE_LINE_COMMENT);
         setRepairer(singleLineComment, IRfpPartitions.SINGLE_LINE_COMMENT);
-        word = new NonRuleBasedDamagerRepairer(ColorScanner.getTextAttribute(store, IColorPreferences.SYMBOL));
+        word = new NonRuleBasedDamagerRepairer(ColorScanner.getTextAttribute(store, IPreferenceConstants.SYMBOL));
         setDamager(word, IRfpPartitions.WORD);
         setRepairer(word, IRfpPartitions.WORD);
-        character = new NonRuleBasedDamagerRepairer(ColorScanner.getTextAttribute(store, IColorPreferences.SYMBOL));
+        character = new NonRuleBasedDamagerRepairer(ColorScanner.getTextAttribute(store, IPreferenceConstants.SYMBOL));
         setDamager(character, IRfpPartitions.CHARACTER);
         setRepairer(character, IRfpPartitions.CHARACTER);
@@ -56 +56 @@
     public void propertyChange (PropertyChangeEvent event) {
         defaultContentScanner.setTokens();
-        multiLineComment.setDefaultTextAttribute(ColorScanner.getTextAttribute(store, IColorPreferences.COMMENT));
-        singleLineComment.setDefaultTextAttribute(ColorScanner.getTextAttribute(store, IColorPreferences.COMMENT));
-        word.setDefaultTextAttribute(ColorScanner.getTextAttribute(store, IColorPreferences.SYMBOL));
-        character.setDefaultTextAttribute(ColorScanner.getTextAttribute(store, IColorPreferences.SYMBOL));
+        multiLineComment.setDefaultTextAttribute(ColorScanner.getTextAttribute(store, IPreferenceConstants.COMMENT));
+        singleLineComment.setDefaultTextAttribute(ColorScanner.getTextAttribute(store, IPreferenceConstants.COMMENT));
+        word.setDefaultTextAttribute(ColorScanner.getTextAttribute(store, IPreferenceConstants.SYMBOL));
+        character.setDefaultTextAttribute(ColorScanner.getTextAttribute(store, IPreferenceConstants.SYMBOL));
     }
 }

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

@@ -22 +22 @@
     public String COMPILER_ADD_LINE_NUMBERS = PREFIX + "compilerLineNumbers"; //$NON-NLS-1$
     public String COMPILER_ADD_SOURCE = PREFIX + "compilerSource"; //$NON-NLS-1$
+
+    public String SYMBOL = PREFIX + "symbol";
+    public String KEYWORD = PREFIX + "keyword";
+    public String IDENTIFIER_DEFINITION = PREFIX + "identifierDefinition";
+    public String IDENTIFIER_USE = PREFIX + "identifierUse";
+    public String VARIABLE_TYPE = PREFIX + "variableType";
+    public String VARIABLE_DEFINITION = PREFIX + "variableDefinition";
+    public String VARIABLE_USE = PREFIX + "variableUse";
+    public String COMMENT = PREFIX + "comment";
+    public String OTHER_SYMBOLS = PREFIX + "otherSymbols";
 }

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

@@ -67 +67 @@
     }
 
-    private static final String[] keys = { IColorPreferences.SYMBOL, IColorPreferences.COMMENT,
-            IColorPreferences.KEYWORD, IColorPreferences.IDENTIFIER_DEFINITION, IColorPreferences.IDENTIFIER_USE,
-            IColorPreferences.VARIABLE_TYPE, IColorPreferences.VARIABLE_DEFINITION, IColorPreferences.VARIABLE_USE,
-            IColorPreferences.OTHER_SYMBOLS };
+    private static final String[] keys = { IPreferenceConstants.SYMBOL, IPreferenceConstants.COMMENT,
+            IPreferenceConstants.KEYWORD, IPreferenceConstants.IDENTIFIER_DEFINITION,
+            IPreferenceConstants.IDENTIFIER_USE, IPreferenceConstants.VARIABLE_TYPE,
+            IPreferenceConstants.VARIABLE_DEFINITION, IPreferenceConstants.VARIABLE_USE,
+            IPreferenceConstants.OTHER_SYMBOLS };
 
     private final HashMap<String, RGB> rgbStore;

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

@@ -19 +19 @@
 import org.refal.rfpdt.editor.ColorManager;
 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 {
@@ -39 +39 @@
         if (colorManager == null)
             return null;
-        Color color = colorManager.getColor(
-                PreferenceConverter.getColor(store, key + ".color"));
+        Color color = colorManager.getColor(PreferenceConverter.getColor(store, key + ".color"));
         int style = store.getBoolean(key + ".bold") ? SWT.BOLD : SWT.NORMAL;
         if (store.getBoolean(key + ".italic"))
@@ -70 +69 @@
 
     public void setTokens () {
-        symbol = new Token(getTextAttribute(store, IColorPreferences.SYMBOL));
-        keyword = new Token(getTextAttribute(store, IColorPreferences.KEYWORD));
-        identifier = new Token(getTextAttribute(store, IColorPreferences.IDENTIFIER_USE));
-        variable_type = new Token(getTextAttribute(store, IColorPreferences.VARIABLE_TYPE));
-        variable = new Token(getTextAttribute(store, IColorPreferences.VARIABLE_USE));
-        other = new Token(getTextAttribute(store, IColorPreferences.OTHER_SYMBOLS));
+        symbol = new Token(getTextAttribute(store, IPreferenceConstants.SYMBOL));
+        keyword = new Token(getTextAttribute(store, IPreferenceConstants.KEYWORD));
+        identifier = new Token(getTextAttribute(store, IPreferenceConstants.IDENTIFIER_USE));
+        variable_type = new Token(getTextAttribute(store, IPreferenceConstants.VARIABLE_TYPE));
+        variable = new Token(getTextAttribute(store, IPreferenceConstants.VARIABLE_USE));
+        other = new Token(getTextAttribute(store, IPreferenceConstants.OTHER_SYMBOLS));
         ArrayList<IRule> rules = new ArrayList<IRule>();
         rules.add(new WhitespaceRule(new WhitespaceDetector()));