--- CMapParser.java	2009-10-30 12:50:23.000000000 +0100
+++ CMapParser.orig	2009-10-30 12:48:24.000000000 +0100
@@ -208,17 +208,13 @@
         }
         return result;
     }
-
-    private boolean isWhitespace( int byteValue ) {
-        return byteValue == 0x09 || byteValue == 0x20 || byteValue == 0x0D || byteValue == 0x0A;
-    }
     
     private Object parseNextToken( PushbackInputStream is ) throws IOException
     {
         Object retval = null;
         int nextByte = is.read();
         //skip whitespace
-        while( isWhitespace( nextByte ) )
+        while( nextByte == 0x09 || nextByte == 0x20 || nextByte == 0x0D || nextByte == 0x0A )
         {
             nextByte = is.read();
         }
@@ -302,38 +298,36 @@
                     int bufferIndex = -1;
                     while( theNextByte != -1 && theNextByte != '>' )
                     {
-                        if ( !isWhitespace( theNextByte ) ) {
-                            int intValue = 0;
-                            if( theNextByte >= '0' && theNextByte <= '9' )
-                            {
-                                intValue = theNextByte - '0';
-                            }
-                            else if( theNextByte >= 'A' && theNextByte <= 'F' )
-                            {
-                                intValue = 10 + theNextByte - 'A';
-                            }
-                            else if( theNextByte >= 'a' && theNextByte <= 'f' )
-                            {
-                                intValue = 10 + theNextByte - 'a';
-                            }
-                            else
-                            {
-                                throw new IOException( "Error: expected hex character and not " + 
-                                          (char)theNextByte + ":" + theNextByte );
-                            }
-                            intValue *= multiplyer;
-                            if( multiplyer == 16 )
-                            {
-                                bufferIndex++;
-                                tokenParserByteBuffer[bufferIndex] = 0;
-                                multiplyer = 1;
-                            }
-                            else
-                            {
-                                multiplyer = 16;
-                            }
-                            tokenParserByteBuffer[bufferIndex]+= intValue;
+                        int intValue = 0;
+                        if( theNextByte >= '0' && theNextByte <= '9' )
+                        {
+                            intValue = theNextByte - '0';
+                        }
+                        else if( theNextByte >= 'A' && theNextByte <= 'F' )
+                        {
+                            intValue = 10 + theNextByte - 'A';
+                        }
+                        else if( theNextByte >= 'a' && theNextByte <= 'f' )
+                        {
+                            intValue = 10 + theNextByte - 'a';
+                        }
+                        else
+                        {
+                            throw new IOException( "Error: expected hex character and not " + 
+                                (char)theNextByte + ":" + theNextByte );
+                        }
+                        intValue *= multiplyer;
+                        if( multiplyer == 16 )
+                        {
+                            bufferIndex++;
+                            tokenParserByteBuffer[bufferIndex] = 0;
+                            multiplyer = 1;
+                        }
+                        else
+                        {
+                            multiplyer = 16;
                         }
+                        tokenParserByteBuffer[bufferIndex]+= intValue;
                         theNextByte = is.read();
                     }
                     byte[] finalResult = new byte[bufferIndex+1];
@@ -528,4 +522,4 @@
         CMap result = parser.parse( cmapFile );
         System.out.println( "Result:" + result );
     }
-}
+}
\ Kein Zeilenumbruch am Dateiende.
