removing package taxonomictree
authorn.hoffmann <n.hoffmann@localhost>
Tue, 1 Sep 2009 11:32:42 +0000 (11:32 +0000)
committern.hoffmann <n.hoffmann@localhost>
Tue, 1 Sep 2009 11:32:42 +0000 (11:32 +0000)
.gitattributes
taxeditor-navigation/META-INF/MANIFEST.MF
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewTaxonomicTreeWizadPage.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewTaxonomicTreeWizard.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/QuickCreateChildTaxonHandler.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeContentProvider.java [deleted file]
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeLabelProvider.java [deleted file]
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeView.java [deleted file]
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeViewDataChangeBehaviour.java [deleted file]

index ad91f3fe08ffa5365d6fa392839954bc68ce5f52..152f41dd8ecc5a04de16bfb6d27870dd65369f33 100644 (file)
@@ -927,10 +927,6 @@ taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/T
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultLabelProvider.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeContentProvider.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeLabelProvider.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeView.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeViewDataChangeBehaviour.java -text
 taxeditor-navigation/src/main/java/log4j.properties -text
 taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/Application.java -text
 taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/ApplicationActionBarAdvisor.java -text
index 50ab4fded38fa62684e2d9e16630f212f9872768..64cc50c5503b7f7fbb99d5350db6c35a5dd627b9 100644 (file)
@@ -9,8 +9,7 @@ Export-Package: eu.etaxonomy.taxeditor.navigation,
  eu.etaxonomy.taxeditor.navigation.handler,
  eu.etaxonomy.taxeditor.navigation.internal,
  eu.etaxonomy.taxeditor.navigation.navigator,
- eu.etaxonomy.taxeditor.navigation.search,
- eu.etaxonomy.taxeditor.navigation.taxonomictree
+ eu.etaxonomy.taxeditor.navigation.search
 Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.1",
  org.eclipse.core.runtime;bundle-version="3.4.0",
  org.eclipse.ui;bundle-version="3.4.1",
index 85f62d4c9ecf99a95fcd30a9ac903e6580cae5bd..a5a840b67e76dfaaa0dd7bb15bfd1f5551d1155a 100644 (file)
@@ -11,6 +11,8 @@
 package eu.etaxonomy.taxeditor.navigation.handler;
 
 
+import java.util.UUID;
+
 import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
@@ -26,6 +28,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
+import eu.etaxonomy.taxeditor.dialogs.FilteredReferenceSelectionDialog;
+import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 
 /**
  * @author n.hoffmann
@@ -42,7 +46,7 @@ public class NewTaxonomicTreeWizadPage extends WizardPage implements ModifyListe
 
        private Button button_browseReference;
 
-       private ReferenceBase reference;
+       private UUID referenceUuid;
 
        private Text text_microReference;
 
@@ -96,6 +100,12 @@ public class NewTaxonomicTreeWizadPage extends WizardPage implements ModifyListe
                                // TODO Auto-generated method stub
                                super.mouseUp(e);
                                logger.warn("Open reference search dialog");
+                               
+                               ReferenceBase reference = FilteredReferenceSelectionDialog.selectReference(NavigationUtil.getShell());
+                               
+                               referenceUuid = reference.getUuid();
+                                
+                               text_reference.setText(reference.getTitleCache());
                        }
                        
                });
@@ -116,13 +126,6 @@ public class NewTaxonomicTreeWizadPage extends WizardPage implements ModifyListe
                return text_treeLabel.getText();
        }
 
-       /**
-        * @return
-        */
-       public ReferenceBase getReference() {
-               return reference;
-       }
-
        /**
         * @return
         */
@@ -138,4 +141,11 @@ public class NewTaxonomicTreeWizadPage extends WizardPage implements ModifyListe
                        setPageComplete(true);
                }
        }
+
+       /**
+        * @return
+        */
+       public UUID getReferenceUuid() {
+               return referenceUuid;
+       }
 }
index 06c2a2a3c02ee0c4fe37b586bfb80f3402b6c6f1..9c27bcf116bea93480090897218050fdf90d0b8d 100644 (file)
@@ -61,7 +61,7 @@ public class NewTaxonomicTreeWizard extends Wizard implements INewWizard {
        public boolean performFinish() {
 
                AbstractOperation operation = new CreateTaxonomicTreeOperation("Create Taxonomic Tree", 
-                               NavigationUtil.getUndoContext(), page.getTreeLabel(), page.getReference(), page.getMicroReference());
+                               NavigationUtil.getUndoContext(), page.getTreeLabel(), page.getReferenceUuid(), page.getMicroReference());
                NavigationUtil.executeOperation(operation);
 
                NavigationUtil.getNavigator().getCommonViewer().refresh();
index fcd8d288d138e0c80c6315db5d09d3570fad41c5..738db136256ddad25b2619b090c9a894e991d0da 100644 (file)
@@ -70,7 +70,7 @@ public class QuickCreateChildTaxonHandler extends AbstractHandler implements
                        
                        //TaxonUtil.addChildTaxonBaseIsolated(parentTaxon.getUuid(), dialog.getValue());
 
-                       TaxonNameBase name = CdmParserUtil.parseFullReference(dialog.getValue());
+                       TaxonNameBase name = CdmParserUtil.parseReferencedName(dialog.getValue());
                        
                        CreateChildTaxonOperation operation;
                        try {
diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeContentProvider.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeContentProvider.java
deleted file mode 100644 (file)
index 123a715..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/**\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.navigation.taxonomictree;\r
-\r
-import java.util.List;\r
-\r
-import org.eclipse.core.runtime.Assert;\r
-import org.eclipse.jface.viewers.ITreeContentProvider;\r
-import org.eclipse.jface.viewers.Viewer;\r
-\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-\r
-/**\r
- * TODO maybe we want to implement ILazyTreeContentProvider\r
- * \r
- * @author p.ciardelli\r
- * @created 27.06.2008\r
- * @version 1.0\r
- * @author n.hoffmann\r
- */\r
-@Deprecated public class TaxonomicTreeContentProvider implements ITreeContentProvider {\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * \r
-        * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)\r
-        */\r
-       public Object[] getChildren(Object parentElement) {\r
-               \r
-               String errorMessage = "getChildren(parentElement) called with non-Taxon element.";\r
-               \r
-               // Make sure we are dealing with taxon objects\r
-               Assert.isTrue(parentElement instanceof Taxon, errorMessage);\r
-               \r
-               if (parentElement instanceof Taxon) {\r
-                       return ((Taxon) parentElement).getTaxonomicChildren().toArray();\r
-               }\r
-\r
-               return null;\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * \r
-        * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)\r
-        */\r
-       public Object getParent(Object element) {\r
-               \r
-               Assert.isTrue(element instanceof Taxon, \r
-                               "getParent(element) called with non-Taxon element.");\r
-               \r
-               return ((Taxon) element).getTaxonomicParent();\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * \r
-        * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)\r
-        */\r
-       public boolean hasChildren(Object element) {\r
-               Assert.isTrue(element instanceof Taxon, \r
-                               "hasChildren(element) called with non-Taxon element.");\r
-               \r
-               return ((Taxon) element).getTaxonomicChildrenCount() > 0;\r
-       }\r
-\r
-       \r
-       /*\r
-        * (non-Javadoc)\r
-        * \r
-        * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)\r
-        */\r
-       @SuppressWarnings("unchecked")\r
-       public Object[] getElements(Object inputElement) {      \r
-               List<Taxon> rootTaxa = (List<Taxon>) inputElement;\r
-               return rootTaxa.toArray();\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * \r
-        * @see org.eclipse.jface.viewers.IContentProvider#dispose()\r
-        */\r
-       public void dispose() {}\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * \r
-        * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,\r
-        *      java.lang.Object, java.lang.Object)\r
-        */\r
-       public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {\r
-       }\r
-}
\ No newline at end of file
diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeLabelProvider.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeLabelProvider.java
deleted file mode 100644 (file)
index 8beba2e..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * 
- */
-package eu.etaxonomy.taxeditor.navigation.taxonomictree;
-
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.navigator.IDescriptionProvider;
-
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.name.IterableSynonymyList;
-import eu.etaxonomy.taxeditor.model.NameHelper;
-
-/**
- * 
- * @author n.hoffmann
- * @created 18.03.2009
- * @version 1.0
- */
-@Deprecated public class TaxonomicTreeLabelProvider extends ColumnLabelProvider implements ILabelProvider, IDescriptionProvider  {
-
-       public Image getImage(Object element) {
-               // This code was to distinct a missaplied name from a accepted taxon name 
-               // in the taxonomic tree. Unfortunately lazy loading slows this down, so that
-               // the taxonomic tree will take 10 minutes to initialize.
-               // I will leave this in here as a reminder.
-//             if (element instanceof Taxon){
-//                     if(((Taxon) element).isMisappliedName()){
-//                             // return misapplication image
-//                             return PlatformUI.getWorkbench().getSharedImages().getImage(
-//                                             ISharedImages.IMG_ELCL_SYNCED); 
-//                     }
-//                     // return standard taxon image
-//                     return PlatformUI.getWorkbench().getSharedImages().getImage(
-//                                     ISharedImages.IMG_OBJS_INFO_TSK); 
-//             }
-               
-               
-               // No image for now
-               return null;
-       }
-
-       public String getText(Object element) {
-               if (element instanceof Taxon) {
-                       Taxon data = (Taxon) element;
-                       return data.getName().getTitleCache(); //$NON-NLS-1$
-               }  
-               return null;
-       }
-
-       public String getDescription(Object anElement) {
-               if (anElement instanceof Taxon) {
-                       Taxon data = (Taxon) anElement;
-                       return "Taxon: " + data.getTitleCache(); //$NON-NLS-1$
-               }
-               return null;
-       }
-
-       public String getToolTipText(Object element) {
-               if (element instanceof Taxon) {
-                       return getSynonymyListDisplay((Taxon) element);
-               }
-               return null;
-       }
-       
-       /**
-        * @param taxon 
-        * @return
-        */
-       private String getSynonymyListDisplay(Taxon taxon) {
-               IterableSynonymyList synonymyList = new IterableSynonymyList(
-                               taxon);
-               String synonymyListDisplay = NameHelper
-                               .getDisplayName(taxon);
-               
-               for (TaxonBase<?> synonymOrMisName : synonymyList) {
-                       TaxonNameBase<?, ?> name = synonymOrMisName.getName();
-                       if (name != null) {
-                               synonymyListDisplay += "\n      "
-                                               + NameHelper.getDisplayName(name);
-                       }
-               }
-               return synonymyListDisplay;
-       }       
-}
diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeView.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeView.java
deleted file mode 100644 (file)
index 7a08780..0000000
+++ /dev/null
@@ -1,330 +0,0 @@
-/**\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
-\r
-package eu.etaxonomy.taxeditor.navigation.taxonomictree;\r
-\r
-import java.util.List;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.jface.action.GroupMarker;\r
-import org.eclipse.jface.action.MenuManager;\r
-import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;\r
-import org.eclipse.jface.viewers.DoubleClickEvent;\r
-import org.eclipse.jface.viewers.IDoubleClickListener;\r
-import org.eclipse.jface.viewers.StructuredSelection;\r
-import org.eclipse.jface.viewers.TreeViewer;\r
-import org.eclipse.jface.viewers.ViewerComparator;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.dnd.DND;\r
-import org.eclipse.swt.dnd.DragSource;\r
-import org.eclipse.swt.dnd.DragSourceAdapter;\r
-import org.eclipse.swt.dnd.DragSourceEvent;\r
-import org.eclipse.swt.dnd.DropTarget;\r
-import org.eclipse.swt.dnd.DropTargetAdapter;\r
-import org.eclipse.swt.dnd.DropTargetEvent;\r
-import org.eclipse.swt.dnd.Transfer;\r
-import org.eclipse.swt.layout.FillLayout;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Menu;\r
-import org.eclipse.swt.widgets.Tree;\r
-import org.eclipse.swt.widgets.TreeItem;\r
-import org.eclipse.ui.IWorkbenchActionConstants;\r
-import org.eclipse.ui.part.ViewPart;\r
-\r
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
-import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;\r
-import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;\r
-import eu.etaxonomy.taxeditor.model.DataChangeBridge;\r
-import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;\r
-import eu.etaxonomy.taxeditor.model.TaxonTransfer;\r
-import eu.etaxonomy.taxeditor.operations.IPostOperationEnabled;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
-\r
-/**\r
- * The panel containing the taxonomic tree.\r
- * \r
- * @author p.ciardelli\r
- * @created 27.05.2008\r
- * @version 1.0\r
- * @author n.hoffmann\r
- */\r
-@Deprecated \r
-public class TaxonomicTreeView extends ViewPart implements IConversationEnabled, IPostOperationEnabled {\r
-       private static final Logger logger = Logger.getLogger(TaxonomicTreeView.class);\r
-       \r
-       public static final String ID = "eu.etaxonomy.taxeditor.navigation.taxonomictree.treeView"; //$NON-NLS-1$\r
-       \r
-       private TreeViewer treeViewer;\r
-\r
-       private ConversationHolder conversation;\r
-\r
-       private IDataChangeBehavior dataChangeBehavior;\r
-\r
-       private Composite parent;\r
-       \r
-       /**\r
-        * Create contents of the view part\r
-        * @param parent\r
-        */\r
-       @Override\r
-       public void createPartControl(Composite parent) {\r
-               conversation = CdmStore.NewTransactionalConversation();\r
-               conversation.registerForDataStoreChanges(this);\r
-\r
-               \r
-               if(this.parent == null){\r
-                       this.parent = parent;\r
-               }\r
-               \r
-               // Create top composite\r
-               FillLayout fillLayout = new FillLayout();\r
-               fillLayout.marginWidth = 0;\r
-               fillLayout.marginHeight = 0;\r
-               fillLayout.type = SWT.VERTICAL; \r
-               parent.setLayout(fillLayout);\r
-               \r
-               createTreeViewer(CdmStore.getDefault().getRootTaxa());\r
-       }\r
-               \r
-       /**\r
-        * Actual tooltips built in label provider\r
-        */\r
-       private void createToolTips() {\r
-               ColumnViewerToolTipSupport.enableFor(treeViewer);\r
-       }\r
-       \r
-       \r
-       public void createTreeViewer(List<Taxon> rootTaxa) {    \r
-               \r
-               // Create tree\r
-               treeViewer = new TreeViewer(parent, SWT.VIRTUAL);\r
-               \r
-               Tree tree = treeViewer.getTree();\r
-               \r
-               tree.setLinesVisible(false);\r
-               tree.setHeaderVisible(false);\r
-               \r
-               treeViewer.setContentProvider(new TaxonomicTreeContentProvider());\r
-               treeViewer.setLabelProvider(new TaxonomicTreeLabelProvider());\r
-               \r
-               treeViewer.setInput(rootTaxa);\r
-               \r
-               createDoubleClickListener();\r
-               createToolTips();\r
-               createDragAndDrop();\r
-               \r
-               // Sort according to "getColumnText" above, i.e. by NameCache\r
-               // TODO check if this is still up to date\r
-               treeViewer.setComparator(new ViewerComparator());\r
-       \r
-               // register context menu\r
-               MenuManager menuMgr = new MenuManager();\r
-               menuMgr.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));\r
-               getSite().registerContextMenu(menuMgr, treeViewer);\r
-\r
-               Control control = treeViewer.getControl();\r
-               Menu menu = menuMgr.createContextMenu(control);\r
-               control.setMenu(menu);  \r
-                       \r
-       }\r
-       \r
-       /**\r
-        * On double click, open name editor\r
-        */\r
-       public void createDoubleClickListener() {\r
-               treeViewer.addDoubleClickListener(new IDoubleClickListener() {\r
-\r
-                       public void doubleClick(DoubleClickEvent event) {\r
-                               if (event.getSelection() instanceof StructuredSelection) {\r
-                                       Object element = ((StructuredSelection) event\r
-                                                       .getSelection()).getFirstElement();\r
-                                       if (element instanceof Taxon) {\r
-                                               // FIXME call EditTaxonHandler\r
-                                               logger.info("Doubleclick on taxon element. Should open editor now");\r
-//                                             NavigationUtil.openEditor((Taxon) element);\r
-                                       }\r
-                               }\r
-                       }\r
-               });\r
-       }\r
-       \r
-       /**\r
-        * \r
-        */\r
-       public void createDragAndDrop() {\r
-               final Tree tree = treeViewer.getTree();\r
-               Transfer[] types = new Transfer[] { TaxonTransfer.getInstance() };\r
-               int operations = DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK;\r
-\r
-               final DragSource source = new DragSource(tree, operations);\r
-               source.setTransfer(types);\r
-               final TreeItem[] dragSourceItem = new TreeItem[1];\r
-               source.addDragListener(new DragSourceAdapter() {\r
-                       public void dragStart(DragSourceEvent event) {\r
-                               TreeItem[] selection = tree.getSelection();\r
-                               if (selection.length > 0) {\r
-                                       event.doit = true;\r
-                                       dragSourceItem[0] = selection[0];\r
-                               } else {\r
-                                       event.doit = false;\r
-                               }\r
-                       }\r
-\r
-                       public void dragSetData(DragSourceEvent event) {\r
-                               Taxon taxon = (Taxon) dragSourceItem[0].getData();\r
-                               TaxonTransfer.getInstance().setTaxon(taxon);\r
-                       }\r
-               });\r
-\r
-               DropTarget target = new DropTarget(tree, operations);\r
-               target.setTransfer(types);\r
-               target.addDropListener(new DropTargetAdapter() {\r
-                       public void drop(DropTargetEvent event) {\r
-\r
-                               // Only drop ONTO another TreeItem OR outside the tree area.\r
-                               // Dropping between TreeItems makes no sense because tree is\r
-                               // sorted.\r
-                               Taxon taxon = (Taxon) dragSourceItem[0].getData();\r
-                               Taxon newParentTaxon = null;\r
-\r
-                               // If event.item == null, user has dragged outside of the tree\r
-                               if (event.item == null) {\r
-                                       newParentTaxon = null;\r
-                               } else {\r
-                                       newParentTaxon = (Taxon) event.item.getData();\r
-                                       \r
-                                       // Make sure parentTaxon is not a child\r
-//                                     if (TaxonNodeUtil.isTaxonChildOfTaxon(newParentTaxon, taxon)) {\r
-//                                             \r
-//                                             MessageDialog.openError(NavigationUtil.getShell(), "Can't move taxon.",\r
-//                                                             "'" + NameUtil.getDisplayName(taxon) + "' sits above " +\r
-//                                                             "'" + NameUtil.getDisplayName(newParentTaxon) + "' " +\r
-//                                                             "in the taxonomic hierarchy.");\r
-//                                             \r
-//                                             return;\r
-//                                     }\r
-                                       \r
-                                       // Make sure taxon is not being dropped onto itself\r
-                                       if (taxon.equals(newParentTaxon)) {\r
-                                               return;\r
-                                       }\r
-                                       \r
-                                       // Make sure parent taxon does not have unsaved changes\r
-//                                     if (NavigationUtil.isDirty(newParentTaxon)){\r
-//                                             MessageDialog.openWarning(NavigationUtil.getShell(), "Unsaved Parent Taxon", "There are unsaved " +\r
-//                                             "changes in the parent taxon. Pleas save first.");\r
-//                                             return;\r
-//                                     }\r
-                               }\r
-\r
-//                             \r
-//                             IUndoableOperation operation = new MoveTaxonOperation\r
-//                                             ("Move Taxon", NavigationUtil.getUndoContext(), taxon, newParentTaxon);\r
-//                             \r
-//                             NavigationUtil.executeOperation(operation);                     \r
-                       }\r
-               });\r
-       }\r
-       \r
-       /*\r
-        * (non-Javadoc)\r
-        * @see org.eclipse.ui.part.WorkbenchPart#setFocus()\r
-        */\r
-       public void setFocus() {\r
-               // bind resources for this widget on focus\r
-               getConversationHolder().bind();\r
-               // pass focus to the tree viewer if it exists\r
-               if(treeViewer != null){\r
-                       treeViewer.getControl().setFocus();\r
-               }\r
-       }\r
-       \r
-       /**\r
-        * Expose TreeViewer, i.e. to manipulate tree nodes\r
-        * @return\r
-        */\r
-       public TreeViewer getTreeViewer() {\r
-               return treeViewer;\r
-       }\r
-       \r
-       \r
-       /*\r
-        * (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder()\r
-        */\r
-       public ConversationHolder getConversationHolder() {\r
-               return conversation;\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.persistence.hibernate.ICdmPostCrudObserver#update(eu.etaxonomy.cdm.persistence.hibernate.CdmCrudEvent)\r
-        */\r
-       public void update(CdmDataChangeMap changeEvents) {\r
-               if(dataChangeBehavior == null){\r
-                       dataChangeBehavior = new TaxonomicTreeViewDataChangeBehaviour(this);\r
-               }\r
-               DataChangeBridge.handleDataChange(changeEvents, dataChangeBehavior);\r
-       }\r
-\r
-       /**\r
-        * Start the creation process of this Control anew. \r
-        */\r
-       public void recreate() {\r
-               this.createPartControl(parent);\r
-       }\r
-       \r
-       /**\r
-        * Get a fresh model from CdmStore and refresh the tree viewer with the data\r
-        */\r
-       public void refresh(){\r
-               treeViewer.setInput(CdmStore.getDefault().getRootTaxa());\r
-               treeViewer.refresh();           \r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.ui.part.WorkbenchPart#dispose()\r
-        */\r
-       @Override\r
-       public void dispose() {\r
-               conversation.unregisterForDataStoreChanges(this);\r
-\r
-               super.dispose();\r
-       }\r
-\r
-       /**\r
-        * If taxon node in the tree is hidden, open and select it\r
-        * \r
-        * @param taxon\r
-        */\r
-       public void revealTaxon(Taxon taxon) {\r
-               if (taxon == null) {\r
-                       return;\r
-               }\r
-               treeViewer.setSelection(new StructuredSelection(taxon), true);\r
-               treeViewer.reveal(taxon);\r
-       }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.taxeditor.store.operations.IPostOperationEnabled#postOperation(eu.etaxonomy.cdm.model.common.CdmBase)\r
-        */\r
-       public boolean postOperation(CdmBase objectAffectedByOperation) {\r
-               \r
-               if(objectAffectedByOperation instanceof Taxon){\r
-                       revealTaxon((Taxon) objectAffectedByOperation);\r
-               }\r
-               \r
-               return true;\r
-       }\r
-       \r
-       \r
-}\r
diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeViewDataChangeBehaviour.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeViewDataChangeBehaviour.java
deleted file mode 100644 (file)
index 92fc862..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-
-package eu.etaxonomy.taxeditor.navigation.taxonomictree;
-
-import org.apache.log4j.Logger;
-
-import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType;
-import eu.etaxonomy.taxeditor.model.AbstractDataChangeBehaviour;
-import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;
-
-/**
- * @author n.hoffmann
- * @created 01.04.2009
- * @version 1.0
- */
-@Deprecated public class TaxonomicTreeViewDataChangeBehaviour extends AbstractDataChangeBehaviour implements 
-               IDataChangeBehavior {
-       private static final Logger logger = Logger
-                       .getLogger(TaxonomicTreeViewDataChangeBehaviour.class);
-
-       private TaxonomicTreeView source;
-       
-       public TaxonomicTreeViewDataChangeBehaviour(
-                       TaxonomicTreeView taxonomicTreeView) {
-               source = taxonomicTreeView;
-       }
-
-       
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior#isRelevant(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmCrudEvent)
-        */
-       public boolean isRelevant(CdmDataChangeMap events) {
-               // react on everything except load
-               if(events.sizeByEventType(EventType.INSERT) > 0){
-                       return true;
-               }else if(events.sizeByEventType(EventType.UPDATE) > 0){
-                       return true;
-               }else if(events.sizeByEventType(EventType.DELETE) > 0){
-                       return true;
-               }else{
-                       return false;
-               }
-       }
-
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior#reactOnDataChange(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmCrudEvent)
-        */
-       public void reactOnDataChange(CdmDataChangeMap events) {
-
-
-               if(isRelevant(events)){
-                       
-                       source.refresh();
-                       
-                       logger.info("DataStore update caused a refresh of the taxonomic tree");
-
-               }
-       }
-}