cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/matching I18nMatcher.java
Date Sun, 11 Jul 2004 21:28:58 GMT
antonio     2004/07/11 14:28:58

  Modified:    src/java/org/apache/cocoon/matching I18nMatcher.java
  Log:
  Allow to compile in java 1.3
  
  Revision  Changes    Path
  1.2       +5 -5      cocoon-2.1/src/java/org/apache/cocoon/matching/I18nMatcher.java
  
  Index: I18nMatcher.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/matching/I18nMatcher.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- I18nMatcher.java	11 Jul 2004 18:50:07 -0000	1.1
  +++ I18nMatcher.java	11 Jul 2004 21:28:58 -0000	1.2
  @@ -170,7 +170,7 @@
           }
               
           if (country == null) {
  -            return new Locale(lang);
  +            return new Locale(lang, "");
           }
           
           if (variant == null) {
  @@ -190,11 +190,11 @@
           
           String matchingUrl = null;
           
  -        if (requestParameter != null && isValidResource(pattern, new Locale(requestParameter),
map)) {
  +        if (requestParameter != null && isValidResource(pattern, new Locale(requestParameter,
""), map)) {
                return map;
           }
           
  -        if (sitemapParameter != null && isValidResource(pattern, new Locale(sitemapParameter),
map)) {
  +        if (sitemapParameter != null && isValidResource(pattern, new Locale(sitemapParameter,
""), map)) {
                 return map;
           }
           
  @@ -239,7 +239,7 @@
               return true;        
           }
           
  -        testLocale = new Locale(locale.getLanguage()); 
  +        testLocale = new Locale(locale.getLanguage(), ""); 
           if (isValidResource(pattern, locale, testLocale.toString(), map)) {
               return true;        
           }
  
  
  

Mime
View raw message