mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-23 08:55:25 +02:00
Patch from Anton Leherbauer for 138330, NPE in AsmEditor
This commit is contained in:
parent
93c96e0452
commit
e6af39c712
1 changed files with 10 additions and 9 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue