You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2005/07/20 23:03:18 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources BaseDirContext.java ProxyDirContext.java
markt 2005/07/20 14:03:18
Modified: catalina/src/share/org/apache/naming NamingContext.java
SelectorContext.java
catalina/src/share/org/apache/naming/resources
BaseDirContext.java ProxyDirContext.java
Log:
Tabs to 8 spaces.
Revision Changes Path
1.10 +11 -11 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java
Index: NamingContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NamingContext.java 26 Aug 2004 21:46:17 -0000 1.9
+++ NamingContext.java 20 Jul 2005 21:03:18 -0000 1.10
@@ -236,8 +236,8 @@
throws NamingException {
checkWritable();
- while ((!name.isEmpty()) && (name.get(0).length() == 0))
- name = name.getSuffix(1);
+ while ((!name.isEmpty()) && (name.get(0).length() == 0))
+ name = name.getSuffix(1);
if (name.isEmpty())
throw new NamingException
(sm.getString("namingContext.invalidName"));
@@ -445,8 +445,8 @@
checkWritable();
- while ((!name.isEmpty()) && (name.get(0).length() == 0))
- name = name.getSuffix(1);
+ while ((!name.isEmpty()) && (name.get(0).length() == 0))
+ name = name.getSuffix(1);
if (name.isEmpty())
throw new NamingException
(sm.getString("namingContext.invalidName"));
@@ -581,8 +581,8 @@
public NameParser getNameParser(Name name)
throws NamingException {
- while ((!name.isEmpty()) && (name.get(0).length() == 0))
- name = name.getSuffix(1);
+ while ((!name.isEmpty()) && (name.get(0).length() == 0))
+ name = name.getSuffix(1);
if (name.isEmpty())
return nameParser;
@@ -632,8 +632,8 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
- return prefix.addAll(name);
+ prefix = (Name) name.clone();
+ return prefix.addAll(name);
}
@@ -822,8 +822,8 @@
checkWritable();
- while ((!name.isEmpty()) && (name.get(0).length() == 0))
- name = name.getSuffix(1);
+ while ((!name.isEmpty()) && (name.get(0).length() == 0))
+ name = name.getSuffix(1);
if (name.isEmpty())
throw new NamingException
(sm.getString("namingContext.invalidName"));
1.4 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java
Index: SelectorContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/SelectorContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SelectorContext.java 26 Aug 2004 21:46:17 -0000 1.3
+++ SelectorContext.java 20 Jul 2005 21:03:18 -0000 1.4
@@ -504,8 +504,8 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
- return prefix.addAll(name);
+ prefix = (Name) name.clone();
+ return prefix.addAll(name);
}
@@ -651,7 +651,7 @@
protected String parseName(String name)
throws NamingException {
- if ((!initialContext) && (name.startsWith(prefix))) {
+ if ((!initialContext) && (name.startsWith(prefix))) {
return (name.substring(prefixLength));
} else {
if (initialContext) {
@@ -675,7 +675,7 @@
protected Name parseName(Name name)
throws NamingException {
- if ((!initialContext) && (!name.isEmpty())
+ if ((!initialContext) && (!name.isEmpty())
&& (name.get(0).equals(prefix))) {
return (name.getSuffix(1));
} else {
1.7 +12 -12 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java
Index: BaseDirContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/BaseDirContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseDirContext.java 4 Feb 2005 22:08:03 -0000 1.6
+++ BaseDirContext.java 20 Jul 2005 21:03:18 -0000 1.7
@@ -120,7 +120,7 @@
* Return the debugging detail level for this component.
*/
public int getDebug() {
- return (this.debug);
+ return (this.debug);
}
@@ -130,7 +130,7 @@
* @param debug The new debugging detail level
*/
public void setDebug(int debug) {
- this.debug = debug;
+ this.debug = debug;
}
@@ -138,7 +138,7 @@
* Return the document root for this component.
*/
public String getDocBase() {
- return (this.docBase);
+ return (this.docBase);
}
@@ -154,13 +154,13 @@
*/
public void setDocBase(String docBase) {
- // Validate the format of the proposed document root
- if (docBase == null)
- throw new IllegalArgumentException
- (sm.getString("resources.null"));
+ // Validate the format of the proposed document root
+ if (docBase == null)
+ throw new IllegalArgumentException
+ (sm.getString("resources.null"));
- // Change the document root property
- this.docBase = docBase;
+ // Change the document root property
+ this.docBase = docBase;
}
@@ -617,8 +617,8 @@
*/
public Name composeName(Name name, Name prefix)
throws NamingException {
- prefix = (Name) name.clone();
- return prefix.addAll(name);
+ prefix = (Name) name.clone();
+ return prefix.addAll(name);
}
1.18 +2 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Index: ProxyDirContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ProxyDirContext.java 4 Feb 2005 22:08:03 -0000 1.17
+++ ProxyDirContext.java 20 Jul 2005 21:03:18 -0000 1.18
@@ -652,7 +652,7 @@
public Name composeName(Name name, Name prefix)
throws NamingException {
prefix = (Name) name.clone();
- return prefix.addAll(name);
+ return prefix.addAll(name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org