1.1 --- a/src/main/java/ru/indvdum/mywork/vaadin/MyWorkApplication.java	Tue Aug 16 09:09:18 2011 +0300
     1.2 +++ b/src/main/java/ru/indvdum/mywork/vaadin/MyWorkApplication.java	Tue Aug 16 15:54:50 2011 +0300
     1.3 @@ -7,13 +7,21 @@
     1.4  import javax.persistence.Query;
     1.5  
     1.6  import ru.indvdum.mywork.openjpa.model.Day;
     1.7 +import ru.indvdum.mywork.openjpa.model.Task;
     1.8 +import ru.indvdum.mywork.openjpa.model.Work;
     1.9  
    1.10  import com.vaadin.Application;
    1.11  import com.vaadin.addon.jpacontainer.JPAContainer;
    1.12  import com.vaadin.addon.jpacontainer.provider.LocalEntityProvider;
    1.13 +import com.vaadin.ui.Alignment;
    1.14 +import com.vaadin.ui.Button;
    1.15 +import com.vaadin.ui.HorizontalLayout;
    1.16 +import com.vaadin.ui.TabSheet;
    1.17  import com.vaadin.ui.Table;
    1.18  import com.vaadin.ui.VerticalLayout;
    1.19  import com.vaadin.ui.Window;
    1.20 +import com.vaadin.ui.Button.ClickEvent;
    1.21 +import com.vaadin.ui.Button.ClickListener;
    1.22  
    1.23  /**
    1.24   * @author indvdum
    1.25 @@ -27,21 +35,45 @@
    1.26  		Window window = new Window();
    1.27  		setMainWindow(window);
    1.28  		
    1.29 -		VerticalLayout vl = new VerticalLayout();
    1.30 -		window.setContent(vl);
    1.31 -		
    1.32 -		Query query = EM.createQuery("select x from " + Day.class.getName() + " x");
    1.33 +		Query query = EM.createQuery("select x from " + Work.class.getName() + " x");
    1.34  		List list = query.getResultList();
    1.35  		list.size();
    1.36  		
    1.37 -//		LocalEntityProvider entityProvider = new LocalEntityProvider(Day.class);
    1.38 -//		entityProvider.setEntityManager(EM);
    1.39 -//		JPAContainer<Day> dayContainer = new JPAContainer(Day.class);
    1.40 -//		dayContainer.setEntityProvider(entityProvider);
    1.41 -//		
    1.42 -//		Table dayTable = new Table();
    1.43 -//		dayTable.setSizeFull();
    1.44 -//		dayTable.setContainerDataSource(dayContainer);
    1.45 -//		vl.addComponent(dayTable);
    1.46 +		TabSheet tabSheet = new TabSheet();
    1.47 +		tabSheet.setSizeFull();
    1.48 +		window.setContent(tabSheet);
    1.49 +		
    1.50 +		VerticalLayout vlMain = new VerticalLayout();
    1.51 +		vlMain.setMargin(true);
    1.52 +		vlMain.setSpacing(true);
    1.53 +		tabSheet.addTab(vlMain, "Main page", null);
    1.54 +		
    1.55 +		LocalEntityProvider dayProvider = new LocalEntityProvider(Day.class);
    1.56 +		dayProvider.setEntityManager(EM);
    1.57 +		JPAContainer<Day> dayContainer = new JPAContainer(Day.class);
    1.58 +		dayContainer.setEntityProvider(dayProvider);
    1.59 +		
    1.60 +		final Table dayTable = new Table();
    1.61 +		dayTable.setSelectable(true);
    1.62 +		dayTable.setEditable(false);
    1.63 +		dayTable.setImmediate(true);
    1.64 +		dayTable.setSizeFull();
    1.65 +		dayTable.setContainerDataSource(dayContainer);
    1.66 +		vlMain.addComponent(dayTable);
    1.67 +		vlMain.setExpandRatio(dayTable, 1f);
    1.68 +		
    1.69 +		LocalEntityProvider taskProvider = new LocalEntityProvider(Task.class);
    1.70 +		taskProvider.setEntityManager(EM);
    1.71 +		JPAContainer<Task> taskContainer = new JPAContainer(Task.class);
    1.72 +		taskContainer.setEntityProvider(taskProvider);
    1.73 +		
    1.74 +		Table taskTable = new Table();
    1.75 +		taskTable.setSelectable(true);
    1.76 +		taskTable.setEditable(false);
    1.77 +		taskTable.setImmediate(true);
    1.78 +		taskTable.setSizeFull();
    1.79 +		taskTable.setContainerDataSource(taskContainer);
    1.80 +		vlMain.addComponent(taskTable);
    1.81 +		vlMain.setExpandRatio(taskTable, 1f);
    1.82  	}
    1.83  }