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:
42ea3f7
)
Add annotation service to config
author
Cherian Mathew
<c.mathew@bgbm.org>
Tue, 8 Sep 2015 15:54:33 +0000
(17:54 +0200)
committer
Cherian Mathew
<c.mathew@bgbm.org>
Tue, 8 Sep 2015 15:54:33 +0000
(17:54 +0200)
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index 23e530215a921fd0d6511def12e4912837fd17d0..0de5bc0bdaea31551b0646a1f352a1e4b1e2e16a 100644
(file)
--- a/
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@
-37,6
+37,7
@@
import org.springframework.transaction.TransactionStatus;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
\r
import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;
\r
import eu.etaxonomy.cdm.api.service.IAgentService;
\r
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
\r
import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;
\r
import eu.etaxonomy.cdm.api.service.IAgentService;
\r
+import eu.etaxonomy.cdm.api.service.IAnnotationService;
\r
import eu.etaxonomy.cdm.api.service.IClassificationService;
\r
import eu.etaxonomy.cdm.api.service.ICollectionService;
\r
import eu.etaxonomy.cdm.api.service.ICommonService;
\r
import eu.etaxonomy.cdm.api.service.IClassificationService;
\r
import eu.etaxonomy.cdm.api.service.ICollectionService;
\r
import eu.etaxonomy.cdm.api.service.ICommonService;
\r
@@
-204,6
+205,11
@@
public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
return (IAgentService) getService(IAgentService.class, "/remoting/agent.service", new CdmServiceRequestExecutor());
\r
}
\r
\r
return (IAgentService) getService(IAgentService.class, "/remoting/agent.service", new CdmServiceRequestExecutor());
\r
}
\r
\r
+ @Override
\r
+ public IAnnotationService getAnnotationService(){
\r
+ return (IAnnotationService) getService(IAnnotationService.class, "/remoting/annotation.service", new CdmServiceRequestExecutor());
\r
+ }
\r
+
\r
@Override
\r
public IDatabaseService getDatabaseService(){
\r
return (IDatabaseService) getService(IDatabaseService.class, "/remoting/database.service", new CdmServiceRequestExecutor());
\r
@Override
\r
public IDatabaseService getDatabaseService(){
\r
return (IDatabaseService) getService(IDatabaseService.class, "/remoting/database.service", new CdmServiceRequestExecutor());
\r
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java
index caa6991897609acb5672a25d1935bddccf132a7b..aebdee8f95469a89c17da851e339333ae2b726eb 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java
@@
-18,6
+18,7
@@
import org.springframework.transaction.TransactionStatus;
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IAgentService;
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IAgentService;
+import eu.etaxonomy.cdm.api.service.IAnnotationService;
import eu.etaxonomy.cdm.api.service.IClassificationService;
import eu.etaxonomy.cdm.api.service.ICollectionService;
import eu.etaxonomy.cdm.api.service.ICommonService;
import eu.etaxonomy.cdm.api.service.IClassificationService;
import eu.etaxonomy.cdm.api.service.ICollectionService;
import eu.etaxonomy.cdm.api.service.ICommonService;
@@
-409,4
+410,12
@@
public class TransientCdmRepository implements ICdmApplicationConfiguration {
public IEntityValidationService getEntityValidationService() {
return defaultApplicationConfiguration.getEntityValidationService();
}
public IEntityValidationService getEntityValidationService() {
return defaultApplicationConfiguration.getEntityValidationService();
}
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getAnnotationService()
+ */
+ @Override
+ public IAnnotationService getAnnotationService() {
+ return defaultApplicationConfiguration.getAnnotationService();
+ }
}
}