luehe 2004/06/10 11:59:48
Modified: catalina/src/share/org/apache/catalina/core
StandardService.java
catalina/src/share/org/apache/catalina/startup Embedded.java
Log:
Removed "debug" instance var and accessor methods from Embedded.java, which now
inherits them from superclass
Revision Changes Path
1.13 +9 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java
Index: StandardService.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StandardService.java 10 Jun 2004 01:09:03 -0000 1.12
+++ StandardService.java 10 Jun 2004 18:59:48 -0000 1.13
@@ -57,12 +57,6 @@
/**
- * The debugging detail level for this component.
- */
- private int debug = 0;
-
-
- /**
* Descriptive information about this component implementation.
*/
private static final String info =
@@ -99,6 +93,12 @@
/**
+ * The debugging detail level for this component.
+ */
+ protected int debug = 0;
+
+
+ /**
* The property change support for this component.
*/
protected PropertyChangeSupport support = new PropertyChangeSupport(this);
@@ -203,8 +203,10 @@
*/
public void setDebug(int debug) {
+ int oldDebug = this.debug;
this.debug = debug;
-
+ support.firePropertyChange("debug", new Integer(oldDebug),
+ new Integer(this.debug));
}
1.16 +1 -32
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Embedded.java 10 Jun 2004 18:44:28 -0000 1.15
+++ Embedded.java 10 Jun 2004 18:59:48 -0000 1.16
@@ -145,12 +145,6 @@
/**
- * The debugging detail level for this component.
- */
- protected int debug = 0;
-
-
- /**
* Is naming enabled ?
*/
protected boolean useNaming = true;
@@ -219,31 +213,6 @@
// ------------------------------------------------------------- Properties
-
-
- /**
- * Return the debugging detail level for this component.
- */
- public int getDebug() {
-
- return (this.debug);
-
- }
-
-
- /**
- * Set the debugging detail level for this component.
- *
- * @param debug The new debugging detail level
- */
- public void setDebug(int debug) {
-
- int oldDebug = this.debug;
- this.debug = debug;
- support.firePropertyChange("debug", new Integer(oldDebug),
- new Integer(this.debug));
-
- }
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
