Projects >> orbeon-forms >>02983673590ce54368a78c586f6f80988246b01e

Chunk
Conflicting content 
            // Compute default value
            try {
                final NodeInfo currentNodeInfo = (NodeInfo) nodeset.get(position - 1);
<<<<<<< HEAD
                final String stringResult = evaluateStringExpression(propertyContext, nodeset, position, bind, bind.getXXFormsDefault(), getVariables(currentNodeInfo));

                // TODO: Detect if we have already handled this node and dispatch xforms-binding-exception
                // TODO: doSetValue may dispatch an xforms-binding-exception. It should reach the bind, but we don't support that yet so pass the model.
                XFormsSetvalueAction.doSetValue(propertyContext, containingDocument, indentedLogger, model, currentNodeInfo, stringResult, null, true);

=======
                return XPathCache.evaluateAsString(propertyContext, nodeset, position, bind.getXXFormsDefault(),
                        container.getNamespaceMappings(bind.getBindElement()), getVariables(currentNodeInfo),
                        XFormsContainingDocument.getFunctionLibrary(), model.getContextStack().getFunctionContext(),
                        bind.getLocationData().getSystemID(), bind.getLocationData());
>>>>>>> 532afd5c0cfc0e8648856a27eb07ee4cf6b4c855
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms calculate bind",
                        bind.getBindElement(), new String[] { "expression", bind.getCalculate() }));
Solution content 
            // Compute default value
            try {
                final NodeInfo currentNodeInfo = (NodeInfo) nodeset.get(position - 1);
                return evaluateStringExpression(propertyContext, nodeset, position, bind, bind.getXXFormsDefault(), getVariables(currentNodeInfo));
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms calculate bind",
                        bind.getBindElement(), new String[] { "expression", bind.getCalculate() }));
File
XFormsModelBinds.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Return statement
Variable
Chunk
Conflicting content 
            // Compute calculated value
            try {
                final NodeInfo currentNodeInfo = (NodeInfo) nodeset.get(position - 1);
<<<<<<< HEAD
                final String stringResult = evaluateStringExpression(propertyContext, nodeset, position, bind, bind.getCalculate(), getVariables(currentNodeInfo));

                // TODO: Detect if we have already handled this node and dispatch xforms-binding-exception
                // TODO: doSetValue may dispatch an xforms-binding-exception. It should reach the bind, but we don't support that yet so pass the model.
                XFormsSetvalueAction.doSetValue(propertyContext, containingDocument, indentedLogger, model, currentNodeInfo, stringResult, null, true);

=======
                return XPathCache.evaluateAsString(propertyContext, nodeset, position, bind.getCalculate(),
                        container.getNamespaceMappings(bind.getBindElement()), getVariables(currentNodeInfo),
                        XFormsContainingDocument.getFunctionLibrary(), model.getContextStack().getFunctionContext(),
                        bind.getLocationData().getSystemID(), bind.getLocationData());
>>>>>>> 532afd5c0cfc0e8648856a27eb07ee4cf6b4c855
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms calculate bind",
                        bind.getBindElement(), new String[] { "expression", bind.getCalculate() }));
Solution content 
            // Compute calculated value
            try {
                final NodeInfo currentNodeInfo = (NodeInfo) nodeset.get(position - 1);
                return evaluateStringExpression(propertyContext, nodeset, position, bind, bind.getCalculate(), getVariables(currentNodeInfo));
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms calculate bind",
                        bind.getBindElement(), new String[] { "expression", bind.getCalculate() }));
File
XFormsModelBinds.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Return statement
Variable
Chunk
Conflicting content 
            // Evaluate "required" XPath expression on this node
            try {
                // Get MIP value
<<<<<<< HEAD
                final boolean required = evaluateBooleanExpression1(propertyContext, nodeset, position, bind, bind.getRequired(), currentVariables);

                // Update node with MIP value
                InstanceData.setRequired(currentNodeInfo, required);
=======
                return evaluateBooleanExpression1(propertyContext, bind, bind.getRequired(), nodeset, position, currentVariables);
>>>>>>> 532afd5c0cfc0e8648856a27eb07ee4cf6b4c855
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms required bind",
                        bind.getBindElement(), new String[] { "expression", bind.getRequired() }));
Solution content 
            // Evaluate "required" XPath expression on this node
            try {
                // Get MIP value
                return evaluateBooleanExpression1(propertyContext, nodeset, position, bind, bind.getRequired(), currentVariables);
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms required bind",
                        bind.getBindElement(), new String[] { "expression", bind.getRequired() }));
File
XFormsModelBinds.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Return statement
Variable
Chunk
Conflicting content 
        }
        // Handle relevant MIP
        if (bind.getRelevant() != null) {
    }

<<<<<<< HEAD
            // Evaluate "relevant" XPath expression on this node
            try {
                final boolean relevant = evaluateBooleanExpression1(propertyContext, nodeset, position, bind, bind.getRelevant(), currentVariables);
                // Mark node
                InstanceData.setRelevant(currentNodeInfo, relevant);
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms relevant bind",
                        bind.getBindElement(), new String[] { "expression", bind.getRelevant() }));

                container.dispatchEvent(propertyContext, new XFormsComputeExceptionEvent(containingDocument, model, ve.getMessage(), ve));
            }
=======
    private void handleReadonlyMIP(PropertyContext propertyContext, Bind bind, List nodeset, int position, NodeInfo currentNodeInfo, Map currentVariables) {
        final Boolean readonly = evaluateReadonlyMIP(propertyContext, bind, nodeset, position, currentVariables);
        if (readonly != null) {
            // Mark node
            InstanceData.setReadonly(currentNodeInfo, readonly);
        } else if (bind.getCalculate() != null) {
            // The bind doesn't have a readonly attribute, but has a calculate: set readonly to true()
            InstanceData.setReadonly(currentNodeInfo, true);
>>>>>>> 532afd5c0cfc0e8648856a27eb07ee4cf6b4c855
        }
    }
Solution content 
        }
    }

    private void handleReadonlyMIP(PropertyContext propertyContext, Bind bind, List nodeset, int position, NodeInfo currentNodeInfo, Map currentVariables) {
        final Boolean readonly = evaluateReadonlyMIP(propertyContext, bind, nodeset, position, currentVariables);
        if (readonly != null) {
            // Mark node
            InstanceData.setReadonly(currentNodeInfo, readonly);
        } else if (bind.getCalculate() != null) {
            // The bind doesn't have a readonly attribute, but has a calculate: set readonly to true()
            InstanceData.setReadonly(currentNodeInfo, true);
        }
    }
File
XFormsModelBinds.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation
Method signature
Try statement
Variable
Chunk
Conflicting content 
            // The bind has a readonly attribute
            // Evaluate "readonly" XPath expression on this node
            try {
<<<<<<< HEAD
                final boolean readonly = evaluateBooleanExpression1(propertyContext, nodeset, position, bind, bind.getReadonly(), currentVariables);

                // Mark node
                InstanceData.setReadonly(currentNodeInfo, readonly);
=======
                return evaluateBooleanExpression1(propertyContext, bind, bind.getReadonly(), nodeset, position, currentVariables);
>>>>>>> 532afd5c0cfc0e8648856a27eb07ee4cf6b4c855
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms readonly bind",
                        bind.getBindElement(), new String[] { "expression", bind.getReadonly() }));
Solution content 
            // The bind has a readonly attribute
            // Evaluate "readonly" XPath expression on this node
            try {
                return evaluateBooleanExpression1(propertyContext, nodeset, position, bind, bind.getReadonly(), currentVariables);
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms readonly bind",
                        bind.getBindElement(), new String[] { "expression", bind.getReadonly() }));
File
XFormsModelBinds.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Return statement
Variable
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
        final Map customMips = bind.getCustomMips();
        if (customMips != null && customMips.size() > 0) {
            for (Map.Entry entry: customMips.entrySet()) {
                final String key = entry.getKey();
                final String expression = entry.getValue();

                try {
                    final String stringResult = evaluateStringExpression(propertyContext, nodeset, position, bind, expression, getVariables(currentNodeInfo));
                    InstanceData.setCustom(currentNodeInfo, key, stringResult);
                } catch (Exception e) {
                    final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms custom bind",
                            bind.getBindElement(), new String[] { "name", key, "expression", expression }));
=======
    private void handleRelevantMIP(PropertyContext propertyContext, Bind bind, List nodeset, int position, NodeInfo currentNodeInfo, Map currentVariables) {
        final Boolean relevant = evaluateRelevantMIP(propertyContext, bind, nodeset, position, currentVariables);
        if (relevant != null) {
            // Mark node
            InstanceData.setRelevant(currentNodeInfo, relevant);
        }
    }

    private Boolean evaluateRelevantMIP(PropertyContext propertyContext, Bind bind, List nodeset, int position, Map currentVariables) {
        if (bind.getRelevant() != null) {
            // Evaluate "relevant" XPath expression on this node
            try {
                return evaluateBooleanExpression1(propertyContext, bind, bind.getRelevant(), nodeset, position, currentVariables);
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms relevant bind",
                        bind.getBindElement(), new String[] { "expression", bind.getRelevant() }));
>>>>>>> 532afd5c0cfc0e8648856a27eb07ee4cf6b4c855

                container.dispatchEvent(propertyContext, new XFormsComputeExceptionEvent(containingDocument, model, ve.getMessage(), ve));
                throw new IllegalStateException(); // event above throw an exception anyway
Solution content 
        }
    }

    private void handleRelevantMIP(PropertyContext propertyContext, Bind bind, List nodeset, int position, NodeInfo currentNodeInfo, Map currentVariables) {
        final Boolean relevant = evaluateRelevantMIP(propertyContext, bind, nodeset, position, currentVariables);
        if (relevant != null) {
            // Mark node
            InstanceData.setRelevant(currentNodeInfo, relevant);
        }
    }

    private Boolean evaluateRelevantMIP(PropertyContext propertyContext, Bind bind, List nodeset, int position, Map currentVariables) {
        if (bind.getRelevant() != null) {
            // Evaluate "relevant" XPath expression on this node
            try {
                return evaluateBooleanExpression1(propertyContext, nodeset, position, bind, bind.getRelevant(), currentVariables);
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms relevant bind",
                        bind.getBindElement(), new String[] { "expression", bind.getRelevant() }));

                container.dispatchEvent(propertyContext, new XFormsComputeExceptionEvent(containingDocument, model, ve.getMessage(), ve));
                throw new IllegalStateException(); // event above throw an exception anyway
File
XFormsModelBinds.java
Developer's decision
Manual
Kind of conflict
Catch clause
Comment
For statement
If statement
Method declaration
Method invocation
Method signature
Return statement
Try statement
Variable
Chunk
Conflicting content 
            try {
<<<<<<< HEAD
                // Get MIP value
            // Evaluate constraint
                final boolean valid = evaluateBooleanExpression1(propertyContext, nodeset, position, bind, bind.getConstraint(), getVariables(currentNodeInfo));

                // Update node with MIP value
                isValid &= valid;
                // TODO: why do we allow calling this with valid == true?
                InstanceData.updateValueValid(currentNodeInfo, valid, bind.getId());
=======
                return evaluateBooleanExpression1(propertyContext, bind, bind.getConstraint(), nodeset, position, getVariables(currentNodeInfo));
>>>>>>> 532afd5c0cfc0e8648856a27eb07ee4cf6b4c855
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms constraint bind",
                        bind.getBindElement(), new String[] { "expression", bind.getConstraint() }));
Solution content 
            // Evaluate constraint
            try {
                // Get MIP value
                return evaluateBooleanExpression1(propertyContext, nodeset, position, bind, bind.getConstraint(), getVariables(currentNodeInfo));
            } catch (Exception e) {
                final ValidationException ve = ValidationException.wrapException(e, new ExtendedLocationData(bind.getLocationData(), "evaluating XForms constraint bind",
                        bind.getBindElement(), new String[] { "expression", bind.getConstraint() }));
File
XFormsModelBinds.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Return statement
Variable