svn commit: r1654362 - /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CharStringCommand.java

[tilman]

Author: tilman
Date: Fri Jan 23 20:19:47 2015
New Revision: 1654362

URL: http://svn.apache.org/r1654362
Log:
PDFBOX-2576: merge if statements

Modified:
    
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CharStringCommand.java

Modified: 
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CharStringCommand.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CharStringCommand.java?rev=1654362&r1=1654361&r2=1654362&view=diff
==============================================================================
--- 
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CharStringCommand.java
 (original)
+++ 
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CharStringCommand.java
 Fri Jan 23 20:19:47 2015
@@ -80,6 +80,7 @@ public class CharStringCommand
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString()
     {
         String str = TYPE2_VOCABULARY.get(getKey());
@@ -100,6 +101,7 @@ public class CharStringCommand
     /**
      * {@inheritDoc}
      */
+    @Override
     public int hashCode()
     {
         return getKey().hashCode();
@@ -108,6 +110,7 @@ public class CharStringCommand
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean equals(Object object)
     {
         if (object instanceof CharStringCommand)
@@ -175,6 +178,7 @@ public class CharStringCommand
         /**
          * {@inheritDoc}
          */
+        @Override
         public String toString()
         {
             return Arrays.toString(getValue());
@@ -183,14 +187,12 @@ public class CharStringCommand
         /**
          * {@inheritDoc}
          */
+        @Override
         public int hashCode()
         {
-            if (keyValues[0] == 12)
+            if (keyValues[0] == 12 && keyValues.length > 1)
             {
-                if (keyValues.length > 1)
-                {
-                    return keyValues[0] ^ keyValues[1];
-                }
+                return keyValues[0] ^ keyValues[1];
             }
             return keyValues[0];
         }
@@ -198,6 +200,7 @@ public class CharStringCommand
         /**
          * {@inheritDoc}
          */
+        @Override
         public boolean equals(Object object)
         {
             if (object instanceof Key)
@@ -209,7 +212,6 @@ public class CharStringCommand
                     {
                         return keyValues[1] == that.keyValues[1];
                     }
-
                     return keyValues.length == that.keyValues.length;
                 }
                 return keyValues[0] == that.keyValues[0];
@@ -316,4 +318,4 @@ public class CharStringCommand
 
         TYPE2_VOCABULARY = Collections.unmodifiableMap(map);
     }
-}
\ No newline at end of file
+}