Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D4F28200C5C for ; Thu, 20 Apr 2017 18:30:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D3940160B9F; Thu, 20 Apr 2017 16:30:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 009C9160B90 for ; Thu, 20 Apr 2017 18:30:56 +0200 (CEST) Received: (qmail 27816 invoked by uid 500); 20 Apr 2017 16:30:56 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 27802 invoked by uid 99); 20 Apr 2017 16:30:56 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Apr 2017 16:30:56 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 755393A04F3 for ; Thu, 20 Apr 2017 16:30:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1792081 - /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java Date: Thu, 20 Apr 2017 16:30:55 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170420163055.755393A04F3@svn01-us-west.apache.org> archived-at: Thu, 20 Apr 2017 16:30:58 -0000 Author: tilman Date: Thu Apr 20 16:30:54 2017 New Revision: 1792081 URL: http://svn.apache.org/viewvc?rev=1792081&view=rev Log: PDFBOX-2852: use JDK7 syntax 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=1792081&r1=1792080&r2=1792081&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 20 16:30:54 2017 @@ -96,34 +96,34 @@ public class CMapParser if (token instanceof Operator) { Operator op = (Operator) token; - if (op.op.equals("usecmap")) - { - parseUsecmap(previousToken, result); - } - else if (op.op.equals("endcmap")) + if (op.op.equals("endcmap")) { // end of CMap reached, stop reading as there isn't any interesting info anymore break; } - else if (op.op.equals("begincodespacerange")) - { - parseBegincodespacerange(previousToken, cmapStream, result); - } - else if (op.op.equals("beginbfchar")) - { - parseBeginbfchar(previousToken, cmapStream, result); - } - else if (op.op.equals("beginbfrange")) - { - parseBeginbfrange(previousToken, cmapStream, result); - } - else if (op.op.equals("begincidchar")) - { - parseBegincidchar(previousToken, cmapStream, result); - } - else if (op.op.equals("begincidrange")) + + switch (op.op) { - parseBegincidrange(previousToken, cmapStream, result); + case "usecmap": + parseUsecmap(previousToken, result); + break; + case "begincodespacerange": + parseBegincodespacerange(previousToken, cmapStream, result); + break; + case "beginbfchar": + parseBeginbfchar(previousToken, cmapStream, result); + break; + case "beginbfrange": + parseBeginbfrange(previousToken, cmapStream, result); + break; + case "begincidchar": + parseBegincidchar(previousToken, cmapStream, result); + break; + case "begincidrange": + parseBegincidrange(previousToken, cmapStream, result); + break; + default: + break; } } else if (token instanceof LiteralName) @@ -146,65 +146,77 @@ public class CMapParser private void parseLiteralName(Object token, PushbackInputStream cmapStream, CMap result) throws IOException { LiteralName literal = (LiteralName) token; - if ("WMode".equals(literal.name)) + switch (literal.name) { - Object next = parseNextToken(cmapStream); - if (next instanceof Integer) + case "WMode": { - result.setWMode((Integer) next); - } - } - else if ("CMapName".equals(literal.name)) - { - Object next = parseNextToken(cmapStream); - if (next instanceof LiteralName) - { - result.setName(((LiteralName) next).name); + Object next = parseNextToken(cmapStream); + if (next instanceof Integer) + { + result.setWMode((Integer) next); + } + break; } - } - else if ("CMapVersion".equals(literal.name)) - { - Object next = parseNextToken(cmapStream); - if (next instanceof Number) + case "CMapName": { - result.setVersion(next.toString()); + Object next = parseNextToken(cmapStream); + if (next instanceof LiteralName) + { + result.setName(((LiteralName) next).name); + } + break; } - else if (next instanceof String) + case "CMapVersion": { - result.setVersion((String) next); + Object next = parseNextToken(cmapStream); + if (next instanceof Number) + { + result.setVersion(next.toString()); + } + else if (next instanceof String) + { + result.setVersion((String) next); + } + break; } - } - else if ("CMapType".equals(literal.name)) - { - Object next = parseNextToken(cmapStream); - if (next instanceof Integer) + case "CMapType": { - result.setType((Integer) next); + Object next = parseNextToken(cmapStream); + if (next instanceof Integer) + { + result.setType((Integer) next); + } + break; } - } - else if ("Registry".equals(literal.name)) - { - Object next = parseNextToken(cmapStream); - if (next instanceof String) + case "Registry": { - result.setRegistry((String) next); + Object next = parseNextToken(cmapStream); + if (next instanceof String) + { + result.setRegistry((String) next); + } + break; } - } - else if ("Ordering".equals(literal.name)) - { - Object next = parseNextToken(cmapStream); - if (next instanceof String) + case "Ordering": { - result.setOrdering((String) next); + Object next = parseNextToken(cmapStream); + if (next instanceof String) + { + result.setOrdering((String) next); + } + break; } - } - else if ("Supplement".equals(literal.name)) - { - Object next = parseNextToken(cmapStream); - if (next instanceof Integer) + case "Supplement": { - result.setSupplement((Integer) next); + Object next = parseNextToken(cmapStream); + if (next instanceof Integer) + { + result.setSupplement((Integer) next); + } + break; } + default: + break; } }