| Chunk |
|---|
| Conflicting content |
|---|
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
<<<<<<< HEAD
Intent i = new Intent(MusicdroidActivity.this, RecordSoundActivity.class);
startActivity(i);
// Seventh change!!! (Bianca ;-) )
}
}
=======
OpenRecorderButton = (Button)findViewById(R.id.soundRecorderButton);
OpenRecorderButton.setOnClickListener(this);
OpenPlayerButton = (Button)findViewById(R.id.soundPlayerButton);
OpenPlayerButton.setOnClickListener(this);
OpenProjectButton = (Button)findViewById(R.id.openProjectButton);
OpenProjectButton.setOnClickListener(this);
NewProjectButton = (Button)findViewById(R.id.newProjectButton);
NewProjectButton.setOnClickListener(this);
}
public void onClick(View arg0) {
// TODO Auto-generated method stub
if (arg0 == NewProjectButton)
{
// new project
}
if (arg0 == OpenProjectButton)
{
// open project
}
if (arg0 == OpenPlayerButton)
{
// open player
}
if (arg0 == OpenRecorderButton)
{
// open Recorder
}
}
}
>>>>>>> b5b828866f33d68209a8a89cb44fff12e4a82210 |
| Solution content |
|---|
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
Intent i = new Intent(MusicdroidActivity.this, RecordSoundActivity.class);
startActivity(i);
OpenRecorderButton = (Button)findViewById(R.id.soundRecorderButton);
OpenRecorderButton.setOnClickListener(this);
OpenPlayerButton = (Button)findViewById(R.id.soundPlayerButton);
OpenPlayerButton.setOnClickListener(this);
OpenProjectButton = (Button)findViewById(R.id.openProjectButton);
OpenProjectButton.setOnClickListener(this);
NewProjectButton = (Button)findViewById(R.id.newProjectButton);
NewProjectButton.setOnClickListener(this);
}
public void onClick(View arg0) {
// TODO Auto-generated method stub
if (arg0 == NewProjectButton)
{
// new project
}
if (arg0 == OpenProjectButton)
{
// open project
}
if (arg0 == OpenPlayerButton)
{
// open player
}
if (arg0 == OpenRecorderButton)
{
// open Recorder
}
}
}
|
| File |
|---|
| MusicdroidActivity.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Cast expression |
| Comment |
| Method declaration |
| Method invocation |
| Variable |