Index: WSDLSemanticsVisitor.java =================================================================== RCS file: /cvs/xml/wsdl/api/src/org/netbeans/modules/xml/wsdl/validator/visitor/WSDLSemanticsVisitor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -r1.5 -r1.6 78c78 < * @version $Revision: 1.5 $ --- > * @version $Revision: 1.6 $ 204a205,211 > public static final String VAL_OPERATION_DOES_NOT_MATCH_INPUT_NAME_IN_PORT_TYPE = "VAL_OPERATION_DOES_NOT_MATCH_INPUT_NAME_IN_PORT_TYPE"; > public static final String FIX_OPERATION_DOES_NOT_MATCH_INPUT_NAME_IN_PORT_TYPE = "FIX_OPERATION_DOES_NOT_MATCH_INPUT_NAME_IN_PORT_TYPE"; > > public static final String VAL_OPERATION_DOES_NOT_MATCH_OUTPUT_NAME_IN_PORT_TYPE = "VAL_OPERATION_DOES_NOT_MATCH_OUTPUT_NAME_IN_PORT_TYPE"; > public static final String FIX_OPERATION_DOES_NOT_MATCH_OUTPUT_NAME_IN_PORT_TYPE = "FIX_OPERATION_DOES_NOT_MATCH_OUTPUT_NAME_IN_PORT_TYPE"; > > 791a799,806 > BindingInput bindingInput = bindingOp.getBindingInput(); > boolean bindingOpHasInput = bindingInput != null; > Input portTypeInput = matchingOp.getInput(); > boolean portTypeOpHasInput = portTypeInput != null; > BindingOutput bindingOutput = bindingOp.getBindingOutput(); > boolean bindingOpHasOutput = bindingOutput != null; > Output portTypeOutput = matchingOp.getOutput(); > boolean portTypeOpHasOutput = portTypeOutput != null; 795c810 < if(!inputsMatch(bindingOp, matchingOp)){ --- > if(bindingOpHasInput != portTypeOpHasInput){ 798,799c813,814 < (Validator.ResultType.WARNING, bindingOp, < mMsg.getString(VAL_OPERATION_DOES_NOT_MATCH_INPUT_IN_PORT_TYPE, operationName, binding.getName(), portTypeName), --- > (Validator.ResultType.ERROR, bindingOp, > mMsg.getString(VAL_OPERATION_DOES_NOT_MATCH_INPUT_IN_PORT_TYPE, operationName, bindingName, portTypeName), 800a816,824 > }else{ > if(bindingOpHasInput){ > if(!inputNamesMatch(bindingInput, portTypeInput)){ > getValidateSupport().fireToDo > (Validator.ResultType.WARNING, bindingInput, > mMsg.getString(VAL_OPERATION_DOES_NOT_MATCH_INPUT_NAME_IN_PORT_TYPE, operationName, bindingName, portTypeName), > mMsg.getString(FIX_OPERATION_DOES_NOT_MATCH_INPUT_NAME_IN_PORT_TYPE, operationName)); > } > } 802c826,827 < if(!outputsMatch(bindingOp, matchingOp)){ --- > > if(bindingOpHasOutput != portTypeOpHasOutput){ 805,806c830,831 < (Validator.ResultType.WARNING, bindingOp, < mMsg.getString(VAL_OPERATION_DOES_NOT_MATCH_OUTPUT_IN_PORT_TYPE, operationName, binding.getName(), portTypeName), --- > (Validator.ResultType.ERROR, bindingOp, > mMsg.getString(VAL_OPERATION_DOES_NOT_MATCH_OUTPUT_IN_PORT_TYPE, operationName, bindingName, portTypeName), 807a833,841 > }else{ > if(bindingOpHasOutput){ > if(!outputNamesMatch(bindingOutput, portTypeOutput)){ > getValidateSupport().fireToDo > (Validator.ResultType.WARNING, bindingOutput, > mMsg.getString(VAL_OPERATION_DOES_NOT_MATCH_OUTPUT_NAME_IN_PORT_TYPE, operationName, bindingName, portTypeName), > mMsg.getString(FIX_OPERATION_DOES_NOT_MATCH_OUTPUT_NAME_IN_PORT_TYPE, operationName)); > } > } 812c846 < (Validator.ResultType.WARNING, bindingOp, --- > (Validator.ResultType.ERROR, bindingOp, 826,838c860,863 < private boolean inputsMatch(BindingOperation bindingOp, Operation portTypeOp){ < BindingInput bindingInput = bindingOp.getBindingInput(); < Input portTypeInput = portTypeOp.getInput(); < boolean bindingOpHasInput = bindingInput != null; < boolean portTypeOpHasInput = portTypeInput != null; < if(bindingOpHasInput != portTypeOpHasInput){ < return false; < } < if(bindingOpHasInput){ < String bindingInputName = bindingInput.getName(); < if(bindingInputName != null){ < return bindingInputName.equals(portTypeInput.getName()); < } --- > private boolean inputNamesMatch(BindingInput bindingInput, Input portTypeInput){ > String bindingInputName = bindingInput.getName(); > if(bindingInputName != null){ > return bindingInputName.equals(portTypeInput.getName()); 843,855c868,871 < private boolean outputsMatch(BindingOperation bindingOp, Operation portTypeOp){ < BindingOutput bindingOutput = bindingOp.getBindingOutput(); < Output portTypeOutput = portTypeOp.getOutput(); < boolean bindingOpHasOutput = bindingOutput != null; < boolean portTypeOpHasOutput = portTypeOutput != null; < if(bindingOpHasOutput != portTypeOpHasOutput){ < return false; < } < if(bindingOpHasOutput){ < String bindingOutputName = bindingOutput.getName(); < if(bindingOutputName != null){ < return bindingOutputName.equals(portTypeOutput.getName()); < } --- > private boolean outputNamesMatch(BindingOutput bindingOutput, Output portTypeOutput){ > String bindingOutputName = bindingOutput.getName(); > if(bindingOutputName != null){ > return bindingOutputName.equals(portTypeOutput.getName());