From commits-return-15410-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Fri Aug 16 15:01:35 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id E928418057A for ; Fri, 16 Aug 2019 17:01:34 +0200 (CEST) Received: (qmail 23008 invoked by uid 500); 16 Aug 2019 15:01:34 -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 22999 invoked by uid 99); 16 Aug 2019 15:01:34 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Aug 2019 15:01:34 +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 82DA23A0DC2 for ; Fri, 16 Aug 2019 15:01:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1865306 - /pdfbox/branches/issue4569/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java Date: Fri, 16 Aug 2019 15:01:33 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190816150133.82DA23A0DC2@svn01-us-west.apache.org> Author: tilman Date: Fri Aug 16 15:01:33 2019 New Revision: 1865306 URL: http://svn.apache.org/viewvc?rev=1865306&view=rev Log: PDFBOX-4071: use constants; improve logging; fix typo Modified: pdfbox/branches/issue4569/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java Modified: pdfbox/branches/issue4569/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java?rev=1865306&r1=1865305&r2=1865306&view=diff ============================================================================== --- pdfbox/branches/issue4569/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java (original) +++ pdfbox/branches/issue4569/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java Fri Aug 16 15:01:33 2019 @@ -22,6 +22,9 @@ import java.util.List; import javax.swing.text.BadLocationException; import javax.swing.text.JTextComponent; import javax.swing.text.Utilities; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.pdfbox.contentstream.operator.OperatorName; import org.apache.pdfbox.pdmodel.PDResources; interface ToolTip @@ -31,21 +34,11 @@ interface ToolTip /** * @author Khyrul Bashar - * A class that provieds the tooltip for an operator. + * A class that provides the tooltip for an operator. */ public class ToolTipController { - private static final String FONT_OPERATOR = "Tf"; - private static final String STROKING_COLOR = "SCN"; - private static final String STROKING_COLOR_SPACE = "CS"; - private static final String NON_STROKING_COLOR_SPACE = "cs"; - private static final String NON_STROKING_COLOR = "scn"; - private static final String RGB_STROKING_COLOR = "RG"; - private static final String RGB_NON_STROKING_COLOR = "rg"; - private static final String CMYK_STROKING_COLOR = "K"; - private static final String CMYK_NON_STROKING_COLOR = "k"; - private static final String GRAY_STROKING_COLOR = "G"; - private static final String GRAY_NON_STROKING_COLOR = "g"; + private static final Log LOG = LogFactory.getLog(ToolTipController.class); private final PDResources resources; private JTextComponent textComponent; @@ -91,12 +84,12 @@ public class ToolTipController ToolTip toolTip; switch (word) { - case FONT_OPERATOR: + case OperatorName.SET_FONT_AND_SIZE: toolTip = new FontToolTip(resources, rowText); return toolTip.getToolTipText(); - case STROKING_COLOR: + case OperatorName.STROKING_COLOR_N: { - String colorSpaceName = findColorSpace(offset, STROKING_COLOR_SPACE); + String colorSpaceName = findColorSpace(offset, OperatorName.STROKING_COLORSPACE); if (colorSpaceName != null) { toolTip = new SCNToolTip(resources, colorSpaceName, rowText); @@ -104,9 +97,9 @@ public class ToolTipController } break; } - case NON_STROKING_COLOR: + case OperatorName.NON_STROKING_COLOR_N: { - String colorSpaceName = findColorSpace(offset, NON_STROKING_COLOR_SPACE); + String colorSpaceName = findColorSpace(offset, OperatorName.NON_STROKING_COLORSPACE); if (colorSpaceName != null) { toolTip = new SCNToolTip(resources, colorSpaceName, rowText); @@ -114,16 +107,16 @@ public class ToolTipController } break; } - case RGB_STROKING_COLOR: - case RGB_NON_STROKING_COLOR: + case OperatorName.STROKING_COLOR_RGB: + case OperatorName.NON_STROKING_RGB: toolTip = new RGToolTip(rowText); return toolTip.getToolTipText(); - case CMYK_STROKING_COLOR: - case CMYK_NON_STROKING_COLOR: + case OperatorName.STROKING_COLOR_CMYK: + case OperatorName.NON_STROKING_CMYK: toolTip = new KToolTip(rowText); return toolTip.getToolTipText(); - case GRAY_STROKING_COLOR: - case GRAY_NON_STROKING_COLOR: + case OperatorName.STROKING_COLOR_GRAY: + case OperatorName.NON_STROKING_GRAY: toolTip = new GToolTip(rowText); return toolTip.getToolTipText(); default: @@ -154,8 +147,7 @@ public class ToolTipController } catch (BadLocationException e) { - e.printStackTrace(); - return null; + LOG.error(e, e); } return null; } @@ -176,7 +168,7 @@ public class ToolTipController } catch (BadLocationException e) { - e.printStackTrace(); + LOG.error(e, e); } return null; } @@ -191,7 +183,7 @@ public class ToolTipController } catch (BadLocationException e) { - e.printStackTrace(); + LOG.error(e, e); } return null; }