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

[tilman]

Author: tilman
Date: Thu Sep 13 16:44:23 2018
New Revision: 1840837

URL: http://svn.apache.org/viewvc?rev=1840837&view=rev
Log:
PDFBOX-2941: don't display hex pane when displaying an image, don't create a 
stream from a temporary created jpeg image, change tabbed pane names

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=1840837&r1=1840836&r2=1840837&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
 Thu Sep 13 16:44:23 2018
@@ -30,7 +30,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 import java.util.concurrent.ExecutionException;
-import javax.imageio.ImageIO;
 import javax.swing.BoxLayout;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
@@ -146,8 +145,15 @@ public class StreamPane implements Actio
         }
 
         tabbedPane = new JTabbedPane();
-        tabbedPane.add("Text view", view.getStreamPanel());
-        tabbedPane.add("Hex view", hexView.getPane());
+        if (stream.isImage())
+        {
+            tabbedPane.add("Image view", view.getStreamPanel());
+        }
+        else
+        {
+            tabbedPane.add("Text view", view.getStreamPanel());
+            tabbedPane.add("Hex view", hexView.getPane());
+        }
 
         panel.add(tabbedPane);
     }
@@ -182,8 +188,13 @@ public class StreamPane implements Actio
                 if (currentFilter.equals(Stream.IMAGE))
                 {
                     requestImageShowing();
+                    tabbedPane.removeAll();
+                    tabbedPane.add("Image view", view.getStreamPanel());
                     return;
                 }
+                tabbedPane.removeAll();
+                tabbedPane.add("Text view", view.getStreamPanel());
+                tabbedPane.add("Hex view", hexView.getPane());
                 requestStreamText(currentFilter);
             }
             catch (IOException e)
@@ -208,14 +219,6 @@ public class StreamPane implements Actio
                 return;
             }
             view.showStreamImage(image);
-
-           
-            try (ByteArrayOutputStream baos = new ByteArrayOutputStream())
-            {
-                ImageIO.write(image, "jpg", baos);
-                baos.flush();
-                hexView.changeData(baos.toByteArray());
-            }            
         }
     }