From 2c28be6a12f0a4287131a0f5154e76d3404d1a6d Mon Sep 17 00:00:00 2001
From: Patrick Plitzner
Date: Mon, 17 Dec 2018 07:38:21 +0100
Subject: [PATCH] ref #7589 Remove UpdateResult handling from CharacterMatrix
---
.../descriptiveDataSet/matrix/CharacterMatrix.java | 5 -----
.../matrix/CharacterMatrixBottomToolbar.java | 1 -
.../descriptiveDataSet/matrix/CharacterMatrixPart.java | 9 ---------
3 files changed, 15 deletions(-)
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 f205c46f2..9f4e4a503 100644
--- 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
@@ -93,7 +93,6 @@ import ca.odell.glazedlists.EventList;
import ca.odell.glazedlists.SortedList;
import ca.odell.glazedlists.TreeList;
import eu.etaxonomy.cdm.api.application.CdmApplicationState;
-import eu.etaxonomy.cdm.api.service.UpdateResult;
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
import eu.etaxonomy.cdm.api.service.dto.SpecimenRowWrapperDTO;
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
@@ -708,10 +707,6 @@ public class CharacterMatrix extends Composite {
return features;
}
- public void addUpdateResult(UpdateResult result){
- part.addUpdateResult(result);
- }
-
public Map getFeatureToHistogramMap() {
return featureToHistogramMap;
}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
index 0c8305f94..0c9e7cb20 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
@@ -168,7 +168,6 @@ public class CharacterMatrixBottomToolbar extends Composite{
TaxonDescription taxonDescription = (TaxonDescription) result.getCdmEntity();
TaxonRowWrapperDTO taxonRowWrapper = CdmStore.getService(IDescriptiveDataSetService.class).createTaxonRowWrapper(taxonDescription.getUuid(), matrix.getDescriptiveDataSet().getUuid());
matrix.getDescriptions().add(taxonRowWrapper);
- matrix.addUpdateResult(result);
aggregateCategorcialHistogram(matrix.getFeatureToHistogramMap());
aggregateQuantitativeSummary(matrix.getFeatureToQuantDataStatisticsMap());
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 94d0deb47..a11bf14a0 100644
--- 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
@@ -92,8 +92,6 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
private DescriptiveDataSet descriptiveDataSet;
- private Collection updateResults;
-
private ConversationHolder conversation;
private ICdmEntitySession cdmEntitySession;
@@ -268,13 +266,6 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
return propertyMap;
}
- public void addUpdateResult(UpdateResult result){
- if(updateResults==null){
- updateResults = new HashSet<>();
- }
- updateResults.add(result);
- }
-
public void loadingDone() {
stackLayout.topControl = matrix;
matrix.getParent().layout();
--
2.34.1