Project

General

Profile

« Previous | Next » 

Revision d8b1c9ce

Added by Andreas Kohlbecker over 6 years ago

flexible choosing of the viewDisplay per UI

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/ui/DistributionStatusUI.java
2 2

  
3 3
import org.apache.log4j.Logger;
4 4
import org.springframework.beans.factory.annotation.Autowired;
5
import org.springframework.beans.factory.annotation.Qualifier;
6 5
import org.springframework.context.ApplicationEventPublisher;
7 6

  
8 7
import com.vaadin.annotations.Theme;
9 8
import com.vaadin.annotations.Title;
10 9
import com.vaadin.annotations.Widgetset;
10
import com.vaadin.navigator.Navigator;
11 11
import com.vaadin.navigator.ViewDisplay;
12 12
import com.vaadin.server.Page;
13 13
import com.vaadin.server.Responsive;
14 14
import com.vaadin.server.VaadinRequest;
15 15
import com.vaadin.spring.annotation.SpringUI;
16 16
import com.vaadin.spring.navigator.SpringViewProvider;
17
import com.vaadin.ui.Component;
18 17
import com.vaadin.ui.UI;
19 18

  
20
import eu.etaxonomy.cdm.vaadin.toolbar.Toolbar;
21 19
import eu.etaxonomy.cdm.vaadin.view.RedirectToLoginView;
22 20
import eu.etaxonomy.cdm.vaadin.view.distributionStatus.DistributionTableViewBean;
23 21
import eu.etaxonomy.vaadin.ui.UIInitializedEvent;
24 22
import eu.etaxonomy.vaadin.ui.navigation.NavigationManagerBean;
25
import eu.etaxonomy.vaadin.ui.view.ToolbarDisplay;
26 23

  
27 24
@Theme("macosx")
28 25
@Title("Distribution Editor")
......
33 30

  
34 31
    private final static Logger logger = Logger.getLogger(DistributionStatusUI.class);
35 32

  
36
    @Autowired
37 33
    private ViewDisplay viewDisplay;
38 34

  
39 35
    //---- pull into abstract super class ? ---------
......
63 59

  
64 60
    public static final String INITIAL_VIEW =  DistributionTableViewBean.NAME;
65 61

  
66
    @Autowired
67
    @Qualifier("registrationToolbar")
68
    private Toolbar toolbar;
62
//    @Autowired
63
//    @Qualifier("registrationToolbar")
64
//    private Toolbar toolbar;
69 65

  
70 66
    @Autowired
71 67
    ApplicationEventPublisher eventBus;
......
80 76

  
81 77
        Responsive.makeResponsive(this);
82 78

  
83
        setContent((Component) viewDisplay);
79
        viewDisplay = new Navigator.SingleComponentContainerViewDisplay(this);
80
        navigator.setViewDisplay(viewDisplay);
81
        //setContent((Component) viewDisplay);
84 82

  
85
        if(ToolbarDisplay.class.isAssignableFrom(viewDisplay.getClass())){
86
            ((ToolbarDisplay)viewDisplay).setToolbar(toolbar);
87
        }
83
//        if(ToolbarDisplay.class.isAssignableFrom(viewDisplay.getClass())){
84
//            ((ToolbarDisplay)viewDisplay).setToolbar(toolbar);
85
//        }
88 86

  
89 87
        eventBus.publishEvent(new UIInitializedEvent());
90 88

  

Also available in: Unified diff