src/share/classes/javax/swing/JViewport.java

rev 1527 : 6727662: Code improvement and warnings removing from swing packages
Summary: Removed unnecessary castings and other warnings
Reviewed-by: malenkov

@@ -386,11 +386,11 @@
                 // If the view is not valid, validate. scrollRectToVisible
                 // may fail if the view is not valid first, contentRect
                 // could be bigger than invalid size.
                 validateView();
             }
-            int     dx = 0, dy = 0;
+            int dx, dy;
 
             dx = positionAdjustment(getWidth(), contentRect.width, contentRect.x);
             dy = positionAdjustment(getHeight(), contentRect.height, contentRect.y);
 
             if (dx != 0 || dy != 0) {

@@ -679,14 +679,11 @@
      *
      * @return true if if scroll mode is a BACKINGSTORE_SCROLL_MODE.
      * @see JComponent#isPaintingOrigin()
      */
     boolean isPaintingOrigin() {
-        if (scrollMode == BACKINGSTORE_SCROLL_MODE) {
-            return true;
-        }
-        return false;
+        return scrollMode == BACKINGSTORE_SCROLL_MODE;
     }
 
 
     /**
      * Only used by the paint method below.

@@ -900,15 +897,11 @@
       *
       * @since 1.3
       */
     public void setScrollMode(int mode) {
         scrollMode = mode;
-        if (mode == BACKINGSTORE_SCROLL_MODE) {
-            backingStore = true;
-        } else {
-            backingStore = false;
-        }
+        backingStore = mode == BACKINGSTORE_SCROLL_MODE;
     }
 
     /**
       * Returns the current scrolling mode.
       *

@@ -955,14 +948,14 @@
         } else {
             setScrollMode(BLIT_SCROLL_MODE);
         }
     }
 
-    private final boolean isBlitting() {
+    private boolean isBlitting() {
         Component view = getView();
         return (scrollMode == BLIT_SCROLL_MODE) &&
-               (view instanceof JComponent) && ((JComponent)view).isOpaque();
+               (view instanceof JComponent) && view.isOpaque();
     }
 
 
     /**
      * Returns the <code>JViewport</code>'s one child or <code>null</code>.

@@ -1376,12 +1369,11 @@
      * @return all of the <code>ChangeListener</code>s added or an empty
      *         array if no listeners have been added
      * @since 1.4
      */
     public ChangeListener[] getChangeListeners() {
-        return (ChangeListener[])listenerList.getListeners(
-                ChangeListener.class);
+        return listenerList.getListeners(ChangeListener.class);
     }
 
     /**
      * Notifies all <code>ChangeListeners</code> when the views
      * size, position, or the viewports extent size has changed.