diff options
| author | nitind | 2004-11-29 19:53:33 +0000 |
|---|---|---|
| committer | nitind | 2004-11-29 19:53:33 +0000 |
| commit | afbeaa455aba79925ef6316c83176c46a78a38da (patch) | |
| tree | 4f50a8246c62de5ce084ba9528e676365ba49809 /bundles/org.eclipse.jst.jsp.ui | |
| parent | 57514aab071b73063448a3b7a222d24c2879b874 (diff) | |
| download | webtools.sourceediting-afbeaa455aba79925ef6316c83176c46a78a38da.tar.gz webtools.sourceediting-afbeaa455aba79925ef6316c83176c46a78a38da.tar.xz webtools.sourceediting-afbeaa455aba79925ef6316c83176c46a78a38da.zip | |
fix default preferences "race" condition
Diffstat (limited to 'bundles/org.eclipse.jst.jsp.ui')
| -rw-r--r-- | bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/JSPEditorPlugin.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/JSPEditorPlugin.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/JSPEditorPlugin.java index 04820f8297..44a74bf4fc 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/JSPEditorPlugin.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/JSPEditorPlugin.java @@ -57,10 +57,11 @@ public class JSPEditorPlugin extends AbstractUIPlugin { public JSPEditorPlugin(IPluginDescriptor descriptor) { super(descriptor); instance = this; - - // reference the preference store so - // initializeDefaultPreferences(IPreferenceStore preferenceStore) is called - getPreferenceStore(); + + // Force a call to initializeDefaultJSPPreferences since + // initializeDefaultPreferences is only called if *this* plugin's + // preference store is accessed + initializeDefaultJSPPreferences(((AbstractUIPlugin)Platform.getPlugin(EditorPlugin.ID)).getPreferenceStore()); } public static JSPEditorPlugin getDefault() { @@ -89,7 +90,6 @@ public class JSPEditorPlugin extends AbstractUIPlugin { // ignore this preference store // use EditorPlugin preference store IPreferenceStore editorStore = ((AbstractUIPlugin)Platform.getPlugin(EditorPlugin.ID)).getPreferenceStore(); - EditorPlugin.initializeDefaultEditorPreferences(editorStore); initializeDefaultJSPPreferences(editorStore); } |