This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
commit e76097dd1a3b45f0df591efd0fc6aece072d143f
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sun May 4 09:23:34 2025 -0400
Normalize local variable and parameter naming
Javadoc
---
.../jaxme/examples/misc/address/AddressType.java | 52 +++--
.../jaxme/examples/misc/address/ObjectFactory.java | 50 ++---
.../misc/address/impl/AddressTypeHandler.java | 242 ++++++++++-----------
.../misc/address/impl/AddressTypeImpl.java | 120 +++++-----
.../misc/address/impl/AddressTypeSerializer.java | 36 +--
5 files changed, 246 insertions(+), 254 deletions(-)
diff --git
a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/AddressType.java
b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/AddressType.java
index 1e71c405..07f7439f 100644
---
a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/AddressType.java
+++
b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/AddressType.java
@@ -14,35 +14,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.ws.jaxme.examples.misc.address;
public interface AddressType {
- public interface NameType {
-
-
-
- public java.lang.String getFirst();
-
- public void setFirst(java.lang.String pFirst);
-
- public java.util.List getMiddle();
-
- public java.lang.String getLast();
-
- public void setLast(java.lang.String pLast);
-
- public java.lang.String getInitials();
-
- public void setInitials(java.lang.String pInitials);
-
- }
-
- public java.lang.String getId();
-
- public void setId(java.lang.String pId);
-
- public org.apache.ws.jaxme.examples.misc.address.AddressType.NameType
getName();
-
- public void
setName(org.apache.ws.jaxme.examples.misc.address.AddressType.NameType pName);
+ public interface NameType {
+
+ public String getFirst();
+
+ public void setFirst(String first);
+
+ public java.util.List getMiddle();
+
+ public String getLast();
+
+ public void setLast(String last);
+
+ public String getInitials();
+
+ public void setInitials(String initials);
+ }
+
+ public String getId();
+
+ public void setId(String id);
+
+ public org.apache.ws.jaxme.examples.misc.address.AddressType.NameType
getName();
+
+ public void
setName(org.apache.ws.jaxme.examples.misc.address.AddressType.NameType name);
}
diff --git
a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/ObjectFactory.java
b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/ObjectFactory.java
index d6049819..b59e10ae 100644
---
a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/ObjectFactory.java
+++
b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/ObjectFactory.java
@@ -14,41 +14,41 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.ws.jaxme.examples.misc.address;
public class ObjectFactory {
- private org.apache.ws.jaxme.impl.JAXBContextImpl jaxbContext;
-
- private java.util.Map properties;
- public ObjectFactory() throws javax.xml.bind.JAXBException {
- jaxbContext = (org.apache.ws.jaxme.impl.JAXBContextImpl)
javax.xml.bind.JAXBContext.newInstance("org.apache.ws.jaxme.examples.misc.address");
- }
+ private org.apache.ws.jaxme.impl.JAXBContextImpl jaxbContext;
+ private java.util.Map properties;
- public java.lang.Object newInstance(java.lang.Class pElementInterface)
throws javax.xml.bind.JAXBException {
- return jaxbContext.getElement(pElementInterface);
- }
+ public ObjectFactory() throws javax.xml.bind.JAXBException {
+ jaxbContext = (org.apache.ws.jaxme.impl.JAXBContextImpl)
javax.xml.bind.JAXBContext.newInstance("org.apache.ws.jaxme.examples.misc.address");
+ }
- public java.lang.Object getProperty(java.lang.String pName) {
- if (properties == null) {
- return null;
+ public java.lang.Object newInstance(Class elementInterface) throws
javax.xml.bind.JAXBException {
+ return jaxbContext.getElement(elementInterface);
}
- return properties.get(pName);
- }
- public void setProperty(java.lang.String pName, java.lang.Object pValue) {
- if (properties == null) {
- properties = new java.util.HashMap();
+ public java.lang.Object getProperty(String name) {
+ if (properties == null) {
+ return null;
+ }
+ return properties.get(name);
}
- properties.put(pName, pValue);
- }
- public org.apache.ws.jaxme.examples.misc.address.Address createAddress()
throws javax.xml.bind.JAXBException {
- return (org.apache.ws.jaxme.examples.misc.address.Address)
newInstance(org.apache.ws.jaxme.examples.misc.address.Address.class);
- }
+ public void setProperty(String name, Object value) {
+ if (properties == null) {
+ properties = new java.util.HashMap();
+ }
+ properties.put(name, value);
+ }
- public org.apache.ws.jaxme.examples.misc.address.AddressType
createAddressType() throws javax.xml.bind.JAXBException {
- return (org.apache.ws.jaxme.examples.misc.address.AddressType)
newInstance(org.apache.ws.jaxme.examples.misc.address.AddressType.class);
- }
+ public org.apache.ws.jaxme.examples.misc.address.Address createAddress()
throws javax.xml.bind.JAXBException {
+ return (org.apache.ws.jaxme.examples.misc.address.Address)
newInstance(org.apache.ws.jaxme.examples.misc.address.Address.class);
+ }
+ public org.apache.ws.jaxme.examples.misc.address.AddressType
createAddressType() throws javax.xml.bind.JAXBException {
+ return (org.apache.ws.jaxme.examples.misc.address.AddressType)
newInstance(org.apache.ws.jaxme.examples.misc.address.AddressType.class);
+ }
}
diff --git
a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeHandler.java
b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeHandler.java
index 28b924e6..7803fcbd 100644
---
a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeHandler.java
+++
b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeHandler.java
@@ -21,7 +21,7 @@ public class AddressTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
/** The current level of nested elements. 0, if outside the root element.
*
*/
- private int __level;
+ private int level;
/** The current state. The following values are valid states:
* 0 = Before parsing the element
@@ -33,20 +33,19 @@ public class AddressTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
* 6 = While parsing the child element
{http://ws.apache.org/jaxme/examples/misc/address}Initials
*
*/
- private int __state;
+ private int state;
/** The current handler for parsing child elements or simple content.
*
*/
- private org.apache.ws.jaxme.JMHandler __handler;
+ private org.apache.ws.jaxme.JMHandler handler;
@Override
public void startDocument() throws org.xml.sax.SAXException {
- __level = 0;
- __state = 0;
- __state = 0;
- __handler = null;
+ level = 0;
+ state = 0;
+ handler = null;
}
protected org.apache.ws.jaxme.examples.misc.address.AddressType.NameType
newResult() throws org.xml.sax.SAXException {
@@ -54,131 +53,131 @@ public class AddressTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
}
@Override
- public void startElement(java.lang.String pNamespaceURI, java.lang.String
pLocalName, java.lang.String pQName, org.xml.sax.Attributes pAttr) throws
org.xml.sax.SAXException {
- switch (__level++) {
+ public void startElement(String namespaceURI, String localName, String
qName, org.xml.sax.Attributes attr) throws org.xml.sax.SAXException {
+ switch (level++) {
case 0:
setResult(newResult());
- if (pAttr != null) {
- for (int _1 = 0; _1 < pAttr.getLength(); _1++) {
- super.addAttribute(pAttr.getURI(_1), pAttr.getLocalName(_1),
pAttr.getValue(_1));
+ if (attr != null) {
+ for (int _1 = 0; _1 < attr.getLength(); _1++) {
+ super.addAttribute(attr.getURI(_1), attr.getLocalName(_1),
attr.getValue(_1));
}
}
break;
case 1:
- if
("http://ws.apache.org/jaxme/examples/misc/address".equals(pNamespaceURI)) {
- if ("First".equals(pLocalName)) {
- switch (__state) {
+ if
("http://ws.apache.org/jaxme/examples/misc/address".equals(namespaceURI)) {
+ if ("First".equals(localName)) {
+ switch (state) {
case 0:
- __state = 3;
- __handler = getData().getAtomicHandler();
- __handler.startDocument();
- __handler.startElement(pNamespaceURI, pLocalName, pQName,
pAttr);
+ state = 3;
+ handler = getData().getAtomicHandler();
+ handler.startDocument();
+ handler.startElement(namespaceURI, localName, qName, attr);
break;
default:
- validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The
element " + pQName + " was unexpected at this place.",
org.apache.ws.jaxme.ValidationEvents.EVENT_UNEXPECTED_CHILD_STATE);
+ validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The
element " + qName + " was unexpected at this place.",
org.apache.ws.jaxme.ValidationEvents.EVENT_UNEXPECTED_CHILD_STATE);
break;
}
- } else if ("Middle".equals(pLocalName)) {
- switch (__state) {
+ } else if ("Middle".equals(localName)) {
+ switch (state) {
case 3:
case 4:
- __state = 4;
- __handler = getData().getAtomicHandler();
- __handler.startDocument();
- __handler.startElement(pNamespaceURI, pLocalName, pQName,
pAttr);
+ state = 4;
+ handler = getData().getAtomicHandler();
+ handler.startDocument();
+ handler.startElement(namespaceURI, localName, qName, attr);
break;
default:
- validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The
element " + pQName + " was unexpected at this place.",
org.apache.ws.jaxme.ValidationEvents.EVENT_UNEXPECTED_CHILD_STATE);
+ validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The
element " + qName + " was unexpected at this place.",
org.apache.ws.jaxme.ValidationEvents.EVENT_UNEXPECTED_CHILD_STATE);
break;
}
- } else if ("Last".equals(pLocalName)) {
- switch (__state) {
+ } else if ("Last".equals(localName)) {
+ switch (state) {
case 3:
case 4:
- __state = 5;
- __handler = getData().getAtomicHandler();
- __handler.startDocument();
- __handler.startElement(pNamespaceURI, pLocalName, pQName,
pAttr);
+ state = 5;
+ handler = getData().getAtomicHandler();
+ handler.startDocument();
+ handler.startElement(namespaceURI, localName, qName, attr);
break;
default:
- validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The
element " + pQName + " was unexpected at this place.",
org.apache.ws.jaxme.ValidationEvents.EVENT_UNEXPECTED_CHILD_STATE);
+ validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The
element " + qName + " was unexpected at this place.",
org.apache.ws.jaxme.ValidationEvents.EVENT_UNEXPECTED_CHILD_STATE);
break;
}
- } else if ("Initials".equals(pLocalName)) {
- switch (__state) {
+ } else if ("Initials".equals(localName)) {
+ switch (state) {
case 5:
- __state = 6;
- __handler = getData().getAtomicHandler();
- __handler.startDocument();
- __handler.startElement(pNamespaceURI, pLocalName, pQName,
pAttr);
+ state = 6;
+ handler = getData().getAtomicHandler();
+ handler.startDocument();
+ handler.startElement(namespaceURI, localName, qName, attr);
break;
default:
- validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The
element " + pQName + " was unexpected at this place.",
org.apache.ws.jaxme.ValidationEvents.EVENT_UNEXPECTED_CHILD_STATE);
+ validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The
element " + qName + " was unexpected at this place.",
org.apache.ws.jaxme.ValidationEvents.EVENT_UNEXPECTED_CHILD_STATE);
break;
}
}
}
break;
default:
- if (__handler == null) {
- super.startElement(pNamespaceURI, pLocalName, pQName, pAttr);
+ if (handler == null) {
+ super.startElement(namespaceURI, localName, qName, attr);
} else {
- __handler.startElement(pNamespaceURI, pLocalName, pQName, pAttr);
+ handler.startElement(namespaceURI, localName, qName, attr);
}
}
}
@Override
- public void endElement(java.lang.String pNamespaceURI, java.lang.String
pLocalName, java.lang.String pQName) throws org.xml.sax.SAXException {
- if (__handler == null) {
- if (__level > 1) {
- super.endElement(pNamespaceURI, pLocalName, pQName);
+ public void endElement(String namespaceURI, String localName, String
qName) throws org.xml.sax.SAXException {
+ if (handler == null) {
+ if (level > 1) {
+ super.endElement(namespaceURI, localName, qName);
}
} else {
- __handler.endElement(pNamespaceURI, pLocalName, pQName);
+ handler.endElement(namespaceURI, localName, qName);
}
- switch (--__level) {
+ switch (--level) {
case 0:
break;
case 1:
org.apache.ws.jaxme.examples.misc.address.AddressType.NameType _1 =
(org.apache.ws.jaxme.examples.misc.address.AddressType.NameType) getResult();
- switch (__state) {
+ switch (state) {
case 3:
- if (__handler != null) {
- __handler.endDocument();
+ if (handler != null) {
+ handler.endDocument();
}
- _1.setFirst(((java.lang.String) __handler.getResult()));
+ _1.setFirst(((java.lang.String) handler.getResult()));
break;
case 4:
- if (__handler != null) {
- __handler.endDocument();
+ if (handler != null) {
+ handler.endDocument();
}
- _1.getMiddle().add(__handler.getResult());
+ _1.getMiddle().add(handler.getResult());
break;
case 5:
- if (__handler != null) {
- __handler.endDocument();
+ if (handler != null) {
+ handler.endDocument();
}
- _1.setLast(((java.lang.String) __handler.getResult()));
+ _1.setLast(((java.lang.String) handler.getResult()));
break;
case 6:
- if (__handler != null) {
- __handler.endDocument();
+ if (handler != null) {
+ handler.endDocument();
}
- _1.setInitials(((java.lang.String) __handler.getResult()));
+ _1.setInitials(((java.lang.String) handler.getResult()));
break;
default:
- throw new java.lang.IllegalStateException("Illegal state: " +
__state);
+ throw new java.lang.IllegalStateException("Illegal state: " +
state);
}
}
}
@Override
- public void characters(char[] pChars, int pOffset, int pLen) throws
org.xml.sax.SAXException {
- if (__handler == null) {
- super.characters(pChars, pOffset, pLen);
+ public void characters(char[] chars, int offset, int len) throws
org.xml.sax.SAXException {
+ if (handler == null) {
+ super.characters(chars, offset, len);
} else {
- __handler.characters(pChars, pOffset, pLen);
+ handler.characters(chars, offset, len);
}
}
@@ -187,7 +186,7 @@ public class AddressTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
/** The current level of nested elements. 0, if outside the root element.
*
*/
- private int __level;
+ private int level;
/** The current state. The following values are valid states:
* 0 = Before parsing the element
@@ -196,36 +195,35 @@ public class AddressTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
* 3 = While parsing the child element
{http://ws.apache.org/jaxme/examples/misc/address}Name
*
*/
- private int __state;
+ private int state;
/** The current handler for parsing child elements or simple content.
*
*/
- private org.apache.ws.jaxme.JMHandler __handler;
+ private org.apache.ws.jaxme.JMHandler handler;
- private org.apache.ws.jaxme.JMHandler __handler_Name;
+ private org.apache.ws.jaxme.JMHandler handlerName;
@Override
public void startDocument() throws org.xml.sax.SAXException {
- __level = 0;
- __state = 0;
- __state = 0;
- __handler = null;
+ level = 0;
+ state = 0;
+ handler = null;
}
@Override
-public void addAttribute(java.lang.String pURI, java.lang.String pLocalName,
java.lang.String pValue) throws org.xml.sax.SAXException {
- if (pURI == null) {
- pURI = "";
+public void addAttribute(String uri, String localName, String value) throws
org.xml.sax.SAXException {
+ if (uri == null) {
+ uri = "";
}
org.apache.ws.jaxme.examples.misc.address.AddressType _1 =
(org.apache.ws.jaxme.examples.misc.address.AddressType) getResult();
- if ("".equals(pURI)) {
- if ("id".equals(pLocalName)) {
- _1.setId(pValue);
+ if ("".equals(uri)) {
+ if ("id".equals(localName)) {
+ _1.setId(value);
return;
}
}
- super.addAttribute(pURI, pLocalName, pValue);
+ super.addAttribute(uri, localName, value);
}
protected org.apache.ws.jaxme.examples.misc.address.AddressType newResult()
throws org.xml.sax.SAXException {
@@ -237,96 +235,96 @@ public void addAttribute(java.lang.String pURI,
java.lang.String pLocalName, jav
}
@Override
-public void startElement(java.lang.String pNamespaceURI, java.lang.String
pLocalName, java.lang.String pQName, org.xml.sax.Attributes pAttr) throws
org.xml.sax.SAXException {
- switch (__level++) {
+public void startElement(String namespaceURI, String localName, String qName,
org.xml.sax.Attributes attr) throws org.xml.sax.SAXException {
+ switch (level++) {
case 0:
setResult(newResult());
- if (pAttr != null) {
- for (int _1 = 0; _1 < pAttr.getLength(); _1++) {
- addAttribute(pAttr.getURI(_1), pAttr.getLocalName(_1),
pAttr.getValue(_1));
+ if (attr != null) {
+ for (int _1 = 0; _1 < attr.getLength(); _1++) {
+ addAttribute(attr.getURI(_1), attr.getLocalName(_1),
attr.getValue(_1));
}
}
break;
case 1:
- if
("http://ws.apache.org/jaxme/examples/misc/address".equals(pNamespaceURI)) {
- if ("Name".equals(pLocalName)) {
- switch (__state) {
+ if
("http://ws.apache.org/jaxme/examples/misc/address".equals(namespaceURI)) {
+ if ("Name".equals(localName)) {
+ switch (state) {
case 0:
- __state = 3;
- __handler = getHandlerForName();
- __handler.startDocument();
- __handler.startElement(pNamespaceURI, pLocalName, pQName,
pAttr);
+ state = 3;
+ handler = getHandlerForName();
+ handler.startDocument();
+ handler.startElement(namespaceURI, localName, qName, attr);
break;
default:
- validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The
element " + pQName + " was unexpected at this place.",
org.apache.ws.jaxme.ValidationEvents.EVENT_UNEXPECTED_CHILD_STATE);
+ validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The
element " + qName + " was unexpected at this place.",
org.apache.ws.jaxme.ValidationEvents.EVENT_UNEXPECTED_CHILD_STATE);
break;
}
}
}
break;
default:
- if (__handler == null) {
- super.startElement(pNamespaceURI, pLocalName, pQName, pAttr);
+ if (handler == null) {
+ super.startElement(namespaceURI, localName, qName, attr);
} else {
- __handler.startElement(pNamespaceURI, pLocalName, pQName, pAttr);
+ handler.startElement(namespaceURI, localName, qName, attr);
}
}
}
@Override
-public void endElement(java.lang.String pNamespaceURI, java.lang.String
pLocalName, java.lang.String pQName) throws org.xml.sax.SAXException {
- if (__handler == null) {
- if (__level > 1) {
- super.endElement(pNamespaceURI, pLocalName, pQName);
+public void endElement(String namespaceURI, String localName, String qName)
throws org.xml.sax.SAXException {
+ if (handler == null) {
+ if (level > 1) {
+ super.endElement(namespaceURI, localName, qName);
}
} else {
- __handler.endElement(pNamespaceURI, pLocalName, pQName);
+ handler.endElement(namespaceURI, localName, qName);
}
- switch (--__level) {
+ switch (--level) {
case 0:
break;
case 1:
org.apache.ws.jaxme.examples.misc.address.AddressType _1 =
(org.apache.ws.jaxme.examples.misc.address.AddressType) getResult();
- switch (__state) {
+ switch (state) {
case 3:
- if (__handler != null) {
- __handler.endDocument();
+ if (handler != null) {
+ handler.endDocument();
}
-
_1.setName(((org.apache.ws.jaxme.examples.misc.address.AddressType.NameType)
__handler.getResult()));
+
_1.setName(((org.apache.ws.jaxme.examples.misc.address.AddressType.NameType)
handler.getResult()));
break;
default:
- throw new java.lang.IllegalStateException("Illegal state: " +
__state);
+ throw new java.lang.IllegalStateException("Illegal state: " +
state);
}
}
}
@Override
-public void characters(char[] pChars, int pOffset, int pLen) throws
org.xml.sax.SAXException {
- if (__handler == null) {
- super.characters(pChars, pOffset, pLen);
+public void characters(char[] buffer, int offset, int length) throws
org.xml.sax.SAXException {
+ if (handler == null) {
+ super.characters(buffer, offset, length);
} else {
- __handler.characters(pChars, pOffset, pLen);
+ handler.characters(buffer, offset, length);
}
}
@Override
-public void init(org.apache.ws.jaxme.JMHandler.Data pData) throws
javax.xml.bind.JAXBException {
- super.init(pData);
- if (__handler_Name != null) {
- __handler_Name.init(pData);
+public void init(org.apache.ws.jaxme.JMHandler.Data data) throws
javax.xml.bind.JAXBException {
+ super.init(data);
+ if (handlerName != null) {
+ handlerName.init(data);
}
}
protected org.apache.ws.jaxme.JMHandler getHandlerForName() throws
org.xml.sax.SAXException {
- if (__handler_Name == null) {
+ if (handlerName == null) {
try {
- __handler_Name = new
org.apache.ws.jaxme.examples.misc.address.impl.AddressTypeHandler.NameTypeHandler();
- __handler_Name.init(getData());
+ handlerName = new
org.apache.ws.jaxme.examples.misc.address.impl.AddressTypeHandler.NameTypeHandler();
+ handlerName.init(getData());
} catch (javax.xml.bind.JAXBException _1) {
throw new org.xml.sax.SAXException(_1);
}
}
- return __handler_Name;
+ return handlerName;
}
}
diff --git
a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeImpl.java
b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeImpl.java
index d49e8bdd..8c05a73e 100644
---
a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeImpl.java
+++
b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeImpl.java
@@ -14,78 +14,74 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.ws.jaxme.examples.misc.address.impl;
public class AddressTypeImpl implements
org.apache.ws.jaxme.examples.misc.address.AddressType {
- public static class NameTypeImpl implements
org.apache.ws.jaxme.examples.misc.address.AddressType.NameType {
- private java.lang.String First;
-
- private java.util.List Middle = new java.util.ArrayList();
-
- private java.lang.String Last;
-
- private java.lang.String Initials;
-
-
- @Override
- public java.lang.String getFirst() {
- return First;
- }
-
- @Override
- public void setFirst(java.lang.String pFirst) {
- First = pFirst;
- }
-
- @Override
- public java.util.List getMiddle() {
- return Middle;
+
+ public static class NameTypeImpl implements
org.apache.ws.jaxme.examples.misc.address.AddressType.NameType {
+
+ private String first;
+ private java.util.List middle = new java.util.ArrayList();
+ private String last;
+ private String initials;
+
+ @Override
+ public String getFirst() {
+ return first;
+ }
+
+ @Override
+ public void setFirst(String first) {
+ this.first = first;
+ }
+
+ @Override
+ public java.util.List getMiddle() {
+ return middle;
+ }
+
+ @Override
+ public String getLast() {
+ return last;
+ }
+
+ @Override
+ public void setLast(String last) {
+ this.last = last;
+ }
+
+ @Override
+ public String getInitials() {
+ return initials;
+ }
+
+ @Override
+ public void setInitials(String initials) {
+ this.initials = initials;
+ }
}
-
+
+ private String id;
+ private org.apache.ws.jaxme.examples.misc.address.AddressType.NameType
name;
+
@Override
- public java.lang.String getLast() {
- return Last;
+ public String getId() {
+ return id;
}
-
+
@Override
- public void setLast(java.lang.String pLast) {
- Last = pLast;
+ public void setId(String id) {
+ this.id = id;
}
-
+
@Override
- public java.lang.String getInitials() {
- return Initials;
+ public org.apache.ws.jaxme.examples.misc.address.AddressType.NameType
getName() {
+ return name;
}
-
+
@Override
- public void setInitials(java.lang.String pInitials) {
- Initials = pInitials;
+ public void
setName(org.apache.ws.jaxme.examples.misc.address.AddressType.NameType name) {
+ this.name = name;
}
-
- }
-
- private java.lang.String Id;
-
- private org.apache.ws.jaxme.examples.misc.address.AddressType.NameType Name;
-
- @Override
-public java.lang.String getId() {
- return Id;
- }
-
- @Override
-public void setId(java.lang.String pId) {
- Id = pId;
- }
-
- @Override
-public org.apache.ws.jaxme.examples.misc.address.AddressType.NameType
getName() {
- return Name;
- }
-
- @Override
-public void
setName(org.apache.ws.jaxme.examples.misc.address.AddressType.NameType pName) {
- Name = pName;
- }
-
}
diff --git
a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeSerializer.java
b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeSerializer.java
index 7961bbb2..21049194 100644
---
a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeSerializer.java
+++
b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeSerializer.java
@@ -29,59 +29,59 @@ public class AddressTypeSerializer extends
org.apache.ws.jaxme.impl.JMXmlSeriali
@Override
- protected void marshalChilds(org.apache.ws.jaxme.JMXmlSerializer.Data
pData, java.lang.Object pObject) throws org.xml.sax.SAXException {
- org.apache.ws.jaxme.examples.misc.address.AddressType.NameType _1 =
(org.apache.ws.jaxme.examples.misc.address.AddressType.NameType) pObject;
+ protected void marshalChilds(org.apache.ws.jaxme.JMXmlSerializer.Data
data, java.lang.Object object) throws org.xml.sax.SAXException {
+ org.apache.ws.jaxme.examples.misc.address.AddressType.NameType _1 =
(org.apache.ws.jaxme.examples.misc.address.AddressType.NameType) object;
java.lang.String _2 = _1.getFirst();
if (_2 != null) {
- marshalAtomicChild(pData, __ser_First_qname, _1.getFirst());
+ marshalAtomicChild(data, __ser_First_qname, _1.getFirst());
}
java.util.List _3 = _1.getMiddle();
for (int _4 = 0; _4 < (_3).size(); _4++) {
java.lang.String _5 = (java.lang.String)_3.get(_4);
if (_5 != null) {
- marshalAtomicChild(pData, __ser_Middle_qname,
(java.lang.String)_3.get(_4));
+ marshalAtomicChild(data, __ser_Middle_qname,
(java.lang.String)_3.get(_4));
}
}
java.lang.String _6 = _1.getLast();
if (_6 != null) {
- marshalAtomicChild(pData, __ser_Last_qname, _1.getLast());
+ marshalAtomicChild(data, __ser_Last_qname, _1.getLast());
}
java.lang.String _7 = _1.getInitials();
if (_7 != null) {
- marshalAtomicChild(pData, __ser_Initials_qname, _1.getInitials());
+ marshalAtomicChild(data, __ser_Initials_qname, _1.getInitials());
}
}
}
- private
org.apache.ws.jaxme.examples.misc.address.impl.AddressTypeSerializer.NameTypeSerializer
__ser_Name;
+ private
org.apache.ws.jaxme.examples.misc.address.impl.AddressTypeSerializer.NameTypeSerializer
serName;
final static javax.xml.namespace.QName __ser_Name_qname = new
javax.xml.namespace.QName("http://ws.apache.org/jaxme/examples/misc/address";,
"Name");
@Override
-protected org.xml.sax.helpers.AttributesImpl
getAttributes(org.apache.ws.jaxme.JMXmlSerializer.Data pData, java.lang.Object
pElement) throws org.xml.sax.SAXException {
- org.xml.sax.helpers.AttributesImpl _1 = super.getAttributes(pData,
pElement);
- org.apache.ws.jaxme.examples.misc.address.AddressType _2 =
(org.apache.ws.jaxme.examples.misc.address.AddressType) pElement;
+protected org.xml.sax.helpers.AttributesImpl
getAttributes(org.apache.ws.jaxme.JMXmlSerializer.Data data, java.lang.Object
rlement) throws org.xml.sax.SAXException {
+ org.xml.sax.helpers.AttributesImpl _1 = super.getAttributes(data, rlement);
+ org.apache.ws.jaxme.examples.misc.address.AddressType _2 =
(org.apache.ws.jaxme.examples.misc.address.AddressType) rlement;
java.lang.String _3 = _2.getId();
if (_3 != null) {
- _1.addAttribute("", "id", getAttributeQName(pData, "", "id"), "CDATA",
_2.getId());
+ _1.addAttribute("", "id", getAttributeQName(data, "", "id"), "CDATA",
_2.getId());
}
return _1;
}
@Override
-public void init(org.apache.ws.jaxme.impl.JAXBContextImpl pFactory) throws
javax.xml.bind.JAXBException {
- super.init(pFactory);
- __ser_Name = new
org.apache.ws.jaxme.examples.misc.address.impl.AddressTypeSerializer.NameTypeSerializer();
- __ser_Name.init(pFactory);
+public void init(org.apache.ws.jaxme.impl.JAXBContextImpl factory) throws
javax.xml.bind.JAXBException {
+ super.init(factory);
+ serName = new
org.apache.ws.jaxme.examples.misc.address.impl.AddressTypeSerializer.NameTypeSerializer();
+ serName.init(factory);
}
@Override
-protected void marshalChilds(org.apache.ws.jaxme.JMXmlSerializer.Data pData,
java.lang.Object pObject) throws org.xml.sax.SAXException {
- org.apache.ws.jaxme.examples.misc.address.AddressType _1 =
(org.apache.ws.jaxme.examples.misc.address.AddressType) pObject;
+protected void marshalChilds(org.apache.ws.jaxme.JMXmlSerializer.Data data,
Object object) throws org.xml.sax.SAXException {
+ org.apache.ws.jaxme.examples.misc.address.AddressType _1 =
(org.apache.ws.jaxme.examples.misc.address.AddressType) object;
org.apache.ws.jaxme.examples.misc.address.AddressType.NameType _2 =
_1.getName();
if (_2 != null) {
- __ser_Name.marshal(pData, __ser_Name_qname, _1.getName());
+ serName.marshal(data, __ser_Name_qname, _1.getName());
}
}
