Projects >> nubbles >>e4bcea09d07beeec0828a3bff41539d19c514e2e

Chunk
Conflicting content 
		//final FormPanel north = new FormPanel();

		// now for the child panels:
		// At the top, control widgets
<<<<<<< HEAD
		LayoutContainer north = new LayoutContainer();
		HBoxLayout northLayout = new HBoxLayout();
		northLayout.setHBoxLayoutAlign(HBoxLayoutAlign.STRETCH);
		north.setLayout(northLayout);
=======
		final LayoutContainer north = new LayoutContainer();
		//north.setHeading("North: Control Widgets");
		TableLayout tl = new TableLayout(3);
		tl.setBorder(1);
		tl.setWidth("100%");
		north.setLayout(tl);
>>>>>>> 9a19ef0655c6f365d1938a906f288360f3788537

		// 4 calendar controls:
		final FormPanel northCalendar = new FormPanel();
Solution content 

		// now for the child panels:
		// At the top, control widgets

		final LayoutContainer north = new LayoutContainer();
		HBoxLayout northLayout = new HBoxLayout();
		northLayout.setHBoxLayoutAlign(HBoxLayoutAlign.STRETCH);
		north.setLayout(northLayout);
		// 4 calendar controls:
		final FormPanel northCalendar = new FormPanel();
File
Schedule.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
        });
        tabPanel.add(schTab);
        
<<<<<<< HEAD
        // TODO Why does not "tabPanel.setAutoHeight(true);? work?
        tabPanel.setHeight(920);
=======
        TabItem taTab = addTab(ta, "Time Accounting", "Manage Time Accounting");
        taTab.addListener(Events.Select, new SelectionListener(){
    	@Override
    	public void componentSelected(TabPanelEvent tpe){
    		ta.updatePCodeOptions();
    	}
    });        
        tabPanel.add(taTab);
        
        tabPanel.setHeight(800);
>>>>>>> 9a19ef0655c6f365d1938a906f288360f3788537

        RootPanel rp = RootPanel.get();
        rp.add(new Image("http://www.gb.nrao.edu/~dss/images/banner.jpg"));
Solution content 
        });
        tabPanel.add(schTab);
        
        TabItem taTab = addTab(ta, "Time Accounting", "Manage Time Accounting");
        taTab.addListener(Events.Select, new SelectionListener(){
    	@Override
    	public void componentSelected(TabPanelEvent tpe){
    		ta.updatePCodeOptions();
    	}
    });        
        tabPanel.add(taTab);
        
        // TODO Why does not "tabPanel.setAutoHeight(true);? work?
        tabPanel.setHeight(920);


        RootPanel rp = RootPanel.get();
        rp.add(new Image("http://www.gb.nrao.edu/~dss/images/banner.jpg"));
File
Scheduler.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Variable