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 3CAA0200C2F for ; Mon, 6 Mar 2017 20:24:34 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3AFB4160B81; Mon, 6 Mar 2017 19:24:34 +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 87D72160B66 for ; Mon, 6 Mar 2017 20:24:33 +0100 (CET) Received: (qmail 56667 invoked by uid 500); 6 Mar 2017 19:24:32 -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 56658 invoked by uid 99); 6 Mar 2017 19:24:32 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Mar 2017 19:24:32 +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 25AAA3A05B4 for ; Mon, 6 Mar 2017 19:24:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1785745 - /pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java Date: Mon, 06 Mar 2017 19:24:32 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170306192432.25AAA3A05B4@svn01-us-west.apache.org> archived-at: Mon, 06 Mar 2017 19:24:34 -0000 Author: tilman Date: Mon Mar 6 19:24:31 2017 New Revision: 1785745 URL: http://svn.apache.org/viewvc?rev=1785745&view=rev Log: PDFBOX-2852: use switch Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java?rev=1785745&r1=1785744&r2=1785745&view=diff ============================================================================== --- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java (original) +++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/type1/Type1Lexer.java Mon Mar 6 19:24:31 2017 @@ -378,54 +378,50 @@ class Type1Lexer char c = getChar(); // string context - if (c == '(') + switch (c) { - openParens++; - sb.append('('); - } - else if (c == ')') - { - if (openParens == 0) - { - // end of string - return new Token(sb.toString(), Token.STRING); - } - else - { + case '(': + openParens++; + sb.append('('); + break; + case ')': + if (openParens == 0) + { + // end of string + return new Token(sb.toString(), Token.STRING); + } sb.append(')'); openParens--; - } - } - else if (c == '\\') - { - // escapes: \n \r \t \b \f \\ \( \) - char c1 = getChar(); - switch (c1) - { - case 'n': - case 'r': sb.append("\n"); break; - case 't': sb.append('\t'); break; - case 'b': sb.append('\b'); break; - case 'f': sb.append('\f'); break; - case '\\': sb.append('\\'); break; - case '(': sb.append('('); break; - case ')': sb.append(')'); break; - } - // octal \ddd - if (Character.isDigit(c1)) - { - String num = String.valueOf(new char[] { c1, getChar(), getChar() }); - Integer code = Integer.parseInt(num, 8); - sb.append((char)(int)code); - } - } - else if (c == '\r' || c == '\n') - { - sb.append("\n"); - } - else - { - sb.append(c); + break; + case '\\': + // escapes: \n \r \t \b \f \\ \( \) + char c1 = getChar(); + switch (c1) + { + case 'n': + case 'r': sb.append("\n"); break; + case 't': sb.append('\t'); break; + case 'b': sb.append('\b'); break; + case 'f': sb.append('\f'); break; + case '\\': sb.append('\\'); break; + case '(': sb.append('('); break; + case ')': sb.append(')'); break; + } + // octal \ddd + if (Character.isDigit(c1)) + { + String num = String.valueOf(new char[] { c1, getChar(), getChar() }); + Integer code = Integer.parseInt(num, 8); + sb.append((char)(int)code); + } + break; + case '\r': + case '\n': + sb.append("\n"); + break; + default: + sb.append(c); + break; } } return null;