remm        2004/01/08 03:11:33

  Modified:    util/java/org/apache/tomcat/util/http/mapper Mapper.java
  Log:
  - Cosmetic changes.
  - Remove useless check for null.
  - Use static on the inner classes.
  
  Revision  Changes    Path
  1.33      +6 -8      
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
  
  Index: Mapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Mapper.java       23 Dec 2003 11:09:50 -0000      1.32
  +++ Mapper.java       8 Jan 2004 11:11:33 -0000       1.33
  @@ -519,9 +519,7 @@
                       MappingData mappingData)
           throws Exception {
   
  -        if (host != null) {
  -            host.toChars();
  -        }
  +        host.toChars();
           uri.toChars();
           internalMap(host.getCharChunk(), uri.getCharChunk(), mappingData);
   
  @@ -1113,7 +1111,7 @@
       // ------------------------------------------------- MapElement Inner Class
   
   
  -    protected abstract class MapElement {
  +    protected static abstract class MapElement {
   
           public String name = null;
           public Object object = null;
  @@ -1124,7 +1122,7 @@
       // ------------------------------------------------------- Host Inner Class
   
   
  -    protected final class Host
  +    protected static final class Host
           extends MapElement {
   
           public ContextList contextList = null;
  @@ -1135,7 +1133,7 @@
       // ------------------------------------------------ ContextList Inner Class
   
   
  -    protected final class ContextList {
  +    protected static final class ContextList {
   
           public Context[] contexts = new Context[0];
           public int nesting = 0;
  @@ -1146,7 +1144,7 @@
       // ---------------------------------------------------- Context Inner Class
   
   
  -    protected final class Context
  +    protected static final class Context
           extends MapElement {
   
           public String path = null;
  @@ -1164,7 +1162,7 @@
       // ---------------------------------------------------- Wrapper Inner Class
   
   
  -    protected class Wrapper
  +    protected static class Wrapper
           extends MapElement {
   
           public String path = null;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to