/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 82f2be03

fix #7742 unsubscribing other beans from event bus on dispose()

     import javax.annotation.PostConstruct;
     import org.springframework.beans.factory.DisposableBean;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.beans.factory.annotation.Qualifier;
     import org.vaadin.spring.events.EventBus;
-...
      */
     @SpringComponent("distributionToolbar")
     @ViewScope
     public class DistributionToolbar extends HorizontalLayout implements Serializable{
     public class DistributionToolbar extends HorizontalLayout implements Serializable, DisposableBean{
     	/**
     	 * automatically generated ID
-...
         @Autowired
         private final void setViewEventBus(EventBus.UIEventBus viewEventBus){
             this.uiEventBus = viewEventBus;
             viewEventBus.subscribe(AuthenticationSuccessEvent.class);
             viewEventBus.subscribe(AuthenticationSuccessEvent.class); // FIXME shouldn't this be .subscribe(this) ??
+        }
         @Autowired
-...
     	public Button getHelpButton() {
     		return helpButton;
+    	}
         /**
          * {@inheritDoc}
          */
         @Override
         public void destroy() throws Exception {
             uiEventBus.unsubscribe(this);
+        }
+    }

     import java.util.stream.Collectors;
     import java.util.stream.StreamSupport;
     import org.springframework.beans.factory.DisposableBean;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.vaadin.spring.events.EventBus;
     import org.vaadin.spring.events.annotation.EventBusListenerMethod;
-...
     @SpringComponent
     @UIScope
     class ValoMainMenuBean extends CssLayout implements MainMenu {
     class ValoMainMenuBean extends CssLayout implements MainMenu, DisposableBean {
     	private static final long serialVersionUID = -993548217313748689L;
-...
         public void addMenuComponent(Component component) {
             menuArea.addComponent(component);
+        }
         /**
          * {@inheritDoc}
          */
         @Override
         public void destroy() throws Exception {
             uiEventBus.unsubscribe(this);
+        }
+    }

         public void setViewDisplay(ViewDisplay viewDisplay){
             this.viewDisplay = viewDisplay;
+        }
         /**
          * {@inheritDoc}
          */
         @Override
         public void destroy() {
             super.destroy();
             uiEventBus.unsubscribe(this);
+        }
+    }

Also available in: Unified diff