| Chunk |
|---|
| Conflicting content |
|---|
*/ private static long selectedCourseCode = -1; /** <<<<<<< HEAD * Short name of the chosen course. * */ private static String selectedCourseShortName; /** * Short name of the full course. * */ private static String selectedCourseFullName; ======= * Code of the chosen course for rollcall. All next actions are referred to this course. */ private static long selectedRollcallCourseCode = -1; >>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1 /** * Indicates if there are changes on db * */ |
| Solution content |
|---|
*/ private static long selectedCourseCode = -1; /** * Short name of the chosen course. * */ private static String selectedCourseShortName; /** * Short name of the full course. * */ private static String selectedCourseFullName; /** * Code of the chosen course for rollcall. All next actions are referred to this course. */ private static long selectedRollcallCourseCode = -1; /** * Indicates if there are changes on db * */ |
| File |
|---|
| Global.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
/**
* Request code for Rollcall Config Download module.
*/
<<<<<<< HEAD
public static final int SCAN_QR_REQUEST_CODE = 12;
/**
* Request code for Directory Tree Download module
* */
public static final int DIRECTORY_TREE_REQUEST_CODE = 13;
/**
* Request code for Directory Tree Download module
* */
public static final int GROUPS_REQUEST_CODE = 14;
/**
* Request code for Downloads Manager
* */
public static final int DOWNLOADSMANAGER_REQUEST_CODE = 15;
/**
* Request code for Notify Download
* */
public static final int NOTIFYDOWNLOAD_REQUEST_CODE = 16;
/**
* Request code for MyGroups Manager
* */
public static final int MYGROUPSMANAGER_REQUEST_CODE= 17;
=======
public static final int ROLLCALL_CONFIG_DOWNLOAD_REQUEST_CODE = 15;
/**
* Request code for Rollcall History module.
*/
public static final int ROLLCALL_HISTORY_REQUEST_CODE = 16;
/**
* Request code for Students List module.
*/
public static final int STUDENTS_LIST_REQUEST_CODE = 17;
/**
* Request code for Students History module.
*/
public static final int STUDENTS_HISTORY_REQUEST_CODE = 18;
/**
* Request code for Sessions List module.
*/
public static final int SESSIONS_LIST_REQUEST_CODE = 19;
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
/**
* Prefix tag name for Logcat
*/ |
| Solution content |
|---|
/**
* Request code for Rollcall Config Download module.
*/
public static final int ROLLCALL_CONFIG_DOWNLOAD_REQUEST_CODE = 15;
/**
* Request code for Rollcall History module.
*/
public static final int ROLLCALL_HISTORY_REQUEST_CODE = 16;
/**
* Request code for Students List module.
*/
public static final int STUDENTS_LIST_REQUEST_CODE = 17;
/**
* Request code for Students History module.
*/
public static final int STUDENTS_HISTORY_REQUEST_CODE = 18;
/**
* Request code for Sessions List module.
*/
public static final int SESSIONS_LIST_REQUEST_CODE = 19;
/**
* Request code for Downloads Manager
* */
public static final int DOWNLOADSMANAGER_REQUEST_CODE = 20;
/**
* Request code for Notify Download
* */
public static final int NOTIFYDOWNLOAD_REQUEST_CODE = 21;
/**
* Request code for MyGroups Manager
* */
public static final int MYGROUPSMANAGER_REQUEST_CODE= 22;
/**
* Prefix tag name for Logcat
*/ |
| File |
|---|
| Global.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
public static void setPreferencesChanged(boolean newState){
preferencesChanged = newState;
}
<<<<<<< HEAD
public static void setSelectedCourseShortName(String currentCourseShortName){
selectedCourseShortName = currentCourseShortName;
}
public static void setSelectedCourseFullName(String currentCourseFullName){
selectedCourseFullName = currentCourseFullName;
}
public static String getSelectedCourseShortName(){
return selectedCourseShortName;
}
public static String getSelectedCourseFullName(){
return selectedCourseFullName;
=======
/**
* Gets code of actual rollcall course
* return -1 if no rollcall course chosen; code of actual rollcall course in other case
* */
public static long getSelectedRollcallCourseCode() {
return selectedRollcallCourseCode;
}
/**
* Sets code of actual rollcall course
* @param actualCourseCode. Code of the chosen rollcall course. It should be actualCourseCode>0. Otherwise nothing will change
* */
public static void setSelectedRollcallCourseCode(long actualCourseCode) {
selectedRollcallCourseCode = actualCourseCode;
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
}
} |
| Solution content |
|---|
public static void setPreferencesChanged(boolean newState){
preferencesChanged = newState;
}
public static void setSelectedCourseShortName(String currentCourseShortName){
selectedCourseShortName = currentCourseShortName;
}
public static void setSelectedCourseFullName(String currentCourseFullName){
selectedCourseFullName = currentCourseFullName;
}
public static String getSelectedCourseShortName(){
return selectedCourseShortName;
}
public static String getSelectedCourseFullName(){
return selectedCourseFullName;
}
/**
* Gets code of actual rollcall course
* return -1 if no rollcall course chosen; code of actual rollcall course in other case
* */
public static long getSelectedRollcallCourseCode() {
return selectedRollcallCourseCode;
}
/**
* Sets code of actual rollcall course
* @param actualCourseCode. Code of the chosen rollcall course. It should be actualCourseCode>0. Otherwise nothing will change
* */
public static void setSelectedRollcallCourseCode(long actualCourseCode) {
selectedRollcallCourseCode = actualCourseCode;
}
} |
| File |
|---|
| Global.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Method declaration |
| Method signature |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import es.ugr.swad.swadroid.modules.Messages; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.modules.Notices; <<<<<<< HEAD import es.ugr.swad.swadroid.modules.attendance.Attendance; import es.ugr.swad.swadroid.modules.downloads.DownloadsManager; ======= >>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1 import es.ugr.swad.swadroid.modules.downloads.DirectoryTreeDownload; import es.ugr.swad.swadroid.modules.groups.MyGroupsManager; import es.ugr.swad.swadroid.modules.notifications.Notifications; |
| Solution content |
|---|
import es.ugr.swad.swadroid.modules.Messages; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.modules.Notices; import es.ugr.swad.swadroid.modules.downloads.DownloadsManager; import es.ugr.swad.swadroid.modules.downloads.DirectoryTreeDownload; import es.ugr.swad.swadroid.modules.notifications.Notifications; |
| File |
|---|
| SWADMain.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
/** * Group position inside the main menu for User group * */ <<<<<<< HEAD private int USERS_GROUP = 4; ======= private int USERS_GROUP = 2; >>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1 /** * Child position inside the messages menu for Notification * */ |
| Solution content |
|---|
/** * Group position inside the main menu for User group * */ private int USERS_GROUP = 4; /** * Child position inside the messages menu for Notification * */ |
| File |
|---|
| SWADMain.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
}else{
Global.setSelectedCourseCode(-1);
<<<<<<< HEAD
Global.setSelectedCourseShortName("");
Global.setSelectedCourseFullName("");
if(!firstRun && Module.connectionAvailable(this)) getCurrentCourses(); //at the first run, this will be launched after the preferences menu
=======
if(!firstRun && Module.connectionAvailable(this))
getActualCourses(); //at the first run, this will be launched after the preferences menu
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
}
currentRole = -1;
} catch (Exception ex) { |
| Solution content |
|---|
}else{
Global.setSelectedCourseCode(-1);
Global.setSelectedCourseShortName("");
Global.setSelectedCourseFullName("");
if(!firstRun && Module.connectionAvailable(this)) getCurrentCourses(); //at the first run, this will be launched after the preferences menu
}
currentRole = -1;
} catch (Exception ex) { |
| File |
|---|
| SWADMain.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
createMenu();
break;
case Global.GROUPS_REQUEST_CODE:
<<<<<<< HEAD
=======
// Check if course has practice groups
Cursor c = dbHelper.getPracticeGroups(Global.getSelectedCourseCode());
startManagingCursor(c);
if (c.getCount() > 0) {
Intent activity = new Intent(getBaseContext(), Rollcall.class);
startActivityForResult(activity, Global.ROLLCALL_REQUEST_CODE);
} else {
error(getString(R.string.noGroupsAvailableMsg));
}
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
break;
}
} |
| Solution content |
|---|
createMenu();
break;
case Global.GROUPS_REQUEST_CODE:
// Check if course has practice groups
Cursor c = dbHelper.getPracticeGroups(Global.getSelectedCourseCode());
startManagingCursor(c);
if (c.getCount() > 0) {
Intent activity = new Intent(getBaseContext(), Rollcall.class);
startActivityForResult(activity, Global.ROLLCALL_REQUEST_CODE);
} else {
error(getString(R.string.noGroupsAvailableMsg));
}
break;
}
} |
| File |
|---|
| SWADMain.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
//Removes Publish Note from messages menu ((ImageExpandableListAdapter) getExpandableListAdapter()).removeChild(MESSAGES_GROUP, PUBLISH_NOTE_CHILD); //Removes completely users menu <<<<<<< HEAD //DISABLE until it will be functional ((ImageExpandableListAdapter) getExpandableListAdapter()).removeGroup(USERS_GROUP); ======= ((ImageExpandableListAdapter) getExpandableListAdapter()).removeGroup(USERS_GROUP); >>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1 } currentRole = Global.STUDENT_ROLE; } |
| Solution content |
|---|
//Removes Publish Note from messages menu ((ImageExpandableListAdapter) getExpandableListAdapter()).removeChild(MESSAGES_GROUP, PUBLISH_NOTE_CHILD); //Removes completely users menu ((ImageExpandableListAdapter) getExpandableListAdapter()).removeGroup(USERS_GROUP); } currentRole = Global.STUDENT_TYPE_CODE; } |
| File |
|---|
| SWADMain.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
map.put(IMAGE, getResources().getDrawable(R.drawable.note)); ((ImageExpandableListAdapter) getExpandableListAdapter()).addChild(MESSAGES_GROUP,PUBLISH_NOTE_CHILD, map); <<<<<<< HEAD //DISABLE until it will be functional ======= >>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1 final HashMap |
| Solution content |
|---|
map.put(IMAGE, getResources().getDrawable(R.drawable.note)); ((ImageExpandableListAdapter) getExpandableListAdapter()).addChild(MESSAGES_GROUP,PUBLISH_NOTE_CHILD, map); final HashMap |
| File |
|---|
| SWADMain.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
map.put(NAME, getString(R.string.rollcallModuleLabel)); map.put(IMAGE, getResources().getDrawable(R.drawable.rollcall)); child.add(map); <<<<<<< HEAD ((ImageExpandableListAdapter) getExpandableListAdapter()).addGroup(USERS_GROUP, users, child); ======= >>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1 ((ImageExpandableListAdapter) getExpandableListAdapter()).addGroup(USERS_GROUP, users, child); } |
| Solution content |
|---|
map.put(NAME, getString(R.string.rollcallModuleLabel)); map.put(IMAGE, getResources().getDrawable(R.drawable.rollcall)); child.add(map); ((ImageExpandableListAdapter) getExpandableListAdapter()).addGroup(USERS_GROUP, users, child); } |
| File |
|---|
| SWADMain.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
private static PropertyInfo PI_id = new PropertyInfo();
private static PropertyInfo PI_name = new PropertyInfo();
private static PropertyInfo PI_userRole = new PropertyInfo();
<<<<<<< HEAD
private static PropertyInfo PI_shortName = new PropertyInfo();
private static PropertyInfo PI_fullName = new PropertyInfo();
@SuppressWarnings("unused")
private static PropertyInfo[] PI_PROP_ARRAY =
{
PI_id,
PI_name,
PI_userRole,
PI_shortName,
PI_fullName
};
=======
@SuppressWarnings("unused")
private static PropertyInfo[] PI_PROP_ARRAY =
{
PI_id,
PI_name,
PI_userRole
};
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
/**
* Constructor
* @param id Course identifier |
| Solution content |
|---|
private static PropertyInfo PI_id = new PropertyInfo();
private static PropertyInfo PI_name = new PropertyInfo();
private static PropertyInfo PI_userRole = new PropertyInfo();
private static PropertyInfo PI_shortName = new PropertyInfo();
private static PropertyInfo PI_fullName = new PropertyInfo();
@SuppressWarnings("unused")
private static PropertyInfo[] PI_PROP_ARRAY =
{
PI_id,
PI_name,
PI_userRole,
PI_shortName,
PI_fullName
};
/**
* Constructor
* @param id Course identifier |
| File |
|---|
| Course.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Array initializer |
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
=======
}
public int getUserRole(){
return userRole;
}
<<<<<<< HEAD
/**
* Gets short course name
* @return Short course name
*/
public String getShortName() {
return shortName;
}
/**
* Sets short course name
* @param shortName short course name
*/
public void setShortName(String shortName) {
this.shortName = shortName;
}
/**
* Gets short course name
* @return Full course name
*/
public String getFullName() {
return fullName;
}
/**
* Sets short course name
* @param shortName short course name
*/
public void setFullName(String fullName) {
this.fullName = fullName;
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
/* (non-Javadoc)
* @see java.lang.Object#hashCode() |
| Solution content |
|---|
public int getUserRole(){
return userRole;
}
/**
* Gets short course name
* @return Short course name
*/
public String getShortName() {
return shortName;
}
/**
* Sets short course name
* @param shortName short course name
*/
public void setShortName(String shortName) {
this.shortName = shortName;
}
/**
* Gets short course name
* @return Full course name
*/
public String getFullName() {
return fullName;
}
/**
* Sets short course name
* @param shortName short course name
*/
public void setFullName(String fullName) {
this.fullName = fullName;
}
/* (non-Javadoc)
* @see java.lang.Object#hashCode() |
| File |
|---|
| Course.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
*/
public Object getProperty(int param) {
Object object = null;
<<<<<<< HEAD
switch(param)
{
case 0 : object = this.getId();break;
case 1 : object = name;break;
case 2 : object = userRole;break;
case 3 : object = shortName;break;
case 4 : object = fullName;break;
}
return object;
=======
switch(param)
{
case 0 : object = this.getId();break;
case 1 : object = name;break;
case 2 : object = userRole;break;
}
return object;
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
}
/* (non-Javadoc) |
| Solution content |
|---|
*/
public Object getProperty(int param) {
Object object = null;
switch(param)
{
case 0 : object = this.getId();break;
case 1 : object = name;break;
case 2 : object = userRole;break;
case 3 : object = shortName;break;
case 4 : object = fullName;break;
}
return object;
}
/* (non-Javadoc) |
| File |
|---|
| Course.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Return statement |
| Switch statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
*/
public void getPropertyInfo(int param, @SuppressWarnings("rawtypes") Hashtable arg1, PropertyInfo propertyInfo) {
switch(param){
<<<<<<< HEAD
case 0:
propertyInfo.type = PropertyInfo.LONG_CLASS;
propertyInfo.name = "id";
break;
case 1:
propertyInfo.type = PropertyInfo.STRING_CLASS;
propertyInfo.name = "name";
break;
case 2:
propertyInfo.type = PropertyInfo.INTEGER_CLASS;
propertyInfo.name = "userRole";
break;
case 3:
propertyInfo.type = PropertyInfo.STRING_CLASS;
propertyInfo.name = "shortName";
break;
case 4:
propertyInfo.type = PropertyInfo.STRING_CLASS;
propertyInfo.name = "fullName";
break;
=======
case 0:
propertyInfo.type = PropertyInfo.LONG_CLASS;
propertyInfo.name = "id";
break;
case 1:
propertyInfo.type = PropertyInfo.STRING_CLASS;
propertyInfo.name = "name";
break;
case 2:
propertyInfo.type = PropertyInfo.INTEGER_CLASS;
propertyInfo.name = "userRole";
break;
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
}
}
|
| Solution content |
|---|
*/
public void getPropertyInfo(int param, @SuppressWarnings("rawtypes") Hashtable arg1, PropertyInfo propertyInfo) {
switch(param){
case 0:
propertyInfo.type = PropertyInfo.LONG_CLASS;
propertyInfo.name = "id";
break;
case 1:
propertyInfo.type = PropertyInfo.STRING_CLASS;
propertyInfo.name = "name";
break;
case 2:
propertyInfo.type = PropertyInfo.INTEGER_CLASS;
propertyInfo.name = "userRole";
break;
case 3:
propertyInfo.type = PropertyInfo.STRING_CLASS;
propertyInfo.name = "shortName";
break;
case 4:
propertyInfo.type = PropertyInfo.STRING_CLASS;
propertyInfo.name = "fullName";
break;
}
}
|
| File |
|---|
| Course.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Break statement |
| Case statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
public void setProperty(int param, Object obj) {
switch(param)
{
<<<<<<< HEAD
case 0 : this.setId((Long)obj); break;
case 1 : name = (String)obj; break;
case 2 : userRole = (Integer)obj; break;
case 3 : shortName = (String)obj; break;
case 4 : fullName = (String)obj; break;
=======
case 0 : this.setId((Long)obj); break;
case 1 : name = (String)obj; break;
case 2 : userRole = (Integer)obj; break;
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
}
}
|
| Solution content |
|---|
public void setProperty(int param, Object obj) {
switch(param)
{
case 0 : this.setId((Long)obj); break;
case 1 : name = (String)obj; break;
case 2 : userRole = (Integer)obj; break;
case 3 : shortName = (String)obj; break;
case 4 : fullName = (String)obj; break;
}
}
|
| File |
|---|
| Course.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Break statement |
| Case statement |
| Cast expression |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
ent.getString("groupTypeName"));
ent.getString("userFirstname"),
ent.getString("photoPath"),
ent.getInt("userRole"));
<<<<<<< HEAD
} else if (table.equals(Global.DB_TABLE_GROUPS)){
o = new Group(ent.getLong("groupCode"),
ent.getString("groupName"),
ent.getInt("groupTypeCode"),
ent.getString("groupTypeName"));
=======
} else if(table.equals(Global.DB_TABLE_GROUPS)) {
o = new Group(ent.getInt("groupCode"),
ent.getString("groupName"),
ent.getInt("groupTypeCode"),
} else if(table.equals(Global.DB_TABLE_PRACTICE_SESSIONS)) {
SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
try {
o = new PracticeSession(ent.getId(),
ent.getInt("crsCod"),
ent.getInt("grpCod"),
format.parse(ent.getString("startDate")),
format.parse(ent.getString("endDate")),
ent.getString("site"),
ent.getString("description"));
} catch (ParseException e) {
e.printStackTrace();
}
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
}
return o; |
| Solution content |
|---|
ent.getString("userFirstname"),
ent.getString("photoPath"),
ent.getInt("userRole"));
} else if (table.equals(Global.DB_TABLE_GROUPS)){
o = new Group(ent.getLong("groupCode"),
ent.getString("groupName"),
ent.getInt("groupTypeCode"),
ent.getString("groupTypeName"));
} else if(table.equals(Global.DB_TABLE_GROUPS)) {
o = new Group(ent.getInt("groupCode"),
ent.getString("groupName"),
ent.getInt("groupTypeCode"),
ent.getString("groupTypeName"));
} else if(table.equals(Global.DB_TABLE_PRACTICE_SESSIONS)) {
SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
try {
o = new PracticeSession(ent.getId(),
ent.getInt("crsCod"),
ent.getInt("grpCod"),
format.parse(ent.getString("startDate")),
format.parse(ent.getString("endDate")),
ent.getString("site"),
ent.getString("description"));
} catch (ParseException e) {
e.printStackTrace();
}
}
return o; |
| File |
|---|
| DataBaseHelper.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Try statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
* @param description Optional description of practice session
* @return True if practice session does not exist in database and is inserted. False otherwise.
*/
<<<<<<< HEAD
public boolean insertGroup(Group g, long courseCode)
{
List |
| Solution content |
|---|
* @param description Optional description of practice session
* @return True if practice session does not exist in database and is inserted. False otherwise.
*/
public boolean insertPracticeSession(long courseCode, long groupCode, String startDate, String endDate, String site, String description) {
String where = "crsCod = '" + courseCode + "' AND " +
"grpCod = '" + groupCode + "' AND " +
"startDate = '" + startDate + "' AND " +
"endDate = '" + endDate + "'";
List |
| File |
|---|
| DataBaseHelper.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method declaration |
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
======= emptyTable(Global.DB_TABLE_TEST_TAGS); emptyTable(Global.DB_TABLE_USERS_COURSES); emptyTable(Global.DB_TABLE_USERS); <<<<<<< HEAD emptyTable(Global.DB_TABLE_GROUPS); emptyTable(Global.DB_TABLE_GROUPS_COURSES); emptyTable(Global.DB_TABLE_GROUPS_COURSES); emptyTable(Global.DB_TABLE_GROUPS); emptyTable(Global.DB_TABLE_PRACTICE_SESSIONS); emptyTable(Global.DB_TABLE_ROLLCALL); >>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1 compactDB(); // Removes users photos from external storage (Android 2.2 or higher only) |
| Solution content |
|---|
emptyTable(Global.DB_TABLE_TEST_TAGS); emptyTable(Global.DB_TABLE_USERS_COURSES); emptyTable(Global.DB_TABLE_USERS); emptyTable(Global.DB_TABLE_GROUPS_COURSES); emptyTable(Global.DB_TABLE_GROUPS); emptyTable(Global.DB_TABLE_PRACTICE_SESSIONS); emptyTable(Global.DB_TABLE_ROLLCALL); compactDB(); // Removes users photos from external storage (Android 2.2 or higher only) |
| File |
|---|
| DataBaseHelper.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
* Group type name. */ private String groupTypeName; <<<<<<< HEAD ======= >>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1 private static PropertyInfo PI_id = new PropertyInfo(); private static PropertyInfo PI_groupName = new PropertyInfo(); private static PropertyInfo PI_groupTypeCode = new PropertyInfo(); |
| Solution content |
|---|
* Group type name. */ private String groupTypeName; private static PropertyInfo PI_id = new PropertyInfo(); private static PropertyInfo PI_groupName = new PropertyInfo(); private static PropertyInfo PI_groupTypeCode = new PropertyInfo(); |
| File |
|---|
| Group.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
private static PropertyInfo PI_groupName = new PropertyInfo();
private static PropertyInfo PI_groupTypeCode = new PropertyInfo();
private static PropertyInfo PI_groupTypeName = new PropertyInfo();
<<<<<<< HEAD
@SuppressWarnings("unused")
private static PropertyInfo[] PI_PROP_ARRAY =
{
PI_id,
PI_groupName,
PI_groupTypeCode,
PI_groupTypeName,
};
public Group(long id,String groupName, int groupTypeCode, String groupTypeName) {
=======
@SuppressWarnings("unused")
private static PropertyInfo[] PI_PROP_ARRAY = {
PI_id,
PI_groupName,
PI_groupTypeCode,
PI_groupTypeName
};
/**
* Constructor.
* @param id Group code.
* @param groupName Group name.
* @param groupTypeCode Identifier of the group type that owns this group.
* @param groupTypeName Group type name.
*/
public Group(long id, String groupName, int groupTypeCode, String groupTypeName) {
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
super(id);
this.groupName = groupName;
this.groupTypeCode = groupTypeCode; |
| Solution content |
|---|
private static PropertyInfo PI_groupName = new PropertyInfo();
private static PropertyInfo PI_groupTypeCode = new PropertyInfo();
private static PropertyInfo PI_groupTypeName = new PropertyInfo();
@SuppressWarnings("unused")
private static PropertyInfo[] PI_PROP_ARRAY = {
PI_id,
PI_groupName,
PI_groupTypeCode,
PI_groupTypeName
};
/**
* Constructor.
* @param id Group code.
* @param groupName Group name.
* @param groupTypeCode Identifier of the group type that owns this group.
* @param groupTypeName Group type name.
*/
public Group(long id, String groupName, int groupTypeCode, String groupTypeName) {
super(id);
this.groupName = groupName;
this.groupTypeCode = groupTypeCode; |
| File |
|---|
| Group.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Array initializer |
| Attribute |
| Comment |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
public String getGroupCompleteName() {
return groupTypeName + ":" + groupName;
}
<<<<<<< HEAD
public int getGroupTypeCode(){
return groupTypeCode;
}
=======
>>>>>>> 24dc45a690175534d8f261a9ad5078b213ccded1
@Override
public int hashCode() { |
| Solution content |
|---|
return groupTypeName + ":" + groupName;
}
public int getGroupTypeCode(){
return groupTypeCode;
}
@Override
public int hashCode() { |
| File |
|---|
| Group.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD package es.ugr.swad.swadroid.modules; import java.io.IOException; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; import java.util.Vector; import org.ksoap2.SoapFault; import org.ksoap2.serialization.SoapObject; import org.xmlpull.v1.XmlPullParserException; import android.os.Bundle; import android.util.Log; import android.widget.Toast; import es.ugr.swad.swadroid.Global; import es.ugr.swad.swadroid.model.Course; import es.ugr.swad.swadroid.model.Group; import es.ugr.swad.swadroid.model.Model; /** * Groups module gets user's groups inside the current course * and stores them in the database * @author Helena Rodríguez Gijón |
| Solution content |
|---|
package es.ugr.swad.swadroid.modules; import java.io.IOException; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; import java.util.Vector; import org.ksoap2.SoapFault; import org.ksoap2.serialization.SoapObject; import org.xmlpull.v1.XmlPullParserException; import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.util.Log; import android.widget.Toast; import es.ugr.swad.swadroid.Global; import es.ugr.swad.swadroid.model.Course; import es.ugr.swad.swadroid.model.Group; import es.ugr.swad.swadroid.model.Model; import es.ugr.swad.swadroid.R; /** * Groups module gets user's groups inside the current course * and stores them in the database * @author Helena Rodriguez Gijon |
| File |
|---|
| Groups.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Class declaration |
| Comment |
| Import |
| Package declaration |