Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Leherbauer2011-03-23 06:20:54 -0400
committerAnton Leherbauer2011-03-23 06:20:54 -0400
commit4ab1f9b72f901f384cd4286894b9105e7ed45ff2 (patch)
tree174f59d791fee864a16929c9b16313e731065d45
parent25bed5bd57483fb67eae0c1d6f366c7e83ebe4a7 (diff)
downloadorg.eclipse.cdt-4ab1f9b72f901f384cd4286894b9105e7ed45ff2.tar.gz
org.eclipse.cdt-4ab1f9b72f901f384cd4286894b9105e7ed45ff2.tar.xz
org.eclipse.cdt-4ab1f9b72f901f384cd4286894b9105e7ed45ff2.zip
Fix issue with templates view close/reopen and deprecation warning
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
index d245ee62cc..b665029d63 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
@@ -1570,8 +1570,8 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
} else if (ITemplatesPage.class.equals(required)) {
if (fTemplatesPage == null) {
fTemplatesPage = new CTemplatesPage(this);
- return fTemplatesPage;
}
+ return fTemplatesPage;
}
return super.getAdapter(required);
}
@@ -3490,7 +3490,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
}
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());
return new ChainedPreferenceStore(stores.toArray(new IPreferenceStore[stores.size()]));

Back to the top