ref #8785: smaller issues in character matrix - add and remove descriptions

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
index 5425ff76f53685aa770c96986ffeeb0526ab4626..ad3520981aef0289e86b8207ed5ade46596b0579 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
@@ -940,6 +940,7 @@ public class CharacterMatrix extends Composite {
         dataSet = this.getCdmEntitiySession().load(dataSet, true);
         // update local dataset
         this.setDescriptiveDataSet(dataSet);
+        specimenToAdd.clear();
 
 //        UUID monitorUuid =  CdmApplicationState.getLongRunningTasksService().addRowWrapperToDataset(specimenToAdd, getDescriptiveDataSet().getUuid());
 //        specimenToAdd = null;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java
index 682712ce2a58c81b8fa0dad9e2027290277ba8be..bc913c803ab989bc6beee098c27f0756f73e8646 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java
@@ -24,6 +24,7 @@ import javax.inject.Inject;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.Persist;
 import org.eclipse.e4.ui.model.application.ui.MDirtyable;
@@ -53,6 +54,7 @@ import eu.etaxonomy.cdm.persistence.dto.MergeResult;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
+import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
@@ -110,6 +112,9 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
     @Inject
     private MPart thisPart;
 
+    @Inject
+    private IEventBroker eventBroker;
+
     private CharacterMatrix matrix;
 
     private StackLayout stackLayout;
@@ -205,6 +210,7 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
                result.includeResult(CdmStore.getService(IDescriptiveDataSetService.class).removeDescriptions(matrix.getDescriptionsToDelete().get(config), matrix.getDescriptiveDataSet().getUuid(), config));
             }
             matrix.getDescriptionsToDelete().clear();
+
         }
         List<MergeResult<DescriptionBase>> results = CdmStore.getService(IDescriptionService.class).mergeDescriptions(descriptions, matrix.getDescriptiveDataSet().getUuid(), true);
         conversation.commit();
@@ -222,7 +228,7 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
             }
         }
 //        matrix.loadDescriptions(getDescriptiveDataSet().getUuid(), false);
-
+        eventBroker.post(WorkbenchEventConstants.CURRENT_ACTIVE_EDITOR, null);
         dirty.setDirty(false);
     }
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
index 24eba01e4895023aeaf8b7ec0b3bbc6a5e62730f..f0100366843dd6fd4b26142d782a5291d8429f34 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
@@ -255,7 +255,6 @@ DeleteDescriptionElementOperation_DESC_NOT_FOUND=Beschreibung konnte nicht gefun
 DeleteDescriptiveDataSetHandler_DELETE_FAILED_MESSAGE=Löschen fehlgeschlagen.
 DeleteDescriptiveDataSetHandler_DELETE_FAILED_TITLE=Löschen fehlgeschlagen
 DeleteDescriptiveDataSetHandler_DELETE_MESSAGE=Wollen Sie wirklich den deskriptiven Datensatz löschen?
-DeleteDescriptiveDataSetHandler_DELETE_SELECTION=Wählen Sie welche Beschreibungen komplett gelöscht werden sollen (nicht ausgewählte Beschreibungen verbleiben in der Datenbank und verknüpft mit ihrem Beleg/Taxon)
 DeleteDescriptiveDataSetHandler_DELETE_TITLE=Löschen bestätigen
 DeleteHandler_CONFIRM_DELETION=Löschen bestätigen
 DeleteHandler_CONFIRM_DELETION_MESSAGE=Wollen sie die Mediendaten wirklich löschen?