Projects >> swp-uebersetzerbau-ss12 >>241aa8173428904da2e882864eb40639c11bb4a2

Chunk
Conflicting content 
            root.setAttributeNode(typeAttr);
			doc.appendChild(root);
			
<<<<<<< HEAD
			doc = childrenToXML(node, root, doc);
=======
			for (ISyntaxTree child:node.getChildren()){
				tagName = currNode.getSymbol().getName();
				if (tagName.startsWith("<")){
					tagName = tagName.substring(1, tagName.length()-1);
				}
				Element childNode;
				if (child.getChildrenCount() == 0){
					childNode = doc.createElement("LEAF");
					root.appendChild(childNode);
				}
				else{
					childNode = doc.createElement(tagName);
					root.appendChild(childNode);
					doc = childrenToXML(child, childNode, doc);
				}
				
			}
>>>>>>> b6b0b22718600f9b034d9ed3fa83ead3e99fe585
			
			// write the content into xml file
			TransformerFactory transformerFactory = TransformerFactory.newInstance();
Solution content 
            root.setAttributeNode(typeAttr);
			doc.appendChild(root);
			
			doc = childrenToXML(node, root, doc);
			
			for (ISyntaxTree child:node.getChildren()){
				tagName = currNode.getSymbol().getName();
				if (tagName.startsWith("<")){
					tagName = tagName.substring(1, tagName.length()-1);
				}
				Element childNode;
				if (child.getChildrenCount() == 0){
					childNode = doc.createElement("LEAF");
					root.appendChild(childNode);
				}
				else{
					childNode = doc.createElement(tagName);
					root.appendChild(childNode);
					doc = childrenToXML(child, childNode, doc);
				}
				
			}
			
			// write the content into xml file
			TransformerFactory transformerFactory = TransformerFactory.newInstance();
File
Printer.java
Developer's decision
Concatenation
Kind of conflict
For statement
Method invocation
Variable
Chunk
Conflicting content 
		
		for (ISyntaxTree child:node.getChildren()){
			SyntaxTree currNode = (SyntaxTree)child;
<<<<<<< HEAD
			String tagName = currNode.getSymbol();
			boolean nonterminal=false;
=======
			String tagName = currNode.getSymbol().getName();
>>>>>>> b6b0b22718600f9b034d9ed3fa83ead3e99fe585
			if (tagName.startsWith("<")){
				tagName = tagName.substring(1, tagName.length()-1);
				nonterminal = true;
Solution content 
		
		for (ISyntaxTree child:node.getChildren()){
			SyntaxTree currNode = (SyntaxTree)child;

			String tagName = currNode.getSymbol().getName();
			boolean nonterminal=false;
			
			if (tagName.startsWith("<")){
				tagName = tagName.substring(1, tagName.length()-1);
				nonterminal = true;
File
Printer.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable