ref #3276:minor

diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
index 0f51496ab9681aa5a143849abe6425be1782b9ae..b138341edb775cf7513a875e95e7eb87bbcdb0c0 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
@@ -51,7 +51,7 @@ command.label.26 = Delete
 command.label.27 = New Factual Data Set\r
 menu.label.1 = New\r
 command.label.28 = Move Factual Data to Other Taxon\r
-command.label.29 = Move Fact to Other Taxon\r
+command.label.29 = Move Fact(s) to Other Taxon\r
 command.label.30 = Delete\r
 command.label.31 = Save\r
 menu.label.2 = New Derivative\r

diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
index 2cceea9a382466f7df18c8bdaf9dc1f04f19e873..544cfa459c1117dbcdde5f801c6ae2948c317e7f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
@@ -51,7 +51,7 @@ command.label.26 = L\u00f6schen
 command.label.27 = Neues Faktendaten-Set
 menu.label.1 = Neue
 command.label.28 = Verschiebe Faktendaten zu anderem Taxon
-command.label.29 = Verschiebe Fakt zu anderem Taxon
+command.label.29 = Verschiebe Fakt(en) zu anderem Taxon
 command.label.30 = L\u00f6schen
 command.label.31 = Speichern
 menu.label.2 = Neue Derivate

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java
index 367a4e22658a3525df15f731147c6f946325f314..2be1e622efcd77fc69c467c804a68f956e5683e9 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java
@@ -202,9 +202,7 @@ public class MoveDescriptionToOtherTaxonHandlerE4 implements IPostOperationEnabl
             if(selection instanceof IStructuredSelection){
                 Object firstElement = ((IStructuredSelection) selection).getFirstElement();
                 canExecute = ((IStructuredSelection) selection).size()==1
-                        &&
-                        (firstElement instanceof FeatureNodeContainer
-                        || firstElement instanceof DescriptionBase);
+                        && firstElement instanceof DescriptionBase;
                 menuItem.setVisible(canExecute);
             }
         }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java
index ce797d4620d1f229b83e129d1dd4691103875be2..5424f9015873729c46a6b38d079c92e8fd0890cd 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java
@@ -14,6 +14,7 @@ import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 
 import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
@@ -62,10 +63,13 @@ public class DeleteTaxonDescriptionOperation extends AbstractPostTaxonOperation
                        throws ExecutionException {
 
                monitor.worked(20);
-               if (description != null){
+               if (description != null && description.isPersited()){
 //                 element.removeDescription(description);
                    CdmStore.getService(IDescriptionService.class).deleteDescription(description.getUuid());
                        return postExecute(element);
+               }else if (description != null && !description.isPersited()){
+                   element.removeDescription(description);
+                   return Status.OK_STATUS;
                }
                return null;