Changeset 3875 for devel-tools

Timestamp:

Jul 23, 2008, 9:43:51 PM (12 years ago)

Author:

yura

Message:

• DefaultTextAttribute?.

Location:

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

Files:

• editor/PresentationVisitor.java (modified) (2 diffs)
• editor/RfpEditor.java (modified) (2 diffs)
• ui/preferences/RfpPreferences.java (modified) (2 diffs)

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

@@ -54 +54 @@
     public static class StylePosition extends Position {
         private final String key;
-        /** May be <code>null</code>! */
-        private TextAttribute textAttribute = null;
+        private TextAttribute textAttribute = RfpPreferences.defaultTextAttribute;
 
         public StylePosition (SrcPosition pos, String key) {
@@ -66 +65 @@
         }
 
-        /** May return <code>null</code>! */
         public StyleRange getStyleRange () {
-            if (textAttribute == null)
-                return null;
             StyleRange styleRange = new StyleRange(offset, length, textAttribute.getForeground(), textAttribute
                     .getBackground());

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

@@ -26 +26 @@
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.custom.StyleRange;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.widgets.Composite;
@@ -266 +265 @@
                         if (reg.getOffset() <= stylePosition.getOffset()
                                 && stylePosition.getOffset() + stylePosition.getLength() <= reg.getOffset()
-                                        + reg.getLength()) {
-                            StyleRange styleRange = stylePosition.getStyleRange();
-                            if (styleRange != null)
-                                presentation.mergeStyleRange(styleRange);
-                        }
+                                        + reg.getLength())
+                            presentation.mergeStyleRange(stylePosition.getStyleRange());
                 }
             });

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

@@ -11 +11 @@
 
 public class RfpPreferences {
+    public static final TextAttribute defaultTextAttribute = new TextAttribute(null, null, SWT.NORMAL);
+
     private final IPreferenceStore store;
     
@@ -25 +27 @@
     }
     
-
-    /** May return <code>null</code>! */
     public TextAttribute getTextAttribute (String key) {
         ColorManager colorManager = RfpEditor.getColorManager();
         if (colorManager == null)
-            return null;
+            return defaultTextAttribute;
         Color color = colorManager.getColor(PreferenceConverter.getColor(store, key + ".color"));
         int style = store.getBoolean(key + ".bold") ? SWT.BOLD : SWT.NORMAL;