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/10/01 18:04:22 UTC

svn commit: r1867854 - in /pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger: hexviewer/HexPane.java ui/PDFTreeCellRenderer.java

Author: tilman
Date: Tue Oct  1 18:04:22 2019
New Revision: 1867854

URL: http://svn.apache.org/viewvc?rev=1867854&view=rev
Log:
PDFBOX-4071: use jdk8 lambda expressions; simplify code

Modified:
    pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/hexviewer/HexPane.java
    pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PDFTreeCellRenderer.java

Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/hexviewer/HexPane.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/hexviewer/HexPane.java?rev=1867854&r1=1867853&r2=1867854&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/hexviewer/HexPane.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/hexviewer/HexPane.java Tue Oct  1 18:04:22 2019
@@ -219,18 +219,12 @@ class HexPane extends JPanel implements
 
     private void fireSelectionChanged(SelectEvent event)
     {
-        for (SelectionChangeListener listener:selectionChangeListeners)
-        {
-            listener.selectionChanged(event);
-        }
+        selectionChangeListeners.forEach(listener -> listener.selectionChanged(event));
     }
 
     private void fireHexValueChanged(byte value, int index)
     {
-        for (HexChangeListener listener:hexChangeListeners)
-        {
-            listener.hexChanged(new HexChangedEvent(value, index));
-        }
+        hexChangeListeners.forEach(listener -> listener.hexChanged(new HexChangedEvent(value, index)));
     }
 
     public void addSelectionChangeListener(SelectionChangeListener listener)

Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PDFTreeCellRenderer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PDFTreeCellRenderer.java?rev=1867854&r1=1867853&r2=1867854&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PDFTreeCellRenderer.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PDFTreeCellRenderer.java Tue Oct  1 18:04:22 2019
@@ -32,6 +32,7 @@ import org.apache.pdfbox.cos.COSFloat;
 import org.apache.pdfbox.cos.COSInteger;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.cos.COSNull;
+import org.apache.pdfbox.cos.COSNumber;
 import org.apache.pdfbox.cos.COSObject;
 import org.apache.pdfbox.cos.COSStream;
 import org.apache.pdfbox.cos.COSString;
@@ -127,13 +128,9 @@ public class PDFTreeCellRenderer extends
         {
             result = Boolean.toString(((COSBoolean) nodeValue).getValue());
         }
-        else if (nodeValue instanceof COSFloat)
-        {
-            result = Float.toString(((COSFloat) nodeValue).floatValue());
-        }
-        else if (nodeValue instanceof COSInteger)
+        else if (nodeValue instanceof COSNumber)
         {
-            result = Integer.toString(((COSInteger) nodeValue).intValue());
+            result = Float.toString(((COSNumber) nodeValue).floatValue());
         }
         else if (nodeValue instanceof COSString)
         {
@@ -356,10 +353,7 @@ public class PDFTreeCellRenderer extends
         public synchronized void paintIcon(Component c, Graphics g, int x, int y)
         {
             base.paintIcon(c, g, x, y);
-            for (ImageIcon icon: overlays)
-            {
-                icon.paintIcon(c, g, x, y);
-            }
+            overlays.forEach(icon -> icon.paintIcon(c, g, x, y));
         }
     }
 }