cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/generation CalendarGenerator.java
Date Mon, 19 Apr 2004 15:58:58 GMT
ugo         2004/04/19 08:58:58

  Modified:    src/java/org/apache/cocoon/generation CalendarGenerator.java
  Log:
  Removed call to "new Locale(String)" which works in JDK 1.4 only.
  
  Revision  Changes    Path
  1.8       +4 -7      cocoon-2.1/src/java/org/apache/cocoon/generation/CalendarGenerator.java
  
  Index: CalendarGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/CalendarGenerator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CalendarGenerator.java	15 Apr 2004 16:15:50 -0000	1.7
  +++ CalendarGenerator.java	19 Apr 2004 15:58:58 -0000	1.8
  @@ -144,14 +144,11 @@
           locale = Locale.getDefault();
           if (langString != null) {
               this.cacheKeyParList.add(langString);
  -            String countryString = par.getParameter("country", null);
  -            if (countryString != null) {
  +            String countryString = par.getParameter("country", "");
  +            if (! "".equals(countryString)) {
                   this.cacheKeyParList.add(countryString);
  -                locale = new Locale(langString, countryString);
  -            } else {
  -                locale = new Locale(langString);
               }
  -            
  +            locale = new Locale(langString, countryString);
           }
           
           // Determine year and month. Default is current year and month.
  
  
  

Mime
View raw message