Projects >> webservices-axiom >>9a7c74445d719a63c0331fbaba2867e3653615a2

Chunk
Conflicting content 
package org.apache.axiom.soap.impl.dom;

import org.apache.axiom.om.OMAttribute;
<<<<<<< HEAD
=======
import org.apache.axiom.om.OMCloneOptions;
>>>>>>> ad3f36dd408a89b66f777b2e1903f5cd357b0f65
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
Solution content 
package org.apache.axiom.soap.impl.dom;

import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
File
SOAPHeaderBlockImpl.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
            checkParent((OMElement) element);
        }
    }
<<<<<<< HEAD
=======
    
    protected OMElement createClone(OMCloneOptions options, OMContainer targetParent) {
        SOAPHeaderBlock clone = ((SOAPFactory)factory).createSOAPHeaderBlock(getLocalName(), getNamespace(), (SOAPHeader)targetParent);
        copyData(options, clone);
        return clone;
    }

    private void copyData(OMCloneOptions options, SOAPHeaderBlock targetSHB) {
        // Copy the processed flag.  The other SOAPHeaderBlock information 
        // (e.g. role, mustUnderstand) are attributes on the tag and are copied elsewhere.
        Boolean processedFlag = options instanceof SOAPCloneOptions ? ((SOAPCloneOptions)options).getProcessedFlag() : null;
        if ((processedFlag == null && isProcessed()) || (processedFlag != null && processedFlag.booleanValue())) {
            targetSHB.setProcessed();
        }
    }
>>>>>>> ad3f36dd408a89b66f777b2e1903f5cd357b0f65
}
Solution content 
            checkParent((OMElement) element);
        }
    }
    
    protected OMElement createClone(OMCloneOptions options, OMContainer targetParent) {
        SOAPHeaderBlock clone = ((SOAPFactory)factory).createSOAPHeaderBlock(getLocalName(), getNamespace(), (SOAPHeader)targetParent);
        copyData(options, clone);
        return clone;
    }

    private void copyData(OMCloneOptions options, SOAPHeaderBlock targetSHB) {
        // Copy the processed flag.  The other SOAPHeaderBlock information 
        // (e.g. role, mustUnderstand) are attributes on the tag and are copied elsewhere.
        Boolean processedFlag = options instanceof SOAPCloneOptions ? ((SOAPCloneOptions)options).getProcessedFlag() : null;
        if ((processedFlag == null && isProcessed()) || (processedFlag != null && processedFlag.booleanValue())) {
            targetSHB.setProcessed();
        }
    }
}
File
SOAPHeaderBlockImpl.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
            OMNamespace ns = (OMNamespace)it.next();
            targetElement.declareNamespace(ns);
        }
<<<<<<< HEAD
        
        // Build the (target) clonedElement from the parser
        OMElement clonedElement =
                new StAXOMBuilder(xmlStreamReader).getDocumentElement(true);
        clonedElement.build();
        return clonedElement;
=======
        for (Iterator it = getAllAttributes(); it.hasNext(); ) {
            OMAttribute attr = (OMAttribute)it.next();
            targetElement.addAttribute(attr);
        }
        for (Iterator it = getChildren(); it.hasNext(); ) {
            ((OMNodeImpl)it.next()).clone(options, targetElement);
        }
        return targetElement;
>>>>>>> ad3f36dd408a89b66f777b2e1903f5cd357b0f65
    }

    protected OMElement createClone(OMCloneOptions options, OMContainer targetParent) {
Solution content 
            OMNamespace ns = (OMNamespace)it.next();
            targetElement.declareNamespace(ns);
        }
        for (Iterator it = getAllAttributes(); it.hasNext(); ) {
            OMAttribute attr = (OMAttribute)it.next();
            targetElement.addAttribute(attr);
        }
        for (Iterator it = getChildren(); it.hasNext(); ) {
            ((OMNodeImpl)it.next()).clone(options, targetElement);
        }
        return targetElement;
    }

    protected OMElement createClone(OMCloneOptions options, OMContainer targetParent) {
File
OMElementImpl.java
Developer's decision
Version 2
Kind of conflict
Comment
For statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
package org.apache.axiom.soap.impl.llom;

import org.apache.axiom.om.OMAttribute;
<<<<<<< HEAD
=======
import org.apache.axiom.om.OMCloneOptions;
>>>>>>> ad3f36dd408a89b66f777b2e1903f5cd357b0f65
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDataSourceExt;
Solution content 
package org.apache.axiom.soap.impl.llom;

import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMCloneOptions;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDataSourceExt;
File
SOAPHeaderBlockImpl.java
Developer's decision
Version 2
Kind of conflict
Import