Projects >> tvguide-sample-parent >>fc60ea76ecd6f07bc2c2e01c00ecbec9761ae38c

Chunk
Conflicting content 
	
=======
>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
	ButtonElement login;
	@UiField
	ButtonElement register;
<<<<<<< HEAD
	@UiField
	ButtonElement about;
	private Presenter presenter;

	public LoginWidget() {
Solution content 
	ButtonElement login;
	@UiField
	ButtonElement register;
	@UiField
	ButtonElement about;
	
	private Presenter presenter;

	public LoginWidget() {
File
LoginWidget.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
import com.acme.gwt.client.place.TvGuidePlaceHistoryMapper;
import com.acme.gwt.client.place.WelcomePlace;
import com.acme.gwt.client.presenter.TvGuideActivityMapper;
<<<<<<< HEAD
import com.acme.gwt.client.view.AboutView;
=======
>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
import com.acme.gwt.client.view.LoginView;
import com.acme.gwt.client.view.WelcomeView;
import com.acme.gwt.client.widget.AboutWidget;
Solution content 
import com.acme.gwt.client.place.TvGuidePlaceHistoryMapper;
import com.acme.gwt.client.place.WelcomePlace;
import com.acme.gwt.client.presenter.TvGuideActivityMapper;
import com.acme.gwt.client.view.AboutView;
import com.acme.gwt.client.view.LoginView;
import com.acme.gwt.client.view.WelcomeView;
import com.acme.gwt.client.widget.AboutWidget;
File
TvGuideClientModule.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
		// View interfaces to their singleton Widgets
		bind(WelcomeView.class).to(WelcomeWidget.class).in(Singleton.class);
		bind(LoginView.class).to(LoginWidget.class);//not singleton, since it should only be loaded once
<<<<<<< HEAD
		bind(AboutView.class).to(AboutWidget.class).in(Singleton.class);
=======
>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
	}

	@Singleton
Solution content 
		// View interfaces to their singleton Widgets
		bind(WelcomeView.class).to(WelcomeWidget.class).in(Singleton.class);
		bind(LoginView.class).to(LoginWidget.class);//not singleton, since it should only be loaded once
		bind(AboutView.class).to(AboutWidget.class).in(Singleton.class);

	}

	@Singleton
File
TvGuideClientModule.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import com.acme.gwt.client.TvGuide;
import com.acme.gwt.client.place.ShowDetailPlace;
import com.acme.gwt.client.place.WelcomePlace;
<<<<<<< HEAD
import com.acme.gwt.client.presenter.AboutPresenter;
=======
>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
import com.acme.gwt.client.presenter.LoginPresenter;
import com.acme.gwt.client.presenter.ShowDetailPresenter;
import com.acme.gwt.client.presenter.WelcomePresenter;
Solution content 
import com.acme.gwt.client.TvGuide;
import com.acme.gwt.client.place.ShowDetailPlace;
import com.acme.gwt.client.place.WelcomePlace;
import com.acme.gwt.client.presenter.AboutPresenter;
import com.acme.gwt.client.presenter.LoginPresenter;
import com.acme.gwt.client.presenter.ShowDetailPresenter;
import com.acme.gwt.client.presenter.WelcomePresenter;
File
TvGuideGinjector.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	// Provide injection for each Presenter. Consider replacing this mess with assisted inject
	void injectPresenter(WelcomePresenter presenter);
	void injectPresenter(ShowDetailPresenter presenter);
<<<<<<< HEAD
	void injectPresenter(AboutPresenter presenter);
=======
>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
	//...

	// List the tokenizers that are available for history. Another way to solve this?
Solution content 
	// Provide injection for each Presenter. Consider replacing this mess with assisted inject
	void injectPresenter(WelcomePresenter presenter);
	void injectPresenter(ShowDetailPresenter presenter);
	void injectPresenter(AboutPresenter presenter);
	//...

	// List the tokenizers that are available for history. Another way to solve this?
File
TvGuideGinjector.java
Developer's decision
Version 1
Kind of conflict
Method interface
Chunk
Conflicting content 
package com.acme.gwt.client.presenter;

import com.acme.gwt.client.ioc.TvGuideGinjector;
<<<<<<< HEAD
import com.acme.gwt.client.place.AboutPlace;
=======
>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
import com.acme.gwt.client.place.ShowDetailPlace;
import com.acme.gwt.client.place.WelcomePlace;
import com.google.gwt.activity.shared.Activity;
Solution content 
package com.acme.gwt.client.presenter;

import com.acme.gwt.client.ioc.TvGuideGinjector;
import com.acme.gwt.client.place.AboutPlace;
import com.acme.gwt.client.place.ShowDetailPlace;
import com.acme.gwt.client.place.WelcomePlace;
import com.google.gwt.activity.shared.Activity;
File
TvGuideActivityMapper.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
			injector.injectPresenter(p);
			return p;
		}
<<<<<<< HEAD
		if (place instanceof AboutPlace) {
			AboutPresenter p = new AboutPresenter();
			injector.injectPresenter(p);
			return p;
		}
=======
>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec

		return null;
	}
Solution content 
			injector.injectPresenter(p);
			return p;
		}

		if (place instanceof AboutPlace) {
			AboutPresenter p = new AboutPresenter();
			injector.injectPresenter(p);
			return p;
		}

		return null;
	}
File
TvGuideActivityMapper.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
package com.acme.gwt.client.widget;

import com.acme.gwt.shared.TvEpisodeProxy;
<<<<<<< HEAD
//<<<<<<< HEAD
////import com.colinalworth.celltable.columns.client.Columns;
////import com.colinalworth.celltable.columns.client.HasDataFlushableEditor;
//=======
//import com.colinalworth.celltable.columns.client.Columns;
//>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
=======
import com.colinalworth.celltable.columns.client.Columns;
>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
import com.google.gwt.cell.client.EditTextCell;
import com.google.gwt.core.client.GWT;
import com.google.gwt.editor.client.Editor.Path;
Solution content 
package com.acme.gwt.client.widget;

import com.acme.gwt.shared.TvEpisodeProxy;
import com.google.gwt.core.client.GWT;
import com.google.gwt.editor.client.Editor.Path;
File
EditableEpisodeListWidget.java
Developer's decision
None
Kind of conflict
Comment
Import
Chunk
Conflicting content 
	CellTable list = new CellTable();

	public EditableEpisodeListWidget() {
<<<<<<< HEAD
		//listEd = HasDataFlushableEditor.of(list);
		//columns.configure(list, listEd);
=======
		listEd = HasDataEditor.of(list);

		columns.configure(list);

>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
		initWidget(uiBinder.createAndBindUi(this));
	}
Solution content 
	CellTable list = new CellTable();

	public EditableEpisodeListWidget() {
		//listEd = HasDataFlushableEditor.of(list);
		//columns.configure(list, listEd);
		initWidget(uiBinder.createAndBindUi(this));
	}
File
EditableEpisodeListWidget.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
import java.util.List;

import com.acme.gwt.shared.TvShowProxy;
<<<<<<< HEAD
//<<<<<<< HEAD
////import com.colinalworth.celltable.columns.client.Columns;
////import com.colinalworth.celltable.columns.client.HasDataFlushableEditor;
////import com.google.gwt.cell.client.TextCell;
//=======
//import com.colinalworth.celltable.columns.client.Columns;
=======
import com.colinalworth.celltable.columns.client.Columns;
>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
import com.google.gwt.cell.client.TextCell;
//>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
import com.google.gwt.core.client.GWT;
Solution content 
import java.util.List;

import com.acme.gwt.shared.TvShowProxy;
//<<<<<<< HEAD
////import com.colinalworth.celltable.columns.client.Columns;
////import com.colinalworth.celltable.columns.client.HasDataFlushableEditor;
////import com.google.gwt.cell.client.TextCell;
//=======
//import com.colinalworth.celltable.columns.client.Columns;
//>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
import com.google.gwt.core.client.GWT;
File
FavoriteShowsListWidget.java
Developer's decision
Version 1
Kind of conflict
Comment
Import
Chunk
Conflicting content 
//	private ShowColumns columns = GWT.create(ShowColumns.class);
	@Path("")
	HasDataEditor listEditor;
<<<<<<< HEAD
//>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
=======
>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
	@UiField(provided = true)
	CellTable list = new CellTable();
Solution content 
//	private ShowColumns columns = GWT.create(ShowColumns.class);
	@Path("")
	HasDataEditor listEditor;
	@UiField(provided = true)
	CellTable list = new CellTable();
File
FavoriteShowsListWidget.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
	CellTable list = new CellTable();

	public FavoriteShowsListWidget() {
<<<<<<< HEAD
//<<<<<<< HEAD
//		listEditor = HasDataFlushableEditor.of(list);
//
//		columns.configure(list, listEditor);
//=======
		listEditor = HasDataEditor.of(list);

//		columns.configure(list);
//>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec
=======
		listEditor = HasDataEditor.of(list);

		columns.configure(list);
>>>>>>> eca62aed5f6c10a8a84d523e74d86ea7584f51ec

		initWidget(uiBinder.createAndBindUi(this));
	}
Solution content 
	CellTable list = new CellTable();

	public FavoriteShowsListWidget() {
//		listEditor = HasDataFlushableEditor.of(list);
//		columns.configure(list, listEditor);
		listEditor = HasDataEditor.of(list);

		listEditor = HasDataEditor.of(list);

//		columns.configure(list);

		initWidget(uiBinder.createAndBindUi(this));
	}
File
FavoriteShowsListWidget.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Method invocation