Projects >> SOCIETIES-Platform >>907d64e1755264c93ba667d6acac698350cff215

Chunk
Conflicting content 
<<<<<<< HEAD
		dest.writeString(this.getCommunityType());
		dest.writeString(this.getDescription());
		dest.writeString(this.getOwnerJid());
		dest.writeString(this.getDescription());
		if(this.getMembershipCrit() !=null)
			dest.writeParcelable(this.getMembershipCrit(), flags);
=======
		if (null != this.getMembershipCrit() && null != this.getMembershipCrit().getACriteria() && this.getMembershipCrit().getACriteria().size() > 0){
			dest.writeParcelable(this.getMembershipCrit(), flags);
		}
>>>>>>> 0889ac434a4762eded8bce5b69c028c32220abf9
	}
			
	private ACommunity(Parcel in) {
Solution content 
		dest.writeString(this.getCommunityType());
		dest.writeString(this.getDescription());
		dest.writeString(this.getOwnerJid());
		if (null != this.getMembershipCrit() && null != this.getMembershipCrit().getACriteria() && this.getMembershipCrit().getACriteria().size() > 0){
			dest.writeParcelable(this.getMembershipCrit(), flags);
		}
	}
			
	private ACommunity(Parcel in) {
File
ACommunity.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
		this.setCommunityType(in.readString());
		this.setDescription(in.readString());
		this.setOwnerJid(in.readString());
<<<<<<< HEAD
		this.setDescription(in.readString());
		if(in.dataAvail() >0)
			this.setMembershipCrit((AMembershipCrit) in.readParcelable(this.getClass().getClassLoader()));
=======
		in.m
		if (in.dataAvail() > 0) {
			this.setMembershipCrit((AMembershipCrit) in.readParcelable(this.getClass().getClassLoader()));
		}
>>>>>>> 0889ac434a4762eded8bce5b69c028c32220abf9
	}

	public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
Solution content 
		this.setCommunityType(in.readString());
		this.setDescription(in.readString());
		this.setOwnerJid(in.readString());
		if(in.dataAvail() >0)
			this.setMembershipCrit((AMembershipCrit) in.readParcelable(this.getClass().getClassLoader()));
	}

	public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
File
ACommunity.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
	public static AMembershipCrit convertMembershipCrit(MembershipCrit memberCrit) {
		AMembershipCrit amemberCrit = new AMembershipCrit();
		List returnList = new ArrayList();
<<<<<<< HEAD
		for (Criteria crit: memberCrit.getCriteria()) {
			returnList.add(ACriteria.convertCriteria(crit));
=======

		if (null != memberCrit && null != memberCrit.getCriteria()) {
			for (Criteria crit: memberCrit.getCriteria()) {
				returnList.add(ACriteria.convertCriteria(crit));
			}
>>>>>>> 0889ac434a4762eded8bce5b69c028c32220abf9
		}
		amemberCrit.setACriteria(returnList);
Solution content 
	public static AMembershipCrit convertMembershipCrit(MembershipCrit memberCrit) {
		AMembershipCrit amemberCrit = new AMembershipCrit();
		List returnList = new ArrayList();

		if (null != memberCrit && null != memberCrit.getCriteria()) {
			for (Criteria crit: memberCrit.getCriteria()) {
				returnList.add(ACriteria.convertCriteria(crit));
			}
		}
		amemberCrit.setACriteria(returnList);
File
AMembershipCrit.java
Developer's decision
Version 2
Kind of conflict
For statement
If statement
Method invocation