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 2015/06/19 19:48:27 UTC
svn commit: r1686468 -
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
Author: tilman
Date: Fri Jun 19 17:48:26 2015
New Revision: 1686468
URL: http://svn.apache.org/r1686468
Log:
PDFBOX-2576: use !equals instead of !=; use Integer.valueOf() instead of new Integer()
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
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=1686468&r1=1686467&r2=1686468&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 Fri Jun 19 17:48:26 2015
@@ -74,6 +74,7 @@ public class CMapParser
* Parses a predefined CMap.
*
* @param name CMap name.
+ * @return The parsed predefined CMap as a java object.
* @throws IOException If the CMap could not be parsed.
*/
public CMap parsePredefined(String name) throws IOException
@@ -374,8 +375,6 @@ public class CMapParser
}
boolean done = false;
- String value = null;
-
int arrayIndex = 0;
while (!done)
{
@@ -383,7 +382,7 @@ public class CMapParser
{
done = true;
}
- value = createStringFromBytes(tokenBytes);
+ String value = createStringFromBytes(tokenBytes);
result.addCharMapping(startCode, value);
increment(startCode);
@@ -473,7 +472,7 @@ public class CMapParser
List<Object> list = new ArrayList<Object>();
Object nextToken = parseNextToken(is);
- while (nextToken != null && nextToken != MARK_END_OF_ARRAY)
+ while (nextToken != null && !MARK_END_OF_ARRAY.equals(nextToken))
{
list.add(nextToken);
nextToken = parseNextToken(is);
@@ -489,7 +488,7 @@ public class CMapParser
Map<String, Object> result = new HashMap<String, Object>();
// we are reading a dictionary
Object key = parseNextToken(is);
- while (key instanceof LiteralName && key != MARK_END_OF_DICTIONARY)
+ while (key instanceof LiteralName && !MARK_END_OF_DICTIONARY.equals(key))
{
Object value = parseNextToken(is);
result.put(((LiteralName) key).name, value);
@@ -601,7 +600,7 @@ public class CMapParser
}
else
{
- retval = new Integer(value);
+ retval = Integer.valueOf(value);
}
break;
}