1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java Thu Apr 04 19:05:24 2013 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java Tue Apr 09 14:51:13 2013 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -66,6 +66,7 @@
1.11 import java.net.URL;
1.12
1.13 import com.sun.xml.internal.ws.util.ServiceFinder;
1.14 +import java.util.Locale;
1.15
1.16 /**
1.17 * @author WS Development Team
1.18 @@ -100,7 +101,7 @@
1.19 }
1.20
1.21 cls._extends(javax.xml.ws.Service.class);
1.22 - String serviceFieldName = BindingHelper.mangleNameToClassName(service.getName().getLocalPart()).toUpperCase();
1.23 + String serviceFieldName = BindingHelper.mangleNameToClassName(service.getName().getLocalPart()).toUpperCase(Locale.ENGLISH);
1.24 String wsdlLocationName = serviceFieldName + "_WSDL_LOCATION";
1.25 JFieldVar urlField = cls.field(JMod.PRIVATE | JMod.STATIC | JMod.FINAL, URL.class, wsdlLocationName);
1.26
1.27 @@ -219,8 +220,9 @@
1.28 Locator loc = null;
1.29 if (portTypeName != null) {
1.30 PortType pt = port.portTypes.get(portTypeName);
1.31 - if (pt != null)
1.32 + if (pt != null) {
1.33 loc = pt.getLocator();
1.34 + }
1.35 }
1.36 receiver.error(loc, GeneratorMessages.GENERATOR_SEI_CLASS_ALREADY_EXIST(port.getJavaInterface().getName(), portTypeName));
1.37 return;
1.38 @@ -230,8 +232,9 @@
1.39 writeDefaultGetPort(port, retType, cls);
1.40
1.41 //write getXyzPort(WebServicesFeature...)
1.42 - if (options.target.isLaterThan(Options.Target.V2_1))
1.43 + if (options.target.isLaterThan(Options.Target.V2_1)) {
1.44 writeGetPort(port, retType, cls);
1.45 + }
1.46 }
1.47
1.48 writeGetWsdlLocation(cm.ref(URL.class), cls, urlField, exField);
1.49 @@ -240,8 +243,9 @@
1.50 private void writeGetPort(Port port, JType retType, JDefinedClass cls) {
1.51 JMethod m = cls.method(JMod.PUBLIC, retType, port.getPortGetter());
1.52 JDocComment methodDoc = m.javadoc();
1.53 - if (port.getJavaDoc() != null)
1.54 + if (port.getJavaDoc() != null) {
1.55 methodDoc.add(port.getJavaDoc());
1.56 + }
1.57 JCommentPart ret = methodDoc.addReturn();
1.58 JCommentPart paramDoc = methodDoc.addParam("features");
1.59 paramDoc.append("A list of ");
1.60 @@ -250,7 +254,7 @@
1.61 ret.add("returns " + retType.name());
1.62 m.varParam(WebServiceFeature.class, "features");
1.63 JBlock body = m.body();
1.64 - StringBuffer statement = new StringBuffer("return ");
1.65 + StringBuilder statement = new StringBuilder("return ");
1.66 statement.append("super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
1.67 statement.append(retType.name());
1.68 statement.append(".class, features);");
1.69 @@ -389,12 +393,13 @@
1.70 String portGetter = port.getPortGetter();
1.71 JMethod m = cls.method(JMod.PUBLIC, retType, portGetter);
1.72 JDocComment methodDoc = m.javadoc();
1.73 - if (port.getJavaDoc() != null)
1.74 + if (port.getJavaDoc() != null) {
1.75 methodDoc.add(port.getJavaDoc());
1.76 + }
1.77 JCommentPart ret = methodDoc.addReturn();
1.78 ret.add("returns " + retType.name());
1.79 JBlock body = m.body();
1.80 - StringBuffer statement = new StringBuffer("return ");
1.81 + StringBuilder statement = new StringBuilder("return ");
1.82 statement.append("super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
1.83 statement.append(retType.name());
1.84 statement.append(".class);");
