Projects >> externalKanbanBoardForJira >>b3c81ac54d8ebfc0cc9d9c598c28ba7e83511e2b

Chunk
Conflicting content 
	private KanbanBoardServiceAsync service;
	private HasWidgets container;
	private KanbanBoardViewImpl kanbanBoardView;
<<<<<<< HEAD
	@Inject
	private final KanbanBoardResources resources;

	@Inject
	public KanbanBoardController(EventBus eventBus, KanbanBoardResources resources) {
		this.eventBus = eventBus;
		this.resources = resources;
		this.resources.style().ensureInjected();
=======
	private KanbanBoardPresenter kanbanBoardPresenter;

	@Inject
	public KanbanBoardController(KanbanBoardServiceAsync rpcService, EventBus eventBus, KanbanBoardPresenter kanbanBoardPresenter) {
		this.service = rpcService;
		this.eventBus = eventBus;
		this.kanbanBoardPresenter = kanbanBoardPresenter;
>>>>>>> 810b2be54b535b25f29a40e1131154c71b557ce7
		bind();
	}
Solution content 
	private KanbanBoardServiceAsync service;
	private HasWidgets container;
	private KanbanBoardViewImpl kanbanBoardView;
	@Inject
	private final KanbanBoardResources resources;
	@Inject
	KanbanBoardPresenter kanbanBoardPresenter;

	@Inject
	public KanbanBoardController(EventBus eventBus, KanbanBoardResources resources) {
		this.eventBus = eventBus;
		this.resources = resources;
		this.resources.style().ensureInjected();
		bind();
	}
File
KanbanBoardController.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Method invocation
Method signature
Variable
Chunk
Conflicting content 
	        			kanbanBoardView = new KanbanBoardViewImpl(resources);
	              
	        		}
<<<<<<< HEAD
	        		new KanbanBoardPresenter(service, eventBus, new KanbanBoardViewImpl(resources)).execute(container);
=======
//	        		kanbanBoardPresenter = new KanbanBoardPresenter(service, eventBus, new KanbanBoardViewImpl());
	        		kanbanBoardPresenter.execute(container);
>>>>>>> 810b2be54b535b25f29a40e1131154c71b557ce7
	        	}
	    	});
	      }
Solution content 
	        			kanbanBoardView = new KanbanBoardViewImpl(resources);
	              
	        		}
	        		kanbanBoardPresenter.execute(container);
	        	}
	    	});
	      }
File
KanbanBoardController.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HorizontalPanel;
<<<<<<< HEAD
import com.google.inject.Inject;
=======
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.VerticalPanel;
>>>>>>> 810b2be54b535b25f29a40e1131154c71b557ce7
import com.stw.kanban.client.entities.Board;
import com.stw.kanban.client.entities.BoardColumn;
import com.stw.kanban.resources.KanbanBoardResources;
Solution content 
import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.inject.Inject;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.stw.kanban.client.entities.Board;
import com.stw.kanban.client.entities.BoardColumn;
import com.stw.kanban.resources.KanbanBoardResources;
File
KanbanBoardViewImpl.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
	private VerticalPanel mainPanel = new VerticalPanel();
	private HorizontalPanel boardColumnPanel;
	private Presenter presenter;
<<<<<<< HEAD
	private KanbanBoardResources resources;
		
	@Inject
	public KanbanBoardViewImpl(KanbanBoardResources resources) { 
		this.resources = resources;
		this.resources.style().ensureInjected();
		panel = new HorizontalPanel();
		initWidget(panel);
		panel.setHeight("99%");
		panel.setWidth("99%");
=======
	private Label lastUpdatedLabel;
		
	public KanbanBoardViewImpl() { 
		
		boardColumnPanel = new HorizontalPanel();
		initWidget(mainPanel);
		mainPanel.add(boardColumnPanel);
		mainPanel.setHeight("99%");
		mainPanel.setWidth("99%");
		boardColumnPanel.setHeight("100%");
		boardColumnPanel.setWidth("100%");
		lastUpdatedLabel = new Label();
		mainPanel.add(lastUpdatedLabel);
>>>>>>> 810b2be54b535b25f29a40e1131154c71b557ce7
	}
	
	public void onLoadedBoard() {
Solution content 
	private HorizontalPanel boardColumnPanel;
	private Presenter presenter;
	private Label lastUpdatedLabel;
	@Inject
	private KanbanBoardResources resources;
		
	@Inject		
	public KanbanBoardViewImpl(KanbanBoardResources resources) {
		this.resources = resources;
		this.resources.style().ensureInjected();
	
		mainPanel = new VerticalPanel();
		initWidget(mainPanel);
		
		boardColumnPanel = new HorizontalPanel();
		mainPanel.add(boardColumnPanel);
		
		mainPanel.setHeight("99%");
		mainPanel.setWidth("99%");
		boardColumnPanel.setHeight("100%");
		boardColumnPanel.setWidth("100%");
		
		lastUpdatedLabel = new Label();
		mainPanel.add(lastUpdatedLabel);
	}
	
	public void onLoadedBoard() {
File
KanbanBoardViewImpl.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Method invocation
Method signature