fix #6120 Cleanup uuidAndTitleCache methods

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
index c72fb04fa99fce351e53c5ccf454e2c87cf08c63..d705cd56b8b9ca8cae75236485b453c0ac074569 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
@@ -861,5 +861,12 @@ public class TransientAgentService implements IAgentService {
                return null;
        }
 
+       @Override
+       public <S extends AgentBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
+                       Class<S> arg0, Integer arg1, String arg2) {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
 
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
index 643d78760bdb0ed46ed875e878ec1d877bf0138b..450425219e36e5206f6c48f48a417bfa22f06665 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
@@ -1070,6 +1070,13 @@ public class TransientClassificationService implements IClassificationService {
                return null;
        }
 
+       @Override
+       public <S extends Classification> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
+                       Class<S> arg0, Integer arg1, String arg2) {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
    
 
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
index c06afc64d667f7fcafff327c39163dac4855f938..5c823e58e45ae1ed080b88536ebf5cc438ed287d 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
@@ -768,6 +768,13 @@ public class TransientCollectionService implements ICollectionService {
                return null;
        }
 
+       @Override
+       public <S extends Collection> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
+                       Class<S> arg0, Integer arg1, String arg2) {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
 
 
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
index 5e1793c882698535443a08e40898b81bb1aa542e..d7fc6be3d9a53d0c929e2bd67ac77f7e5ec2b7ee 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
@@ -1253,5 +1253,12 @@ public class TransientDescriptionService implements IDescriptionService {
                return null;
        }
 
+       @Override
+       public <S extends DescriptionBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
+                       Class<S> arg0, Integer arg1, String arg2) {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
 
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
index 5bec09489d25c162e017aacff65ce26ea6a00e43..530a5b011ba3025fb7112bf32048c1c6e8cd7a0f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
@@ -1243,6 +1243,13 @@ public class TransientNameService implements INameService {
                // TODO Auto-generated method stub
                return null;
        }
+
+       @Override
+       public <S extends TaxonNameBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
+                       Class<S> arg0, Integer arg1, String arg2) {
+               // TODO Auto-generated method stub
+               return null;
+       }
        
 
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index dd6b392e0bfdecdf92fe4c118fd3be2f02ce3737..82621f168e2345afbcfb98ae70ce37d1df06a1a1 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
@@ -1119,4 +1119,11 @@ public class TransientOccurenceService implements IOccurrenceService {
                return null;
        }
 
+       @Override
+       public <S extends SpecimenOrObservationBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
+                       Class<S> arg0, Integer arg1, String arg2) {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
index 68e522a7f9037fca7806d4eae7d9ffe0d644a982..0f20cac205ba7165f233ec8362bbd1051efb095f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
@@ -787,4 +787,11 @@ public class TransientReferenceService implements IReferenceService {
                return null;
        }
 
+       @Override
+       public <S extends Reference> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
+                       Class<S> arg0, Integer arg1, String arg2) {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
index 7dfd86d473403477ca806e85a8b767abce46e1ba..e3363d7ae5888085dee9dab218ff5d191071fbe2 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
@@ -1485,17 +1485,6 @@ public class TransientTaxonService implements ITaxonService {
                return defaultService.getUuidAndTitleCache(limit, pattern);
        }
 
-       @Override
-       public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheTaxon(
-                       Integer limit, String pattern) {
-               return defaultService.getUuidAndTitleCacheTaxon(limit, pattern);
-       }
-
-       @Override
-       public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheSynonym(
-                       Integer limit, String pattern) {
-               return defaultService.getUuidAndTitleCacheSynonym(limit, pattern);
-       }
 
        @Override
        public List<TaxonBase> loadByIds(List<Integer> idSet, List<String> propertyPaths) {
@@ -1518,5 +1507,12 @@ public class TransientTaxonService implements ITaxonService {
                return null;
        }
 
+       @Override
+       public <S extends TaxonBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
+                       Class<S> arg0, Integer arg1, String arg2) {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
 
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
index 87125d3a98a92d5cccde4bd247847e2e1134a4e0..e1dc377c7b418e7138f0546011ff39f530c30aac 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
@@ -933,4 +933,11 @@ public class TransientTermService implements ITermService {
                // TODO Auto-generated method stub
                return null;
        }
+
+       @Override
+       public <S extends DefinedTermBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
+                       Class<S> arg0, Integer arg1, String arg2) {
+               // TODO Auto-generated method stub
+               return null;
+       }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java
index d28a01d2434b25ab964193b7ca502c075e596034..4b0549593c1ed059ed2da8cff4a41c924bcb82b9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java
@@ -10,6 +10,7 @@
 
 package eu.etaxonomy.taxeditor.ui.dialog.selection;
 
+import java.util.List;
 import java.util.UUID;
 
 import org.eclipse.swt.widgets.Control;
@@ -21,6 +22,7 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.newWizard.NewTaxonWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -69,7 +71,8 @@ public class TaxonBaseSelectionDialog extends AbstractFilteredCdmResourceSelecti
     }
 
     /** {@inheritDoc} */
-    @Override
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+       @Override
     protected void initModel() {
         Control control = getPatternControl();
         String pattern = null;
@@ -79,15 +82,7 @@ public class TaxonBaseSelectionDialog extends AbstractFilteredCdmResourceSelecti
 
 
 
-        if(clazz == TaxonBase.class){
-            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
-        }
-        else if(clazz == Taxon.class){
-            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheTaxon(limitOfInitialElements, pattern);
-        }
-        else if(clazz == Synonym.class){
-            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheSynonym(limitOfInitialElements, pattern);
-        }
+        model = (List)CdmStore.getService(ITaxonService.class).getUuidAndTitleCache(Taxon.class, limitOfInitialElements, pattern);
     }
 
     /** {@inheritDoc} */