Author: violetagg
Date: Wed Sep 14 07:44:29 2016
New Revision: 1760649
URL: http://svn.apache.org/viewvc?rev=1760649&view=rev
Log:
Format the code. No functional changes.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 07:44:29 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759611,1760005,1760300,1760446,1760454
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759611,1760005,1760300,1760446,1760454,1760640
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1760649&r1=1760648&r2=1760649&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Wed
Sep 14 07:44:29 2016
@@ -78,10 +78,9 @@ public class Digester extends DefaultHan
// ---------------------------------------------------------- Static Fields
- private static class SystemPropertySource
- implements IntrospectionUtils.PropertySource {
+ private static class SystemPropertySource implements
IntrospectionUtils.PropertySource {
@Override
- public String getProperty( String key ) {
+ public String getProperty(String key) {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
if (cl instanceof PermissionCheck) {
Permission p = new PropertyPermission(key, "read");
@@ -93,29 +92,32 @@ public class Digester extends DefaultHan
}
}
- protected static IntrospectionUtils.PropertySource source[] =
- new IntrospectionUtils.PropertySource[] { new SystemPropertySource() };
+ protected static IntrospectionUtils.PropertySource source[] = new
IntrospectionUtils.PropertySource[] {
+ new SystemPropertySource() };
static {
String className =
System.getProperty("org.apache.tomcat.util.digester.PROPERTY_SOURCE");
- if (className!=null) {
+ if (className != null) {
IntrospectionUtils.PropertySource[] sources = new
IntrospectionUtils.PropertySource[2];
sources[1] = source[0];
- ClassLoader[] cls = new ClassLoader[]
{Digester.class.getClassLoader(),Thread.currentThread().getContextClassLoader()};
+ ClassLoader[] cls = new ClassLoader[] {
Digester.class.getClassLoader(),
+ Thread.currentThread().getContextClassLoader() };
boolean initialized = false;
- for (int i=0; i<cls.length && (!initialized); i++) {
+ for (int i = 0; i < cls.length && (!initialized); i++) {
try {
- Class<?> clazz = Class.forName(className,true,cls[i]);
- IntrospectionUtils.PropertySource src =
(IntrospectionUtils.PropertySource)clazz.newInstance();
+ Class<?> clazz = Class.forName(className, true, cls[i]);
+ IntrospectionUtils.PropertySource src =
(IntrospectionUtils.PropertySource) clazz
+ .newInstance();
sources[0] = src;
initialized = true;
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
-
LogFactory.getLog("org.apache.tomcat.util.digester.Digester").
- error("Unable to load property
source["+className+"].",t);
+
LogFactory.getLog("org.apache.tomcat.util.digester.Digester")
+ .error("Unable to load property source[" +
className + "].", t);
}
}
- if (initialized) source = sources;
+ if (initialized)
+ source = sources;
}
}
@@ -171,7 +173,7 @@ public class Digester extends DefaultHan
* The URLs of entityValidator that have been registered, keyed by the
public
* identifier that corresponds.
*/
- protected HashMap<String,String> entityValidator = new HashMap<>();
+ protected HashMap<String, String> entityValidator = new HashMap<>();
/**
@@ -212,7 +214,7 @@ public class Digester extends DefaultHan
* is required because documents can declare nested uses of the same
* prefix for different Namespace URIs).
*/
- protected HashMap<String,ArrayStack<String>> namespaces = new HashMap<>();
+ protected HashMap<String, ArrayStack<String>> namespaces = new HashMap<>();
/**
@@ -289,15 +291,13 @@ public class Digester extends DefaultHan
/**
* The Log to which most logging calls will be made.
*/
- protected Log log =
- LogFactory.getLog("org.apache.tomcat.util.digester.Digester");
+ protected Log log =
LogFactory.getLog("org.apache.tomcat.util.digester.Digester");
/**
* The Log to which all SAX event related logging calls will be made.
*/
- protected Log saxLog =
- LogFactory.getLog("org.apache.tomcat.util.digester.Digester.sax");
+ protected Log saxLog =
LogFactory.getLog("org.apache.tomcat.util.digester.Digester.sax");
// ------------------------------------------------------------- Properties
@@ -342,8 +342,7 @@ public class Digester extends DefaultHan
return (this.classLoader);
}
if (this.useContextClassLoader) {
- ClassLoader classLoader =
- Thread.currentThread().getContextClassLoader();
+ ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
if (classLoader != null) {
return (classLoader);
}
@@ -421,9 +420,8 @@ public class Digester extends DefaultHan
* @throws SAXNotSupportedException Error creating parser
* @throws SAXNotRecognizedException Error creating parser
*/
- public SAXParserFactory getFactory()
- throws SAXNotRecognizedException, SAXNotSupportedException,
- ParserConfigurationException {
+ public SAXParserFactory getFactory() throws SAXNotRecognizedException,
SAXNotSupportedException,
+ ParserConfigurationException {
if (factory == null) {
factory = SAXParserFactory.newInstance();
@@ -431,21 +429,15 @@ public class Digester extends DefaultHan
factory.setNamespaceAware(namespaceAware);
// Preserve xmlns attributes
if (namespaceAware) {
- factory.setFeature(
- "http://xml.org/sax/features/namespace-prefixes";,
- true);
+
factory.setFeature("http://xml.org/sax/features/namespace-prefixes";, true);
}
factory.setValidating(validating);
if (validating) {
// Enable DTD validation
- factory.setFeature(
- "http://xml.org/sax/features/validation";,
- true);
+ factory.setFeature("http://xml.org/sax/features/validation";,
true);
// Enable schema validation
- factory.setFeature(
- "http://apache.org/xml/features/validation/schema";,
- true);
+
factory.setFeature("http://apache.org/xml/features/validation/schema";, true);
}
}
return (factory);
@@ -473,9 +465,8 @@ public class Digester extends DefaultHan
* @exception SAXNotSupportedException if the property name is
* recognized but not supported
*/
- public void setFeature(String feature, boolean value)
- throws ParserConfigurationException, SAXNotRecognizedException,
- SAXNotSupportedException {
+ public void setFeature(String feature, boolean value) throws
ParserConfigurationException,
+ SAXNotRecognizedException, SAXNotSupportedException {
getFactory().setFeature(feature, value);
@@ -563,7 +554,7 @@ public class Digester extends DefaultHan
* Set the public id of the current file being parse.
* @param publicId the DTD/Schema public's id.
*/
- public void setPublicId(String publicId){
+ public void setPublicId(String publicId) {
this.publicId = publicId;
}
@@ -644,7 +635,7 @@ public class Digester extends DefaultHan
* recognized but not supported
*/
public Object getProperty(String property)
- throws SAXNotRecognizedException, SAXNotSupportedException {
+ throws SAXNotRecognizedException, SAXNotSupportedException {
return (getParser().getProperty(property));
@@ -809,21 +800,20 @@ public class Digester extends DefaultHan
* @exception SAXException if no XMLReader can be instantiated
*/
public XMLReader getXMLReader() throws SAXException {
- if (reader == null){
+ if (reader == null) {
reader = getParser().getXMLReader();
}
reader.setDTDHandler(this);
reader.setContentHandler(this);
- if (entityResolver == null){
+ if (entityResolver == null) {
reader.setEntityResolver(this);
} else {
reader.setEntityResolver(entityResolver);
}
- reader.setProperty(
- "http://xml.org/sax/properties/lexical-handler";, this);
+ reader.setProperty("http://xml.org/sax/properties/lexical-handler";,
this);
reader.setErrorHandler(this);
return reader;
@@ -843,8 +833,7 @@ public class Digester extends DefaultHan
* @exception SAXException if a parsing error is to be reported
*/
@Override
- public void characters(char buffer[], int start, int length)
- throws SAXException {
+ public void characters(char buffer[], int start, int length) throws
SAXException {
if (saxLog.isDebugEnabled()) {
saxLog.debug("characters(" + new String(buffer, start, length) +
")");
@@ -865,8 +854,7 @@ public class Digester extends DefaultHan
if (saxLog.isDebugEnabled()) {
if (getCount() > 1) {
- saxLog.debug("endDocument(): " + getCount() +
- " elements left");
+ saxLog.debug("endDocument(): " + getCount() + " elements
left");
} else {
saxLog.debug("endDocument()");
}
@@ -910,15 +898,14 @@ public class Digester extends DefaultHan
* @exception SAXException if a parsing error is to be reported
*/
@Override
- public void endElement(String namespaceURI, String localName,
- String qName) throws SAXException {
+ public void endElement(String namespaceURI, String localName, String qName)
+ throws SAXException {
boolean debug = log.isDebugEnabled();
if (debug) {
if (saxLog.isDebugEnabled()) {
- saxLog.debug("endElement(" + namespaceURI + "," + localName +
- "," + qName + ")");
+ saxLog.debug("endElement(" + namespaceURI + "," + localName +
"," + qName + ")");
}
log.debug(" match='" + match + "'");
log.debug(" bodyText='" + bodyText + "'");
@@ -1037,12 +1024,10 @@ public class Digester extends DefaultHan
* @exception SAXException if a parsing error is to be reported
*/
@Override
- public void ignorableWhitespace(char buffer[], int start, int len)
- throws SAXException {
+ public void ignorableWhitespace(char buffer[], int start, int len) throws
SAXException {
if (saxLog.isDebugEnabled()) {
- saxLog.debug("ignorableWhitespace(" +
- new String(buffer, start, len) + ")");
+ saxLog.debug("ignorableWhitespace(" + new String(buffer, start,
len) + ")");
}
// No processing required
@@ -1059,8 +1044,7 @@ public class Digester extends DefaultHan
* @exception SAXException if a parsing error is to be reported
*/
@Override
- public void processingInstruction(String target, String data)
- throws SAXException {
+ public void processingInstruction(String target, String data) throws
SAXException {
if (saxLog.isDebugEnabled()) {
saxLog.debug("processingInstruction('" + target + "','" + data +
"')");
@@ -1155,14 +1139,12 @@ public class Digester extends DefaultHan
* @exception SAXException if a parsing error is to be reported
*/
@Override
- public void startElement(String namespaceURI, String localName,
- String qName, Attributes list)
+ public void startElement(String namespaceURI, String localName, String
qName, Attributes list)
throws SAXException {
boolean debug = log.isDebugEnabled();
if (saxLog.isDebugEnabled()) {
- saxLog.debug("startElement(" + namespaceURI + "," + localName +
"," +
- qName + ")");
+ saxLog.debug("startElement(" + namespaceURI + "," + localName +
"," + qName + ")");
}
// Parse system properties
@@ -1227,8 +1209,7 @@ public class Digester extends DefaultHan
* @exception SAXException if a parsing error is to be reported
*/
@Override
- public void startPrefixMapping(String prefix, String namespaceURI)
- throws SAXException {
+ public void startPrefixMapping(String prefix, String namespaceURI) throws
SAXException {
if (saxLog.isDebugEnabled()) {
saxLog.debug("startPrefixMapping(" + prefix + "," + namespaceURI +
")");
@@ -1259,8 +1240,7 @@ public class Digester extends DefaultHan
public void notationDecl(String name, String publicId, String systemId) {
if (saxLog.isDebugEnabled()) {
- saxLog.debug("notationDecl(" + name + "," + publicId + "," +
- systemId + ")");
+ saxLog.debug("notationDecl(" + name + "," + publicId + "," +
systemId + ")");
}
}
@@ -1275,12 +1255,11 @@ public class Digester extends DefaultHan
* @param notation The name of the associated notation
*/
@Override
- public void unparsedEntityDecl(String name, String publicId,
- String systemId, String notation) {
+ public void unparsedEntityDecl(String name, String publicId, String
systemId, String notation) {
if (saxLog.isDebugEnabled()) {
- saxLog.debug("unparsedEntityDecl(" + name + "," + publicId + "," +
- systemId + "," + notation + ")");
+ saxLog.debug("unparsedEntityDecl(" + name + "," + publicId + "," +
systemId + ","
+ + notation + ")");
}
}
@@ -1294,7 +1273,7 @@ public class Digester extends DefaultHan
* This must be called before the first call to <code>parse()</code>.
* @param entityResolver a class that implement the
<code>EntityResolver</code> interface.
*/
- public void setEntityResolver(EntityResolver entityResolver){
+ public void setEntityResolver(EntityResolver entityResolver) {
this.entityResolver = entityResolver;
}
@@ -1303,17 +1282,17 @@ public class Digester extends DefaultHan
* Return the Entity Resolver used by the SAX parser.
* @return Return the Entity Resolver used by the SAX parser.
*/
- public EntityResolver getEntityResolver(){
+ public EntityResolver getEntityResolver() {
return entityResolver;
}
@Override
- public InputSource resolveEntity(String name, String publicId,
- String baseURI, String systemId) throws SAXException, IOException {
+ public InputSource resolveEntity(String name, String publicId, String
baseURI, String systemId)
+ throws SAXException, IOException {
if (saxLog.isDebugEnabled()) {
- saxLog.debug("resolveEntity('" + publicId + "', '" + systemId +
- "', '" + baseURI + "')");
+ saxLog.debug(
+ "resolveEntity('" + publicId + "', '" + systemId + "', '"
+ baseURI + "')");
}
// Has this system identifier been registered?
@@ -1333,8 +1312,7 @@ public class Digester extends DefaultHan
} else {
// try to resolve using system ID
if (log.isDebugEnabled()) {
- log.debug(" Trying to resolve using system ID '" +
- systemId + "'");
+ log.debug(" Trying to resolve using system ID '" +
systemId + "'");
}
entityURL = systemId;
// resolve systemId against baseURI if it is not absolute
@@ -1346,8 +1324,7 @@ public class Digester extends DefaultHan
}
} catch (URISyntaxException e) {
if (log.isDebugEnabled()) {
- log.debug("Invalid URI '" + baseURI + "' or '" +
- systemId + "'");
+ log.debug("Invalid URI '" + baseURI + "' or '" +
systemId + "'");
}
}
}
@@ -1370,8 +1347,7 @@ public class Digester extends DefaultHan
// ----------------------------------------------- LexicalHandler Methods
@Override
- public void startDTD(String name, String publicId, String systemId)
- throws SAXException {
+ public void startDTD(String name, String publicId, String systemId) throws
SAXException {
setPublicId(publicId);
}
@@ -1389,9 +1365,8 @@ public class Digester extends DefaultHan
@Override
public void error(SAXParseException exception) throws SAXException {
- log.error("Parse Error at line " + exception.getLineNumber() +
- " column " + exception.getColumnNumber() + ": " +
- exception.getMessage(), exception);
+ log.error("Parse Error at line " + exception.getLineNumber() + "
column "
+ + exception.getColumnNumber() + ": " + exception.getMessage(),
exception);
if (errorHandler != null) {
errorHandler.error(exception);
}
@@ -1410,9 +1385,8 @@ public class Digester extends DefaultHan
@Override
public void fatalError(SAXParseException exception) throws SAXException {
- log.error("Parse Fatal Error at line " + exception.getLineNumber() +
- " column " + exception.getColumnNumber() + ": " +
- exception.getMessage(), exception);
+ log.error("Parse Fatal Error at line " + exception.getLineNumber() + "
column "
+ + exception.getColumnNumber() + ": " + exception.getMessage(),
exception);
if (errorHandler != null) {
errorHandler.fatalError(exception);
}
@@ -1430,10 +1404,11 @@ public class Digester extends DefaultHan
*/
@Override
public void warning(SAXParseException exception) throws SAXException {
- if (errorHandler != null) {
- log.warn("Parse Warning Error at line " +
exception.getLineNumber() +
- " column " + exception.getColumnNumber() + ": " +
- exception.getMessage(), exception);
+ if (errorHandler != null) {
+ log.warn(
+ "Parse Warning Error at line " + exception.getLineNumber()
+ " column "
+ + exception.getColumnNumber() + ": " +
exception.getMessage(),
+ exception);
errorHandler.warning(exception);
}
@@ -1461,6 +1436,8 @@ public class Digester extends DefaultHan
return (root);
}
+
+
/**
* Parse the content of the specified input source using this Digester.
* Returns the root element from the object stack (if any).
@@ -1579,9 +1556,7 @@ public class Digester extends DefaultHan
*/
public void addCallMethod(String pattern, String methodName) {
- addRule(
- pattern,
- new CallMethodRule(methodName));
+ addRule(pattern, new CallMethodRule(methodName));
}
@@ -1594,11 +1569,9 @@ public class Digester extends DefaultHan
* for a single parameter from the body of this element)
* @see CallMethodRule
*/
- public void addCallMethod(String pattern, String methodName,
- int paramCount) {
+ public void addCallMethod(String pattern, String methodName, int
paramCount) {
- addRule(pattern,
- new CallMethodRule(methodName, paramCount));
+ addRule(pattern, new CallMethodRule(methodName, paramCount));
}
@@ -1613,8 +1586,7 @@ public class Digester extends DefaultHan
*/
public void addCallParam(String pattern, int paramIndex) {
- addRule(pattern,
- new CallParamRule(paramIndex));
+ addRule(pattern, new CallParamRule(paramIndex));
}
@@ -1629,13 +1601,11 @@ public class Digester extends DefaultHan
* object creation will be ignored.
* @see FactoryCreateRule
*/
- public void addFactoryCreate(String pattern,
- ObjectCreationFactory creationFactory,
- boolean ignoreCreateExceptions) {
+ public void addFactoryCreate(String pattern, ObjectCreationFactory
creationFactory,
+ boolean ignoreCreateExceptions) {
creationFactory.setDigester(this);
- addRule(pattern,
- new FactoryCreateRule(creationFactory,
ignoreCreateExceptions));
+ addRule(pattern, new FactoryCreateRule(creationFactory,
ignoreCreateExceptions));
}
@@ -1648,8 +1618,7 @@ public class Digester extends DefaultHan
*/
public void addObjectCreate(String pattern, String className) {
- addRule(pattern,
- new ObjectCreateRule(className));
+ addRule(pattern, new ObjectCreateRule(className));
}
@@ -1663,11 +1632,9 @@ public class Digester extends DefaultHan
* the default Java class name to be created
* @see ObjectCreateRule
*/
- public void addObjectCreate(String pattern, String className,
- String attributeName) {
+ public void addObjectCreate(String pattern, String className, String
attributeName) {
- addRule(pattern,
- new ObjectCreateRule(className, attributeName));
+ addRule(pattern, new ObjectCreateRule(className, attributeName));
}
@@ -1683,11 +1650,9 @@ public class Digester extends DefaultHan
* for a <code>boolean</code> parameter)
* @see SetNextRule
*/
- public void addSetNext(String pattern, String methodName,
- String paramType) {
+ public void addSetNext(String pattern, String methodName, String
paramType) {
- addRule(pattern,
- new SetNextRule(methodName, paramType));
+ addRule(pattern, new SetNextRule(methodName, paramType));
}
@@ -1700,8 +1665,7 @@ public class Digester extends DefaultHan
*/
public void addSetProperties(String pattern) {
- addRule(pattern,
- new SetPropertiesRule());
+ addRule(pattern, new SetPropertiesRule());
}
@@ -1919,8 +1883,7 @@ public class Digester extends DefaultHan
* @return the new exception
*/
public SAXException createSAXException(String message, Exception e) {
- if ((e != null) &&
- (e instanceof InvocationTargetException)) {
+ if ((e != null) && (e instanceof InvocationTargetException)) {
Throwable t = e.getCause();
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
@@ -1933,8 +1896,8 @@ public class Digester extends DefaultHan
}
}
if (locator != null) {
- String error = "Error at (" + locator.getLineNumber() + ", " +
- locator.getColumnNumber() + ") : " + message;
+ String error = "Error at (" + locator.getLineNumber() + ", " +
locator.getColumnNumber()
+ + ") : " + message;
if (e != null) {
return new SAXParseException(error, locator, e);
} else {
@@ -2001,13 +1964,11 @@ public class Digester extends DefaultHan
for (int i = 0; i < nAttributes; ++i) {
String value = newAttrs.getValue(i);
try {
- String newValue =
- IntrospectionUtils.replaceProperties(value, null, source);
+ String newValue = IntrospectionUtils.replaceProperties(value,
null, source);
if (value != newValue) {
newAttrs.setValue(i, newValue);
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
// ignore - let the attribute have its original value
}
}
@@ -2027,11 +1988,11 @@ public class Digester extends DefaultHan
String out;
try {
out = IntrospectionUtils.replaceProperties(in, null, source);
- } catch(Exception e) {
+ } catch (Exception e) {
return bodyText; // return unchanged data
}
- if (out == in) {
+ if (out == in) {
// No substitutions required. Don't waste memory creating
// a new buffer
return bodyText;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
