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 9059e2732f69a60531e9962875c119fb041975af
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Jun 13 11:32:36 2025 -0400
Remove trailing whitespace
- Use final
- Use a switch instead of cascading if-else
- Combine nested if statements
---
.../misc/address/impl/AddressTypeHandler.java | 187 +++++++++++----------
1 file changed, 95 insertions(+), 92 deletions(-)
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 0671bb74..4ae51f69 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
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
-*
+*
* https://www.apache.org/licenses/LICENSE-2.0
-*
+*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@ package org.apache.ws.jaxme.examples.misc.address.impl;
public class AddressTypeHandler extends org.apache.ws.jaxme.impl.JMHandlerImpl
{
public static class NameTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
/** The current level of nested elements. 0, if outside the root element.
- *
+ *
*/
private int level;
-
+
/** The current state. The following values are valid states:
* 0 = Before parsing the element
* 1 = Parsing an unknown element
@@ -31,29 +31,29 @@ public class AddressTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
* 4 = While parsing the child element
{http://ws.apache.org/jaxme/examples/misc/address}Middle
* 5 = While parsing the child element
{http://ws.apache.org/jaxme/examples/misc/address}Last
* 6 = While parsing the child element
{http://ws.apache.org/jaxme/examples/misc/address}Initials
- *
+ *
*/
private int state;
-
+
/** The current handler for parsing child elements or simple content.
- *
+ *
*/
private org.apache.ws.jaxme.JMHandler handler;
-
-
+
+
@Override
public void startDocument() throws org.xml.sax.SAXException {
level = 0;
state = 0;
handler = null;
}
-
+
protected org.apache.ws.jaxme.examples.misc.address.AddressType.NameType
newResult() throws org.xml.sax.SAXException {
return new
org.apache.ws.jaxme.examples.misc.address.impl.AddressTypeImpl.NameTypeImpl();
}
-
+
@Override
- public void startElement(String namespaceURI, String localName, String
qName, org.xml.sax.Attributes attr) throws org.xml.sax.SAXException {
+ public void startElement(final String namespaceURI, final String
localName, final String qName, final org.xml.sax.Attributes attr) throws
org.xml.sax.SAXException {
switch (level++) {
case 0:
setResult(newResult());
@@ -64,59 +64,66 @@ public class AddressTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
}
break;
case 1:
- 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(namespaceURI, localName, qName, attr);
- break;
- default:
- 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(localName)) {
- switch (state) {
- case 3:
- case 4:
- state = 4;
- handler = getData().getAtomicHandler();
- handler.startDocument();
- handler.startElement(namespaceURI, localName, qName, attr);
- break;
- default:
- 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(localName)) {
- switch (state) {
- case 3:
- case 4:
- state = 5;
- handler = getData().getAtomicHandler();
- handler.startDocument();
- handler.startElement(namespaceURI, localName, qName, attr);
- break;
- default:
- 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(localName)) {
- switch (state) {
- case 5:
- state = 6;
- handler = getData().getAtomicHandler();
- handler.startDocument();
- handler.startElement(namespaceURI, localName, qName, attr);
- break;
- default:
- validationEvent(javax.xml.bind.ValidationEvent.WARNING, "The
element " + qName + " was unexpected at this place.",
org.apache.ws.jaxme.ValidationEvents.EVENT_UNEXPECTED_CHILD_STATE);
- break;
- }
+ if
("http://ws.apache.org/jaxme/examples/misc/address".equals(namespaceURI) &&
(localName != null)) {
+ switch (localName) {
+ case "First":
+ switch (state) {
+ case 0:
+ state = 3;
+ handler = getData().getAtomicHandler();
+ handler.startDocument();
+ handler.startElement(namespaceURI, localName, qName,
attr);
+ break;
+ default:
+ 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;
+ case "Middle":
+ switch (state) {
+ case 3:
+ case 4:
+ state = 4;
+ handler = getData().getAtomicHandler();
+ handler.startDocument();
+ handler.startElement(namespaceURI, localName, qName,
attr);
+ break;
+ default:
+ 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;
+ case "Last":
+ switch (state) {
+ case 3:
+ case 4:
+ state = 5;
+ handler = getData().getAtomicHandler();
+ handler.startDocument();
+ handler.startElement(namespaceURI, localName, qName,
attr);
+ break;
+ default:
+ 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;
+ case "Initials":
+ switch (state) {
+ case 5:
+ state = 6;
+ handler = getData().getAtomicHandler();
+ handler.startDocument();
+ handler.startElement(namespaceURI, localName, qName,
attr);
+ break;
+ default:
+ 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:
+ break;
}
- }
+ }
break;
default:
if (handler == null) {
@@ -126,9 +133,9 @@ public class AddressTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
}
}
}
-
+
@Override
- public void endElement(String namespaceURI, String localName, String
qName) throws org.xml.sax.SAXException {
+ public void endElement(final String namespaceURI, final String localName,
final String qName) throws org.xml.sax.SAXException {
if (handler == null) {
if (level > 1) {
super.endElement(namespaceURI, localName, qName);
@@ -140,13 +147,13 @@ public class AddressTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
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();
+ final org.apache.ws.jaxme.examples.misc.address.AddressType.NameType
_1 = (org.apache.ws.jaxme.examples.misc.address.AddressType.NameType)
getResult();
switch (state) {
case 3:
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) {
@@ -158,33 +165,33 @@ public class AddressTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
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();
}
- _1.setInitials(((java.lang.String) handler.getResult()));
+ _1.setInitials((java.lang.String) handler.getResult());
break;
default:
throw new java.lang.IllegalStateException("Illegal state: " +
state);
}
}
}
-
+
@Override
- public void characters(char[] chars, int offset, int len) throws
org.xml.sax.SAXException {
+ public void characters(final char[] chars, final int offset, final int
len) throws org.xml.sax.SAXException {
if (handler == null) {
super.characters(chars, offset, len);
} else {
handler.characters(chars, offset, len);
}
}
-
+
}
/** The current level of nested elements. 0, if outside the root element.
- *
+ *
*/
private int level;
@@ -193,12 +200,12 @@ public class AddressTypeHandler extends
org.apache.ws.jaxme.impl.JMHandlerImpl {
* 1 = Parsing an unknown element
* 2 = After parsing the element
* 3 = While parsing the child element
{http://ws.apache.org/jaxme/examples/misc/address}Name
- *
+ *
*/
private int state;
/** The current handler for parsing child elements or simple content.
- *
+ *
*/
private org.apache.ws.jaxme.JMHandler handler;
@@ -212,30 +219,28 @@ public void startDocument() throws
org.xml.sax.SAXException {
}
@Override
-public void addAttribute(String uri, String localName, String value) throws
org.xml.sax.SAXException {
+public void addAttribute(String uri, final String localName, final 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(uri)) {
- if ("id".equals(localName)) {
+ final org.apache.ws.jaxme.examples.misc.address.AddressType _1 =
(org.apache.ws.jaxme.examples.misc.address.AddressType) getResult();
+ if ("".equals(uri) && "id".equals(localName)) {
_1.setId(value);
return;
}
- }
super.addAttribute(uri, localName, value);
}
protected org.apache.ws.jaxme.examples.misc.address.AddressType newResult()
throws org.xml.sax.SAXException {
try {
return (org.apache.ws.jaxme.examples.misc.address.AddressType)
getData().getFactory().getElement(org.apache.ws.jaxme.examples.misc.address.AddressType.class);
- } catch (javax.xml.bind.JAXBException _1) {
+ } catch (final javax.xml.bind.JAXBException _1) {
throw new org.xml.sax.SAXException(_1);
}
}
@Override
-public void startElement(String namespaceURI, String localName, String qName,
org.xml.sax.Attributes attr) throws org.xml.sax.SAXException {
+public void startElement(final String namespaceURI, final String localName,
final String qName, final org.xml.sax.Attributes attr) throws
org.xml.sax.SAXException {
switch (level++) {
case 0:
setResult(newResult());
@@ -246,8 +251,7 @@ public void startElement(String namespaceURI, String
localName, String qName, or
}
break;
case 1:
- if
("http://ws.apache.org/jaxme/examples/misc/address".equals(namespaceURI)) {
- if ("Name".equals(localName)) {
+ if
("http://ws.apache.org/jaxme/examples/misc/address".equals(namespaceURI) &&
"Name".equals(localName)) {
switch (state) {
case 0:
state = 3;
@@ -260,7 +264,6 @@ public void startElement(String namespaceURI, String
localName, String qName, or
break;
}
}
- }
break;
default:
if (handler == null) {
@@ -272,7 +275,7 @@ public void startElement(String namespaceURI, String
localName, String qName, or
}
@Override
-public void endElement(String namespaceURI, String localName, String qName)
throws org.xml.sax.SAXException {
+public void endElement(final String namespaceURI, final String localName,
final String qName) throws org.xml.sax.SAXException {
if (handler == null) {
if (level > 1) {
super.endElement(namespaceURI, localName, qName);
@@ -284,13 +287,13 @@ public void endElement(String namespaceURI, String
localName, String qName) thro
case 0:
break;
case 1:
- org.apache.ws.jaxme.examples.misc.address.AddressType _1 =
(org.apache.ws.jaxme.examples.misc.address.AddressType) getResult();
+ final org.apache.ws.jaxme.examples.misc.address.AddressType _1 =
(org.apache.ws.jaxme.examples.misc.address.AddressType) getResult();
switch (state) {
case 3:
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);
@@ -299,7 +302,7 @@ public void endElement(String namespaceURI, String
localName, String qName) thro
}
@Override
-public void characters(char[] buffer, int offset, int length) throws
org.xml.sax.SAXException {
+public void characters(final char[] buffer, final int offset, final int
length) throws org.xml.sax.SAXException {
if (handler == null) {
super.characters(buffer, offset, length);
} else {
@@ -308,7 +311,7 @@ public void characters(char[] buffer, int offset, int
length) throws org.xml.sax
}
@Override
-public void init(org.apache.ws.jaxme.JMHandler.Data data) throws
javax.xml.bind.JAXBException {
+public void init(final org.apache.ws.jaxme.JMHandler.Data data) throws
javax.xml.bind.JAXBException {
super.init(data);
if (handlerName != null) {
handlerName.init(data);
@@ -320,7 +323,7 @@ public void init(org.apache.ws.jaxme.JMHandler.Data data)
throws javax.xml.bind.
try {
handlerName = new
org.apache.ws.jaxme.examples.misc.address.impl.AddressTypeHandler.NameTypeHandler();
handlerName.init(getData());
- } catch (javax.xml.bind.JAXBException _1) {
+ } catch (final javax.xml.bind.JAXBException _1) {
throw new org.xml.sax.SAXException(_1);
}
}
