src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this --- 1,7 ---- /* ! * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this
*** 84,101 **** } public void addParameter(JavaParameter param) { // verify that this member does not already exist if (hasParameter(param.getName())) { ! if(options.isExtensionMode()){ param.setName(getUniqueName(param.getName())); ! }else{ Parameter duplicParam = getParameter(param.getName()); if(param.getParameter().isEmbedded()){ errorReceiver.error(param.getParameter().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE_WRAPPER(param.getName(), param.getParameter().getEntityName())); errorReceiver.error(duplicParam.getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE_WRAPPER(param.getName(), duplicParam.getEntityName())); ! }else{ errorReceiver.error(param.getParameter().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), param.getParameter().getEntityName())); errorReceiver.error(duplicParam.getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), duplicParam.getEntityName())); } return; } --- 84,101 ---- } public void addParameter(JavaParameter param) { // verify that this member does not already exist if (hasParameter(param.getName())) { ! if (options.isExtensionMode()) { param.setName(getUniqueName(param.getName())); ! } else { Parameter duplicParam = getParameter(param.getName()); if(param.getParameter().isEmbedded()){ errorReceiver.error(param.getParameter().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE_WRAPPER(param.getName(), param.getParameter().getEntityName())); errorReceiver.error(duplicParam.getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE_WRAPPER(param.getName(), duplicParam.getEntityName())); ! } else { errorReceiver.error(param.getParameter().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), param.getParameter().getEntityName())); errorReceiver.error(duplicParam.getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), duplicParam.getEntityName())); } return; }
*** 119,129 **** return exceptions.iterator(); } private String getUniqueName(String param){ int parmNum = 0; ! while(hasParameter(param)){ param = param + Integer.toString(parmNum++); } return param; } } --- 119,129 ---- return exceptions.iterator(); } private String getUniqueName(String param){ int parmNum = 0; ! while (hasParameter(param)) { param = param + Integer.toString(parmNum++); } return param; } }