You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2019/04/22 11:24:42 UTC
svn commit: r1857950 - in
/pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/streampane:
OperatorMarker.java StreamPane.java
Author: lehmi
Date: Mon Apr 22 11:24:42 2019
New Revision: 1857950
URL: http://svn.apache.org/viewvc?rev=1857950&view=rev
Log:
PDFBOX-4458: use new operator name constants
Modified:
pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/OperatorMarker.java
pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java
Modified: pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/OperatorMarker.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/OperatorMarker.java?rev=1857950&r1=1857949&r2=1857950&view=diff
==============================================================================
--- pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/OperatorMarker.java (original)
+++ pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/OperatorMarker.java Mon Apr 22 11:24:42 2019
@@ -24,19 +24,29 @@ import javax.swing.text.Style;
import javax.swing.text.StyleConstants;
import javax.swing.text.StyleContext;
+import org.apache.pdfbox.contentstream.operator.OperatorName;
+
/**
* @author Khyrul Bashar
*/
final class OperatorMarker
{
- public static final String BEGIN_TEXT_OBJECT = "BT";
- public static final String END_TEXT_OBJECT = "ET";
- public static final String SAVE_GRAPHICS_STATE = "q";
- public static final String RESTORE_GRAPHICS_STATE = "Q";
- public static final String CONCAT = "cm";
- public static final String INLINE_IMAGE_BEGIN = "BI";
- public static final String IMAGE_DATA = "ID";
- public static final String INLINE_IMAGE_END = "EI";
+ @Deprecated
+ public static final String BEGIN_TEXT_OBJECT = OperatorName.BEGIN_TEXT;
+ @Deprecated
+ public static final String END_TEXT_OBJECT = OperatorName.END_TEXT;
+ @Deprecated
+ public static final String SAVE_GRAPHICS_STATE = OperatorName.SAVE;
+ @Deprecated
+ public static final String RESTORE_GRAPHICS_STATE = OperatorName.RESTORE;
+ @Deprecated
+ public static final String CONCAT = OperatorName.CONCAT;
+ @Deprecated
+ public static final String INLINE_IMAGE_BEGIN = OperatorName.BEGIN_INLINE_IMAGE;
+ @Deprecated
+ public static final String IMAGE_DATA = OperatorName.BEGIN_INLINE_IMAGE_DATA;
+ @Deprecated
+ public static final String INLINE_IMAGE_END = OperatorName.END_INLINE_IMAGE;
private static final Map<String, Style> operatorStyleMap;
@@ -64,14 +74,14 @@ final class OperatorMarker
Map<String, Style> styleMap = new HashMap<String, Style>();
- styleMap.put(BEGIN_TEXT_OBJECT, textObjectStyle);
- styleMap.put(END_TEXT_OBJECT, textObjectStyle);
- styleMap.put(SAVE_GRAPHICS_STATE, graphicsStyle);
- styleMap.put(RESTORE_GRAPHICS_STATE, graphicsStyle);
- styleMap.put(CONCAT, concatStyle);
- styleMap.put(INLINE_IMAGE_BEGIN, inlineImage);
- styleMap.put(IMAGE_DATA, imageData);
- styleMap.put(INLINE_IMAGE_END, inlineImage);
+ styleMap.put(OperatorName.BEGIN_TEXT, textObjectStyle);
+ styleMap.put(OperatorName.END_TEXT, textObjectStyle);
+ styleMap.put(OperatorName.SAVE, graphicsStyle);
+ styleMap.put(OperatorName.RESTORE, graphicsStyle);
+ styleMap.put(OperatorName.CONCAT, concatStyle);
+ styleMap.put(OperatorName.BEGIN_INLINE_IMAGE, inlineImage);
+ styleMap.put(OperatorName.BEGIN_INLINE_IMAGE_DATA, imageData);
+ styleMap.put(OperatorName.END_INLINE_IMAGE, inlineImage);
operatorStyleMap = styleMap;
}
Modified: pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java?rev=1857950&r1=1857949&r2=1857950&view=diff
==============================================================================
--- pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java (original)
+++ pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java Mon Apr 22 11:24:42 2019
@@ -44,6 +44,7 @@ import javax.swing.text.StyleConstants;
import javax.swing.text.StyleContext;
import javax.swing.text.StyledDocument;
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.COSBoolean;
@@ -67,16 +68,26 @@ import org.apache.pdfbox.util.Charsets;
*/
public class StreamPane implements ActionListener
{
- public static final String BEGIN_TEXT_OBJECT = "BT";
- public static final String END_TEXT_OBJECT = "ET";
- public static final String SAVE_GRAPHICS_STATE = "q";
- public static final String RESTORE_GRAPHICS_STATE = "Q";
- public static final String INLINE_IMAGE_BEGIN = "BI";
- public static final String IMAGE_DATA = "ID";
- public static final String INLINE_IMAGE_END = "EI";
- public static final String BEGIN_MARKED_CONTENT1 = "BMC";
- public static final String BEGIN_MARKED_CONTENT2 = "BDC";
- public static final String END_MARKED_CONTENT = "EMC";
+ @Deprecated
+ public static final String BEGIN_TEXT_OBJECT = OperatorName.BEGIN_TEXT;
+ @Deprecated
+ public static final String END_TEXT_OBJECT = OperatorName.END_TEXT;
+ @Deprecated
+ public static final String SAVE_GRAPHICS_STATE = OperatorName.SAVE;
+ @Deprecated
+ public static final String RESTORE_GRAPHICS_STATE = OperatorName.RESTORE;
+ @Deprecated
+ public static final String INLINE_IMAGE_BEGIN = OperatorName.BEGIN_INLINE_IMAGE;
+ @Deprecated
+ public static final String IMAGE_DATA = OperatorName.BEGIN_INLINE_IMAGE_DATA;
+ @Deprecated
+ public static final String INLINE_IMAGE_END = OperatorName.END_INLINE_IMAGE;
+ @Deprecated
+ public static final String BEGIN_MARKED_CONTENT1 = OperatorName.BEGIN_MARKED_CONTENT;
+ @Deprecated
+ public static final String BEGIN_MARKED_CONTENT2 = OperatorName.BEGIN_MARKED_CONTENT_SEQ;
+ @Deprecated
+ public static final String END_MARKED_CONTENT = OperatorName.END_MARKED_CONTENT;
private static final StyleContext CONTEXT = StyleContext.getDefaultStyleContext();
private static final Style OPERATOR_STYLE = CONTEXT.addStyle("operator", null);
@@ -453,17 +464,17 @@ public class StreamPane implements Actio
{
Operator op = (Operator) obj;
- if (op.getName().equals(END_TEXT_OBJECT)
- || op.getName().equals(RESTORE_GRAPHICS_STATE)
- || op.getName().equals(END_MARKED_CONTENT))
+ if (op.getName().equals(OperatorName.END_TEXT)
+ || op.getName().equals(OperatorName.RESTORE)
+ || op.getName().equals(OperatorName.END_MARKED_CONTENT))
{
indent--;
}
writeIndent(docu);
- if (op.getName().equals(INLINE_IMAGE_BEGIN))
+ if (op.getName().equals(OperatorName.BEGIN_INLINE_IMAGE))
{
- docu.insertString(docu.getLength(), INLINE_IMAGE_BEGIN + "\n", OPERATOR_STYLE);
+ docu.insertString(docu.getLength(), OperatorName.BEGIN_INLINE_IMAGE + "\n", OPERATOR_STYLE);
COSDictionary dic = op.getImageParameters();
for (COSName key : dic.keySet())
{
@@ -473,10 +484,10 @@ public class StreamPane implements Actio
docu.insertString(docu.getLength(), "\n", null);
}
String imageString = new String(op.getImageData(), Charsets.ISO_8859_1);
- docu.insertString(docu.getLength(), IMAGE_DATA + "\n", INLINE_IMAGE_STYLE);
+ docu.insertString(docu.getLength(), OperatorName.BEGIN_INLINE_IMAGE_DATA + "\n", INLINE_IMAGE_STYLE);
docu.insertString(docu.getLength(), imageString, null);
docu.insertString(docu.getLength(), "\n", null);
- docu.insertString(docu.getLength(), INLINE_IMAGE_END + "\n", OPERATOR_STYLE);
+ docu.insertString(docu.getLength(), OperatorName.END_INLINE_IMAGE + "\n", OPERATOR_STYLE);
}
else
{
@@ -484,10 +495,10 @@ public class StreamPane implements Actio
docu.insertString(docu.getLength(), operator + "\n", OPERATOR_STYLE);
// nested opening operators
- if (op.getName().equals(BEGIN_TEXT_OBJECT) ||
- op.getName().equals(SAVE_GRAPHICS_STATE) ||
- op.getName().equals(BEGIN_MARKED_CONTENT1) ||
- op.getName().equals(BEGIN_MARKED_CONTENT2))
+ if (op.getName().equals(OperatorName.BEGIN_TEXT) ||
+ op.getName().equals(OperatorName.SAVE) ||
+ op.getName().equals(OperatorName.BEGIN_MARKED_CONTENT) ||
+ op.getName().equals(OperatorName.BEGIN_MARKED_CONTENT_SEQ))
{
indent++;
}