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 2020/09/25 17:52:30 UTC

svn commit: r1882024 - /pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java

Author: tilman
Date: Fri Sep 25 17:52:29 2020
New Revision: 1882024

URL: http://svn.apache.org/viewvc?rev=1882024&view=rev
Log:
PDFBOX-4971: replace CR with LF and remove CR when LF follows so that it gets shown

Modified:
    pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java

Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java?rev=1882024&r1=1882023&r2=1882024&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java Fri Sep 25 17:52:29 2020
@@ -337,6 +337,12 @@ public class StreamPane implements Actio
             if (inputStream != null)
             {
                 String data = getStringOfStream(inputStream, encoding);
+
+                // CR is not displayed in the raw view (see file from PDFBOX-4964),
+                // but LF is displayed, so lets first replace CR LF with LF and then
+                // replace the remaining CRs with LF
+                data = data.replace("\r\n", "\n").replace('\r', '\n');
+
                 try
                 {
                     docu.insertString(0, data, null);