[*-Editor] Make use of default label provider in outline pages
Change-Id: Icbe48e2c1ecd9a3123aaae98761e17de4935bba4
diff --git a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxOutlinePage.java b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxOutlinePage.java
index 9dca9ee..f06e13e 100644
--- a/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxOutlinePage.java
+++ b/docmlet/org.eclipse.statet.docmlet.tex.ui/src/org/eclipse/statet/internal/docmlet/tex/ui/editors/LtxOutlinePage.java
@@ -19,6 +19,8 @@
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.services.IServiceLocator;
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+
import org.eclipse.statet.ecommons.commands.core.HandlerCollection;
import org.eclipse.statet.ecommons.ui.dialogs.DialogUtils;
@@ -29,7 +31,6 @@
import org.eclipse.statet.ltk.model.core.element.LtkModelElementFilter;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor1;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor2OutlinePage;
-import org.eclipse.statet.ltk.ui.util.ExtModelLabelProvider;
import org.eclipse.statet.ltk.ui.util.ViewerDragSupport;
import org.eclipse.statet.ltk.ui.util.ViewerDropSupport;
@@ -37,6 +38,7 @@
/**
* Outline page for R sources
*/
+@NonNullByDefault
public class LtxOutlinePage extends SourceEditor2OutlinePage {
private class ContentFilter implements LtkModelElementFilter {
@@ -59,7 +61,8 @@
public LtxOutlinePage(final SourceEditor1 editor) {
- super(editor, TexModel.LTX_TYPE_ID, TexRefactoring.getLtxFactory(),
+ super(editor, TexModel.LTX_TYPE_ID,
+ TexRefactoring.getLtxFactory(),
"org.eclipse.statet.docmlet.menus.TexOutlineViewContextMenu"); //$NON-NLS-1$
}
@@ -78,8 +81,6 @@
protected void configureViewer(final TreeViewer viewer) {
super.configureViewer(viewer);
- viewer.setLabelProvider(new ExtModelLabelProvider());
-
final ViewerDropSupport drop= new ViewerDropSupport(viewer, this,
getRefactoringFactory() );
drop.init();
diff --git a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlOutlinePage.java b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlOutlinePage.java
index f380d89..9042672 100644
--- a/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlOutlinePage.java
+++ b/yaml/org.eclipse.statet.yaml.ui/src/org/eclipse/statet/internal/yaml/ui/editors/YamlOutlinePage.java
@@ -19,6 +19,8 @@
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.services.IServiceLocator;
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+
import org.eclipse.statet.ecommons.commands.core.HandlerCollection;
import org.eclipse.statet.ecommons.ui.dialogs.DialogUtils;
@@ -27,7 +29,6 @@
import org.eclipse.statet.ltk.model.core.element.LtkModelElementFilter;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor1;
import org.eclipse.statet.ltk.ui.sourceediting.SourceEditor2OutlinePage;
-import org.eclipse.statet.ltk.ui.util.ExtModelLabelProvider;
import org.eclipse.statet.ltk.ui.util.ViewerDragSupport;
import org.eclipse.statet.ltk.ui.util.ViewerDropSupport;
import org.eclipse.statet.yaml.core.model.YamlModel;
@@ -37,6 +38,7 @@
/**
* Outline page for YAML sources.
*/
+@NonNullByDefault
public class YamlOutlinePage extends SourceEditor2OutlinePage {
private class ContentFilter implements LtkModelElementFilter {
@@ -59,7 +61,8 @@
public YamlOutlinePage(final SourceEditor1 editor) {
- super(editor, YamlModel.YAML_TYPE_ID, YamlRefactoring.getYamlFactory(),
+ super(editor, YamlModel.YAML_TYPE_ID,
+ YamlRefactoring.getYamlFactory(),
"org.eclipse.statet.yaml.menus.YamlOutlineViewContextMenu"); //$NON-NLS-1$
}
@@ -78,8 +81,6 @@
protected void configureViewer(final TreeViewer viewer) {
super.configureViewer(viewer);
- viewer.setLabelProvider(new ExtModelLabelProvider(YamlModel.YAML_TYPE_ID));
-
final ViewerDropSupport drop= new ViewerDropSupport(viewer, this,
getRefactoringFactory() );
drop.init();
