Projects >> SOCIETIES-Platform >>23fa0ec93c223c6e581bac4a094e47e38f16bcfa

Chunk
Conflicting content 
			Community c = new Community();

<<<<<<< HEAD
			Join j = new Join();
			c.setJoin(j);

=======
			c.setJoin(new Join());
>>>>>>> 07210c147c99ab6df6b95a71cfab709dd3827ef0
			try {
				LOG.info("Sending stanza with join");
				this.iCommMgr.sendIQGet(stanza, c, commsCallback);
Solution content 
			Community c = new Community();

<<<<<<< HEAD
			Join j = new Join();
			c.setJoin(j);

=======
			c.setJoin(new Join());
>>>>>>> branch 'development' of local repository
			try {
				LOG.info("Sending stanza with join");
				this.iCommMgr.sendIQGet(stanza, c, commsCallback);
File
CisManager.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
			Participant p = new Participant();
			p.setJid(this.cssManagerId.getBareJid());
			j.setParticipant(p);*/
<<<<<<< HEAD

			c.setJoin(new Join());
=======
			c.setJoin(new Join());
>>>>>>> 07210c147c99ab6df6b95a71cfab709dd3827ef0
			try {
				LOG.info("Sending stanza with join");
				this.CSSendpoint.sendIQGet(stanza, c, commsCallback);
Solution content 
			Participant p = new Participant();
			p.setJid(this.cssManagerId.getBareJid());
			j.setParticipant(p);*/

			c.setJoin(new Join());

			try {
				LOG.info("Sending stanza with join");
				this.CSSendpoint.sendIQGet(stanza, c, commsCallback);
File
CisManagerClient.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.societies.api.internal.comm.ICISCommunicationMgrFactory;
import org.societies.api.schema.cis.community.Community;
import org.societies.api.schema.cis.community.Join;
<<<<<<< HEAD
=======
import org.societies.api.schema.cis.community.Leave;
>>>>>>> 07210c147c99ab6df6b95a71cfab709dd3827ef0
import org.societies.api.schema.cis.community.Participant;

@Deprecated
Solution content 
import org.societies.api.internal.comm.ICISCommunicationMgrFactory;
import org.societies.api.schema.cis.community.Community;
import org.societies.api.schema.cis.community.Join;

import org.societies.api.schema.cis.community.Leave;

import org.societies.api.schema.cis.community.Participant;

@Deprecated
File
CisManagerClient.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
				model.put("methodcalled", "CreateCis");
				res = "Creating CIS...";

<<<<<<< HEAD

				Hashtable cisCriteria = new Hashtable (); 
=======
				@SuppressWarnings("deprecation")
>>>>>>> 07210c147c99ab6df6b95a71cfab709dd3827ef0
				Future cisResult = this.getCisManager().createCis(
						cisForm.getCisName(),
						cisForm.getCisType(),cisCriteria,""
Solution content 
				model.put("methodcalled", "CreateCis");
				res = "Creating CIS...";

				Hashtable cisCriteria = new Hashtable (); 

				Future cisResult = this.getCisManager().createCis(
						cisForm.getCisName(),
						cisForm.getCisType(),cisCriteria,""
File
CisManagerController.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method invocation
Variable