Author: violetagg
Date: Wed Sep 14 06:37:13 2016
New Revision: 1760640
URL: http://svn.apache.org/viewvc?rev=1760640&view=rev
Log:
Format the code. No functional changes.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1760640&r1=1760639&r2=1760640&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Wed Sep 14
06:37:13 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
