It is now possible to drag a taxon onto another classification, previously it one...

diff --git a/.gitattributes b/.gitattributes
index b63e89750564ab193edca13741e4572d38086951..a4b106ed526f610699cb49acf88aaaad71522688 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -532,9 +532,9 @@ eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigatio
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java -text

-eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeDropAdapterAssistant.java -text

 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java -text

+eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java -text

 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java -text

diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml
index 87559168053388ecd2b01800400e045699931fff..a547a83537e3e1213e41f9e9bffa72058316aa7d 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@ -365,6 +365,11 @@
                   value="eu.etaxonomy.cdm.model.taxon.TaxonNode">
             </instanceof>
          </possibleChildren>
                   value="eu.etaxonomy.cdm.model.taxon.TaxonNode">
             </instanceof>
          </possibleChildren>

+         <dropAssistant
+               class="eu.etaxonomy.taxeditor.navigation.navigator.TreeNodeDropAdapterAssistant"
+               id="eu.etaxonomy.taxeditor.navigation.navigator.dropassistant">
+            <possibleDropTargets></possibleDropTargets>
+         </dropAssistant>

       </navigatorContent>
       <navigatorContent
             contentProvider="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodeContentProvider"
       </navigatorContent>
       <navigatorContent
             contentProvider="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodeContentProvider"


@@ -388,7 +393,7 @@
             </or>
          </triggerPoints>
          <dropAssistant
             </or>
          </triggerPoints>
          <dropAssistant

-               class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodeDropAdapterAssistant"
+               class="eu.etaxonomy.taxeditor.navigation.navigator.TreeNodeDropAdapterAssistant"

                id="eu.etaxonomy.taxeditor.navigation.navigator.dropassistant">
             <possibleDropTargets>
                <or>
                id="eu.etaxonomy.taxeditor.navigation.navigator.dropassistant">
             <possibleDropTargets>
                <or>

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeDropAdapterAssistant.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
similarity index 96%
rename from eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeDropAdapterAssistant.java
rename to eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
index 17643575f1943112a6308ab0c5b56e0abf705b5d..b0d7bb74f6297ecd44fbb02f2b186383790cc739 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeDropAdapterAssistant.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
@@ -42,9 +42,9 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 03.06.2009
  * @version 1.0
  */
  * @created 03.06.2009
  * @version 1.0
  */

-public class TaxonNodeDropAdapterAssistant extends CommonDropAdapterAssistant implements IPostOperationEnabled{
+public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant implements IPostOperationEnabled{

        private static final Logger logger = Logger
        private static final Logger logger = Logger

-                       .getLogger(TaxonNodeDropAdapterAssistant.class);
+                       .getLogger(TreeNodeDropAdapterAssistant.class);

 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.navigation.navig"{trunked}</code> */
        public static final String ID = "eu.etaxonomy.taxeditor.navigation.navigator.dropassistant"; //$NON-NLS-1$
 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.navigation.navig"{trunked}</code> */
        public static final String ID = "eu.etaxonomy.taxeditor.navigation.navigator.dropassistant"; //$NON-NLS-1$


@@ -92,7 +92,7 @@ public class TaxonNodeDropAdapterAssistant extends CommonDropAdapterAssistant im
        /** {@inheritDoc} */
        @Override
        public IStatus validateDrop(Object target, int operation,
        /** {@inheritDoc} */
        @Override
        public IStatus validateDrop(Object target, int operation,

-                       TransferData transferType) {            
+                       TransferData transferType) {    

                if (target instanceof ITreeNode) {
                        // do not allow to drop onto itself
                        for(TaxonNode taxonNode : getSelectedTaxa()){
                if (target instanceof ITreeNode) {
                        // do not allow to drop onto itself
                        for(TaxonNode taxonNode : getSelectedTaxa()){