You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ni...@apache.org on 2004/09/02 18:07:29 UTC
svn commit: rev 37392 - in cocoon/trunk/src/java/org/apache/cocoon: components/treeprocessor/sitemap i18n matching
Author: nicolaken
Date: Thu Sep 2 09:07:28 2004
New Revision: 37392
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
cocoon/trunk/src/java/org/apache/cocoon/i18n/I18nUtils.java
cocoon/trunk/src/java/org/apache/cocoon/matching/LocaleMatcher.java
Log:
Remove unneeded dependencies on Java 1.4.
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java Thu Sep 2 09:07:28 2004
@@ -77,7 +77,7 @@
throws Exception {
Object previousPassThrough = env.getAttribute(COCOON_PASS_THROUGH);
- env.setAttribute(COCOON_PASS_THROUGH,Boolean.valueOf(passThrough));
+ env.setAttribute(COCOON_PASS_THROUGH,new Boolean(passThrough));
final Map objectModel = env.getObjectModel();
Modified: cocoon/trunk/src/java/org/apache/cocoon/i18n/I18nUtils.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/i18n/I18nUtils.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/i18n/I18nUtils.java Thu Sep 2 09:07:28 2004
@@ -187,7 +187,7 @@
// 7. Blank
if (useBlankLocale) {
- locale = new Locale("");
+ locale = new Locale("", "");
if (test == null || test.test("blank", locale)) {
return locale;
}
Modified: cocoon/trunk/src/java/org/apache/cocoon/matching/LocaleMatcher.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/matching/LocaleMatcher.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/matching/LocaleMatcher.java Thu Sep 2 09:07:28 2004
@@ -289,7 +289,7 @@
}
// Test "language" locale (or empty - if language is "")
- testLocale = new Locale(locale.getLanguage());
+ testLocale = new Locale(locale.getLanguage(), "");
if (isValidResource(pattern, locale, testLocale, map)) {
return true;
}