Projects information

Chunk

Conflicting content
@Override protected void valueModelUpdated(Integer newColor) { <<<<<<< HEAD textView.setTextColor(newColor); ======= view.setTextColor(newColor); >>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc } }

Solution content
@Override protected void valueModelUpdated(Integer newColor) { view.setTextColor(newColor); } }

File
TextColorAttribute.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content
@Override protected void valueModelUpdated(Bitmap newBitmap) { <<<<<<< HEAD view.setBackgroundResource(newResourceId); ======= view.setBackgroundDrawable(new BitmapDrawable(newBitmap)); >>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc } }

Conflicting content

		@Override
		protected void valueModelUpdated(Bitmap newBitmap)
		{
<<<<<<< HEAD
			view.setBackgroundResource(newResourceId);
=======
			view.setBackgroundDrawable(new BitmapDrawable(newBitmap));
>>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc
		}
	}

Solution content
@Override protected void valueModelUpdated(Bitmap newBitmap) { view.setBackgroundDrawable(new BitmapDrawable(newBitmap)); } }

File
BackgroundAttribute.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content
public class TextColorAttributeTest extends AbstractPropertyViewAttributeTest { @Test <<<<<<< HEAD public void givenBoundAttribute_whenValueModelUpdated_thenViewShouldReflectChanges() ======= public void whenValueModelUpdated_ThenViewShouldReflectChanges() >>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc { int newColor = RandomValues.anyColor();

Conflicting content

public class TextColorAttributeTest extends AbstractPropertyViewAttributeTest
{
	@Test
<<<<<<< HEAD
	public void givenBoundAttribute_whenValueModelUpdated_thenViewShouldReflectChanges()
=======
	public void whenValueModelUpdated_ThenViewShouldReflectChanges()
>>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc
	{
		int newColor = RandomValues.anyColor();

Solution content
public class TextColorAttributeTest extends AbstractPropertyViewAttributeTest { @Test public void whenValueModelUpdated_ThenViewShouldReflectChanges() { int newColor = RandomValues.anyColor();

File
TextColorAttributeTest.java

Developer's decision
Version 2

Kind of conflict
Method signature

Chunk

Conflicting content
@RunWith(RobolectricTestRunner.class) public class BackgroundAttributeTest { <<<<<<< HEAD @Test public void givenResourceIdBoundAttribute_whenValueModelUpdated_thenViewShouldReflectChanges() ======= private BackgroundAttribute backgroundAttribute; private Map, Class>> propertyTypeToViewAttributeMappings; @Before public void setUp() >>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc { backgroundAttribute = new BackgroundAttribute();

Conflicting content

@RunWith(RobolectricTestRunner.class)
public class BackgroundAttributeTest
{
<<<<<<< HEAD
	@Test
	public void givenResourceIdBoundAttribute_whenValueModelUpdated_thenViewShouldReflectChanges()
=======
	private BackgroundAttribute backgroundAttribute;
	private Map, Class>> propertyTypeToViewAttributeMappings;
	@Before
	public void setUp()
>>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc
	{
		backgroundAttribute = new BackgroundAttribute();

Solution content
@RunWith(RobolectricTestRunner.class) public class BackgroundAttributeTest { private BackgroundAttribute backgroundAttribute; private Map, Class>> propertyTypeToViewAttributeMappings; @Before public void setUp() { backgroundAttribute = new BackgroundAttribute();

Solution content

@RunWith(RobolectricTestRunner.class)
public class BackgroundAttributeTest
{
	private BackgroundAttribute backgroundAttribute;
	private Map, Class>> propertyTypeToViewAttributeMappings;
	@Before
	public void setUp()
	{
		backgroundAttribute = new BackgroundAttribute();

File
BackgroundAttributeTest.java

Developer's decision
Version 2

Kind of conflict
Annotation
Attribute
Method signature

Chunk

Conflicting content
propertyTypeToViewAttributeMappings.put(Drawable.class, DrawableBackgroundAttribute.class); } @Test <<<<<<< HEAD public void givenDrawableBoundAttribute_whenValueModelUpdated_thenViewShouldReflectChanges() ======= public void givenPropertyType_whenCreatePropertyViewAttribute_thenReturnExpectedInstance() >>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc { for(Class propertyType : propertyTypeToViewAttributeMappings.keySet()) {

Conflicting content

		propertyTypeToViewAttributeMappings.put(Drawable.class, DrawableBackgroundAttribute.class);
	}
	@Test
<<<<<<< HEAD
	public void givenDrawableBoundAttribute_whenValueModelUpdated_thenViewShouldReflectChanges()
=======
	public void givenPropertyType_whenCreatePropertyViewAttribute_thenReturnExpectedInstance()
>>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc
	{
		for(Class propertyType : propertyTypeToViewAttributeMappings.keySet())
		{

Solution content
propertyTypeToViewAttributeMappings.put(Drawable.class, DrawableBackgroundAttribute.class); } @Test public void givenPropertyType_whenCreatePropertyViewAttribute_thenReturnExpectedInstance() { for(Class propertyType : propertyTypeToViewAttributeMappings.keySet()) {

Solution content

		propertyTypeToViewAttributeMappings.put(Drawable.class, DrawableBackgroundAttribute.class);
	}
	
	@Test
	public void givenPropertyType_whenCreatePropertyViewAttribute_thenReturnExpectedInstance()
	{
		for(Class propertyType : propertyTypeToViewAttributeMappings.keySet())
		{

File
BackgroundAttributeTest.java

Developer's decision
Manual

Kind of conflict
Method signature

Chunk

Conflicting content
* @version $Revision: 1.0 $ * @author Cheng Wei */ <<<<<<< HEAD:robobinding/src/test/java/org/robobinding/viewattribute/view/BackgroundColorAttributeTest.java @RunWith(RobolectricTestRunner.class) public class BackgroundColorAttributeTest extends AbstractViewPropertyAttributeTest { @Test public void givenBoundAttribute_whenValueModelUpdated_thenViewShouldReflectChanges() ======= public class BackgroundColorTest extends AbstractPropertyViewAttributeTest { @Test public void whenValueModelUpdated_ThenViewShouldReflectChanges() >>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc:robobinding/src/test/java/org/robobinding/viewattribute/view/BackgroundColorTest.java { int newColor = RandomValues.anyColor();

Conflicting content

 * @version $Revision: 1.0 $
 * @author Cheng Wei
 */
<<<<<<< HEAD:robobinding/src/test/java/org/robobinding/viewattribute/view/BackgroundColorAttributeTest.java
@RunWith(RobolectricTestRunner.class)
public class BackgroundColorAttributeTest extends AbstractViewPropertyAttributeTest
{
	@Test
	public void givenBoundAttribute_whenValueModelUpdated_thenViewShouldReflectChanges()
=======
public class BackgroundColorTest extends AbstractPropertyViewAttributeTest
{
	@Test
	public void whenValueModelUpdated_ThenViewShouldReflectChanges()
>>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc:robobinding/src/test/java/org/robobinding/viewattribute/view/BackgroundColorTest.java
	{
		int newColor = RandomValues.anyColor();

Solution content
* @version $Revision: 1.0 $ * @author Cheng Wei */ public class BackgroundColorAttributeTest extends AbstractPropertyViewAttributeTest { @Test public void whenValueModelUpdated_ThenViewShouldReflectChanges() { int newColor = RandomValues.anyColor();

Solution content

 * @version $Revision: 1.0 $
 * @author Cheng Wei
 */
public class BackgroundColorAttributeTest extends AbstractPropertyViewAttributeTest
{
	@Test
	public void whenValueModelUpdated_ThenViewShouldReflectChanges()
	{
		int newColor = RandomValues.anyColor();

File
BackgroundColorAttributeTest.java

Developer's decision
Manual

Kind of conflict
Annotation
Class signature
Method signature

Chunk

Conflicting content
public class SelectedAttributeTest extends AbstractPropertyViewAttributeTest { @Test <<<<<<< HEAD public void givenBoundAttribute_whenValueModelUpdated_thenViewShouldReflectChanges() ======= public void whenValueModelUpdated_ThenViewShouldReflectChanges() >>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc { boolean selected = RandomValues.trueOrFalse();

Conflicting content

public class SelectedAttributeTest extends AbstractPropertyViewAttributeTest
{
	@Test
<<<<<<< HEAD
	public void givenBoundAttribute_whenValueModelUpdated_thenViewShouldReflectChanges()
=======
	public void whenValueModelUpdated_ThenViewShouldReflectChanges()
>>>>>>> 1b9ff1b56f34793b20c00e3bf7eee8caf0b516cc
	{
		boolean selected = RandomValues.trueOrFalse();

Solution content
public class SelectedAttributeTest extends AbstractPropertyViewAttributeTest { @Test public void whenValueModelUpdated_ThenViewShouldReflectChanges() { boolean selected = RandomValues.trueOrFalse();

File
SelectedAttributeTest.java

Developer's decision
Version 2

Kind of conflict
Method signature

Projects >> RoboBinding >>5ca0d2a16dcf282f3b65848e14e30b88ceb6447d