Projects >> railo >>46f12f82d88e6d76a6e7e2768438855c5fc282e3

Chunk
Conflicting content 
		do {
			hasChanged=false;
			if(data.cfml.isCurrent('c')) {
<<<<<<< HEAD
					if (data.cfml.forwardIfCurrent("ct",false,true)) {expr = decisionOpCreate(data,OPDecision.CT,expr);hasChanged=true;} 
					else if (data.cfml.forwardIfCurrent("contains",false,true)){ expr = decisionOpCreate(data,OPDecision.CT,expr);hasChanged=true;}
=======
					if (data.cfml.forwardIfCurrentAndNoWordAfter("ct")) {expr = decisionOpCreate(data,OPDecision.CT,expr);hasChanged=true;} 
					else if (data.cfml.forwardIfCurrentAndNoWordAfter("contains")){ expr = decisionOpCreate(data,OPDecision.CT,expr);hasChanged=true;}
>>>>>>> c09c1b9aec0f8f2b2a3a80567ce6456351af8d48
			}
			// does not contain
			else if (data.cfml.forwardIfCurrent("does","not","contain",false,true)){ expr = decisionOpCreate(data,OPDecision.NCT,expr); hasChanged=true;}
Solution content 
		do {
			hasChanged=false;
			if(data.cfml.isCurrent('c')) {
					if (data.cfml.forwardIfCurrent("ct",false,true)) {expr = decisionOpCreate(data,OPDecision.CT,expr);hasChanged=true;} 
					else if (data.cfml.forwardIfCurrent("contains",false,true)){ expr = decisionOpCreate(data,OPDecision.CT,expr);hasChanged=true;}
			}
			// does not contain
			else if (data.cfml.forwardIfCurrent("does","not","contain",false,true)){ expr = decisionOpCreate(data,OPDecision.NCT,expr); hasChanged=true;}
File
CFMLExprTransformer.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
			// gt, gte, greater than or equal to, greater than
			else if (data.cfml.isCurrent('g')) {
				if (data.cfml.forwardIfCurrent("gt")) {
<<<<<<< HEAD
					if(data.cfml.forwardIfCurrentAndNoWordAfter("e")) {
						if(data.cfml.isCurrentVariableCharacter()) {
							data.cfml.setPos(data.cfml.getPos()-3);
						}
						else {
							expr = decisionOpCreate(data,OPDecision.GTE,expr);
							hasChanged=true;
						}
					}
					else {
						if(data.cfml.isCurrentVariableCharacter()) {
							data.cfml.setPos(data.cfml.getPos()-2);
						}
						else {
							expr = decisionOpCreate(data,OPDecision.GT,expr);
							hasChanged=true;
						}
					}
=======
					if(data.cfml.forwardIfCurrentAndNoWordAfter("e")) expr = decisionOpCreate(data,OPDecision.GTE,expr);
					else expr = decisionOpCreate(data,OPDecision.GT,expr);
					hasChanged=true;
>>>>>>> c09c1b9aec0f8f2b2a3a80567ce6456351af8d48
				} 
				else if (data.cfml.forwardIfCurrent("greater", "than",false,true)) {
					if(data.cfml.forwardIfCurrent("or","equal", "to",true,true)) expr = decisionOpCreate(data,OPDecision.GTE,expr);
Solution content 
			// gt, gte, greater than or equal to, greater than
			else if (data.cfml.isCurrent('g')) {
				if (data.cfml.forwardIfCurrent("gt")) {
					if(data.cfml.forwardIfCurrentAndNoWordAfter("e")) {
						if(data.cfml.isCurrentVariableCharacter()) {
							data.cfml.setPos(data.cfml.getPos()-3);
						}
						else {
							expr = decisionOpCreate(data,OPDecision.GTE,expr);
							hasChanged=true;
						}
					}
					else {
						if(data.cfml.isCurrentVariableCharacter()) {
							data.cfml.setPos(data.cfml.getPos()-2);
						}
						else {
							expr = decisionOpCreate(data,OPDecision.GT,expr);
							hasChanged=true;
						}
					}
				} 
				else if (data.cfml.forwardIfCurrent("greater", "than",false,true)) {
					if(data.cfml.forwardIfCurrent("or","equal", "to",true,true)) expr = decisionOpCreate(data,OPDecision.GTE,expr);
File
CFMLExprTransformer.java
Developer's decision
Version 1
Kind of conflict
If statement
Variable
Chunk
Conflicting content 
					else expr = decisionOpCreate(data,OPDecision.GT,expr);
					hasChanged=true;
				}	
<<<<<<< HEAD
				else if (data.cfml.forwardIfCurrent("ge",false,true)) {
=======
				else if (data.cfml.forwardIfCurrentAndNoWordAfter("ge")) {
>>>>>>> c09c1b9aec0f8f2b2a3a80567ce6456351af8d48
					expr = decisionOpCreate(data,OPDecision.GTE,expr);
					hasChanged=true;
				}
Solution content 
					else expr = decisionOpCreate(data,OPDecision.GT,expr);
					hasChanged=true;
				}	
				else if (data.cfml.forwardIfCurrent("ge",false,true)) {
					expr = decisionOpCreate(data,OPDecision.GTE,expr);
					hasChanged=true;
				}
File
CFMLExprTransformer.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
			// lt, lte, less than, less than or equal to
			else if (data.cfml.isCurrent('l')) {
				if (data.cfml.forwardIfCurrent("lt")) {
<<<<<<< HEAD
					if(data.cfml.forwardIfCurrentAndNoWordAfter("e")) {
						if(data.cfml.isCurrentVariableCharacter()) {
							data.cfml.setPos(data.cfml.getPos()-3);
						}
						else {
							expr = decisionOpCreate(data,OPDecision.LTE,expr);
							hasChanged=true;
						}
					}
					else {
						if(data.cfml.isCurrentVariableCharacter()) {
							data.cfml.setPos(data.cfml.getPos()-2);
						}
						else {
							expr = decisionOpCreate(data,OPDecision.LT,expr);
							hasChanged=true;
						}
					}
=======
					if(data.cfml.forwardIfCurrentAndNoWordAfter("e")) expr = decisionOpCreate(data,OPDecision.LTE,expr);
					else expr = decisionOpCreate(data,OPDecision.LT,expr);
					hasChanged=true;
>>>>>>> c09c1b9aec0f8f2b2a3a80567ce6456351af8d48
				} 
				else if (data.cfml.forwardIfCurrent("less","than",false,true)) {
					if(data.cfml.forwardIfCurrent("or", "equal", "to",true,true)) expr = decisionOpCreate(data,OPDecision.LTE,expr);
Solution content 
			// lt, lte, less than, less than or equal to
			else if (data.cfml.isCurrent('l')) {
				if (data.cfml.forwardIfCurrent("lt")) {
					if(data.cfml.forwardIfCurrentAndNoWordAfter("e")) {
						if(data.cfml.isCurrentVariableCharacter()) {
							data.cfml.setPos(data.cfml.getPos()-3);
						}
						else {
							expr = decisionOpCreate(data,OPDecision.LTE,expr);
							hasChanged=true;
						}
					}
					else {
						if(data.cfml.isCurrentVariableCharacter()) {
							data.cfml.setPos(data.cfml.getPos()-2);
						}
						else {
							expr = decisionOpCreate(data,OPDecision.LT,expr);
							hasChanged=true;
						}
					}
				} 
				else if (data.cfml.forwardIfCurrent("less","than",false,true)) {
					if(data.cfml.forwardIfCurrent("or", "equal", "to",true,true)) expr = decisionOpCreate(data,OPDecision.LTE,expr);
File
CFMLExprTransformer.java
Developer's decision
Version 1
Kind of conflict
If statement
Variable
Chunk
Conflicting content 
					else expr = decisionOpCreate(data,OPDecision.LT,expr);
					hasChanged=true;
				}	
<<<<<<< HEAD
				else if (data.cfml.forwardIfCurrent("le",false,true)) {
=======
				else if (data.cfml.forwardIfCurrentAndNoWordAfter("le")) {
>>>>>>> c09c1b9aec0f8f2b2a3a80567ce6456351af8d48
					expr = decisionOpCreate(data,OPDecision.LTE,expr);
					hasChanged=true;
				}
Solution content 
					else expr = decisionOpCreate(data,OPDecision.LT,expr);
					hasChanged=true;
				}	
				else if (data.cfml.forwardIfCurrent("le",false,true)) {
					expr = decisionOpCreate(data,OPDecision.LTE,expr);
					hasChanged=true;
				}
File
CFMLExprTransformer.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
			// neq, not equal, nct
			else if (data.cfml.isCurrent('n')) {
				// Not Equal
<<<<<<< HEAD
					if (data.cfml.forwardIfCurrent("neq",false,true)){ expr = decisionOpCreate(data,OPDecision.NEQ,expr); hasChanged=true;}
=======
					if (data.cfml.forwardIfCurrentAndNoWordAfter("neq")){ expr = decisionOpCreate(data,OPDecision.NEQ,expr); hasChanged=true;}
>>>>>>> c09c1b9aec0f8f2b2a3a80567ce6456351af8d48
				// Not Equal (Alias)
					else if (data.cfml.forwardIfCurrent("not","equal",false,true)){ expr = decisionOpCreate(data,OPDecision.NEQ,expr);hasChanged=true; }
				// nct
Solution content 
			// neq, not equal, nct
			else if (data.cfml.isCurrent('n')) {
				// Not Equal
					if (data.cfml.forwardIfCurrent("neq",false,true)){ expr = decisionOpCreate(data,OPDecision.NEQ,expr); hasChanged=true;}
				// Not Equal (Alias)
					else if (data.cfml.forwardIfCurrent("not","equal",false,true)){ expr = decisionOpCreate(data,OPDecision.NEQ,expr);hasChanged=true; }
				// nct
File
CFMLExprTransformer.java
Developer's decision
Version 1
Kind of conflict
If statement
Variable
Chunk
Conflicting content 
				// Not Equal (Alias)
					else if (data.cfml.forwardIfCurrent("not","equal",false,true)){ expr = decisionOpCreate(data,OPDecision.NEQ,expr);hasChanged=true; }
				// nct
<<<<<<< HEAD
					else if (data.cfml.forwardIfCurrent("nct",false,true)){ expr = decisionOpCreate(data,OPDecision.NCT,expr); hasChanged=true;}	
=======
					else if (data.cfml.forwardIfCurrentAndNoWordAfter("nct")){ expr = decisionOpCreate(data,OPDecision.NCT,expr); hasChanged=true;}	
>>>>>>> c09c1b9aec0f8f2b2a3a80567ce6456351af8d48
			}
			
		}
Solution content 
				// Not Equal (Alias)
					else if (data.cfml.forwardIfCurrent("not","equal",false,true)){ expr = decisionOpCreate(data,OPDecision.NEQ,expr);hasChanged=true; }
				// nct
					else if (data.cfml.forwardIfCurrent("nct",false,true)){ expr = decisionOpCreate(data,OPDecision.NCT,expr); hasChanged=true;}	
			}
			
		}
File
CFMLExprTransformer.java
Developer's decision
Version 1
Kind of conflict
If statement