Merged changes to 6.4 (FindBugs results, #5111, label and javadoc corrections)

svn changeset:13471/svn branch:6.4

6 files changed, 5 insertions, 8 deletions

diff --git a/src/com/vaadin/ui/AbstractField.java b/src/com/vaadin/ui/AbstractField.java
index f7d1ddd79e..8d02602aab 100644
--- a/src/com/vaadin/ui/AbstractField.java
+++ b/src/com/vaadin/ui/AbstractField.java
@@ -1232,7 +1232,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     }
 
     public void removeShortcutListener(ShortcutListener shortcut) {
-        if (actionManager == null) {
+        if (actionManager != null) {
             actionManager.removeAction(shortcut);
         }
     }
diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java
index 0929c05b68..901d96db21 100644
--- a/src/com/vaadin/ui/Form.java
+++ b/src/com/vaadin/ui/Form.java
@@ -1325,7 +1325,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
 
     public <T extends Action & com.vaadin.event.Action.Listener> void removeAction(
             T action) {
-        if (ownActionManager == null) {
+        if (ownActionManager != null) {
             ownActionManager.removeAction(action);
         }
     }
diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java
index 18a602280b..b7e92402cc 100644
--- a/src/com/vaadin/ui/GridLayout.java
+++ b/src/com/vaadin/ui/GridLayout.java
@@ -572,7 +572,7 @@ public class GridLayout extends AbstractLayout implements
 
                             // Removes the cellUsed key as it has become
                             // obsolete
-                            cellUsed.remove(new Integer(curx));
+                            cellUsed.remove(Integer.valueOf(curx));
                         }
                     } else {
 
diff --git a/src/com/vaadin/ui/MenuBar.java b/src/com/vaadin/ui/MenuBar.java
index 036aa1b718..f53c7469ee 100644
--- a/src/com/vaadin/ui/MenuBar.java
+++ b/src/com/vaadin/ui/MenuBar.java
@@ -55,9 +55,6 @@ public class MenuBar extends AbstractComponent {
         // Superclass writes any common attributes in the paint target.
         super.paintContent(target);
 
-        // Stack for list iterators
-        Stack<Iterator<MenuItem>> iteratorStack = new Stack<Iterator<MenuItem>>();
-
         target.startTag("options");
 
         if (submenuIcon != null) {
diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java
index d4fb66deb6..ce3e8bb582 100644
--- a/src/com/vaadin/ui/Panel.java
+++ b/src/com/vaadin/ui/Panel.java
@@ -501,7 +501,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
 
     public <T extends Action & com.vaadin.event.Action.Listener> void removeAction(
             T action) {
-        if (actionManager == null) {
+        if (actionManager != null) {
             actionManager.removeAction(action);
         }
     }
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 03f2bd27e2..e7323af06b 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -729,7 +729,7 @@ public class Table extends AbstractSelect implements Action.Container,
         if (width < 0) {
             columnWidths.remove(columnId);
         } else {
-            columnWidths.put(columnId, new Integer(width));
+            columnWidths.put(columnId, Integer.valueOf(width));
         }
     }