Fixed some normal priority warnings by FindBugs

svn changeset:13463/svn branch:6.3

diff --git a/src/com/vaadin/terminal/gwt/client/DateTimeService.java b/src/com/vaadin/terminal/gwt/client/DateTimeService.java
index c2b44f2e20225084626dd07a36a3ee20b621bfcf..0693994a9efb8693fef898f7315258e26788eede 100644 (file)
--- 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) {\r
             return (start <= target && end >= target);\r
         }\r
-        start += s.getDate() * 1000000;\r
-        end += e.getDate() * 1000000;\r
-        target += date.getDate() * 1000000;\r
+        start += s.getDate() * 1000000l;\r
+        end += e.getDate() * 1000000l;\r
+        target += date.getDate() * 1000000l;\r
         if (resolution == RESOLUTION_DAY) {\r
             return (start <= target && end >= target);\r
         }\r
-        start += s.getHours() * 10000;\r
-        end += e.getHours() * 10000;\r
-        target += date.getHours() * 10000;\r
+        start += s.getHours() * 10000l;\r
+        end += e.getHours() * 10000l;\r
+        target += date.getHours() * 10000l;\r
         if (resolution == RESOLUTION_HOUR) {\r
             return (start <= target && end >= target);\r
         }\r
-        start += s.getMinutes() * 100;\r
-        end += e.getMinutes() * 100;\r
-        target += date.getMinutes() * 100;\r
+        start += s.getMinutes() * 100l;\r
+        end += e.getMinutes() * 100l;\r
+        target += date.getMinutes() * 100l;\r
         if (resolution == RESOLUTION_MIN) {\r
             return (start <= target && end >= target);\r
         }\r

diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
index 9f8e3ba17ecba765494752f56a60b548583285ec..4bc8d386b4e28a278bd9befaed0de6448e70b9ac 100644 (file)
--- 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 18a602280b225069597961e01ffe353c252b348b..b7e92402cc2fd67737ae49c68e9ee87954d86aec 100644 (file)
--- 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 610d638ab4631a7919f96fd889be1a480394e390..ad9a0c2f3f65bd0175ed6b5b312e498ce8f22737 100644 (file)
--- 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));
         }
     }