ref #10034: better handling of messages

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermNodeDtoTransfer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermNodeDtoTransfer.java
index 45222cb8228666ce7ef6ce5bad68a676ecaef0a2..3257c9a8ca24bcc0608b6e0802a940a458271738 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermNodeDtoTransfer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermNodeDtoTransfer.java
@@ -80,7 +80,7 @@ public class TermNodeDtoTransfer extends ByteArrayTransfer {
                 return fromByteArray(bytes);
             }
         }catch (SWTException e){
-            MessagingUtils.warningDialog("The new imported node needs to be saved first", this, "Newly created nodes can not be moved without saving");
+           MessagingUtils.warningDialog("The new imported node needs to be saved first", this, "Newly created nodes can not be moved without saving");
         }
 
         return null;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java
index cdea483890653a0c3706fc76b24c7d1da278217c..650465b25c22de7a0f8d50c10a28c92352bebfa2 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java
@@ -60,6 +60,9 @@ public class TermTreeDtoDropAdapter extends ViewerDropAdapter {
 
        @Override
        public boolean performDrop(Object data) {
+               if (data == null){
+                       return false;
+               }
                Object currentTarget = getCurrentTarget();
                TermNodeDto target = null;
                if(currentTarget instanceof TermTreeDto){