BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc87b74
)
update new generic services in TaxEditor #4224
author
Andreas Müller
<a.mueller@bgbm.org>
Tue, 20 May 2014 11:12:31 +0000
(11:12 +0000)
committer
Andreas Müller
<a.mueller@bgbm.org>
Tue, 20 May 2014 11:12:31 +0000
(11:12 +0000)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
patch
|
blob
|
history
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 313ef06d02ad9643cbe353e478c5b6c223320c8a..11a381a5446f69cd45037e4e27d6cbf6effa8d34 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
@@
-23,7
+23,6
@@
import org.hibernate.envers.query.criteria.AuditCriterion;
import eu.etaxonomy.cdm.api.service.IAgentService;
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
import eu.etaxonomy.cdm.api.service.IAgentService;
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
-import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.model.agent.Address;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.model.agent.Address;
@@
-508,7
+507,7
@@
public class TransientAgentService implements IAgentService {
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
List<AgentBase> list(Class<? extends AgentBase
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends AgentBase> List<S> list(Class<S
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultAgentService.list(type, limit, start, orderHints, propertyPaths);
}
return defaultAgentService.list(type, limit, start, orderHints, propertyPaths);
}
@@
-603,7
+602,7
@@
public class TransientAgentService implements IAgentService {
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
Pager<AgentBase> page(Class<? extends AgentBase
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends AgentBase> Pager<S> page(Class<S
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultAgentService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
return defaultAgentService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
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 04c4b45206a5346ac6df7d79b123bf1c542f5be0..941a1151896ee674760ccc87a4763076aa3dcd5a 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
@@
-23,7
+23,6
@@
import org.hibernate.envers.query.criteria.AuditCriterion;
import eu.etaxonomy.cdm.api.service.IClassificationService;
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
import eu.etaxonomy.cdm.api.service.IClassificationService;
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
-import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.model.common.Annotation;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.model.common.Annotation;
@@
-527,7
+526,7
@@
public class TransientClassificationService implements IClassificationService {
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
List<Classification> list(Class<? extends Classification
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends Classification> List<S> list(Class<S
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultClassificationService.list(type, limit, start, orderHints, propertyPaths);
}
return defaultClassificationService.list(type, limit, start, orderHints, propertyPaths);
}
@@
-635,7
+634,7
@@
public class TransientClassificationService implements IClassificationService {
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
Pager<Classification> page(Class<? extends Classification
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends Classification> Pager<S> page(Class<S
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultClassificationService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
return defaultClassificationService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
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 f53599ca6ee70c6677758d76b689846e979d1db9..8dcdc78e31cf49b1a70c02a4bd2e8142b00ef203 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
@@
-24,7
+24,6
@@
import eu.etaxonomy.cdm.api.service.DistributionTree;
import eu.etaxonomy.cdm.api.service.IDescriptionService;
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
import eu.etaxonomy.cdm.api.service.IDescriptionService;
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
-import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.model.common.Annotation;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.model.common.Annotation;
@@
-525,7
+524,7
@@
public class TransientDescriptionService implements IDescriptionService {
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
List<DescriptionBase> list(Class<? extends DescriptionBase
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends DescriptionBase> List<S> list(Class<S
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultDescriptionService.list(type, limit, start, orderHints, propertyPaths);
}
return defaultDescriptionService.list(type, limit, start, orderHints, propertyPaths);
}
@@
-653,7
+652,7
@@
public class TransientDescriptionService implements IDescriptionService {
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
Pager<DescriptionBase> page(Class<? extends DescriptionBase
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends DescriptionBase> Pager<S> page(Class<S
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultDescriptionService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
return defaultDescriptionService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
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 50606709f29be44e6f72561b66a26baf7ae6b332..bdd9cd2c81a2136ef23ee27dbde1ad5f9fb45973 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
@@
-589,7
+589,7
@@
public class TransientNameService implements INameService {
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
List<TaxonNameBase> list(Class<? extends TaxonNameBase
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends TaxonNameBase> List<S> list(Class<S
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultNameService.list(type, limit, start, orderHints, propertyPaths);
}
return defaultNameService.list(type, limit, start, orderHints, propertyPaths);
}
@@
-701,7
+701,7
@@
public class TransientNameService implements INameService {
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
Pager<TaxonNameBase> page(Class<? extends TaxonNameBase
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends TaxonNameBase> Pager<S> page(Class<S
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultNameService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
return defaultNameService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
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 c7c98901a1f121b4bd49b9e37e3343df6d7729db..cb28d8ae6a5604327c3a9fce81e92fe88833a7dc 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
@@
-503,7
+503,7
@@
public class TransientOccurenceService implements IOccurrenceService {
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
List<SpecimenOrObservationBase> list(Class<? extends SpecimenOrObservationBase
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends SpecimenOrObservationBase> List<S> list(Class<S
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultService.list(type, limit, start, orderHints, propertyPaths);
}
return defaultService.list(type, limit, start, orderHints, propertyPaths);
}
@@
-654,7
+654,7
@@
public class TransientOccurenceService implements IOccurrenceService {
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
Pager<SpecimenOrObservationBase> page(Class<? extends SpecimenOrObservationBase
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends SpecimenOrObservationBase> Pager<S> page(Class<S
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
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 932cae0f71462c76338ce5317b4815a3747a391c..1c052a6031b4be230d1be50966757719c5599e79 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
@@
-23,7
+23,6
@@
import org.hibernate.envers.query.criteria.AuditCriterion;
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.IReferenceService;
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
-import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.model.common.Annotation;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.model.common.Annotation;
@@
-461,7
+460,7
@@
public class TransientReferenceService implements IReferenceService {
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
List<Reference> list(Class<? extends Reference
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends Reference> List<S> list(Class<S
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultReferenceService.list(type, limit, start, orderHints, propertyPaths);
}
return defaultReferenceService.list(type, limit, start, orderHints, propertyPaths);
}
@@
-556,7
+555,7
@@
public class TransientReferenceService implements IReferenceService {
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
Pager<Reference> page(Class<? extends Reference
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends Reference> Pager<S> page(Class<S
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultReferenceService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
return defaultReferenceService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
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 da1c1752e29dd942829c1e3bb2490590e3f4b0af..4b913bae19a37f6828adc807452d7d1e82a59b6f 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
@@
-34,7
+34,6
@@
import eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator;
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
import eu.etaxonomy.cdm.api.service.exception.DataChangeNoRollbackException;
import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
import eu.etaxonomy.cdm.api.service.exception.DataChangeNoRollbackException;
import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;
-import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.api.service.search.LuceneMultiSearchException;
import eu.etaxonomy.cdm.api.service.search.SearchResult;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.api.service.search.LuceneMultiSearchException;
import eu.etaxonomy.cdm.api.service.search.SearchResult;
@@
-284,16
+283,6
@@
public class TransientTaxonService implements ITaxonService {
return defaultTaxonService.exists(uuid);
}
return defaultTaxonService.exists(uuid);
}
- /**
- * @param limit
- * @param start
- * @return
- * @see eu.etaxonomy.cdm.api.service.ITaxonService#getAllSynonyms(int, int)
- */
- @Override
- public List<Synonym> getAllSynonyms(int limit, int start) {
- return defaultTaxonService.getAllSynonyms(limit, start);
- }
/**
* @param x
/**
* @param x
@@
-306,17
+295,6
@@
public class TransientTaxonService implements ITaxonService {
return defaultTaxonService.replace(x, y);
}
return defaultTaxonService.replace(x, y);
}
- /**
- * @param limit
- * @param start
- * @return
- * @see eu.etaxonomy.cdm.api.service.ITaxonService#getAllTaxa(int, int)
- */
- @Override
- public List<Taxon> getAllTaxa(int limit, int start) {
- return defaultTaxonService.getAllTaxa(limit, start);
- }
-
/**
* @param uuidSet
* @return
/**
* @param uuidSet
* @return
@@
-538,7
+516,7
@@
public class TransientTaxonService implements ITaxonService {
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
List<TaxonBase> list(Class<? extends TaxonBase
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends TaxonBase> List<S> list(Class<S
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultTaxonService.list(type, limit, start, orderHints, propertyPaths);
}
return defaultTaxonService.list(type, limit, start, orderHints, propertyPaths);
}
@@
-649,7
+627,7
@@
public class TransientTaxonService implements ITaxonService {
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
Pager<TaxonBase> page(Class<? extends TaxonBase
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends TaxonBase> Pager<S> page(Class<S
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultTaxonService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
return defaultTaxonService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
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 fa0d6a7b41f5a9a716e409abe09a6ac8dac78cce..e4a80d30d05beea9f8ef9f6ccef273408ee0a4d4 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
@@
-28,7
+28,6
@@
import eu.etaxonomy.cdm.api.service.ITermService;
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.config.DeleteConfiguratorBase;
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
import eu.etaxonomy.cdm.api.service.config.TermDeletionConfigurator;
-import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.model.common.Annotation;
import eu.etaxonomy.cdm.api.service.pager.Pager;
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
import eu.etaxonomy.cdm.model.common.Annotation;
@@
-582,7
+581,7
@@
public class TransientTermService implements ITermService {
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
List<DefinedTermBase> list(Class<? extends DefinedTermBase
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends DefinedTermBase> List<S> list(Class<S
> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultTermService.list(type, limit, start, orderHints, propertyPaths);
}
return defaultTermService.list(type, limit, start, orderHints, propertyPaths);
}
@@
-702,7
+701,7
@@
public class TransientTermService implements ITermService {
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
* @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
*/
@Override
- public
Pager<DefinedTermBase> page(Class<? extends DefinedTermBase
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+ public
<S extends DefinedTermBase> Pager<S> page(Class<S
> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
return defaultTermService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}
return defaultTermService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
}