| Chunk |
|---|
| Conflicting content |
|---|
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
<<<<<<< HEAD
setUsername();
}
private void setUsername()
{
username = (EditText)findViewById(R.id.username_label);
if (prefs.getString("webapp_username", null) != null)
{
username.setText(prefs.getString("webapp_username", null));
=======
setContentView(R.layout.main);
}
private void populateListView() {
try {
talkMessages = messageStore.getAllMessages();
} catch (Exception e) {
Log.i("Talk", "Error:" + e.getMessage());
}
if (talkMessages != null) {
adapter.setTalkMessages(talkMessages);
talkListView.setAdapter(adapter);
>>>>>>> 272f479bc832716dc494250570ef25f903a7b744
}
}
|
| Solution content |
|---|
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
setUsername();
}
private void setUsername()
{
username = (EditText)findViewById(R.id.username_label);
if (prefs.getString("webapp_username", null) != null)
{
username.setText(prefs.getString("webapp_username", null));
}
}
private void populateListView() {
try {
talkMessages = messageStore.getAllMessages();
} catch (Exception e) {
Log.i("Talk", "Error:" + e.getMessage());
}
if (talkMessages != null) {
adapter.setTalkMessages(talkMessages);
talkListView.setAdapter(adapter);
}
}
|
| File |
|---|
| GeoCamTalkActivity.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Cast expression |
| If statement |
| Method invocation |
| Method signature |
| Try statement |
| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD
public void newMessages() {
populateListView();
}
@Override
protected void onResume() {
super.onResume();
IntentFilter filter = new IntentFilter();
filter.addAction(TalkServerIntent.INTENT_NEW_MESSAGES.toString());
registerReceiver(receiver, filter);
setContentView(R.layout.main);
setUsername();
=======
>>>>>>> 272f479bc832716dc494250570ef25f903a7b744
@Override
protected void onResume() { |
| Solution content |
|---|
public void newMessages() {
populateListView();
}
@Override
protected void onResume() { |
| File |
|---|
| GeoCamTalkActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Method invocation |
| Method signature |
| Variable |