Projects information

Chunk

Conflicting content
package lab.mpp; <<<<<<< HEAD import java.io.IOException; import java.net.MalformedURLException; ======= import java.util.ArrayList; >>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562 import org.json.JSONArray; import org.json.JSONException;

Conflicting content

package lab.mpp;

<<<<<<< HEAD
import java.io.IOException;
import java.net.MalformedURLException;
=======
import java.util.ArrayList;
>>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562

import org.json.JSONArray;
import org.json.JSONException;

Solution content
package lab.mpp; <<<<<<< HEAD import java.io.IOException; import java.net.MalformedURLException; ======= import java.util.ArrayList; >>>>>>> origin/master import org.json.JSONArray; import org.json.JSONException;

Solution content

package lab.mpp;

<<<<<<< HEAD
import java.io.IOException;
import java.net.MalformedURLException;
=======
import java.util.ArrayList;
>>>>>>> origin/master

import org.json.JSONArray;
import org.json.JSONException;

File
ActivityPage.java

Developer's decision
Manual

Kind of conflict
Import

Chunk

Conflicting content
import android.view.View; public class ActivityPage extends Activity { <<<<<<< HEAD private String[] friendNameList = { "jacky", "wang" }; private long[] selectId; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = LayoutInflater.from(this.getParent()).inflate( R.layout.act, null); // setContentView(R.layout.search_activity); setContentView(contentView); ======= private String[] friendNameList = {"jacky","wang"}; private long[] selectId ; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = LayoutInflater.from(this.getParent()).inflate(R.layout.act, null); //setContentView(R.layout.search_activity); setContentView(contentView); ArrayList nameArrayList = LocalData.getFbFriendNameList(); final String[] nameList = (String[])nameArrayList.toArray(new String[nameArrayList.size()]); >>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562 final Activity mppFinal = this.getParent().getParent(); // set button

Conflicting content

import android.view.View;

public class ActivityPage extends Activity {
<<<<<<< HEAD
	private String[] friendNameList = { "jacky", "wang" };
	private long[] selectId;

	@Override
	public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		View contentView = LayoutInflater.from(this.getParent()).inflate(
				R.layout.act, null);
		// setContentView(R.layout.search_activity);
		setContentView(contentView);

=======
	
	private String[] friendNameList = {"jacky","wang"};
	
	private long[] selectId ;
	
	@Override
	public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		View contentView = LayoutInflater.from(this.getParent()).inflate(R.layout.act, null);
		//setContentView(R.layout.search_activity);
		setContentView(contentView); 
		
		ArrayList nameArrayList = LocalData.getFbFriendNameList();
		final String[] nameList = (String[])nameArrayList.toArray(new String[nameArrayList.size()]);
		
>>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562
		final Activity mppFinal = this.getParent().getParent();

		// set button

Solution content
@Override public class ActivityPage extends Activity { import android.view.View; <<<<<<< HEAD private String[] friendNameList = { "jacky", "wang" }; private long[] selectId; public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = LayoutInflater.from(this.getParent()).inflate( R.layout.act, null); // setContentView(R.layout.search_activity); setContentView(contentView); ======= private String[] friendNameList = {"jacky","wang"}; private long[] selectId ; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = LayoutInflater.from(this.getParent()).inflate(R.layout.act, null); //setContentView(R.layout.search_activity); setContentView(contentView); ArrayList nameArrayList = LocalData.getFbFriendNameList(); final String[] nameList = (String[])nameArrayList.toArray(new String[nameArrayList.size()]); >>>>>>> origin/master final Activity mppFinal = this.getParent().getParent(); // set button

Solution content


	@Override
public class ActivityPage extends Activity {
import android.view.View;
<<<<<<< HEAD
	private String[] friendNameList = { "jacky", "wang" };
	private long[] selectId;
	public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		View contentView = LayoutInflater.from(this.getParent()).inflate(
				R.layout.act, null);
		// setContentView(R.layout.search_activity);
		setContentView(contentView);

=======
	
	private String[] friendNameList = {"jacky","wang"};
	
	private long[] selectId ;
	
	@Override
	public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		View contentView = LayoutInflater.from(this.getParent()).inflate(R.layout.act, null);
		//setContentView(R.layout.search_activity);
		setContentView(contentView); 
		
		ArrayList nameArrayList = LocalData.getFbFriendNameList();
		final String[] nameList = (String[])nameArrayList.toArray(new String[nameArrayList.size()]);
		
>>>>>>> origin/master
		final Activity mppFinal = this.getParent().getParent();

		// set button

File
ActivityPage.java

Developer's decision
Manual

Kind of conflict
Annotation
Array initializer
Attribute
Cast expression
Comment
Method invocation
Method signature
Variable

Chunk

Conflicting content
builder.setTitle("加入一個朋友"); final ListView modeList = new ListView(mppFinal); <<<<<<< HEAD ArrayAdapter modeAdapter = new ArrayAdapter( mppFinal, android.R.layout.simple_list_item_multiple_choice, android.R.id.text1, friendNameList); ======= ArrayAdapter modeAdapter = new ArrayAdapter(mppFinal, android.R.layout.simple_list_item_multiple_choice, android.R.id.text1, nameList); >>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562 modeList.setAdapter(modeAdapter); modeList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);

Conflicting content

				builder.setTitle("加入一個朋友");

				final ListView modeList = new ListView(mppFinal);
<<<<<<< HEAD
				ArrayAdapter modeAdapter = new ArrayAdapter(
						mppFinal,
						android.R.layout.simple_list_item_multiple_choice,
						android.R.id.text1, friendNameList);
=======
				ArrayAdapter modeAdapter = new ArrayAdapter(mppFinal, 
						android.R.layout.simple_list_item_multiple_choice, android.R.id.text1, nameList);
>>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562
				modeList.setAdapter(modeAdapter);
				modeList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);

Solution content
builder.setTitle("加入一個朋友"); final ListView modeList = new ListView(mppFinal); <<<<<<< HEAD ArrayAdapter modeAdapter = new ArrayAdapter( mppFinal, android.R.layout.simple_list_item_multiple_choice, android.R.id.text1, friendNameList); ======= ArrayAdapter modeAdapter = new ArrayAdapter(mppFinal, android.R.layout.simple_list_item_multiple_choice, android.R.id.text1, nameList); >>>>>>> origin/master modeList.setAdapter(modeAdapter); modeList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);

Solution content

				builder.setTitle("加入一個朋友");

				final ListView modeList = new ListView(mppFinal);
<<<<<<< HEAD
				ArrayAdapter modeAdapter = new ArrayAdapter(
						mppFinal,
						android.R.layout.simple_list_item_multiple_choice,
						android.R.id.text1, friendNameList);
=======
				ArrayAdapter modeAdapter = new ArrayAdapter(mppFinal, 
						android.R.layout.simple_list_item_multiple_choice, android.R.id.text1, nameList);
>>>>>>> origin/master
				modeList.setAdapter(modeAdapter);
				modeList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);

File
ActivityPage.java

Developer's decision
Manual

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
} catch (FacebookError e) { Log.e(TAG, e.toString()); } <<<<<<< HEAD HttpPoster hp = new HttpPoster(); hp.setInitFbData("friends", response); ======= >>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562 } }

Conflicting content

				} catch (FacebookError e) {
					Log.e(TAG, e.toString());
				}
<<<<<<< HEAD

				HttpPoster hp = new HttpPoster();
				hp.setInitFbData("friends", response);
=======
>>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562
			}

		}

Solution content
} catch (FacebookError e) { Log.e(TAG, e.toString()); } HttpPoster hp = new HttpPoster(); hp.setInitFbData("friends", response); } }

File
LoginActivity.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
} catch (FacebookError e) { Log.e(TAG, e.toString()); } <<<<<<< HEAD HttpPoster hp = new HttpPoster(); hp.setInitFbData("photos", response); ======= >>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562 } }

Conflicting content

				} catch (FacebookError e) {
					Log.e(TAG, e.toString());
				}
<<<<<<< HEAD
				HttpPoster hp = new HttpPoster();
				hp.setInitFbData("photos", response);
=======
>>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562
			}

		}

Solution content
} catch (FacebookError e) { Log.e(TAG, e.toString()); } HttpPoster hp = new HttpPoster(); hp.setInitFbData("photos", response); } }

File
LoginActivity.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
} catch (FacebookError e) { Log.e(TAG, e.toString()); } <<<<<<< HEAD HttpPoster hp = new HttpPoster(); hp.setInitFbData("statuses", response); ======= >>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562 } } }

Conflicting content

				} catch (FacebookError e) {
					Log.e(TAG, e.toString());
				}
<<<<<<< HEAD
				HttpPoster hp = new HttpPoster();
				hp.setInitFbData("statuses", response);
=======
>>>>>>> f6c552000a52de0cbbcdecdc127ba771d4794562
			}
		}
	}

Solution content
} catch (FacebookError e) { Log.e(TAG, e.toString()); } HttpPoster hp = new HttpPoster(); hp.setInitFbData("statuses", response); } } }

File
LoginActivity.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Projects >> mpp_final >>c43dc75f9b823e8bc93660164ceec6a27cf07bb0