svn commit: r618808 - in /lenya/tags/RELEASE_2_0_1/src/modules: collection/java/src/org/apache/lenya/modules/collection/CollectionWrapper.java news/java/src/org/apache/lenya/modules/news/usecases/Edit.java

Author: andreas
Date: Tue Feb  5 14:39:14 2008
New Revision: 618808

URL: http://svn.apache.org/viewvc?rev=618808&view=rev
Log:
Merging changes from trunk to stay compatible with Java 1.4.

Modified:
    lenya/tags/RELEASE_2_0_1/src/modules/collection/java/src/org/apache/lenya/modules/collection/CollectionWrapper.java
    lenya/tags/RELEASE_2_0_1/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java

Modified: lenya/tags/RELEASE_2_0_1/src/modules/collection/java/src/org/apache/lenya/modules/collection/CollectionWrapper.java
URL: http://svn.apache.org/viewvc/lenya/tags/RELEASE_2_0_1/src/modules/collection/java/src/org/apache/lenya/modules/collection/CollectionWrapper.java?rev=618808&r1=618807&r2=618808&view=diff
==============================================================================
--- lenya/tags/RELEASE_2_0_1/src/modules/collection/java/src/org/apache/lenya/modules/collection/CollectionWrapper.java (original)
+++ lenya/tags/RELEASE_2_0_1/src/modules/collection/java/src/org/apache/lenya/modules/collection/CollectionWrapper.java Tue Feb  5 14:39:14 2008
@@ -155,7 +155,7 @@
             
             if (collectionElement.hasAttribute(ATTRIBUTE_ALL_LANGUAGES)) {
                 String value = collectionElement.getAttribute(ATTRIBUTE_ALL_LANGUAGES);
-                this.allLanguages = Boolean.parseBoolean(value);
+                this.allLanguages = Boolean.valueOf(value).booleanValue();
             }
         } catch (RuntimeException e) {
             throw e;

Modified: lenya/tags/RELEASE_2_0_1/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java
URL: http://svn.apache.org/viewvc/lenya/tags/RELEASE_2_0_1/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java?rev=618808&r1=618807&r2=618808&view=diff
==============================================================================
--- lenya/tags/RELEASE_2_0_1/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java (original)
+++ lenya/tags/RELEASE_2_0_1/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java Tue Feb  5 14:39:14 2008
@@ -60,7 +60,7 @@
         short number = Short.parseShort(numberString);
         
         String allLanguagesString = getBooleanCheckboxParameter(SHOW_ALL_LANGUAGES);
-        boolean allLanguages = Boolean.parseBoolean(allLanguagesString);
+        boolean allLanguages = Boolean.valueOf(allLanguagesString).booleanValue();
         
         // we must create a new wrapper, because a new (modifiable) session is used
         NewsWrapper news = new NewsWrapper(getSourceDocument(), getLogger());