Author: markt
Date: Fri Nov 18 15:05:47 2016
New Revision: 1770389
URL: http://svn.apache.org/viewvc?rev=1770389&view=rev
Log:
Refactor to reduce duplication.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1770389&r1=1770388&r2=1770389&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Fri Nov 18
15:05:47 2016
@@ -1319,9 +1319,24 @@ public abstract class ContainerBase exte
}
- // -------------------------------------- ContainerExecuteDelay Inner Class
+ @Override
+ public final String toString() {
+ StringBuilder sb = new StringBuilder();
+ Container parent = getParent();
+ if (parent != null) {
+ sb.append(parent.toString());
+ sb.append('.');
+ }
+ sb.append(this.getClass().getSimpleName());
+ sb.append('[');
+ sb.append(getName());
+ sb.append(']');
+ return sb.toString();
+ }
+ // -------------------------------------- ContainerExecuteDelay Inner Class
+
/**
* Private thread class to invoke the backgroundProcess method
* of this container and its children after a fixed delay.
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1770389&r1=1770388&r2=1770389&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Nov 18
15:05:47 2016
@@ -5595,28 +5595,9 @@ public class StandardContext extends Con
log.debug("resetContext " + getObjectName());
}
- /**
- * Return a String representation of this component.
- */
- @Override
- public String toString() {
-
- StringBuilder sb = new StringBuilder();
- if (getParent() != null) {
- sb.append(getParent().toString());
- sb.append(".");
- }
- sb.append("StandardContext[");
- sb.append(getName());
- sb.append("]");
- return (sb.toString());
-
- }
-
// ------------------------------------------------------ Protected Methods
-
/**
* Adjust the URL pattern to begin with a leading slash, if appropriate
* (i.e. we are running a servlet 2.2 application). Otherwise, return
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1770389&r1=1770388&r2=1770389&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Fri Nov 18
15:05:47 2016
@@ -264,19 +264,6 @@ public class StandardEngine extends Cont
/**
- * Return a String representation of this component.
- */
- @Override
- public String toString() {
-
- StringBuilder sb = new StringBuilder("StandardEngine[");
- sb.append(getName());
- sb.append("]");
- return (sb.toString());
-
- }
-
- /**
* Override the default implementation. If no access log is defined for the
* Engine, look for one in the Engine's default host and then the default
* host's ROOT context. If still none is found, return the default NoOp
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1770389&r1=1770388&r2=1770389&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Fri Nov 18
15:05:47 2016
@@ -836,24 +836,6 @@ public class StandardHost extends Contai
/**
- * @return a String representation of this component.
- */
- @Override
- public String toString() {
-
- StringBuilder sb = new StringBuilder();
- if (getParent() != null) {
- sb.append(getParent().toString());
- sb.append(".");
- }
- sb.append("StandardHost[");
- sb.append(getName());
- sb.append("]");
- return (sb.toString());
-
- }
-
- /**
* Start this component and implement the requirements
* of {@link org.apache.catalina.util.LifecycleBase#startInternal()}.
*
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1770389&r1=1770388&r2=1770389&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Fri Nov 18
15:05:47 2016
@@ -1260,25 +1260,6 @@ public class StandardWrapper extends Con
/**
- * @return a String representation of this component.
- */
- @Override
- public String toString() {
-
- StringBuilder sb = new StringBuilder();
- if (getParent() != null) {
- sb.append(getParent().toString());
- sb.append(".");
- }
- sb.append("StandardWrapper[");
- sb.append(getName());
- sb.append("]");
- return (sb.toString());
-
- }
-
-
- /**
* Process an UnavailableException, marking this servlet as unavailable
* for the specified amount of time.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
