| Chunk |
|---|
| Conflicting content |
|---|
mWheelchairState = newState;
<<<<<<< HEAD
int stateColor = getResources().getColor(
mWSAttributes.get(newState).colorId);
try{
=======
>>>>>>> b826e3fa905c9b96c983b5828349e2f17dc02a8b
if(mWheelchairState.getId() == WheelchairState.UNKNOWN.getId())
state_text.setBackgroundResource(R.drawable.detail_button_grey);
else if(mWheelchairState.getId() == WheelchairState.YES.getId()) |
| Solution content |
|---|
mWheelchairState = newState;
int stateColor = getResources().getColor(
mWSAttributes.get(newState).colorId);
try{
if(mWheelchairState.getId() == WheelchairState.UNKNOWN.getId())
state_text.setBackgroundResource(R.drawable.detail_button_grey);
else if(mWheelchairState.getId() == WheelchairState.YES.getId()) |
| File |
|---|
| POIDetailEditableFragment.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Try statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
state_text.setBackgroundResource(R.drawable.detail_button_grey);
else
state_text.setBackgroundResource(R.drawable.detail_button_grey);
<<<<<<< HEAD
}catch(OutOfMemoryError e){
System.gc();
}
//title_container.setBackgroundColor(stateColor);
//stateIcon.setImageResource(mWSAttributes.get(newState).drawableId);
//stateText.setTextColor(stateColor);
=======
>>>>>>> b826e3fa905c9b96c983b5828349e2f17dc02a8b
state_text.setText(mWSAttributes.get(newState).titleStringId);
} |
| Solution content |
|---|
state_text.setBackgroundResource(R.drawable.detail_button_grey);
else
state_text.setBackgroundResource(R.drawable.detail_button_grey);
}catch(OutOfMemoryError e){
System.gc();
}
//title_container.setBackgroundColor(stateColor);
//stateIcon.setImageResource(mWSAttributes.get(newState).drawableId);
//stateText.setTextColor(stateColor);
state_text.setText(mWSAttributes.get(newState).titleStringId);
} |
| File |
|---|
| POIDetailEditableFragment.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Catch clause |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
long wmID;
private Location mLocation;
<<<<<<< HEAD
ImageView img_logo;
=======
>>>>>>> b826e3fa905c9b96c983b5828349e2f17dc02a8b
private Intent pictureActionIntent = null;
|
| Solution content |
|---|
private Location mLocation;
<<<<<<< HEAD
ImageView img_logo;
=======
>>>>>>> b826e3fa905c9b96c983b5828349e2f17dc02a8b
private Intent pictureActionIntent = null;
long wmID; |
| File |
|---|
| POIDetailFragment.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
private void setWheelchairState(WheelchairState newState) {
mWheelchairState = newState;
<<<<<<< HEAD
int stateColor = getResources().getColor(
mWSAttributes.get(newState).colorId);
try{
=======
>>>>>>> b826e3fa905c9b96c983b5828349e2f17dc02a8b
if(mWheelchairState.getId() == WheelchairState.UNKNOWN.getId())
stateText.setBackgroundResource(R.drawable.detail_button_grey);
else if(mWheelchairState.getId() == WheelchairState.YES.getId()) |
| Solution content |
|---|
private void setWheelchairState(WheelchairState newState) {
mWheelchairState = newState;
<<<<<<< HEAD
int stateColor = getResources().getColor(
mWSAttributes.get(newState).colorId);
try{
=======
>>>>>>> b826e3fa905c9b96c983b5828349e2f17dc02a8b
if(mWheelchairState.getId() == WheelchairState.UNKNOWN.getId())
stateText.setBackgroundResource(R.drawable.detail_button_grey);
else if(mWheelchairState.getId() == WheelchairState.YES.getId()) |
| File |
|---|
| POIDetailFragment.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Try statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
stateText.setBackgroundResource(R.drawable.detail_button_grey);
else
stateText.setBackgroundResource(R.drawable.detail_button_grey);
<<<<<<< HEAD
}catch(OutOfMemoryError e){
System.gc();
}
//title_container.setBackgroundColor(stateColor);
//stateIcon.setImageResource(mWSAttributes.get(newState).drawableId);
//stateText.setTextColor(stateColor);
=======
>>>>>>> b826e3fa905c9b96c983b5828349e2f17dc02a8b
stateText.setText(mWSAttributes.get(newState).titleStringId);
|
| Solution content |
|---|
stateText.setBackgroundResource(R.drawable.detail_button_grey);
else
stateText.setBackgroundResource(R.drawable.detail_button_grey);
<<<<<<< HEAD
}catch(OutOfMemoryError e){
System.gc();
}
//title_container.setBackgroundColor(stateColor);
//stateIcon.setImageResource(mWSAttributes.get(newState).drawableId);
//stateText.setTextColor(stateColor);
=======
>>>>>>> b826e3fa905c9b96c983b5828349e2f17dc02a8b
stateText.setText(mWSAttributes.get(newState).titleStringId);
|
| File |
|---|
| POIDetailFragment.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Catch clause |
| Comment |