svn commit: r1839362 - in /pivot/trunk: core/src/org/apache/pivot/util/ClassUtils.java wtk/src/org/apache/pivot/wtk/text/ImageNode.java

[rw...@apache.org]

Author: rwhitcomb
Date: Mon Aug 27 18:50:09 2018
New Revision: 1839362

URL: http://svn.apache.org/viewvc?rev=1839362&view=rev
Log:
PIVOT-1032:  Fix style errors in ImageNode and ClassUtils (from last change
to these classes to fix bugs in TextPane).

Modified:
    pivot/trunk/core/src/org/apache/pivot/util/ClassUtils.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/text/ImageNode.java

Modified: pivot/trunk/core/src/org/apache/pivot/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/ClassUtils.java?rev=1839362&r1=1839361&r2=1839362&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/ClassUtils.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/ClassUtils.java Mon Aug 27 18:50:09 2018
@@ -78,12 +78,12 @@ public final class ClassUtils {
      * <p> Specifically checks if the given object is an instance of any of the
      * given classes.
      * @param obj The (non-null) object to test.
-     * @param clazz The list of classes.
+     * @param classes The list of classes.
      * @return <tt>true</tt> if the object is non-null and an instance of ANY of
      * the given classes, <tt>false</tt> otherwise.
      */
-    public static boolean instanceOf(Object obj, Class<?> ...clazz) {
-        for (Class<?> cls : clazz) {
+    public static boolean instanceOf(final Object obj, final Class<?>... classes) {
+        for (Class<?> cls : classes) {
             if (cls.isInstance(obj)) {
                 return true;
             }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/text/ImageNode.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/text/ImageNode.java?rev=1839362&r1=1839361&r2=1839362&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/text/ImageNode.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/text/ImageNode.java Mon Aug 27 18:50:09 2018
@@ -35,19 +35,19 @@ public class ImageNode extends Node {
     public ImageNode() {
     }
 
-    public ImageNode(ImageNode imageNode) {
+    public ImageNode(final ImageNode imageNode) {
         setImage(imageNode.getImage());
     }
 
-    public ImageNode(Image image) {
+    public ImageNode(final Image image) {
         setImage(image);
     }
 
-    public ImageNode(URL image) {
+    public ImageNode(final URL image) {
         setImage(image);
     }
 
-    public ImageNode(String image) {
+    public ImageNode(final String image) {
         setImage(image);
     }
 
@@ -55,7 +55,7 @@ public class ImageNode extends Node {
         return image;
     }
 
-    public void setImage(Image image) {
+    public void setImage(final Image image) {
         Image previousImage = this.image;
 
         if (previousImage != image) {
@@ -72,7 +72,7 @@ public class ImageNode extends Node {
      *
      * @param imageURL The location of the image to set.
      */
-    public void setImage(URL imageURL) {
+    public void setImage(final URL imageURL) {
         setImage(Image.loadFromCache(imageURL));
     }
 
@@ -84,12 +84,17 @@ public class ImageNode extends Node {
      * @see #setImage(URL)
      * @see ImageUtils#findByName(String,String)
      */
-    public void setImage(String imageName) {
+    public void setImage(final String imageName) {
         setImage(ImageUtils.findByName(imageName, "image"));
     }
 
     @Override
-    public char getCharacterAt(int offset) {
+    public CharSequence getCharacters() {
+        return "";
+    }
+
+    @Override
+    public char getCharacterAt(final int offset) {
         return 0x00;
     }
 
@@ -99,17 +104,17 @@ public class ImageNode extends Node {
     }
 
     @Override
-    public void insertRange(Node range, int offset) {
+    public void insertRange(final Node range, final int offset) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Node removeRange(int offset, int span) {
+    public Node removeRange(final int offset, final int span) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Node getRange(int offset, int characterCount) {
+    public Node getRange(final int offset, final int characterCount) {
         Utils.checkIndexBounds(offset, 0, 1);
 
         if (characterCount != 1) {
@@ -120,12 +125,7 @@ public class ImageNode extends Node {
     }
 
     @Override
-    public CharSequence getCharacters() {
-        return "";
-    }
-
-    @Override
-    public Node duplicate(boolean recursive) {
+    public Node duplicate(final boolean recursive) {
         return new ImageNode(this);
     }