Projects >> cudl >>e7c0e8bad1f1017bffc72b0d3e26b99cd1883e04

Chunk
Conflicting content 
			InterpreterEventHandler.doEvent(choice, this, choice.getAttribute("event"), 1);
			return null;
		}
<<<<<<< HEAD
		
=======

>>>>>>> a015322ffb27eaf5e96f18e4971053235769114a
		throw new ChoiceException(choice);
	}
Solution content 
			InterpreterEventHandler.doEvent(choice, this, choice.getAttribute("event"), 1);
			return null;
		}
		throw new ChoiceException(choice);
	}
File
Executor.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
import javax.xml.parsers.ParserConfigurationException;

import org.mozilla.javascript.Undefined;
<<<<<<< HEAD
import org.xml.sax.SAXException;
=======
import org.w3c.dom.Document;
>>>>>>> a015322ffb27eaf5e96f18e4971053235769114a

import cudl.node.Audio;
import cudl.node.Block;
Solution content 
import org.mozilla.javascript.Undefined;
import org.w3c.dom.Document;

import cudl.node.Audio;
import cudl.node.Block;
File
FormInterpretationAlgorithm.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
			}

	@Override
	public void visit(Subdialog subdialog) {
<<<<<<< HEAD
		String srcexpr = subdialog.getAttribute("srcexpr");
		try {
			Interpreter interpreter = new Interpreter("file:test/docVxml/subdialogSrcExpr.vxml"+"#"+scripting.eval(srcexpr));
			interpreter.start();
			outPut.getPrompts().addAll(interpreter.getPrompts());
			List logs = interpreter.getLogs();
			for (String log : logs) {
				outPut.addLog(log);
			}
		} catch (Exception e) {
			e.printStackTrace();
		}
		//throw new RuntimeException("implement subdialog visit");
=======
		scripting.set(subdialog.getName(), "true");
		String srcexpr = subdialog.getAttribute("srcexpr");
		try {
			String url = "file:test/docVxml/subdialogSrcExpr.vxml" + scripting.eval(srcexpr);
			Document document = new DocumentAcces("voicextt/0.1").get(url, null);
			Vxml vxml = new Vxml(document.getDocumentElement());
			System.err.println("scrip  f111111111" + scripting.get("f1"));
			VoiceXmlNode dialog;
			if (!url.contains("#")) {
				dialog = vxml.getFirstDialog();
			} else {
				dialog = vxml.getDialogById(url.split("#")[1]);
				System.err.println(dialog);
			FormInterpretationAlgorithm fia = new FormInterpretationAlgorithm(dialog, scripting, outPut,
					userInput);
			scripting.exitScope();
			scripting.exitScope();
			fia.start();

			// Interpreter interpreter = new
			// Interpreter("file:test/docVxml/subdialogSrcExpr.vxml" +
			// scripting.eval(srcexpr));
			// interpreter.start();
			// System.err.println(interpreter.getLogs());
			// System.err.println(interpreter.getPrompts());
		} catch (Exception e) {
			e.printStackTrace();
		}
		// throw new RuntimeException("implement subdialog visit");
>>>>>>> a015322ffb27eaf5e96f18e4971053235769114a
	}

	@Override
Solution content 
	@Override
	public void visit(Subdialog subdialog) {

		scripting.set(subdialog.getName(), "true");
		String srcexpr = subdialog.getAttribute("srcexpr");
		try {
			String url = "file:test/docVxml/subdialogSrcExpr.vxml" + scripting.eval(srcexpr);
			Document document = new DocumentAcces("voicextt/0.1").get(url, null);
			Vxml vxml = new Vxml(document.getDocumentElement());
			System.err.println("scrip  f111111111" + scripting.get("f1"));
			VoiceXmlNode dialog;
			if (!url.contains("#")) {
				dialog = vxml.getFirstDialog();
			} else {
				dialog = vxml.getDialogById(url.split("#")[1]);
				System.err.println(dialog);
			}
			FormInterpretationAlgorithm fia = new FormInterpretationAlgorithm(dialog, scripting, outPut,
					userInput);
			scripting.exitScope();
			scripting.exitScope();
			fia.start();

			// Interpreter interpreter = new
			// Interpreter("file:test/docVxml/subdialogSrcExpr.vxml" +
			// scripting.eval(srcexpr));
			// interpreter.start();
			// System.err.println(interpreter.getLogs());
			// System.err.println(interpreter.getPrompts());
		} catch (Exception e) {
			e.printStackTrace();
		}
	}

	@Override
File
FormInterpretationAlgorithm.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Try statement
Variable
Chunk
Conflicting content 
		this.vxml = new Vxml(interpreterContext.getDocumentAcces().get(this.currentFileName, null)
				.getDocumentElement());
		VoiceXmlNode dialog;
<<<<<<< HEAD
		if(!url.contains("#")){
			dialog= vxml.getFirstDialog();
		}else {
			dialog = vxml.getDialogById(url.split("#")[1]);
		}
		this.fia = new FormInterpretationAlgorithm(dialog, interpreterContext.getScripting(),
				outPut, userInput);
=======
		if (!url.contains("#")) {
			dialog = vxml.getFirstDialog();
		} else {
			System.err.println(url.split("#")[1]+":p "+url);
			dialog = vxml.getDialogById(url.split("#")[1]);
		}
		this.fia = new FormInterpretationAlgorithm(dialog, interpreterContext.getScripting(), outPut, userInput);
>>>>>>> a015322ffb27eaf5e96f18e4971053235769114a
		FormInterpretationAlgorithm.setDefaultUncaughtExceptionHandler(getDefaultUncaughtExceptionHandler());
		interpreterContext.getScripting().eval(sessionVariables);
		interpreterContext.getScripting().enterScope(); // in scope application
Solution content 
		this.vxml = new Vxml(interpreterContext.getDocumentAcces().get(this.currentFileName, null)
				.getDocumentElement());
		VoiceXmlNode dialog;
		if(!url.contains("#")){
			dialog= vxml.getFirstDialog();
		}else {
			dialog = vxml.getDialogById(url.split("#")[1]);
		}
		this.fia = new FormInterpretationAlgorithm(dialog, interpreterContext.getScripting(), outPut, userInput);
		FormInterpretationAlgorithm.setDefaultUncaughtExceptionHandler(getDefaultUncaughtExceptionHandler());
		interpreterContext.getScripting().eval(sessionVariables);
		interpreterContext.getScripting().enterScope(); // in scope application
File
Interpreter.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Method invocation
Chunk
Conflicting content 
							fia.start();
							fia.join();
						}
<<<<<<< HEAD
=======
					} else if (exception instanceof ExitException) {
						isHangup = true;
>>>>>>> a015322ffb27eaf5e96f18e4971053235769114a
					} else {
						e.printStackTrace();
						throw new RuntimeException(e);
Solution content 
							fia.start();
							fia.join();
						}
					} else if (exception instanceof ExitException) {
						isHangup = true;
					} else {
						e.printStackTrace();
						throw new RuntimeException(e);
File
Interpreter.java
Developer's decision
Version 2
Kind of conflict
Attribute
If statement
Chunk
Conflicting content 
		VoiceXmlNode eventHandlers = searchEventHandlers(eventType, eventCount, field);
		if (eventHandlers != null) {
			List childs = eventHandlers.getChilds();
<<<<<<< HEAD
=======
			System.err.println(eventHandlers+"   \teventHandler");
>>>>>>> a015322ffb27eaf5e96f18e4971053235769114a
			for (VoiceXmlNode voiceXmlNode : childs) {
				executor.execute(voiceXmlNode);
			}
Solution content 
		VoiceXmlNode eventHandlers = searchEventHandlers(eventType, eventCount, field);
		if (eventHandlers != null) {
			List childs = eventHandlers.getChilds();
			for (VoiceXmlNode voiceXmlNode : childs) {
				executor.execute(voiceXmlNode);
			}
File
InterpreterEventHandler.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
class EventException extends InterpreterException {
	String eventType;
<<<<<<< HEAD

	EventException(VoiceXmlNode node, String eventType) {
		this.eventType = eventType;
=======

	EventException(VoiceXmlNode node, String eventType) {
		this.eventType = eventType;
	}
}

class DialogChangeException extends InterpreterException {
	private final String nextDialogId;

	public DialogChangeException(String nextDialogId) {
		this.nextDialogId = nextDialogId;
	}

	public String getNextDialogId() {
		return nextDialogId;
	}

}

class FormItemChangeException extends InterpreterException {
	private final String nextFormItemName;

	public FormItemChangeException(String nextFormItemName) {
		this.nextFormItemName = nextFormItemName;
	}

	public String getNextFormItemName() {
		return nextFormItemName;
	}
}

class DocumentChangeException extends InterpreterException {
	private final String nextDocumentFileName;
	private final String method;

	public DocumentChangeException(String nextDocumentFileName, String method) {
		this.nextDocumentFileName = nextDocumentFileName;
		this.method = method;
	}

	public String getMethod() {
		return method;
	}

	public String getNextDocumentFileName() {
		return nextDocumentFileName;
>>>>>>> a015322ffb27eaf5e96f18e4971053235769114a
	}
}
Solution content 
class EventException extends InterpreterException {
	String eventType;

	EventException(VoiceXmlNode node, String eventType) {
		this.eventType = eventType;
	}
}

class DialogChangeException extends InterpreterException {
	private final String nextDialogId;

	public DialogChangeException(String nextDialogId) {
		this.nextDialogId = nextDialogId;
	}

	public String getNextDialogId() {
		return nextDialogId;
	}

}

class FormItemChangeException extends InterpreterException {
	private final String nextFormItemName;

	public FormItemChangeException(String nextFormItemName) {
		this.nextFormItemName = nextFormItemName;
	}

	public String getNextFormItemName() {
		return nextFormItemName;
	}
}

class DocumentChangeException extends InterpreterException {
	private final String nextDocumentFileName;
	private final String method;

	public DocumentChangeException(String nextDocumentFileName, String method) {
		this.nextDocumentFileName = nextDocumentFileName;
		this.method = method;
	}

	public String getMethod() {
		return method;
	}

	public String getNextDocumentFileName() {
		return nextDocumentFileName;
	}
}
File
InterpreterException.java
Developer's decision
Version 2
Kind of conflict
Attribute
Class declaration
Class signature
Method declaration
Method signature
Return statement