Changeset 3359 for devel-tools/trunk

Timestamp:

Feb 4, 2008, 10:32:33 PM (13 years ago)

Author:

yura

Message:

• Refactoring: separate RfpPresentationReconciler? and etc.

Location:

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor

Files:

• PresentationVisitor.java (modified) (5 diffs)
• RfpEditor.java (modified) (2 diffs)
• RfpPresentationReconciler.java (added)
• RfpReconcilingStrategy.java (modified) (3 diffs)
• RfpSourceViewerConfiguration.java (modified) (3 diffs)
• color/ColorScanner.java (modified) (5 diffs)

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

@@ -3 +3 @@
 import java.util.ArrayList;
 
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.TextAttribute;
 import org.eclipse.swt.SWT;
@@ -45 +46 @@
 import org.refal.plus.rfpdt.comp.ast.ProgramVisitor;
 import org.refal.plus.rfpdt.comp.ast.SentenceVisitor;
+import org.refal.plus.rfpdt.editor.color.ColorScanner;
 import org.refal.plus.rfpdt.editor.color.IColorPreferences;
 
 public class PresentationVisitor implements ProgramVisitor, SentenceVisitor, ExpVisitor {
-    public static StyleRange[] updateTextPresentation (AstImplem astImplem) {
-        PresentationVisitor presentationVisitor = new PresentationVisitor();
+    public static StyleRange[] updateTextPresentation (AstImplem astImplem, IPreferenceStore store) {
+        PresentationVisitor presentationVisitor = new PresentationVisitor(store);
         astImplem.accept(presentationVisitor);
         return presentationVisitor.styleRangeList.toArray(new StyleRange[presentationVisitor.styleRangeList.size()]);
@@ -55 +57 @@
 
     private final ArrayList<StyleRange> styleRangeList;
-
-    private void addAstNameStype (AstNode name, TextAttribute textAttribute) {
+    private final IPreferenceStore store;
+
+    private void addAstNameStype (AstNode name, String key) {
         if (name == null)
             return;
@@ -62 +65 @@
         if (pos.rfpResource.isInterface) // TODO - must be RfpResource
             return;
+        TextAttribute textAttribute = ColorScanner.getTextAttribute(store, key);
         int style = textAttribute.getStyle();
         StyleRange range = new StyleRange(pos.charStart, pos.charEnd - pos.charStart, textAttribute.getForeground(),
@@ -71 +75 @@
     }
 
-    private PresentationVisitor () {
+    private PresentationVisitor (IPreferenceStore store) {
         this.styleRangeList = new ArrayList<StyleRange>();
+        this.store = store;
     }
 
     private void visitObjectDefinition (AstName name) {
-        addAstNameStype(name, RfpSourceViewerConfiguration.getTextAttribute(IColorPreferences.IDENTIFIER_DEFINITION));
+        addAstNameStype(name, IColorPreferences.IDENTIFIER_DEFINITION);
     }
 
     private void visitObjectUse (AstName name) {
         if (name != null && name.identifier.length() < name.pos.charEnd - name.pos.charStart)
-            addAstNameStype(name, RfpSourceViewerConfiguration.getTextAttribute(IColorPreferences.IDENTIFIER_USE));
+            addAstNameStype(name, IColorPreferences.IDENTIFIER_USE);
     }
 
     private void visitVariableDefinition (AstName name) {
-        addAstNameStype(name, RfpSourceViewerConfiguration.getTextAttribute(IColorPreferences.VARIABLE_DEFINITION));
+        addAstNameStype(name, IColorPreferences.VARIABLE_DEFINITION);
     }
 
     private void visitVariableUse (AstName name) {
-    // addAstNameStype(name, RfpSourceViewerConfiguration.getTextAttribute(IColorPreferences.VARIABLE_USE));
+    // addAstNameStype(name, IColorPreferences.VARIABLE_USE);
     }
 
     private void visitSymbol (AstWordSymbol astWordSymbol) {
         if (astWordSymbol.word.length() == astWordSymbol.pos.charEnd - astWordSymbol.pos.charStart)
-            addAstNameStype(astWordSymbol, RfpSourceViewerConfiguration.getTextAttribute(IColorPreferences.SYMBOL));
+            addAstNameStype(astWordSymbol, IColorPreferences.SYMBOL);
     }
 

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/RfpEditor.java

@@ -248 +248 @@
                 ISourceViewer sourceViewer = getSourceViewer();
                 if (sourceViewer != null) {
-                    rfpSourceViewerConfiguration.updatePresentationReconsiler(sourceViewer);
                     sourceViewer.invalidateTextPresentation();
                 }
@@ -261 +260 @@
         getPreferenceStore().removePropertyChangeListener(propertyChangeListener);
         bracketMatcher.dispose();
-        rfpSourceViewerConfiguration.dispose(sourceViewer);
 
         editorCount--;

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/RfpReconcilingStrategy.java

@@ -2 +2 @@
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
@@ -10 +11 @@
 
 public class RfpReconcilingStrategy implements IReconcilingStrategy {
-    RfpEditor editor;
-    IDocument document;
+    private final RfpEditor editor;
+    private final IPreferenceStore store;
+    private IDocument document;
 
-    public RfpReconcilingStrategy (RfpEditor editor) {
+    public RfpReconcilingStrategy (RfpEditor editor, IPreferenceStore store) {
         this.editor = editor;
+        this.store = store;
     }
 
@@ -24 +27 @@
         this.editor.astImplem = astImplem;
         if (astImplem != null)
-            editor.changeTextPresentation(PresentationVisitor.updateTextPresentation(astImplem));
+            editor.changeTextPresentation(PresentationVisitor.updateTextPresentation(astImplem, store));
     }
 

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/RfpSourceViewerConfiguration.java

@@ -1 +1 @@
 package org.refal.plus.rfpdt.editor;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.text.IAutoEditStrategy;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextDoubleClickStrategy;
 import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.TextAttribute;
 import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.presentation.PresentationReconciler;
 import org.eclipse.jface.text.reconciler.IReconciler;
 import org.eclipse.jface.text.reconciler.MonoReconciler;
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
 import org.eclipse.jface.text.source.IAnnotationHover;
 import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
 import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
-import org.refal.plus.rfpdt.editor.color.ColorScanner;
-import org.refal.plus.rfpdt.editor.color.IColorPreferences;
 import org.refal.plus.rfpdt.editor.preferences.IPreferenceConstants;
 
 public class RfpSourceViewerConfiguration extends TextSourceViewerConfiguration {
-    private static final String[] defaultPrefixes = { "//" };
-    private RfpDoubleClickStrategy doubleClickStrategy;
-    private RfpAutoIndentStrategy autoIngentStrategy;
-    private ColorScanner scanner;
-    private Map<ISourceViewer, PresentationReconciler> reconcilers = new HashMap<ISourceViewer, PresentationReconciler>();
-    private RfpEditor editor;
+    private final RfpDoubleClickStrategy doubleClickStrategy;
+    private final RfpAutoIndentStrategy autoIngentStrategy;
+    private final RfpEditor editor;
 
     public RfpSourceViewerConfiguration (RfpEditor rfpEditor, IPreferenceStore store) {
         super(store);
+        doubleClickStrategy = new RfpDoubleClickStrategy();
+        autoIngentStrategy = new RfpAutoIndentStrategy(store);
         editor = rfpEditor;
+    }
+
+    public IAnnotationHover getAnnotationHover (ISourceViewer sourceViewer) {
+        return new RfpAnnotationHover();
+    }
+
+    public IAutoEditStrategy[] getAutoEditStrategies (ISourceViewer sourceViewer, String contentType) {
+        return new IAutoEditStrategy[] { autoIngentStrategy };
     }
 
@@ -43 +39 @@
     }
 
+    public String getConfiguredDocumentPartitioning (ISourceViewer sourceViewer) {
+        return IRfpPartitions.PARTITIONING;
+    }
+
+    public String[] getDefaultPrefixes (ISourceViewer sourceViewer, String contentType) {
+        String[] defaultPrefixes = { "//" };
+        return defaultPrefixes;
+    }
+
     public ITextDoubleClickStrategy getDoubleClickStrategy (ISourceViewer sourceViewer, String contentType) {
-        if (doubleClickStrategy == null)
-            doubleClickStrategy = new RfpDoubleClickStrategy();
         return doubleClickStrategy;
     }
 
-    public IAutoEditStrategy[] getAutoEditStrategies (ISourceViewer sourceViewer, String contentType) {
-        if (autoIngentStrategy == null)
-            autoIngentStrategy = new RfpAutoIndentStrategy(fPreferenceStore);
-        return new IAutoEditStrategy[] { autoIngentStrategy };
+    public IPresentationReconciler getPresentationReconciler (ISourceViewer sourceViewer) {
+        return new RfpPresentationReconciler(getConfiguredDocumentPartitioning(sourceViewer), fPreferenceStore);
     }
 
-    private ColorScanner getColorScanner () {
-        if (scanner == null) {
-            scanner = new ColorScanner();
-        }
-        return scanner;
-    }
-
-    public static TextAttribute getTextAttribute (String key) {
-        IPreferenceStore store = RfpEditorPlugin.getPluginPreferenceStore();
-        Color color = RfpEditor.getColorManager().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"))
-            style |= SWT.ITALIC;
-        if (store.getBoolean(IPreferenceConstants.PREFIX + key + ".strikethrough"))
-            style |= TextAttribute.STRIKETHROUGH;
-        if (store.getBoolean(IPreferenceConstants.PREFIX + key + ".underlined"))
-            style |= TextAttribute.UNDERLINE;
-        return new TextAttribute(color, null, style);
-    }
-
-    public IPresentationReconciler getPresentationReconciler (ISourceViewer sourceViewer) {
-        PresentationReconciler reconciler;
-
-        if (reconcilers.containsKey(sourceViewer))
-            reconciler = reconcilers.get(sourceViewer);
-        else
-            reconciler = new PresentationReconciler();
-
-        reconciler.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
-
-        DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getColorScanner());
-        reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
-        reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
-
-        NonRuleBasedDamagerRepairer ndr = new NonRuleBasedDamagerRepairer(getTextAttribute(IColorPreferences.COMMENT));
-        reconciler.setDamager(ndr, IRfpPartitions.MULTI_LINE_COMMENT);
-        reconciler.setRepairer(ndr, IRfpPartitions.MULTI_LINE_COMMENT);
-
-        ndr = new NonRuleBasedDamagerRepairer(getTextAttribute(IColorPreferences.COMMENT));
-        reconciler.setDamager(ndr, IRfpPartitions.SINGLE_LINE_COMMENT);
-        reconciler.setRepairer(ndr, IRfpPartitions.SINGLE_LINE_COMMENT);
-
-        ndr = new NonRuleBasedDamagerRepairer(getTextAttribute(IColorPreferences.SYMBOL));
-        reconciler.setDamager(ndr, IRfpPartitions.WORD);
-        reconciler.setRepairer(ndr, IRfpPartitions.WORD);
-
-        ndr = new NonRuleBasedDamagerRepairer(getTextAttribute(IColorPreferences.SYMBOL));
-        reconciler.setDamager(ndr, IRfpPartitions.CHARACTER);
-        reconciler.setRepairer(ndr, IRfpPartitions.CHARACTER);
-
-        reconcilers.put(sourceViewer, reconciler);
-        return reconciler;
-    }
-
-    public void updatePresentationReconsiler (ISourceViewer sourceViewer) {
-        scanner.setTokens();
-        IPresentationReconciler reconciler = reconcilers.get(sourceViewer);
-        ((NonRuleBasedDamagerRepairer) reconciler.getRepairer(IRfpPartitions.MULTI_LINE_COMMENT))
-                .setDefaultTextAttribute(getTextAttribute(IColorPreferences.COMMENT));
-        ((NonRuleBasedDamagerRepairer) reconciler.getRepairer(IRfpPartitions.SINGLE_LINE_COMMENT))
-                .setDefaultTextAttribute(getTextAttribute(IColorPreferences.COMMENT));
-        ((NonRuleBasedDamagerRepairer) reconciler.getRepairer(IRfpPartitions.WORD))
-                .setDefaultTextAttribute(getTextAttribute(IColorPreferences.SYMBOL));
-        ((NonRuleBasedDamagerRepairer) reconciler.getRepairer(IRfpPartitions.CHARACTER))
-                .setDefaultTextAttribute(getTextAttribute(IColorPreferences.SYMBOL));
-    }
-    
-    public IReconciler getReconciler(ISourceViewer sourceViewer) {
+    public IReconciler getReconciler (ISourceViewer sourceViewer) {
         if (editor != null && editor.isEditable())
-            return new MonoReconciler(new RfpReconcilingStrategy(editor), false);
+            return new MonoReconciler(new RfpReconcilingStrategy(editor, fPreferenceStore), false);
         return null;
-    }
-
-
-    public void dispose (ISourceViewer sourceViewer) {
-        reconcilers.remove(sourceViewer);
-    }
-
-    public ITextHover getTextHover (ISourceViewer sourceViewer, String contentType) {
-        return new RfpTextHover(sourceViewer);
-    }
-
-    public IAnnotationHover getAnnotationHover (ISourceViewer sourceViewer) {
-        return new RfpAnnotationHover();
-    }
-
-    public String[] getDefaultPrefixes (ISourceViewer sourceViewer, String contentType) {
-        return defaultPrefixes;
     }
 
@@ -149 +66 @@
     }
 
-    /*
-     * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredDocumentPartitioning(org.eclipse.jface.text.source.ISourceViewer)
-     * @since 3.0
-     */
-    public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) {
-        return IRfpPartitions.PARTITIONING;
+    public ITextHover getTextHover (ISourceViewer sourceViewer, String contentType) {
+        return new RfpTextHover(sourceViewer);
     }
-
 }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/color/ColorScanner.java

@@ -3 +3 @@
 import java.util.ArrayList;
 
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.TextAttribute;
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
@@ -12 +15 @@
 import org.eclipse.jface.text.rules.WhitespaceRule;
 import org.eclipse.jface.text.rules.WordRule;
-import org.refal.plus.rfpdt.editor.RfpSourceViewerConfiguration;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.refal.plus.rfpdt.editor.RfpEditor;
+import org.refal.plus.rfpdt.editor.preferences.IPreferenceConstants;
 
 public class ColorScanner implements ITokenScanner {
@@ -27 +33 @@
     }
 
+    public static TextAttribute getTextAttribute (IPreferenceStore store, String key) {
+        Color color = RfpEditor.getColorManager().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"))
+            style |= SWT.ITALIC;
+        if (store.getBoolean(IPreferenceConstants.PREFIX + key + ".strikethrough"))
+            style |= TextAttribute.STRIKETHROUGH;
+        if (store.getBoolean(IPreferenceConstants.PREFIX + key + ".underlined"))
+            style |= TextAttribute.UNDERLINE;
+        return new TextAttribute(color, null, style);
+    }
+
+    private final IPreferenceStore store;
     private final RuleBasedScanner scanner;
+    private final ArrayList<TokenWrapper> tokens;
     private IDocument document = null;
-    private final ArrayList<TokenWrapper> tokens;
     private IToken symbol = null;
     private IToken keyword = null;
@@ -37 +57 @@
     private IToken other = null;
 
+    public ColorScanner (IPreferenceStore store) {
+        this.store = store;
+        scanner = new RuleBasedScanner();
+        tokens = new ArrayList<TokenWrapper>(3);
+        setTokens();
+    }
+
     public void setTokens () {
-        symbol = new Token(RfpSourceViewerConfiguration.getTextAttribute(IColorPreferences.SYMBOL));
-        keyword = new Token(RfpSourceViewerConfiguration.getTextAttribute(IColorPreferences.KEYWORD));
-        identifier = new Token(RfpSourceViewerConfiguration.getTextAttribute(IColorPreferences.IDENTIFIER_USE));
-        variable_type = new Token(RfpSourceViewerConfiguration.getTextAttribute(IColorPreferences.VARIABLE_TYPE));
-        variable = new Token(RfpSourceViewerConfiguration.getTextAttribute(IColorPreferences.VARIABLE_USE));
-        other = new Token(RfpSourceViewerConfiguration.getTextAttribute(IColorPreferences.OTHER_SYMBOLS));
+        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));
         ArrayList<IRule> rules = new ArrayList<IRule>();
         rules.add(new WhitespaceRule(new WhitespaceDetector()));
@@ -57 +84 @@
         scanner.setRules(rules.toArray(new IRule[0]));
         scanner.setDefaultReturnToken(other);
-    }
-
-    public ColorScanner () {
-        scanner = new RuleBasedScanner();
-        tokens = new ArrayList<TokenWrapper>(3);
-        setTokens();
     }