1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 17:26:01 +02:00

Fix issue with templates view close/reopen and deprecation warning

This commit is contained in:
Anton Leherbauer 2011-03-23 10:20:54 +00:00
parent 25bed5bd57
commit 4ab1f9b72f

View file

@ -1570,8 +1570,8 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
} else if (ITemplatesPage.class.equals(required)) { } else if (ITemplatesPage.class.equals(required)) {
if (fTemplatesPage == null) { if (fTemplatesPage == null) {
fTemplatesPage = new CTemplatesPage(this); fTemplatesPage = new CTemplatesPage(this);
return fTemplatesPage;
} }
return fTemplatesPage;
} }
return super.getAdapter(required); return super.getAdapter(required);
} }
@ -3490,7 +3490,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
} }
stores.add(CUIPlugin.getDefault().getPreferenceStore()); stores.add(CUIPlugin.getDefault().getPreferenceStore());
stores.add(new ScopedPreferenceStore(new InstanceScope(), CCorePlugin.PLUGIN_ID)); stores.add(new ScopedPreferenceStore(InstanceScope.INSTANCE, CCorePlugin.PLUGIN_ID));
stores.add(EditorsUI.getPreferenceStore()); stores.add(EditorsUI.getPreferenceStore());
return new ChainedPreferenceStore(stores.toArray(new IPreferenceStore[stores.size()])); return new ChainedPreferenceStore(stores.toArray(new IPreferenceStore[stores.size()]));