Projects >> nubbles >>7154e4e85d502a3d31041f72315c09b33e7f4efe

Chunk
Conflicting content
		setCreateFilterToolBar(false);
		setLoadDataInitially(false);
		initLayout(initColumnModel(), true);
<<<<<<< HEAD
		// Setting auto height for the PeriodExplorer only because
		// it is contained in the schedule tab.
		setAutoHeight(true);
		setScrollMode(Scroll.AUTOY);
		getGrid().setAutoHeight(true);
		
=======
		// make sure every time data is loaded, scores are recalculated
		loader.addListener(Loader.Load, new LoadListener() {
    	      @Override
		      public void loaderLoad(LoadEvent le) {
		    	  getScores();
    	      }    
		});	
>>>>>>> d381a5bf0ab7db35872ff8802bc5b96f316e3129
	}
	
	private ColumnModel initColumnModel() {
Solution content
		setCreateFilterToolBar(false);
		setLoadDataInitially(false);
		initLayout(initColumnModel(), true);
<<<<<<< HEAD
		// Setting auto height for the PeriodExplorer only because
		// it is contained in the schedule tab.
		setAutoHeight(true);
		setScrollMode(Scroll.AUTOY);
		getGrid().setAutoHeight(true);
		
=======
		// make sure every time data is loaded, scores are recalculated
		loader.addListener(Loader.Load, new LoadListener() {
    	      @Override
		      public void loaderLoad(LoadEvent le) {
		    	  getScores();
    	      }    
		});	
>>>>>>> d381a5bf0ab7db35872ff8802bc5b96f316e3129
	}
	
	private ColumnModel initColumnModel() {
File
PeriodExplorer.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation