Changeset 2676 in josm for trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java

Timestamp:

2009-12-24T08:48:40+01:00 (14 years ago)

Author:

jttt

Message:

Fix some of the warnings found by FindBugs

File:

• trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java

@@ -13 +13 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-
 import java.util.ArrayList;
 import java.util.List;
@@ -145 +144 @@
         int direction = scrollDirection;
 
-        if (component == null || direction == NO_SCROLL) {
+        if (component == null || direction == NO_SCROLL)
             return;
-        }
-
-        Dimension compSize = component.getSize();
+
         Rectangle viewRect = vp.getViewRect();
 
@@ -162 +159 @@
 
         switch (direction) {
-            case UP_DIRECTION :
-                deltaY *= -1;
-                break;
-            case LEFT_DIRECTION :
-                deltaX *= -1;
-                break;
+        case UP_DIRECTION :
+            deltaY *= -1;
+            break;
+        case LEFT_DIRECTION :
+            deltaX *= -1;
+            break;
         }
 
@@ -173 +170 @@
     }
     public synchronized void scroll(int deltaX, int deltaY) {
-        if (component == null) {
+        if (component == null)
             return;
-        }
         Dimension compSize = component.getSize();
         Rectangle viewRect = vp.getViewRect();
@@ -204 +200 @@
     public void showOrHideButtons() {
         boolean needButtons = vp.getViewSize().height > vp.getViewRect().height ||
-                              vp.getViewSize().width > vp.getViewRect().width;
+        vp.getViewSize().width > vp.getViewRect().width;
         for (JButton b : buttons) {
             b.setVisible(needButtons);