/src/main/java/eu/etaxonomy/cdm/addon/config/CdmVaadinConfiguration.java - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 7f6f8587

Added by Andreas Kohlbecker over 2 years ago

ID 7f6f8587f39e820d2c1969ce960f375ca9403085
Parent 551708da
Child 3a2f0b2a

ref #9884 refactoring UI enablement:

ui beans never are null
disabled beans have state.enabled=false
uis throw UIDisabledException
ErrorView to show UIDisabledException
UIDisabledErrorHandle delegates to the ErrorView

         @WebServlet(name="CdmVaadinServlet", value = {"/app/*", "/VAADIN/*"}, asyncSupported = true)
         public static class CdmVaadinServlet extends SpringVaadinServlet {
             private static final long serialVersionUID = -2615042297393028775L;
             private static final long serialVersionUID = 1L;
             /**
+             *
             @SuppressWarnings("serial")
             /*
             @Override
             protected void servletInitialized() throws ServletException {
                 logger.debug("SpringVaadinServlet initialized");
+            }
                 super.servletInitialized();
                 getService().addSessionInitListener(new SessionInitListener() {
                     private static final long serialVersionUID = 1L;
                     @Override
                     public void sessionInit(SessionInitEvent sessionInitEvent) throws ServiceException {
                         VaadinSession session = sessionInitEvent.getSession();
                         session.setErrorHandler(new DefaultErrorHandler(){
                             private static final long serialVersionUID = 1L;
                             @Override
                             public void error(ErrorEvent errorEvent) {
                                 // ...
                                 UIDisabledException uiDisbledException = findUIDisabledException(errorEvent.getThrowable());
                                 if(uiDisbledException != null) {
                                     logger.error("################## > UIDisabledException");
                                     //throw uiDisbledException ;
                                     doDefault(errorEvent);
                                 } else {
                                     doDefault(errorEvent);
+                                }
+                            }
                             private UIDisabledException findUIDisabledException(Throwable throwable) {
                                 if(throwable instanceof UIDisabledException) {
                                     return (UIDisabledException)throwable;
                                 } else {
                                     if(throwable.getCause() == null) {
                                         return null;
                                     } else {
                                         return findUIDisabledException(throwable.getCause());
+                                    }
+                                }
+                            }
                         });
                         ).getServiceRegistry().getService
                     }});
                     logger.debug("SpringVaadinServlet initialized");
+            }
              */
             */
+        }
         public CdmVaadinConfiguration() {
-...
         @Bean
         @UIScope
         public ConceptRelationshipUI conceptRelationshipUI() {
             if(isUIEnabled(ConceptRelationshipUI.class)){
                 return new ConceptRelationshipUI();
+            }
             return null;
             return applyEnableConfig(new ConceptRelationshipUI());
+        }
         @Bean
         @UIScope
         public RegistrationUI registrationUI() {
             if(isUIEnabled(RegistrationUI.class)){
                 registerRegistrationUiHibernateEventListeners();
                 return new RegistrationUI();
+            }
             return null;
             return applyEnableConfig(new RegistrationUI());
+        }
         @Bean
         @UIScope
         public UserAccountSelfManagementUI passwordResetUI() {
             if(isUIEnabled(UserAccountSelfManagementUI.class)){
                 registerRegistrationUiHibernateEventListeners();
                 return new UserAccountSelfManagementUI();
+            }
             return null;
         public UserAccountSelfManagementUI userAccountSelfManagementUI() {
             return applyEnableConfig(new UserAccountSelfManagementUI());
+        }
         @Bean
         @UIScope
         public DistributionStatusUI distributionStatusUI() {
             return applyEnableConfig( new DistributionStatusUI());
+        }
         @Bean
         @UIScope
         public StatusEditorUI statusEditorUI() {
             return applyEnableConfig(new StatusEditorUI());
+        }
         /**
-...
             return minter;
+        }
         @Bean
         @UIScope
         public DistributionStatusUI distributionStatusUI() {
             if(isUIEnabled(DistributionStatusUI.class)){
                 return new DistributionStatusUI();
+            }
             return null;
+        }
         @Bean
         @UIScope
         public StatusEditorUI statusEditorUI() {
             if(isUIEnabled(StatusEditorUI.class)){
                 return new StatusEditorUI();
+            }
             return null;
+        }
         static final String PROPERTIES_FILE_NAME = "vaadin-apps";
         private Properties appProps = null;
-...
+        }
         private <T extends UI> T applyEnableConfig(T ui) {
             ui.setEnabled(isUIEnabled(ui.getClass()));
             return ui;
+        }
         /**
          * {@inheritDoc}
          */
         @Override
         public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
             this.applicationContext = applicationContext;

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 7f6f8587

Added by Andreas Kohlbecker over 2 years ago

Project

General

Profile

EDIT

Revision 7f6f8587

Added by Andreas Kohlbecker over 2 years ago

Related issues