You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2023/12/14 11:40:24 UTC
svn commit: r1914658 - in /pdfbox/branches/3.0: fontbox/src/main/java/org/apache/fontbox/afm/ fontbox/src/main/java/org/apache/fontbox/cff/ fontbox/src/main/java/org/apache/fontbox/cmap/ pdfbox/src/main/java/org/apache/pdfbox/filter/
Author: tilman
Date: Thu Dec 14 11:40:24 2023
New Revision: 1914658
URL: http://svn.apache.org/viewvc?rev=1914658&view=rev
Log:
PDFBOX-5660: use switch for readability, by Axel Howind
Modified:
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/afm/AFMParser.java
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java
Modified: pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/afm/AFMParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/afm/AFMParser.java?rev=1914658&r1=1914657&r2=1914658&view=diff
==============================================================================
--- pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/afm/AFMParser.java (original)
+++ pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/afm/AFMParser.java Thu Dec 14 11:40:24 2023
@@ -913,10 +913,9 @@ public class AFMParser
*
* @return true If the character is whitespace as defined by the AFM spec.
*/
- private boolean isEOL( int character )
+ private static boolean isEOL( int character )
{
- return character == 0x0D ||
- character == 0x0A;
+ return character == 0x0D || character == 0x0A;
}
/**
@@ -926,11 +925,17 @@ public class AFMParser
*
* @return true If the character is whitespace as defined by the AFM spec.
*/
- private boolean isWhitespace( int character )
+ private static boolean isWhitespace( int character )
{
- return character == ' ' ||
- character == '\t' ||
- character == 0x0D ||
- character == 0x0A;
+ switch (character)
+ {
+ case ' ':
+ case '\t':
+ case 0x0D:
+ case 0x0A:
+ return true;
+ default:
+ return false;
+ }
}
}
Modified: pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java?rev=1914658&r1=1914657&r2=1914658&view=diff
==============================================================================
--- pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java (original)
+++ pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharStringParser.java Thu Dec 14 11:40:24 2023
@@ -139,24 +139,21 @@ public class Type2CharStringParser
private CharStringCommand readCommand(int b0, DataInput input) throws IOException
{
-
- if (b0 == 1 || b0 == 18)
+ switch (b0)
{
+ case 1:
+ case 18:
hstemCount += countNumbers() / 2;
- }
- else if (b0 == 3 || b0 == 19 || b0 == 20 || b0 == 23)
- {
+ return CharStringCommand.getInstance(b0);
+ case 3:
+ case 23:
+ vstemCount += countNumbers() / 2;
+ return CharStringCommand.getInstance(b0);
+ case 12:
+ return CharStringCommand.getInstance(b0, input.readUnsignedByte());
+ case 19:
+ case 20:
vstemCount += countNumbers() / 2;
- } // End if
-
- if (b0 == 12)
- {
- int b1 = input.readUnsignedByte();
-
- return CharStringCommand.getInstance(b0, b1);
- }
- else if (b0 == 19 || b0 == 20)
- {
int[] value = new int[1 + getMaskLength()];
value[0] = b0;
@@ -166,9 +163,9 @@ public class Type2CharStringParser
}
return CharStringCommand.getInstance(value);
+ default:
+ return CharStringCommand.getInstance(b0);
}
-
- return CharStringCommand.getInstance(b0);
}
private Number readNumber(int b0, DataInput input) throws IOException
Modified: pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java?rev=1914658&r1=1914657&r2=1914658&view=diff
==============================================================================
--- pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java (original)
+++ pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java Thu Dec 14 11:40:24 2023
@@ -757,13 +757,22 @@ public class CMapParser
}
}
- private boolean isWhitespaceOrEOF(int aByte)
+ private static boolean isWhitespaceOrEOF(int aByte)
{
- return aByte == -1 || aByte == 0x20 || aByte == 0x0D || aByte == 0x0A;
+ switch (aByte)
+ {
+ case -1:
+ case 0x20:
+ case 0x0D:
+ case 0x0A:
+ return true;
+ default:
+ return false;
+ }
}
/** Is this a standard PDF delimiter character? */
- private boolean isDelimiter(int aByte)
+ private static boolean isDelimiter(int aByte)
{
switch (aByte)
{
@@ -783,7 +792,7 @@ public class CMapParser
}
}
- private boolean increment(byte[] data, int position, boolean useStrictMode)
+ private static boolean increment(byte[] data, int position, boolean useStrictMode)
{
if (position > 0 && (data[position] & 0xFF) == 255)
{
@@ -803,7 +812,7 @@ public class CMapParser
return true;
}
- private String createStringFromBytes(byte[] bytes)
+ private static String createStringFromBytes(byte[] bytes)
{
return new String(bytes, bytes.length == 1 ? StandardCharsets.ISO_8859_1 : StandardCharsets.UTF_16BE);
}
Modified: pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java?rev=1914658&r1=1914657&r2=1914658&view=diff
==============================================================================
--- pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java (original)
+++ pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java Thu Dec 14 11:40:24 2023
@@ -111,12 +111,23 @@ final class ASCIIHexFilter extends Filte
// 12 0x0C Form feed (FF)
// 13 0x0D Carriage return (CR)
// 32 0x20 Space (SP)
- private boolean isWhitespace(int c)
+ private static boolean isWhitespace(int c)
{
- return c == 0 || c == 9 || c == 10 || c == 12 || c == 13 || c == 32;
+ switch (c)
+ {
+ case 0:
+ case 9:
+ case 10:
+ case 12:
+ case 13:
+ case 32:
+ return true;
+ default:
+ return false;
+ }
}
- private boolean isEOD(int c)
+ private static boolean isEOD(int c)
{
return c == '>';
}