merged [9531] from 6.1

svn changeset:9532/svn branch:6.2

diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java
index a0b85cd141d4c97ac120c4c97a4ab6b74adc0d3f..15c36953a13b0cda7e2a48cc513cce1f86e1d235 100644 (file)
--- a/src/com/vaadin/data/util/IndexedContainer.java
+++ b/src/com/vaadin/data/util/IndexedContainer.java
@@ -1387,7 +1387,7 @@ public class IndexedContainer implements Container.Indexed,
         for (int i = 0; i < propertyId.length; i++) {
             if (sortable.contains(propertyId[i])) {
                 ids.add(propertyId[i]);
-                orders.add(new Boolean(i < ascending.length ? ascending[i]
+                orders.add(Boolean.valueOf(i < ascending.length ? ascending[i]
                         : true));
             }
         }

diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 6801bfa1760b2d45893df4ea1550a56e56fa56a3..3ed50b2d42e20f32636d578644077a3730902406 100644 (file)
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -36,7 +36,7 @@ public class Button extends AbstractField {
      * 
      */
     public Button() {
-        setValue(new Boolean(false));
+        setValue(Boolean.FALSE);
         setSwitchMode(false);
     }
 
@@ -96,7 +96,7 @@ public class Button extends AbstractField {
      */
     public Button(String caption, boolean initialState) {
         setCaption(caption);
-        setValue(new Boolean(initialState));
+        setValue(Boolean.valueOf(initialState));
         setSwitchMode(true);
     }
 
@@ -167,7 +167,7 @@ public class Button extends AbstractField {
 
                 // If the button is true for some reason, release it
                 if (oldValue.booleanValue()) {
-                    setValue(new Boolean(false));
+                    setValue(Boolean.FALSE);
                 }
             }
         }
@@ -194,7 +194,7 @@ public class Button extends AbstractField {
         if (!switchMode) {
             setImmediate(true);
             if (booleanValue()) {
-                setValue(new Boolean(false));
+                setValue(Boolean.FALSE);
             }
         }
     }