This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new c241886 cxf-rt-javascript: fix PMD rule: UnusedAssignment
c241886 is described below
commit c24188673a00d70355ebea31b8d36f78483c683d
Author: Alexey Markevich <[email protected]>
AuthorDate: Sat Mar 6 23:34:37 2021 +0300
cxf-rt-javascript: fix PMD rule: UnusedAssignment
---
.../org/apache/cxf/javascript/AttributeInfo.java | 2 +-
.../cxf/javascript/JavascriptGetInterceptor.java | 2 +-
.../org/apache/cxf/javascript/JavascriptUtils.java | 36 ++++-----
.../cxf/javascript/NamespacePrefixAccumulator.java | 2 +-
.../org/apache/cxf/javascript/ParticleInfo.java | 2 +-
.../service/ServiceJavascriptBuilder.java | 93 +++++++++++-----------
.../javascript/types/SchemaJavascriptBuilder.java | 39 ++++-----
7 files changed, 88 insertions(+), 88 deletions(-)
diff --git
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
index a927958..7679b13 100644
---
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
+++
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
@@ -170,7 +170,7 @@ public final class AttributeInfo implements ItemInfo {
if (attributeInfo.type == null
&& !element.getSchemaTypeName()
.getNamespaceURI().equals(Constants.URI_2001_SCHEMA_XSD)) {
- JavascriptUtils.unsupportedConstruct("MISSING_TYPE",
element.getSchemaTypeName()
+ throw JavascriptUtils.unsupportedConstruct("MISSING_TYPE",
element.getSchemaTypeName()
.toString(), element.getQName(), element);
}
}
diff --git
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java
index 75324a4..bbdbfe9 100644
---
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java
+++
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptGetInterceptor.java
@@ -68,7 +68,7 @@ public class JavascriptGetInterceptor extends
AbstractPhaseInterceptor<Message>
return;
}
String baseUri = (String)message.get(Message.REQUEST_URL);
- URI uri = null;
+ final URI uri;
try {
uri = URI.create(baseUri);
diff --git
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
index 5ee06cf..de14081 100755
---
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
+++
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
@@ -534,13 +534,13 @@ public class JavascriptUtils {
public static XmlSchemaAnnotated getObjectAnnotated(XmlSchemaObject
object, QName contextName) {
if (!(object instanceof XmlSchemaAnnotated)) {
- unsupportedConstruct("NON_ANNOTATED_ATTRIBUTE",
+ throw unsupportedConstruct("NON_ANNOTATED_ATTRIBUTE",
object.getClass().getSimpleName(),
contextName, object);
}
if (!(object instanceof XmlSchemaAttribute)
&& !(object instanceof XmlSchemaAnyAttribute)) {
- unsupportedConstruct("EXOTIC_ATTRIBUTE",
+ throw unsupportedConstruct("EXOTIC_ATTRIBUTE",
object.getClass().getSimpleName(), contextName,
object);
}
@@ -557,7 +557,7 @@ public class JavascriptUtils {
XmlSchema currentSchema)
{
if (!(object instanceof XmlSchemaParticle)) {
- unsupportedConstruct("NON_PARTICLE_CHILD",
+ throw unsupportedConstruct("NON_PARTICLE_CHILD",
object.getClass().getSimpleName(),
contextName, object);
}
@@ -566,14 +566,14 @@ public class JavascriptUtils {
QName groupName = ((XmlSchemaGroupRef) object).getRefName();
XmlSchemaGroup group = currentSchema.getGroupByName(groupName);
if (group == null) {
- unsupportedConstruct("MISSING_GROUP",
+ throw unsupportedConstruct("MISSING_GROUP",
groupName.toString(), contextName, null);
}
XmlSchemaParticle groupParticle = group.getParticle();
if (!(groupParticle instanceof XmlSchemaSequence)) {
- unsupportedConstruct("GROUP_REF_UNSUPPORTED_TYPE",
+ throw unsupportedConstruct("GROUP_REF_UNSUPPORTED_TYPE",
groupParticle.getClass().getSimpleName(), contextName,
groupParticle);
}
@@ -584,7 +584,7 @@ public class JavascriptUtils {
&& !(object instanceof XmlSchemaAny)
&& !(object instanceof XmlSchemaChoice)
&& !(object instanceof XmlSchemaSequence)) {
- unsupportedConstruct("GROUP_CHILD",
+ throw unsupportedConstruct("GROUP_CHILD",
object.getClass().getSimpleName(), contextName,
object);
}
@@ -594,7 +594,6 @@ public class JavascriptUtils {
public static XmlSchemaSequence getSequence(XmlSchemaComplexType type) {
XmlSchemaParticle particle = type.getParticle();
- XmlSchemaSequence sequence = null;
if (particle == null) {
// the code that uses this wants to iterate. An empty one is more
useful than
@@ -602,17 +601,17 @@ public class JavascriptUtils {
return EMPTY_SEQUENCE;
}
+ final XmlSchemaSequence sequence;
try {
sequence = (XmlSchemaSequence) particle;
} catch (ClassCastException cce) {
- unsupportedConstruct("NON_SEQUENCE_PARTICLE", type);
+ throw unsupportedConstruct("NON_SEQUENCE_PARTICLE", type);
}
return sequence;
}
public static XmlSchemaChoice getChoice(XmlSchemaComplexType type) {
XmlSchemaParticle particle = type.getParticle();
- XmlSchemaChoice choice = null;
if (particle == null) {
// the code that uses this wants to iterate. An empty one is more
useful than
@@ -620,17 +619,17 @@ public class JavascriptUtils {
return EMPTY_CHOICE;
}
+ final XmlSchemaChoice choice;
try {
choice = (XmlSchemaChoice) particle;
} catch (ClassCastException cce) {
- unsupportedConstruct("NON_CHOICE_PARTICLE", type);
+ throw unsupportedConstruct("NON_CHOICE_PARTICLE", type);
}
return choice;
}
public static XmlSchemaAll getAll(XmlSchemaComplexType type) {
XmlSchemaParticle particle = type.getParticle();
- XmlSchemaAll all = null;
if (particle == null) {
// the code that uses this wants to iterate. An empty one is more
useful than
@@ -638,10 +637,11 @@ public class JavascriptUtils {
return EMPTY_ALL;
}
+ final XmlSchemaAll all;
try {
all = (XmlSchemaAll) particle;
} catch (ClassCastException cce) {
- unsupportedConstruct("NON_CHOICE_PARTICLE", type);
+ throw unsupportedConstruct("NON_CHOICE_PARTICLE", type);
}
return all;
@@ -694,30 +694,30 @@ public class JavascriptUtils {
if (particle == null) {
return null;
}
- XmlSchemaSequence sequence = null;
+ final XmlSchemaSequence sequence;
try {
sequence = (XmlSchemaSequence) particle;
} catch (ClassCastException cce) {
- unsupportedConstruct("NON_SEQUENCE_PARTICLE", type);
+ throw unsupportedConstruct("NON_SEQUENCE_PARTICLE", type);
}
return sequence;
}
- static void unsupportedConstruct(String messageKey,
+ static UnsupportedConstruct unsupportedConstruct(String messageKey,
String what,
QName subjectName,
XmlSchemaObject subject) {
Message message = new Message(messageKey, LOG, what,
subjectName == null ? "anonymous" :
subjectName,
cleanedUpSchemaSource(subject));
- throw new UnsupportedConstruct(message);
+ return new UnsupportedConstruct(message);
}
- static void unsupportedConstruct(String messageKey, XmlSchemaType subject)
{
+ static UnsupportedConstruct unsupportedConstruct(String messageKey,
XmlSchemaType subject) {
Message message = new Message(messageKey, LOG, subject.getQName(),
cleanedUpSchemaSource(subject));
- throw new UnsupportedConstruct(message);
+ return new UnsupportedConstruct(message);
}
static String cleanedUpSchemaSource(XmlSchemaObject subject) {
diff --git
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java
index b0597ba..cf58f93 100644
---
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java
+++
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java
@@ -46,7 +46,7 @@ public class NamespacePrefixAccumulator {
public void collect(String prefix, String uri) {
if (!("".equals(uri)) && !prefixes.contains(prefix)) {
- attributes.append("xmlns:" + prefix + "='" + uri + "' ");
+
attributes.append("xmlns:").append(prefix).append("='").append(uri).append("'
");
prefixes.add(prefix);
}
}
diff --git
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
index 60fe8e7..5aacbf6 100644
---
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
+++
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
@@ -329,7 +329,7 @@ public final class ParticleInfo implements ItemInfo {
if (elementInfo.type == null
&& !element.getSchemaTypeName()
.getNamespaceURI().equals(Constants.URI_2001_SCHEMA_XSD)) {
- JavascriptUtils.unsupportedConstruct("MISSING_TYPE",
element.getSchemaTypeName()
+ throw JavascriptUtils.unsupportedConstruct("MISSING_TYPE",
element.getSchemaTypeName()
.toString(), element.getQName(), element);
}
}
diff --git
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
index b4a10ee..9f3785c 100755
---
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
+++
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
@@ -141,7 +141,7 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
@Override
public void begin(InterfaceInfo intf) {
- code.append("\n// Javascript for " + intf.getName() + "\n\n");
+ code.append("\n// Javascript for
").append(intf.getName()).append("\n\n");
currentInterfaceClassName =
nameManager.getJavascriptName(intf.getName());
operationsWithNameConflicts = new HashSet<>();
@@ -151,7 +151,7 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
localInputMessagesNameMap = new HashMap<>();
localOutputMessagesNameMap = new HashMap<>();
- code.append("function " + currentInterfaceClassName + " () {\n");
+ code.append("function ").append(currentInterfaceClassName).append(" ()
{\n");
utils.appendLine("this.jsutils = new CxfApacheOrgUtil();");
utils.appendLine("this.jsutils.interfaceObject = this;");
utils.appendLine("this.synchronous = false;");
@@ -184,10 +184,10 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
if (elementType != null && elementType.getQName() != null) {
name = elementType.getQName();
}
- utils.appendLine("this.globalElementSerializers['" +
name.toString() + "'] = "
+ utils.appendLine("this.globalElementSerializers['" + name +
"'] = "
+ nameManager.getJavascriptName(name)
+ "_serialize;");
- utils.appendLine("this.globalElementDeserializers['" +
name.toString() + "'] = "
+ utils.appendLine("this.globalElementDeserializers['" + name +
"'] = "
+ nameManager.getJavascriptName(name)
+ "_deserialize;");
}
@@ -200,10 +200,10 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
continue;
}
// the names are misleading, but that's OK.
- utils.appendLine("this.globalElementSerializers['" +
name.toString() + "'] = "
+ utils.appendLine("this.globalElementSerializers['" + name +
"'] = "
+ nameManager.getJavascriptName(name)
+ "_serialize;");
- utils.appendLine("this.globalElementDeserializers['" +
name.toString() + "'] = "
+ utils.appendLine("this.globalElementDeserializers['" + name +
"'] = "
+ nameManager.getJavascriptName(name)
+ "_deserialize;");
}
@@ -211,7 +211,7 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
}
private String getFunctionGlobalName(QName itemName, String itemType) {
- return nameManager.getJavascriptName(itemName) + "_" + itemType;
+ return nameManager.getJavascriptName(itemName) + '_' + itemType;
}
@@ -292,11 +292,11 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
MessageInfo inputMessage = currentOperation.getInput();
code.append("//\n");
- code.append("// Operation " + currentOperation.getName() + "\n");
+ code.append("// Operation
").append(currentOperation.getName()).append('\n');
if (!isWrapped) {
code.append("// - bare operation. Parameters:\n");
for (ParticleInfo ei : unwrappedElementsAndNames) {
- code.append("// - " + getElementObjectName(ei) + "\n");
+ code.append("// -
").append(getElementObjectName(ei)).append('\n');
}
} else {
code.append("// Wrapped operation.\n");
@@ -309,7 +309,7 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
xmlSchemaCollection.getSchemaByTargetNamespace(contextQName.getNamespaceURI());
for (int i = 0; i < sequence.getItems().size(); i++) {
- code.append("// parameter " + inputParameterNames.get(i) +
"\n");
+ code.append("// parameter
").append(inputParameterNames.get(i)).append('\n');
XmlSchemaSequenceMember sequenceItem =
sequence.getItems().get(i);
ParticleInfo itemInfo =
ParticleInfo.forLocalItem((XmlSchemaObject)sequenceItem,
wrapperSchema,
@@ -329,7 +329,7 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
baseName = ((XmlSchemaElement)sequenceItem).getQName();
}
code.append("// - Object constructor is "
- + nameManager.getJavascriptName(baseName)
+ "\n");
+
).append(nameManager.getJavascriptName(baseName)).append('\n');
} else if (type != null) {
code.append("// - simple type ").append(type.getQName());
}
@@ -396,18 +396,18 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
+ syncAsyncFlag + ", requestHeaders);");
code.append("}\n\n");
- code.append(currentInterfaceClassName + ".prototype."
- + opFunctionPropertyName
- + " = "
- + opFunctionGlobalName
- + ";\n\n");
+ code.append(currentInterfaceClassName).append(".prototype."
+ ).append(opFunctionPropertyName
+ ).append(" = "
+ ).append(opFunctionGlobalName
+ ).append(";\n\n");
}
private void buildErrorFunction() {
String errorFunctionPropertyName = opFunctionPropertyName + "_onerror";
String errorFunctionGlobalName = opFunctionGlobalName + "_onerror";
- code.append("function " + errorFunctionGlobalName + "(client) {\n");
+ code.append("function
").append(errorFunctionGlobalName).append("(client) {\n");
utils.startIf("client.user_onerror");
// Is this a good set of parameters for the error function?
// Not if we want to process faults, it isn't. To be revisited.
@@ -427,11 +427,11 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
utils.endBlock();
utils.endBlock();
code.append("}\n\n");
- code.append(currentInterfaceClassName + ".prototype."
- + errorFunctionPropertyName
- + " = "
- + errorFunctionGlobalName
- + ";\n\n");
+ code.append(currentInterfaceClassName).append(".prototype."
+ ).append(errorFunctionPropertyName
+ ).append(" = "
+ ).append(errorFunctionGlobalName
+ ).append(";\n\n");
}
// Note: the response XML that we get from the XMLHttpRequest is the
document element,
@@ -447,7 +447,7 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
arglist = "(client, responseXml)";
}
- code.append("function " + successFunctionGlobalName + arglist + "
{\n");
+ code.append("function
").append(successFunctionGlobalName).append(arglist).append(" {\n");
utils.startIf("client.user_onsuccess");
utils.appendLine("var responseObject = null;");
if (nonVoidOutput) {
@@ -483,10 +483,10 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
utils.appendLine("client.user_onsuccess(responseObject);");
utils.endBlock();
code.append("}\n\n");
- code.append(currentInterfaceClassName + ".prototype."
- + successFunctionPropertyName
- + " = "
- + successFunctionGlobalName + ";\n\n");
+ code.append(currentInterfaceClassName).append(".prototype."
+ ).append(successFunctionPropertyName
+ ).append(" = "
+ ).append(successFunctionGlobalName).append(";\n\n");
}
private void buildParameterList(StringBuilder parameterList) {
@@ -513,10 +513,9 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
}
List<ParticleInfo> elements = new ArrayList<>();
String functionName = outputDeserializerFunctionName(outputMessage);
- code.append("function " + functionName + "(cxfjsutils, partElement)
{\n");
+ code.append("function ").append(functionName).append("(cxfjsutils,
partElement) {\n");
getElementsForParts(outputMessage, elements);
ParticleInfo element = elements.get(0);
- XmlSchemaType type = null;
if (isRPC) {
utils.appendLine("cxfjsutils.trace('rpc element: ' +
cxfjsutils.traceElementName(partElement));");
@@ -524,7 +523,7 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
utils.appendLine("cxfjsutils.trace('rpc element: ' +
cxfjsutils.traceElementName(partElement));");
}
- type = element.getType();
+ XmlSchemaType type = element.getType();
if (!element.isEmpty()) {
if (type instanceof XmlSchemaComplexType) {
@@ -572,7 +571,7 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
getFunctionPropertyName(inputMessagesWithNameConflicts, message,
message.getName())
+ "_serializeInput";
- code.append("function " + serializerFunctionGlobalName + "(cxfjsutils,
args) {\n");
+ code.append("function
").append(serializerFunctionGlobalName).append("(cxfjsutils, args) {\n");
String wrapperXmlElementName = null;
// for the wrapped case, we can name the object for Javascript after
whatever we like.
@@ -653,10 +652,10 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
utils.appendLine("xml = xml + cxfjsutils.endSoap11Message();");
utils.appendLine("return xml;");
code.append("}\n\n");
- code.append(currentInterfaceClassName + ".prototype."
- + serializerFunctionPropertyName
- + " = "
- + serializerFunctionGlobalName + ";\n\n");
+ code.append(currentInterfaceClassName).append(".prototype."
+ ).append(serializerFunctionPropertyName
+ ).append(" = "
+ ).append(serializerFunctionGlobalName).append(";\n\n");
}
private XmlSchemaSequence getTypeSequence(XmlSchemaComplexType type,
@@ -692,7 +691,7 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
private void getElementsForParts(MessageInfo message, List<ParticleInfo>
elements) {
for (MessagePartInfo mpi : message.getMessageParts()) {
XmlSchemaElement element = null;
- XmlSchemaType type = null;
+ XmlSchemaType type;
QName diagnosticName = mpi.getName();
if (mpi.isElement()) {
element = (XmlSchemaElement)mpi.getXmlSchema();
@@ -816,7 +815,7 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
public void begin(ServiceInfo service) {
code.append("//\n");
- code.append("// Definitions for service: " +
service.getName().toString() + "\n");
+ code.append("// Definitions for service:
").append(service.getName().toString()).append('\n');
code.append("//\n");
BindingInfo xml = null;
@@ -929,10 +928,10 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
String address = endpointInfo.getAddress();
String portClassName = currentInterfaceClassName + "_"
+ nameManager.getJavascriptName(endpointInfo.getName());
- code.append("function " + portClassName + " () {\n");
- code.append(" this.url = '" + address + "';\n");
+ code.append("function ").append(portClassName).append(" () {\n");
+ code.append(" this.url = '").append(address).append("';\n");
code.append("}\n");
- code.append(portClassName + ".prototype = new " +
currentInterfaceClassName + ";\n");
+ code.append(portClassName).append(".prototype = new
").append(currentInterfaceClassName).append(";\n");
}
@@ -959,13 +958,13 @@ public class ServiceJavascriptBuilder extends
ServiceModelVisitor {
// The referencing URI only helps if there is a schema that points to
// it.
// It might be the URI for the wsdl TNS, which might have no schema.
- if (xmlSchemaCollection.getSchemaByTargetNamespace(referencingURI) ==
null) {
- referencingURI = null;
- }
-
- if (referencingURI == null && containingType != null) {
- referencingURI = containingType.getQName().getNamespaceURI();
- }
+ //if (xmlSchemaCollection.getSchemaByTargetNamespace(referencingURI)
== null) {
+ // referencingURI = null;
+ //}
+ //
+ //if (referencingURI == null && containingType != null) {
+ // referencingURI = containingType.getQName().getNamespaceURI();
+ //}
XmlSchemaElement originalElement = element;
while (element.getSchemaType() == null && element.isRef()) {
diff --git
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
index a53fb8d..c58b392 100755
---
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
+++
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
@@ -118,10 +118,10 @@ public class SchemaJavascriptBuilder {
if (XmlSchemaUtils.isEumeration(simpleType)) {
List<String> values =
XmlSchemaUtils.enumeratorValues(simpleType);
code.append("//\n");
- code.append("// Simple type (enumeration) " +
simpleType.getQName() + "\n");
+ code.append("// Simple type (enumeration)
").append(simpleType.getQName()).append('\n');
code.append("//\n");
for (String value : values) {
- code.append("// - " + value + "\n");
+ code.append("// - ").append(value).append('\n');
}
}
}
@@ -182,9 +182,9 @@ public class SchemaJavascriptBuilder {
String typeObjectName = nameManager.getJavascriptName(name);
code.append("//\n");
- code.append("// Constructor for XML Schema item " + name.toString() +
"\n");
+ code.append("// Constructor for XML Schema item
").append(name.toString()).append('\n');
code.append("//\n");
- code.append("function " + typeObjectName + " () {\n");
+ code.append("function ").append(typeObjectName).append(" () {\n");
// to assist in debugging we put a type property into every object.
utils.appendLine("this.typeMarker = '" + typeObjectName + "';");
for (XmlSchemaObject thing : items) {
@@ -224,13 +224,13 @@ public class SchemaJavascriptBuilder {
String getFunctionProperty = typeObjectName + ".prototype.get" +
accessorSuffix;
String setFunctionProperty = typeObjectName + ".prototype.set" +
accessorSuffix;
accessors.append("//\n");
- accessors.append("// accessor is " + getFunctionProperty + "\n");
- accessors.append("// element get for " + itemInfo.getJavascriptName()
+ "\n");
+ accessors.append("// accessor is
").append(getFunctionProperty).append('\n');
+ accessors.append("// element get for
").append(itemInfo.getJavascriptName()).append('\n');
if (itemInfo.isAny()) {
accessors.append("// - xs:any\n");
} else {
if (itemInfo.getType() != null) {
- accessors.append("// - element type is " +
itemInfo.getType().getQName() + "\n");
+ accessors.append("// - element type is
").append(itemInfo.getType().getQName()).append('\n');
}
}
@@ -251,16 +251,16 @@ public class SchemaJavascriptBuilder {
}
accessors.append("//\n");
- accessors.append("// element set for " + itemInfo.getJavascriptName()
+ "\n");
- accessors.append("// setter function is is " + setFunctionProperty +
"\n");
+ accessors.append("// element set for
").append(itemInfo.getJavascriptName()).append('\n');
+ accessors.append("// setter function is is
").append(setFunctionProperty).append('\n');
accessors.append("//\n");
- accessors.append("function " + accessorName + "() { return this._" +
itemInfo.getJavascriptName()
- + ";}\n\n");
- accessors.append(getFunctionProperty + " = " + accessorName + ";\n\n");
+ accessors.append("function ").append(accessorName).append("() { return
this._")
+ .append(itemInfo.getJavascriptName()).append(";}\n\n");
+ accessors.append(getFunctionProperty).append(" =
").append(accessorName).append(";\n\n");
accessorName = typeObjectName + "_set" + accessorSuffix;
- accessors.append("function " + accessorName + "(value) { this._" +
itemInfo.getJavascriptName()
- + " = value;}\n\n");
- accessors.append(setFunctionProperty + " = " + accessorName + ";\n");
+ accessors.append("function ").append(accessorName).append("(value) {
this._")
+ .append(itemInfo.getJavascriptName()).append(" =
value;}\n\n");
+ accessors.append(setFunctionProperty).append(" =
").append(accessorName).append(";\n");
if (itemInfo.isOptional() || (itemInfo.isNillable() &&
!itemInfo.isArray())) {
utils.appendLine("this._" + itemInfo.getJavascriptName() + " =
null;");
@@ -300,9 +300,9 @@ public class SchemaJavascriptBuilder {
utils = new JavascriptUtils(code);
String functionName = nameManager.getJavascriptName(name) + "_" +
"serialize";
code.append("//\n");
- code.append("// Serialize " + name + "\n");
+ code.append("// Serialize ").append(name).append('\n');
code.append("//\n");
- code.append("function " + functionName + "(cxfjsutils, elementName,
extraNamespaces) {\n");
+ code.append("function ").append(functionName).append("(cxfjsutils,
elementName, extraNamespaces) {\n");
utils.startXmlStringAccumulator("xml");
utils.startIf("elementName !== null");
utils.appendString("<");
@@ -328,7 +328,8 @@ public class SchemaJavascriptBuilder {
utils.endBlock();
utils.appendLine("return xml;");
code.append("}\n\n");
- code.append(nameManager.getJavascriptName(name) +
".prototype.serialize = " + functionName + ";\n\n");
+
code.append(nameManager.getJavascriptName(name)).append(".prototype.serialize =
")
+ .append(functionName).append(";\n\n");
}
private void complexTypeSerializeAttributes(XmlSchemaComplexType type,
String string) {
@@ -381,7 +382,7 @@ public class SchemaJavascriptBuilder {
List<XmlSchemaObject> contentElements =
JavascriptUtils.getContentElements(type, xmlSchemaCollection);
String typeObjectName = nameManager.getJavascriptName(name);
- code.append("function " + typeObjectName + "_deserialize (cxfjsutils,
element) {\n");
+ code.append("function ").append(typeObjectName).append("_deserialize
(cxfjsutils, element) {\n");
// create the object we are deserializing into.
utils.appendLine("var newobject = new " + typeObjectName + "();");
utils.appendLine("cxfjsutils.trace('element: ' +
cxfjsutils.traceElementName(element));");
