| Chunk |
|---|
| Conflicting content |
|---|
import at.tugraz.ist.musicdroid.common.Projekt;
public class MusicdroidActivity extends Activity implements OnClickListener {
<<<<<<< HEAD
/** Called when the activity is first created. */
private Button OpenRecorderButton;
private Button OpenPlayerButton;
private Button OpenProjectButton;
private Button NewProjectButton;
@Override
public void onCreate(Bundle savedInstanceState) {
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);
=======
/** Called when the activity is first created. */
private final int REQUEST_SELECT_MUSIC = 0;
TextView my_list_view;
String filename_;
private Button OpenRecorderButton;
private Button OpenPlayerButton;
private Button OpenSoundfileButton;
private Button NewProjectButton;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
>>>>>>> 4a291d631260de13a88078064c3f73f1dd356299
OpenRecorderButton = (Button) findViewById(R.id.soundRecorderButton);
OpenRecorderButton.setOnClickListener(this); |
| Solution content |
|---|
OpenRecorderButton.setOnClickListener(this);
import at.tugraz.ist.musicdroid.common.Projekt;
public class MusicdroidActivity extends Activity implements OnClickListener {
/** Called when the activity is first created. */
private final int REQUEST_SELECT_MUSIC = 0;
TextView my_list_view;
String filename_;
private Button OpenRecorderButton;
private Button OpenPlayerButton;
private Button OpenSoundfileButton;
private Button NewProjectButton;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
//Intent i = new Intent(MusicdroidActivity.this, RecordSoundActivity.class);
//startActivity(i);
OpenRecorderButton = (Button) findViewById(R.id.soundRecorderButton); |
| File |
|---|
| MusicdroidActivity.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Cast expression |
| Comment |
| Method invocation |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
if (arg0 == OpenSoundfileButton) {
LoadFile();
}
<<<<<<< HEAD
if (arg0 == OpenPlayerButton)
{
Intent i = new Intent(MusicdroidActivity.this, PianoActivity.class);
startActivity(i);
}
if (arg0 == OpenRecorderButton)
{
Intent i = new Intent(MusicdroidActivity.this, RecordSoundActivity.class);
=======
if (arg0 == OpenPlayerButton) {
// open player
// pl.initFile("mnt/sdcard/bluetooth/test.midi");
// String filename = Projekt.getInstance().getLastSoundFile();
// System.out.println(Projekt.getInstance().getLastSoundFile());
String filename = Projekt.getInstance().getLastSoundFile();
Intent intent = new Intent(MusicdroidActivity.this,
PlaySoundActivity.class);
intent.putExtra("filename", filename);
// PlaySoundActivity.getInstance().initFile(filename);
// PlaySoundActivity.getInstanceCount().initFile(filename);
// startActivity(new Intent(this, PlaySoundActivity.class));
System.out.println("Vor StartActivity");
startActivity(intent);
}
if (arg0 == OpenRecorderButton) {
Intent i = new Intent(MusicdroidActivity.this, RecordSoundActivity.class);
>>>>>>> 4a291d631260de13a88078064c3f73f1dd356299
startActivity(i);
}
} |
| Solution content |
|---|
if (arg0 == OpenSoundfileButton) {
LoadFile();
}
if (arg0 == OpenPlayerButton) {
// pl.initFile("mnt/sdcard/bluetooth/test.midi");
// String filename = Projekt.getInstance().getLastSoundFile();
// System.out.println(Projekt.getInstance().getLastSoundFile());
String filename = Projekt.getInstance().getLastSoundFile();
Intent intent = new Intent(MusicdroidActivity.this,
PlaySoundActivity.class);
intent.putExtra("filename", filename);
// PlaySoundActivity.getInstance().initFile(filename);
// PlaySoundActivity.getInstanceCount().initFile(filename);
// startActivity(new Intent(this, PlaySoundActivity.class));
System.out.println("Vor StartActivity");
startActivity(intent);
}
if (arg0 == OpenRecorderButton) {
Intent i = new Intent(MusicdroidActivity.this, RecordSoundActivity.class);
startActivity(i);
startActivity(i);
}
} |
| File |
|---|
| MusicdroidActivity.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import android.content.Intent; import android.content.ServiceConnection; import android.content.res.Configuration; <<<<<<< HEAD import android.graphics.drawable.Drawable; ======= >>>>>>> 4a291d631260de13a88078064c3f73f1dd356299 import android.media.AudioManager; import android.media.MediaPlayer; import android.net.Uri; |
| Solution content |
|---|
import android.content.Intent; import android.content.ServiceConnection; import android.content.res.Configuration; import android.media.AudioManager; import android.media.MediaPlayer; import android.net.Uri; |
| File |
|---|
| RecordSoundActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
<<<<<<< HEAD
=======
import at.tugraz.ist.musicdroid.common.Constants;
>>>>>>> 4a291d631260de13a88078064c3f73f1dd356299
public class RecordSoundActivity extends Activity {
private final static String Appname = "Record_Sound"; |
| Solution content |
|---|
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import at.tugraz.ist.musicdroid.common.Constants;
import at.tugraz.ist.musicdroid.common.DataManagement;
import at.tugraz.ist.musicdroid.common.Projekt;
public class RecordSoundActivity extends Activity {
private final static String Appname = "Record_Sound"; |
| File |
|---|
| RecordSoundActivity.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
private ImageView recordlight;
private AlertDialog.Builder builder;
private AlertDialog alert;
<<<<<<< HEAD
private final ServiceConnection pdConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
pdService = ((PdService.PdBinder)service).getService();
try {
initPd();
loadPatch();
} catch (IOException e) {
Log.e(Appname, e.toString());
finish();
}
}
@Override
public void onServiceDisconnected(ComponentName name) {
}
};
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
bindService(new Intent(this, PdService.class),pdConnection,BIND_AUTO_CREATE);
setContentView(R.layout.record);
initGui();
guiHandler();
}
public void onConfigurationChanged(Configuration newConfig)
{
super.onConfigurationChanged(newConfig);
setContentView(R.layout.record);
guiHandler();
// initGui();
}
public void initGui() {
builder = new AlertDialog.Builder(this);
builder.setMessage(R.string.overwrite_dialog)
.setCancelable(false)
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
chrono.setBase(SystemClock.elapsedRealtime());
chrono.start();
stopButton.setEnabled(true);
stopButton.setBackgroundResource(R.drawable.stop);
playButton.setEnabled(true);
playButton.setBackgroundResource(R.drawable.play);
recordButton.setEnabled(false);
recordButton.setBackgroundResource(R.drawable.recdisabled);
recordlight = (ImageView) findViewById(R.id.recordlight);
recordlight.setImageResource(R.drawable.recordlighton);
recordSoundFile();
}
})
.setNegativeButton("No", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
alert = builder.create();
directory = new File(Environment.getExternalStorageDirectory()+File.separator+"records");
directory.mkdirs();
newFile = new File(directory, "test.wav");
recordButton = (Button) findViewById(R.id.button2);
stopButton = (Button) findViewById(R.id.stopButton);
playButton = (Button) findViewById(R.id.playButton);
stopButton.setBackgroundResource(R.drawable.stopdisabled);
stopButton.setEnabled(false);
playButton.setBackgroundResource(R.drawable.playdisabled);
playButton.setEnabled(false); //todo
// testoutput = (TextView) findViewById(R.id.textView1);
chrono = (Chronometer) findViewById(R.id.chronometer1);
}
private void guiHandler()
{
recordButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String file = android.os.Environment.getExternalStorageDirectory().getPath() + "/records/test.wav";
File newFile = new File(file);
if(newFile.exists())
{
alert.show();
}
else
{
chrono.setBase(SystemClock.elapsedRealtime());
chrono.start();
stopButton.setEnabled(true);
stopButton.setBackgroundResource(R.drawable.stop);
playButton.setEnabled(true);
playButton.setBackgroundResource(R.drawable.play);
recordButton.setEnabled(false);
recordButton.setBackgroundResource(R.drawable.recdisabled);
recordlight = (ImageView) findViewById(R.id.recordlight);
recordlight.setImageResource(R.drawable.recordlighton);
recordSoundFile();
}
}
});
stopButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
String status = "stop";
chrono.stop();
recordlight.setImageResource(R.drawable.recordlightoff);
recordButton.setEnabled(true);
recordButton.setBackgroundResource(R.drawable.rec);
PdBase.sendSymbol("status", status);
File file = new File(dir, "firstrecord.wav");
patch = file;
try {
copyFile(patch, newFile);
=======
boolean unsaved_changes = false;
private final ServiceConnection pdConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName name, IBinder service) {
pdService = ((PdService.PdBinder) service).getService();
try {
initPd();
loadPatch();
>>>>>>> 4a291d631260de13a88078064c3f73f1dd356299
} catch (IOException e) {
Log.e(Appname, e.toString());
finish(); |
| Solution content |
|---|
private ImageView recordlight;
private AlertDialog.Builder builder;
private AlertDialog alert;
boolean unsaved_changes = false;
boolean on_back_pressed = false;
private final ServiceConnection pdConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName name, IBinder service) {
pdService = ((PdService.PdBinder) service).getService();
try {
initPd();
loadPatch();
} catch (IOException e) {
Log.e(Appname, e.toString());
finish(); |
| File |
|---|
| RecordSoundActivity.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Method declaration |
| Method invocation |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
});
playfile();
}
}
<<<<<<< HEAD
}
playButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
if(!recordButton.isEnabled())
{
Context context = getApplicationContext();
int duration = Toast.LENGTH_SHORT;
Toast toast = Toast.makeText(context, R.string.record_toast, duration);
toast.show();
}
else
{
playfile();
}
}
});
}
private void loadPatch() throws IOException {
Log.e("test", "test");
=======
});
}
private void loadPatch() throws IOException {
Log.e("test", "test");
>>>>>>> 4a291d631260de13a88078064c3f73f1dd356299
dir = getFilesDir();
IoUtils.extractZipResource(
getResources().openRawResource(R.raw.recordtest), dir, true); |
| Solution content |
|---|
playfile();
}
}
});
}
private void loadPatch() throws IOException {
Log.e("test", "test");
dir = getFilesDir();
IoUtils.extractZipResource(
getResources().openRawResource(R.raw.recordtest), dir, true); |
| File |
|---|
| RecordSoundActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Method signature |