From 214bf9b9987332a0dec891478c3a9a464b813b73 Mon Sep 17 00:00:00 2001
From: Patric Plitzner
Date: Wed, 19 Feb 2014 14:32:22 +0000
Subject: [PATCH] - changed type of BioCaseQuery results from List to Set to
filter out duplicates - as saveOrUpdate() for the transient services
just adds the derived units to the lists this was necessary
---
.../AnnotatedLineDocumentProvider.java | 10 ++++++++--
.../taxeditor/dataimport/DerivedUnitEditorInput.java | 6 +++---
.../transientServices/TransientCdmRepository.java | 4 ++--
.../transientServices/TransientOccurenceService.java | 10 +++++-----
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java
index af7d40c9f..391536bca 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java
@@ -9,6 +9,8 @@
*/
package eu.etaxonomy.taxeditor.annotatedlineeditor;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -25,6 +27,7 @@ import org.eclipse.jface.text.source.IAnnotationModel;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.texteditor.AbstractDocumentProvider;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
import eu.etaxonomy.taxeditor.dataimport.DerivedUnitEditorInput;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -58,7 +61,7 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
private ILineDisplayStrategy lineDisplayStrategy;
- private IEditorInput input;
+ private final IEditorInput input;
/**
* Constructor for AnnotatedLineDocumentProvider.
@@ -220,7 +223,10 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider {
return ((AbstractBulkEditorInput)element).getModel();
}
else if(element instanceof DerivedUnitEditorInput){
- return ((DerivedUnitEditorInput) element).getResults();
+ Collection results = ((DerivedUnitEditorInput) element).getResults();
+ if(results!=null){
+ return new ArrayList(results);
+ }
}
return null;
}
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DerivedUnitEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DerivedUnitEditorInput.java
index 1d8951caf..04ba594d1 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DerivedUnitEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DerivedUnitEditorInput.java
@@ -12,7 +12,7 @@ package eu.etaxonomy.taxeditor.dataimport;
import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
-import java.util.List;
+import java.util.Collection;
import org.apache.http.client.ClientProtocolException;
import org.apache.log4j.Logger;
@@ -40,7 +40,7 @@ public class DerivedUnitEditorInput implements IEditorInput {
private final BioCaseQuery query;
- private List results;
+ private Collection results;
/**
* @param results
@@ -135,7 +135,7 @@ public class DerivedUnitEditorInput implements IEditorInput {
/**
* @return the results
*/
- public List getResults() {
+ public Collection getResults() {
return results;
}
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java
index a438ba432..79e09f832 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java
@@ -9,7 +9,7 @@
*/
package eu.etaxonomy.taxeditor.dataimport.transientServices;
-import java.util.List;
+import java.util.Collection;
import org.springframework.security.authentication.ProviderManager;
import org.springframework.transaction.PlatformTransactionManager;
@@ -56,7 +56,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration {
private final ICdmApplicationConfiguration defaultApplicationConfiguration;
private TransientOccurenceService occurenceService;
- public List getUnits(){
+ public Collection getUnits(){
return occurenceService.getUnits();
}
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java
index e47802df5..3296365f8 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java
@@ -10,8 +10,8 @@
package eu.etaxonomy.taxeditor.dataimport.transientServices;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -70,15 +70,15 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy;
*/
public class TransientOccurenceService implements IOccurrenceService {
- private IOccurrenceService defaultService;
- private List units;
+ private final IOccurrenceService defaultService;
+ private final Collection units;
/**
* @param defaultService
*/
public TransientOccurenceService(IOccurrenceService defaultService) {
this.defaultService = defaultService;
- this.units = new ArrayList();
+ this.units = new HashSet();
}
/**
@@ -853,7 +853,7 @@ public class TransientOccurenceService implements IOccurrenceService {
/**
* @return
*/
- public List getUnits() {
+ public Collection getUnits() {
return units;
}
--
2.34.1