Projects >> Web-Karma >>a71dc295d44abecb7087aeae66a73a2383332440

Chunk
Conflicting content 
		// find the means 
		for(Map.Entry> stringArrayListEntry : tmp.entrySet())
		{
<<<<<<< HEAD
			ArrayList tdata = stringArrayListEntry.getValue();
			if(tdata.size() > 0 || tdata.get(0).features.length > 0)
=======
			ArrayList tdata = tmp.get(key);
			if(!tdata.isEmpty() || tdata.get(0).features.length > 0)
>>>>>>> a3f975de56500be401c05b75da05e05b7dd2af43
			{
				ArrayList tcl = new ArrayList();
				for(int i =0; i< tdata.size(); i++)
Solution content 
		// find the means 
		for(Map.Entry> stringArrayListEntry : tmp.entrySet())
		{
			ArrayList tdata = stringArrayListEntry.getValue();
			if(!tdata.isEmpty() || tdata.get(0).features.length > 0)
			{
				ArrayList tcl = new ArrayList();
				for(int i =0; i< tdata.size(); i++)
File
FormatFunc.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
		}
		// generate candiate set
		HashSet result = new HashSet();
<<<<<<< HEAD
		for (Map.Entry> stringVectorEntry : lcxt2ids.entrySet()) {
			if (stringVectorEntry.getValue().size() != 0) {
				String idString = stringVectorEntry.getValue().get(0);
=======
		for (String cxt : lcxt2ids.keySet()) {
			if (!lcxt2ids.get(cxt).isEmpty()) {
				String idString = lcxt2ids.get(cxt).get(0);
>>>>>>> a3f975de56500be401c05b75da05e05b7dd2af43
				if (!result.contains(idString)) {
					result.add(idString);
				}
Solution content 
		}
		// generate candiate set
		HashSet result = new HashSet();
		for (Map.Entry> stringVectorEntry : lcxt2ids.entrySet()) {
			if (!stringVectorEntry.getValue().isEmpty()) {
				String idString = stringVectorEntry.getValue().get(0);
				if (!result.contains(idString)) {
					result.add(idString);
				}
File
RecordDistiller.java
Developer's decision
Manual
Kind of conflict
For statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
				}
			}
		}
<<<<<<< HEAD
		for (Map.Entry> stringVectorEntry : rcxt2ids.entrySet()) {
			if (stringVectorEntry.getValue().size() != 0) {
				String idString = stringVectorEntry.getValue().get(0);
=======
		for (String cxt : rcxt2ids.keySet()) {
			if (!rcxt2ids.get(cxt).isEmpty()) {
				String idString = rcxt2ids.get(cxt).get(0);
>>>>>>> a3f975de56500be401c05b75da05e05b7dd2af43
				if (!result.contains(idString)) {
					result.add(idString);
				}
Solution content 
				}
			}
		}
		for (Map.Entry> stringVectorEntry : rcxt2ids.entrySet()) {
			if (!stringVectorEntry.getValue().isEmpty()) {
				String idString = stringVectorEntry.getValue().get(0);
				if (!result.contains(idString)) {
					result.add(idString);
				}
File
RecordDistiller.java
Developer's decision
Manual
Kind of conflict
For statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
	}*/
	
	public String toString () {
<<<<<<< HEAD
    if(edges.size()==0) return "";
=======
    if(edges.isEmpty()) return("");
>>>>>>> a3f975de56500be401c05b75da05e05b7dd2af43
    StringBuilder b=new StringBuilder();
    Set goodEdges = new TreeSet();
    Set badEdges = new TreeSet();
Solution content 
	}*/
	
	public String toString () {
    if(edges.isEmpty()) return("");
    StringBuilder b=new StringBuilder();
    Set goodEdges = new TreeSet();
    Set badEdges = new TreeSet();
File
Graph.java
Developer's decision
Version 2
Kind of conflict
If statement
Chunk
Conflicting content 
		List noSpanNodes = new ArrayList<>();
		int maxLevel = getMaxLevel(true);
		
<<<<<<< HEAD
		for(Entry> nodeSetEntry : nodesSpan.entrySet()) {
			if(nodeSetEntry.getValue().size() == 0) {
				noSpanNodes.add(nodeSetEntry.getKey());
=======
		for(Node n : nodesSpan.keySet()) {
			if(nodesSpan.get(n).isEmpty()) {
				noSpanNodes.add(n);
>>>>>>> a3f975de56500be401c05b75da05e05b7dd2af43
			} else {
				spanNodes.add(nodeSetEntry.getKey());
			}
Solution content 
		List noSpanNodes = new ArrayList<>();
		int maxLevel = getMaxLevel(true);

		for(Entry> nodeSetEntry : nodesSpan.entrySet()) {
			if(nodeSetEntry.getValue().isEmpty()) {
				noSpanNodes.add(nodeSetEntry.getKey());
			} else {
				spanNodes.add(nodeSetEntry.getKey());
			}
File
DisplayModel.java
Developer's decision
Manual
Kind of conflict
Other