cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor WebApplicationDescriptor.java

[weaver]

weaver      2004/07/02 07:37:41

  Modified:    portal/src/java/org/apache/jetspeed/util/descriptor
                        WebApplicationDescriptor.java
  Log:
  Removed need for locale and display name
  
  Revision  Changes    Path
  1.2       +3 -9      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java
  
  Index: WebApplicationDescriptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WebApplicationDescriptor.java     9 Jun 2004 14:56:41 -0000       1.1
  +++ WebApplicationDescriptor.java     2 Jul 2004 14:37:41 -0000       1.2
  @@ -36,12 +36,7 @@
   
       protected Reader webXmlReader;
       protected String contextRoot;
  -    protected Locale locale;
  -    protected String displayName;
  -    
  -    
  -    public WebApplicationDescriptor(Reader webXmlReader, String contextRoot, Locale 
locale,
  -            String displayName )
  +    public WebApplicationDescriptor(Reader webXmlReader, String contextRoot )
       {
           if(webXmlReader == null)
           {
  @@ -49,8 +44,6 @@
           }
           this.webXmlReader = webXmlReader;
           this.contextRoot = contextRoot;
  -        this.locale = locale;
  -        this.displayName = displayName;
       }
       
   
  @@ -92,7 +85,8 @@
               WebApplicationDefinitionImpl wd = (WebApplicationDefinitionImpl) 
digester.parse(webXmlReader);
   
               wd.setContextRoot(contextRoot);
  -            wd.addDescription(locale, displayName);
  +            //wd.addDescription(locale, displayName);
  +            wd.addDescription(Locale.getDefault(), contextRoot);
               return wd;
   
           }
  
  
  

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