From 77360c9efcc60eeb06aedcd6b1af409812fb1582 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Tue, 1 Jun 2010 11:42:07 +0000
Subject: [PATCH] Fixed some normal priority warnings by FindBugs

svn changeset:13463/svn branch:6.3
---
 .../terminal/gwt/client/DateTimeService.java   | 18 +++++++++---------
 .../gwt/server/DragAndDropService.java         |  5 +----
 src/com/vaadin/ui/GridLayout.java              |  2 +-
 src/com/vaadin/ui/Table.java                   |  2 +-
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/DateTimeService.java b/src/com/vaadin/terminal/gwt/client/DateTimeService.java
index c2b44f2e20..0693994a9e 100644
--- a/src/com/vaadin/terminal/gwt/client/DateTimeService.java
+++ b/src/com/vaadin/terminal/gwt/client/DateTimeService.java
@@ -201,21 +201,21 @@ public class DateTimeService {
         if (resolution == RESOLUTION_MONTH) {
             return (start <= target && end >= target);
         }
-        start += s.getDate() * 1000000;
-        end += e.getDate() * 1000000;
-        target += date.getDate() * 1000000;
+        start += s.getDate() * 1000000l;
+        end += e.getDate() * 1000000l;
+        target += date.getDate() * 1000000l;
         if (resolution == RESOLUTION_DAY) {
             return (start <= target && end >= target);
         }
-        start += s.getHours() * 10000;
-        end += e.getHours() * 10000;
-        target += date.getHours() * 10000;
+        start += s.getHours() * 10000l;
+        end += e.getHours() * 10000l;
+        target += date.getHours() * 10000l;
         if (resolution == RESOLUTION_HOUR) {
             return (start <= target && end >= target);
         }
-        start += s.getMinutes() * 100;
-        end += e.getMinutes() * 100;
-        target += date.getMinutes() * 100;
+        start += s.getMinutes() * 100l;
+        end += e.getMinutes() * 100l;
+        target += date.getMinutes() * 100l;
         if (resolution == RESOLUTION_MIN) {
             return (start <= target && end >= target);
         }
diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
index 9f8e3ba17e..4bc8d386b4 100644
--- a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
+++ b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
@@ -47,10 +47,7 @@ public class DragAndDropService implements VariableOwner {
                     + " must implement DropTarget");
             return;
         }
-        if (owner == null) {
-            System.err.println("DropHandler owner is null");
-            return;
-        }
+        // owner cannot be null here
 
         DropTarget dropTarget = (DropTarget) owner;
         lastVisitId = (Integer) variables.get("visitId");
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/Table.java b/src/com/vaadin/ui/Table.java
index 610d638ab4..ad9a0c2f3f 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -712,7 +712,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));
         }
     }
 
-- 
2.39.5