Changeset 3865

Timestamp:

Jul 23, 2008, 4:01:21 PM (12 years ago)

Author:

yura

Message:

• Check ColorManager? for null

Location:

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

Files:

• PresentationVisitor.java (modified) (2 diffs)
• RfpEditor.java (modified) (6 diffs)
• color/ColorScanner.java (modified) (1 diff)

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

@@ -55 +55 @@
     public static class StylePosition extends Position {
         private final String key;
+        /** May be <code>null</code>! */
         private TextAttribute textAttribute = null;
 
@@ -66 +67 @@
         }
 
+        /** May return <code>null</code>! */
         public StyleRange getStyleRange () {
+            if (textAttribute == null)
+                return null;
             StyleRange styleRange = new StyleRange(offset, length, textAttribute.getForeground(), textAttribute.getBackground());
             int style = textAttribute.getStyle();

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;
@@ -47 +48 @@
 public class RfpEditor extends TextEditor {
     private static int editorCount = 0;
-    private static ColorManager colorManager;
+    /** May be <code>null</code>! */
+    private static ColorManager colorManager = null;
 
     private static Object getLockObject (IAnnotationModel annotationModel) {
@@ -58 +60 @@
     }
 
+    /** May return <code>null</code>! */
     public static ColorManager getColorManager () {
         return colorManager;
@@ -139 +142 @@
         propertyChangeListener = new IPropertyChangeListener() {
             public void propertyChange (PropertyChangeEvent event) {
-                for (StylePosition position : stylePositionList)
-                    position.updateStyleRange(store);
-                redrawTextAsync();
+                if (stylePositionList != null) {
+                    for (StylePosition position : stylePositionList)
+                        position.updateStyleRange(store);
+                    redrawTextAsync();
+                }
             }
         };
@@ -147 +152 @@
     }
 
+    /** May be <code>null</code>! */
     private StylePosition[] stylePositionList = null;
 
@@ -258 +264 @@
                         if (reg.getOffset() <= stylePosition.getOffset()
                                 && stylePosition.getOffset() + stylePosition.getLength() <= reg.getOffset()
-                                        + reg.getLength())
-                            presentation.mergeStyleRange(stylePosition.getStyleRange());
+                                        + reg.getLength()) {
+                            StyleRange styleRange = stylePosition.getStyleRange();
+                            if (styleRange != null)
+                                presentation.mergeStyleRange(styleRange);
+                        }
                 }
             });

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

@@ -33 +33 @@
     }
 
+    /** May return <code>null</code>! */
     public static TextAttribute getTextAttribute (IPreferenceStore store, String key) {
-        Color color = RfpEditor.getColorManager().getColor(
+        ColorManager colorManager = RfpEditor.getColorManager();
+        if (colorManager == null)
+            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;