AT: committing changes to the TaxEditor Post second round of code review

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
index a5cbf7d25ecee3770a8c735e4398a0479766ef1c..6e204c213418d1aaf09a2aaa9947dddb658a4fb9 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
@@ -8,13 +8,9 @@
  */\r
 package eu.etaxonomy.taxeditor.editor.view.uses;\r
 \r
-import java.net.URI;\r
-import java.net.URISyntaxException;\r
 import java.util.HashMap;\r
 import java.util.Map;\r
-import java.util.UUID;\r
 \r
-import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.jface.action.Action;\r
 import org.eclipse.jface.action.GroupMarker;\r
 import org.eclipse.jface.action.IToolBarManager;\r
@@ -34,40 +30,24 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Tree;\r
 import org.eclipse.ui.IEditorInput;\r
 import org.eclipse.ui.IEditorPart;\r
-import org.eclipse.ui.IMemento;\r
 import org.eclipse.ui.IWorkbenchActionConstants;\r
 import org.eclipse.ui.IWorkbenchPart;\r
 \r
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
-import eu.etaxonomy.cdm.api.service.ITermService;\r
-import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.MarkerType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
-import eu.etaxonomy.cdm.model.description.Feature;\r
-import eu.etaxonomy.cdm.model.description.Modifier;\r
-import eu.etaxonomy.cdm.model.description.State;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;\r
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;\r
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
 import eu.etaxonomy.taxeditor.editor.key.AbstractGraphKeyEditor;\r
-import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDragListener;\r
-import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDropAdapter;\r
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementTransfer;\r
-import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;\r
-import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;\r
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;\r
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainerTree;\r
-import eu.etaxonomy.taxeditor.model.IContextListener;\r
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;\r
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;\r
 import eu.etaxonomy.taxeditor.model.ImageResources;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;\r
 \r
 \r
@@ -77,7 +57,7 @@ import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
  * @created mar 13, 2012\r
  * @version 1.0\r
  */\r
-public class UsesViewPart extends DescriptiveViewPart implements IPartContentHasDetails, IPartContentHasSupplementalData {\r
+public class UsesViewPart extends AbstractCdmEditorViewPart implements IPartContentHasDetails, IPartContentHasSupplementalData {\r
 \r
        public static final String ID = "eu.etaxonomy.taxeditor.editor.view.uses";\r
        private TreeViewer viewer;\r
@@ -96,18 +76,15 @@ public class UsesViewPart extends DescriptiveViewPart implements IPartContentHas
                                | SWT.V_SCROLL | SWT.FULL_SELECTION));\r
                viewer.setContentProvider(new UsesContentProvider(featureNodeContainerCache));\r
                viewer.setLabelProvider(new UsesLabelProvider());\r
-               \r
-               //viewer.setSorter(new DescriptiveViewerSorter());\r
-               \r
                viewer.setAutoExpandLevel(2);\r
                \r
                \r
                \r
                Transfer[] transfers = new Transfer[] { DescriptionElementTransfer.getInstance() };\r
-               viewer.addDragSupport(dndOperations, transfers, new DescriptionElementDragListener(\r
+               /*viewer.addDragSupport(dndOperations, transfers, new DescriptionElementDragListener(\r
                                this));\r
                viewer.addDropSupport(dndOperations, transfers,\r
-                               new DescriptionElementDropAdapter(viewer));\r
+                               new DescriptionElementDropAdapter(viewer));*/\r
                                                \r
                // Propagate selection from viewer\r
                getSite().setSelectionProvider(viewer);\r
@@ -119,7 +96,7 @@ public class UsesViewPart extends DescriptiveViewPart implements IPartContentHas
                createMenu();\r
                \r
                createToolbar();\r
-               \r
+\r
        }\r
        \r
 \r
@@ -185,8 +162,10 @@ public class UsesViewPart extends DescriptiveViewPart implements IPartContentHas
                \r
                if(part instanceof MultiPageTaxonEditor){\r
                        if(! part.equals(this.part)){\r
+                               //TaxonEditorInput input = (TaxonEditorInput)((IEditorPart) part).getEditorInput();\r
                                IEditorInput input = ((IEditorPart) part).getEditorInput();\r
                                featureNodeContainerCache.clear();\r
+                               //showViewer(part, new StructuredSelection(CdmStore.getService(IDescriptionService.class).listTaxonDescriptions(input.getTaxonNode().getTaxon(), null, null, null, null, null, null)));\r
                                showViewer(part, new StructuredSelection(input));\r
                        }\r
                        showViewer();\r
@@ -194,20 +173,6 @@ public class UsesViewPart extends DescriptiveViewPart implements IPartContentHas
                \r
        }\r
 \r
-\r
-\r
-       /*@Override\r
-       public void showViewer(IWorkbenchPart part, IStructuredSelection selection) {\r
-               this.part = part;               \r
-       \r
-               Object element = selection.getFirstElement();\r
-               \r
-               getViewer().setInput(descService.listTaxonDescriptions((Taxon) element, null, null, null, null, null, null));\r
-               \r
-               showViewer();   \r
-       }*/\r
-       \r
-       \r
        \r
        private class ToggleDescriptionAction extends Action{\r
                private boolean expanded;\r
@@ -282,5 +247,15 @@ public class UsesViewPart extends DescriptiveViewPart implements IPartContentHas
        public Viewer getViewer() {\r
                return viewer;\r
        }\r
+       \r
+       /**\r
+        * <p>onComplete</p>\r
+        *\r
+        * @return a boolean.\r
+        */\r
+       @Override\r
+       public boolean onComplete() {\r
+               return false;\r
+       }\r
 \r
 }\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
index b51cf74e37a1a3b3f61b7c4a0284664e354389fc..8743932584237b34a6c4b925dd1de2d0ad881f55 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
@@ -1,3 +1,11 @@
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
 package eu.etaxonomy.taxeditor.ui.section.userecords;\r
 \r
 import java.util.ArrayList;\r