From e6af39c712680bad7241f70e7c003c3e6e604102 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Tue, 25 Apr 2006 12:00:17 +0000
Subject: [PATCH] Patch from Anton Leherbauer for 138330, NPE in AsmEditor

---
 .../internal/ui/editor/asm/AsmTextTools.java  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java
index 645bd6f61dd..d05e6e2f755 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     QNX Software System
+ *     Wind River Systems, Inc.
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.editor.asm;
 
@@ -80,14 +81,6 @@ public class AsmTextTools {
 			store = CUIPlugin.getDefault().getPreferenceStore();
 		}
         
-        fPreferenceStore = store;
-		store.addPropertyChangeListener(fPreferenceListener);
-        
-        fCorePreferenceStore= coreStore;
-        if (fCorePreferenceStore != null) {
-            fCorePreferenceStore.addPropertyChangeListener(fPreferenceListener);
-        }
-        
 		fColorManager= new CColorManager();
 		fCodeScanner= new AsmCodeScanner(fColorManager, store);
 		fPartitionScanner= new AsmPartitionScanner();
@@ -95,7 +88,15 @@ public class AsmTextTools {
         fMultilineCommentScanner= new CCommentScanner(fColorManager, store, coreStore, ICColorConstants.C_MULTI_LINE_COMMENT);
         fSinglelineCommentScanner= new CCommentScanner(fColorManager, store, coreStore, ICColorConstants.C_SINGLE_LINE_COMMENT);
 		fStringScanner= new SingleTokenCScanner(fColorManager, store, ICColorConstants.C_STRING);
-	}
+
+        fPreferenceStore = store;
+		store.addPropertyChangeListener(fPreferenceListener);
+        
+        fCorePreferenceStore= coreStore;
+        if (fCorePreferenceStore != null) {
+            fCorePreferenceStore.addPropertyChangeListener(fPreferenceListener);
+        }
+    }
 	
 	/**
 	 * Creates a new Asm text tools collection and eagerly creates