fix transientServices (2)

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 cbced545a74857e1cfda17fcc890ac52b1cbf1c9..4c66240421435e1f15c922cc3f76d51f92275c49 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
@@ -26,6 +26,7 @@ import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
+import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.model.agent.Address;
@@ -852,5 +853,13 @@ public class TransientAgentService implements IAgentService {
                return defaultService.loadByIds(idSet, propertyPaths);
        }
 
+       @Override
+       public <S extends AgentBase> Pager<FindByMarkerDTO<S>> findByMarker(
+                       Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
+                       Integer arg4, Integer arg5, List<String> arg6) {
+               // 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 d8634f4cf510f521ad0d48e0a3d2b98b83fcc404..36239568323156b7c1bf68ede677b841cbcaeb51 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
@@ -28,6 +28,7 @@ import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
 import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
+import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
 import eu.etaxonomy.cdm.api.service.dto.GroupedTaxonDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
@@ -1046,6 +1047,14 @@ public class TransientClassificationService implements IClassificationService {
                return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classification, limit, pattern);
        }
 
+       @Override
+       public <S extends Classification> Pager<FindByMarkerDTO<S>> findByMarker(
+                       Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
+                       Integer arg4, Integer arg5, List<String> arg6) {
+               // 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 b5a90a724c4c86b9f1458e6dd12aae9d82800738..d9d8f0dd1068cbd4c21c9e371b5e1b22eca4e87b 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
@@ -24,6 +24,7 @@ import eu.etaxonomy.cdm.api.service.ICollectionService;
 import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
+import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.model.common.Annotation;
@@ -759,6 +760,14 @@ public class TransientCollectionService implements ICollectionService {
                return defaultService.loadByIds(idSet, propertyPaths);
        }
 
+       @Override
+       public <S extends Collection> Pager<FindByMarkerDTO<S>> findByMarker(
+                       Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
+                       Integer arg4, Integer arg5, List<String> arg6) {
+               // 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 16567845028e7e4e35d883327e53903f9dd8c9b8..a84e32be190561807cd64121ce932afe7398f89e 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
@@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
+import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.model.common.Annotation;
@@ -1244,5 +1245,13 @@ public class TransientDescriptionService implements IDescriptionService {
                return defaultService.loadByIds(idSet, propertyPaths);
        }
 
+       @Override
+       public <S extends DescriptionBase> Pager<FindByMarkerDTO<S>> findByMarker(
+                       Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
+                       Integer arg4, Integer arg5, List<String> arg6) {
+               // 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 152481b73f768a110a9a663629898fab0d8276d8..bc07d085c36115187ac79f5c22ba3ea1feb0a2b4 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
@@ -31,6 +31,7 @@ import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
 import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
+import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
 import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.api.service.search.DocumentSearchResult;
@@ -48,7 +49,6 @@ import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;
 import eu.etaxonomy.cdm.model.common.RelationshipBase;
 import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
-import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.media.Rights;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.HybridRelationship;
@@ -1233,8 +1233,16 @@ public class TransientNameService implements INameService {
 
        @Override
        public List<TaxonNameBase> loadByIds(List<Integer> idSet, List<String> propertyPaths) {
-               
                return defaultService.loadByIds(idSet, propertyPaths);
        }
 
+       @Override
+       public <S extends TaxonNameBase> Pager<FindByMarkerDTO<S>> findByMarker(
+                       Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
+                       Integer arg4, Integer arg5, List<String> arg6) {
+               // 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 52605735ca413b12254431176ab51f3a74091247..8c18cb6c0ad291b29ea981f29e5a3007a71d31d4 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
@@ -35,6 +35,7 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato
 import eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator;
 import eu.etaxonomy.cdm.api.service.dto.FieldUnitDTO;
 import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
+import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
 import eu.etaxonomy.cdm.api.service.dto.PreservedSpecimenDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.api.service.search.SearchResult;
@@ -1110,4 +1111,12 @@ public class TransientOccurenceService implements IOccurrenceService {
                return defaultService.loadByIds(idSet, propertyPaths);
        }
 
+       @Override
+       public <S extends SpecimenOrObservationBase> Pager<FindByMarkerDTO<S>> findByMarker(
+                       Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
+                       Integer arg4, Integer arg5, List<String> arg6) {
+               // 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 1d8e04cb579df1d3064bab52b59d0c397527def3..b6f79899bbf51fa9e3f85d2119a1a1043ef7692d 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
@@ -25,6 +25,7 @@ import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
+import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.model.common.Annotation;
@@ -778,4 +779,12 @@ public class TransientReferenceService implements IReferenceService {
                return defaultService.getUuidAndAbbrevTitleCache(limit, pattern);
        }
 
+       @Override
+       public <S extends Reference> Pager<FindByMarkerDTO<S>> findByMarker(
+                       Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
+                       Integer arg4, Integer arg5, List<String> arg6) {
+               // 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 741f6a6295f31c41c556acfd81c6746cd5e053bf..dba41ca807d8955e2204641f4988af6dd5c85d45 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
@@ -54,7 +54,6 @@ import eu.etaxonomy.cdm.model.common.LSID;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.common.RelationshipBase;
 import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
@@ -82,7 +81,6 @@ import eu.etaxonomy.cdm.model.view.AuditEventRecord;
 import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort;
 import eu.etaxonomy.cdm.persistence.dto.MergeResult;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
-import eu.etaxonomy.cdm.persistence.fetch.CdmFetch;
 import eu.etaxonomy.cdm.persistence.query.Grouping;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;
@@ -1507,9 +1505,17 @@ public class TransientTaxonService implements ITaxonService {
 
        @Override
        public <S extends TaxonBase> Pager<FindByMarkerDTO<S>> findByMarker(
-                       Class<S> arg0, MarkerType arg1, boolean arg2, TaxonNode arg3,
-                       boolean arg4, Integer arg5, Integer arg6, List<String> arg7) {
-               return defaultService.findByMarker(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+                       Class<S> clazz, MarkerType type, Boolean value, TaxonNode subtree,
+                       boolean includeEntity, Integer size, Integer limit, List<String> path) {
+               return defaultService.findByMarker(clazz, type, value, subtree, includeEntity, size, limit, path);
+       }
+
+       @Override
+       public <S extends TaxonBase> Pager<FindByMarkerDTO<S>> findByMarker(
+                       Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
+                       Integer arg4, Integer arg5, List<String> arg6) {
+               // 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 0d6e58a853d7fddd46fc50078853d5a2bf3a609f..23ca453f241ae52146c191e134e6f6b030c09b18 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
@@ -29,6 +29,7 @@ import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.config.TermDeletionConfigurator;
 import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
+import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.model.common.Annotation;
@@ -924,4 +925,12 @@ public class TransientTermService implements ITermService {
                
                return defaultService.loadByIds(idSet, propertyPaths);
        }
+
+       @Override
+       public <S extends DefinedTermBase> Pager<FindByMarkerDTO<S>> findByMarker(
+                       Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
+                       Integer arg4, Integer arg5, List<String> arg6) {
+               // TODO Auto-generated method stub
+               return null;
+       }
 }