cleanup

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / application / CdmApplicationController.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java
index d8f474a823bc52b2c7dc5cf034fd02ab3132cad4..06cc84299edaeec2aeff69e29c717b5832d0459f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java
@@ -593,46 +593,36 @@ public class CdmApplicationController implements ICdmRepository {
         return configuration.getTermNodeService();\r
     }\r
 \r
-\r
        @Override\r
        public final IVocabularyService getVocabularyService(){\r
                return configuration.getVocabularyService();\r
        }\r
 \r
-\r
        @Override\r
        public final IIdentificationKeyService getIdentificationKeyService(){\r
                return configuration.getIdentificationKeyService();\r
        }\r
 \r
-\r
        @Override\r
        public final IPolytomousKeyService getPolytomousKeyService(){\r
                return configuration.getPolytomousKeyService();\r
        }\r
 \r
-\r
        @Override\r
        public final IPolytomousKeyNodeService getPolytomousKeyNodeService(){\r
                return configuration.getPolytomousKeyNodeService();\r
        }\r
 \r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
     @Override\r
     public IProgressMonitorService getProgressMonitorService() {\r
         return configuration.getProgressMonitorService();\r
     }\r
 \r
-\r
        @Override\r
        public IEntityValidationService getEntityValidationService(){\r
                return configuration.getEntityValidationService();\r
        }\r
 \r
-\r
        @Override\r
        public IEntityConstraintViolationService getEntityConstraintViolationService(){\r
                return configuration.getEntityConstraintViolationService();\r
@@ -643,13 +633,36 @@ public class CdmApplicationController implements ICdmRepository {
                return configuration.getDescriptiveDataSetService();\r
        }\r
 \r
-\r
        @Override\r
        public final ConversationHolder NewConversation(){\r
                //return (ConversationHolder)applicationContext.getBean("conversationHolder");\r
                return configuration.NewConversation();\r
        }\r
 \r
+    @Override\r
+    public IRightsService getRightsService() {\r
+        return configuration.getRightsService();\r
+    }\r
+\r
+    @Override\r
+    public IRegistrationService getRegistrationService() {\r
+        return configuration.getRegistrationService();\r
+    }\r
+\r
+    @Override\r
+    public MediaInfoFactory getMediaInfoFactory() {\r
+        return configuration.getMediaInfoFactory();\r
+    }\r
+\r
+    @Override\r
+    public IPasswordResetService getPasswordResetService() {\r
+        return configuration.getPasswordResetService();\r
+    }\r
+\r
+    @Override\r
+    public IAccountRegistrationService getAccountRegistrationService() {\r
+        return configuration.getAccountRegistrationService();\r
+    }\r
 \r
        /* **** Security ***** */\r
 \r
@@ -666,7 +679,6 @@ public class CdmApplicationController implements ICdmRepository {
                return configuration.getAuthenticationManager();\r
        }\r
 \r
-\r
        @Override\r
        public ICdmPermissionEvaluator getPermissionEvaluator(){\r
                return configuration.getPermissionEvaluator();\r
@@ -685,19 +697,16 @@ public class CdmApplicationController implements ICdmRepository {
                return getPermissionEvaluator().hasPermission(context.getAuthentication(), targetDomainObject, permission);\r
        }\r
 \r
-\r
        @Override\r
        public final PlatformTransactionManager getTransactionManager(){\r
                return configuration.getTransactionManager();\r
        }\r
 \r
-\r
        @Override\r
        public final Object getBean(String name){\r
                return this.applicationContext.getBean(name);\r
        }\r
 \r
-\r
        /*\r
         * OLD TRANSACTION STUFF\r
         */\r
@@ -708,18 +717,15 @@ public class CdmApplicationController implements ICdmRepository {
                sf.getCurrentSession().flush();\r
        }\r
 \r
-\r
        public SessionFactory getSessionFactory(){\r
                return (SessionFactory) applicationContext.getBean("sessionFactory");\r
        }\r
 \r
-\r
        @Override\r
        public TransactionStatus startTransaction(){\r
                return startTransaction(false);\r
        }\r
 \r
-\r
        @Override\r
        public TransactionStatus startTransaction(Boolean readOnly){\r
                return configuration.startTransaction(readOnly);\r
@@ -739,30 +745,4 @@ public class CdmApplicationController implements ICdmRepository {
         return;\r
     }\r
 \r
-    @Override\r
-    public IRightsService getRightsService() {\r
-        return configuration.getRightsService();\r
-    }\r
-\r
-    @Override\r
-    public IRegistrationService getRegistrationService() {\r
-        return configuration.getRegistrationService();\r
-    }\r
-\r
-    @Override\r
-    public MediaInfoFactory getMediaInfoFactory() {\r
-        return configuration.getMediaInfoFactory();\r
-    }\r
-\r
-    @Override\r
-    public IPasswordResetService getPasswordResetService() {\r
-        return configuration.getPasswordResetService();\r
-    }\r
-\r
-    @Override\r
-    public IAccountRegistrationService getAccountRegistrationService() {\r
-        return configuration.getAccountRegistrationService();\r
-    }\r
-\r
-}\r
-\r
+}
\ No newline at end of file