svn commit: r1672445 - in /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap: CMap.java CMapParser.java

[ti...@apache.org]

Author: tilman
Date: Thu Apr  9 18:28:32 2015
New Revision: 1672445

URL: http://svn.apache.org/r1672445
Log:
PDFBOX-2576: revert "make methods static" changes due to lack of consensus

Modified:
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java?rev=1672445&r1=1672444&r2=1672445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java Thu Apr  9 18:28:32 2015
@@ -169,7 +169,7 @@ public class CMap
     /**
      * Returns an int given a List<Byte>
      */
-    private static int toInt(List<Byte> data)
+    private int toInt(List<Byte> data)
     {
         int code = 0;
         for (byte b : data)
@@ -210,7 +210,7 @@ public class CMap
      * @param length The length of the data we are getting.
      * @return the resulting integer
      */
-    private static int getCodeFromArray( byte[] data, int offset, int length )
+    private int getCodeFromArray( byte[] data, int offset, int length )
     {
         int code = 0;
         for( int i=0; i<length; i++ )

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java?rev=1672445&r1=1672444&r2=1672445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java Thu Apr  9 18:28:32 2015
@@ -630,7 +630,7 @@ public class CMapParser
         return retval;
     }
 
-    private static void readUntilEndOfLine(InputStream is, StringBuffer buf) throws IOException
+    private void readUntilEndOfLine(InputStream is, StringBuffer buf) throws IOException
     {
         int nextByte = is.read();
         while (nextByte != -1 && nextByte != 0x0D && nextByte != 0x0A)
@@ -640,13 +640,13 @@ public class CMapParser
         }
     }
 
-    private static boolean isWhitespaceOrEOF(int aByte)
+    private boolean isWhitespaceOrEOF(int aByte)
     {
         return aByte == -1 || aByte == 0x20 || aByte == 0x0D || aByte == 0x0A;
     }
 
     /** Is this a standard PDF delimiter character? */
-    private static boolean isDelimiter(int aByte) 
+    private boolean isDelimiter(int aByte) 
     {
         switch (aByte) 
         {
@@ -684,7 +684,7 @@ public class CMapParser
         }
     }
 
-    private static int createIntFromBytes(byte[] bytes)
+    private int createIntFromBytes(byte[] bytes)
     {
         int intValue = (bytes[0] + 256) % 256;
         if (bytes.length == 2)
@@ -695,7 +695,7 @@ public class CMapParser
         return intValue;
     }
 
-    private static String createStringFromBytes(byte[] bytes) throws IOException
+    private String createStringFromBytes(byte[] bytes) throws IOException
     {
         String retval;
         if (bytes.length == 1)
@@ -709,7 +709,7 @@ public class CMapParser
         return retval;
     }
 
-    private static int compare(byte[] first, byte[] second)
+    private int compare(byte[] first, byte[] second)
     {
         int retval = 1;
         int firstLength = first.length;