Clean up and refactoring
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 13 Sep 2016 05:40:17 +0000 (07:40 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 13 Sep 2016 09:28:22 +0000 (11:28 +0200)
 - Delete unused class
 - Rename class to avoid duplicate name

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyGraphContentProvider.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyContentProvider.java with 96% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyGraphEditor.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyLabelProvider.java [deleted file]
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java

index 03a4b1a..61544ab 100644 (file)
@@ -47,6 +47,6 @@ public class PolytomousKeyGraphEditor extends
 
        @Override
        protected IContentProvider getContentProvider() {
-               return new PolytomousKeyContentProvider();
+               return new PolytomousKeyGraphContentProvider();
        }
 }
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyLabelProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyLabelProvider.java
deleted file mode 100644 (file)
index a175246..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * 
- */
-package eu.etaxonomy.taxeditor.navigation.key.polytomous;
-
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-
-/**
- * @author n.hoffmann
- *
- */
-public class PolytomousKeyLabelProvider extends ColumnLabelProvider implements
-               ILabelProvider {
-
-}
index 6dc2729..90119ec 100644 (file)
@@ -11,6 +11,7 @@ import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelection;
@@ -147,7 +148,7 @@ public class PolytomousKeyViewPart extends ViewPart implements
                viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
                viewer.setContentProvider(new PolytomousKeyContentProvider());
-               viewer.setLabelProvider(new PolytomousKeyLabelProvider());
+               viewer.setLabelProvider(new ColumnLabelProvider());
 
                viewer.addDoubleClickListener(new IDoubleClickListener() {