svn commit: r1662848 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java

[tilman]

Author: tilman
Date: Fri Feb 27 22:58:08 2015
New Revision: 1662848

URL: http://svn.apache.org/r1662848
Log:
PDFBOX-2576: simplify compare, as suggested by Andrea Vacondio

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java?rev=1662848&r1=1662847&r2=1662848&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java 
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java 
Fri Feb 27 22:58:08 2015
@@ -119,29 +119,12 @@ public class COSObjectKey implements Com
     @Override
     public int compareTo(COSObjectKey other)
     {
-        if (getNumber() < other.getNumber())
+        int compareNumber = Long.compare(getNumber(), other.getNumber());
+        if (compareNumber == 0)
         {
-            return -1;
-        }
-        else if (getNumber() > other.getNumber())
-        {
-            return 1;
-        }
-        else
-        {
-            if (getGeneration() < other.getGeneration())
-            {
-                return -1;
-            }
-            else if (getGeneration() > other.getGeneration())
-            {
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
+            return Long.compare(getGeneration(), other.getGeneration());
         }
+        return compareNumber;
     }
 
 }