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 2019/08/20 18:08:24 UTC
svn commit: r1865556 - in /pdfbox/branches/issue45:
debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java
Author: tilman
Date: Tue Aug 20 18:08:23 2019
New Revision: 1865556
URL: http://svn.apache.org/viewvc?rev=1865556&view=rev
Log:
PDFBOX-4071: revert usage of constants, not available in this branch
Modified:
pdfbox/branches/issue45/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java
pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java
Modified: pdfbox/branches/issue45/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java?rev=1865556&r1=1865555&r2=1865556&view=diff
==============================================================================
--- pdfbox/branches/issue45/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java (original)
+++ pdfbox/branches/issue45/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java Tue Aug 20 18:08:23 2019
@@ -24,7 +24,6 @@ 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
@@ -40,6 +39,18 @@ public class ToolTipController
{
private static final Log LOG = LogFactory.getLog(ToolTipController.class);
+ 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 final PDResources resources;
private JTextComponent textComponent;
@@ -82,40 +93,40 @@ public class ToolTipController
if (word != null)
{
ToolTip toolTip;
- if (word.equals(OperatorName.SET_FONT_AND_SIZE))
+ if (word.equals(FONT_OPERATOR))
{
toolTip = new FontToolTip(resources, rowText);
return toolTip.getToolTipText();
}
- else if (word.equals(OperatorName.STROKING_COLOR_N))
+ else if (word.equals(STROKING_COLOR))
{
- String colorSpaceName = findColorSpace(offset, OperatorName.STROKING_COLORSPACE);
+ String colorSpaceName = findColorSpace(offset, STROKING_COLOR_SPACE);
if (colorSpaceName != null)
{
toolTip = new SCNToolTip(resources, colorSpaceName, rowText);
return toolTip.getToolTipText();
}
}
- else if (word.equals(OperatorName.NON_STROKING_COLOR_N))
+ else if (word.equals(NON_STROKING_COLOR))
{
- String colorSpaceName = findColorSpace(offset, OperatorName.NON_STROKING_COLORSPACE);
+ String colorSpaceName = findColorSpace(offset, NON_STROKING_COLOR_SPACE);
if (colorSpaceName != null)
{
toolTip = new SCNToolTip(resources, colorSpaceName, rowText);
return toolTip.getToolTipText();
}
}
- else if (word.equals(OperatorName.STROKING_COLOR_RGB) || word.equals(OperatorName.NON_STROKING_RGB))
+ else if (word.equals(RGB_STROKING_COLOR) || word.equals(RGB_NON_STROKING_COLOR))
{
toolTip = new RGToolTip(rowText);
return toolTip.getToolTipText();
}
- else if (word.equals(OperatorName.STROKING_COLOR_CMYK) || word.equals(OperatorName.NON_STROKING_CMYK))
+ else if (word.equals(CMYK_STROKING_COLOR) || word.equals(CMYK_NON_STROKING_COLOR))
{
toolTip = new KToolTip(rowText);
return toolTip.getToolTipText();
}
- else if (word.equals(OperatorName.STROKING_COLOR_GRAY) || word.equals(OperatorName.NON_STROKING_GRAY))
+ else if (word.equals(GRAY_STROKING_COLOR) || word.equals(GRAY_NON_STROKING_COLOR))
{
toolTip = new GToolTip(rowText);
return toolTip.getToolTipText();
Modified: pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java?rev=1865556&r1=1865555&r2=1865556&view=diff
==============================================================================
--- pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java (original)
+++ pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java Tue Aug 20 18:08:23 2019
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.List;
import org.apache.pdfbox.contentstream.operator.Operator;
-import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
@@ -128,19 +127,19 @@ class PDDefaultAppearanceString
{
String name = operator.getName();
- if (OperatorName.SET_FONT_AND_SIZE.equals(name))
+ if ("Tf".equals(name))
{
processSetFont(operands);
}
- else if (OperatorName.NON_STROKING_GRAY.equals(name))
+ else if ("g".equals(name))
{
processSetFontColor(operands);
}
- else if (OperatorName.NON_STROKING_RGB.equals(name))
+ else if ("rg".equals(name))
{
processSetFontColor(operands);
}
- else if (OperatorName.NON_STROKING_CMYK.equals(name))
+ else if ("k".equals(name))
{
processSetFontColor(operands);
}