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 2021/08/12 17:56:45 UTC

svn commit: r1892289 - in /pdfbox/trunk: debugger/src/main/java/org/apache/pdfbox/debugger/streampane/ debugger/src/main/java/org/apache/pdfbox/debugger/ui/ fontbox/src/test/java/org/apache/fontbox/ttf/ pdfbox/src/main/java/org/apache/pdfbox/cos/ pdfbo...

Author: tilman
Date: Thu Aug 12 17:56:45 2021
New Revision: 1892289

URL: http://svn.apache.org/viewvc?rev=1892289&view=rev
Log:
PDFBOX-4892: Sonar fix

Modified:
    pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java
    pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RecentFiles.java
    pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/WindowPrefs.java
    pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GSUBTableDebugger.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/MemoryUsageSetting.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ScratchFile.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.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=1892289&r1=1892288&r2=1892289&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 Aug 12 17:56:45 2021
@@ -197,7 +197,8 @@ public class StreamPane implements Actio
     {
         if ("comboBoxChanged".equals(actionEvent.getActionCommand()))
         {
-            JComboBox comboBox = (JComboBox) actionEvent.getSource();
+            @SuppressWarnings("unchecked")
+            JComboBox<String> comboBox = (JComboBox<String>) actionEvent.getSource();
             String currentFilter = (String) comboBox.getSelectedItem();
 
             try

Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RecentFiles.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RecentFiles.java?rev=1892289&r1=1892288&r2=1892289&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RecentFiles.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RecentFiles.java Thu Aug 12 17:56:45 2021
@@ -46,7 +46,7 @@ public class RecentFiles
      * to create preference instance.
      * @param maximumFile the number of recent files to remember.
      */
-    public RecentFiles(Class className, int maximumFile)
+    public RecentFiles(Class<?> className, int maximumFile)
     {
         this.maximum = maximumFile;
         this.pref = Preferences.userNodeForPackage(className);

Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/WindowPrefs.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/WindowPrefs.java?rev=1892289&r1=1892288&r2=1892289&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/WindowPrefs.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/WindowPrefs.java Thu Aug 12 17:56:45 2021
@@ -32,7 +32,7 @@ public class WindowPrefs
     private static final String KEY = "window_prefs_";
     private final Preferences pref;
 
-    public WindowPrefs(Class className)
+    public WindowPrefs(Class<?> className)
     {
         this.pref = Preferences.userNodeForPackage(className);
     }

Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GSUBTableDebugger.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GSUBTableDebugger.java?rev=1892289&r1=1892288&r2=1892289&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GSUBTableDebugger.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GSUBTableDebugger.java Thu Aug 12 17:56:45 2021
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
  * 
  * @author Palash Ray
  */
-public class GSUBTableDebugger
+class GSUBTableDebugger
 {
 
     private static final String LOHIT_BENGALI_FONT_FILE = "/ttf/Lohit-Bengali.ttf";

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1892289&r1=1892288&r2=1892289&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java Thu Aug 12 17:56:45 2021
@@ -1316,7 +1316,7 @@ public class COSDictionary extends COSBa
         {
             if (retval instanceof COSArray)
             {
-                int idx = Integer.parseInt(pathString.replaceAll("\\[", "").replaceAll("\\]", ""));
+                int idx = Integer.parseInt(pathString.replace("\\[", "").replace("\\]", ""));
                 retval = ((COSArray) retval).getObject(idx);
             }
             else if (retval instanceof COSDictionary)

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/MemoryUsageSetting.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/MemoryUsageSetting.java?rev=1892289&r1=1892288&r2=1892289&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/MemoryUsageSetting.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/MemoryUsageSetting.java Thu Aug 12 17:56:45 2021
@@ -58,7 +58,7 @@ public final class MemoryUsageSetting
                         long maxMainMemoryBytes, long maxStorageBytes)
     {
         // do some checks; adjust values as needed to get consistent setting
-        boolean locUseMainMemory = useTempFile ? useMainMemory : true;
+        boolean locUseMainMemory = !useTempFile || useMainMemory;
         long    locMaxMainMemoryBytes = useMainMemory ? maxMainMemoryBytes : -1;
         long    locMaxStorageBytes = maxStorageBytes > 0 ? maxStorageBytes : -1;
         

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ScratchFile.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ScratchFile.java?rev=1892289&r1=1892288&r2=1892289&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ScratchFile.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ScratchFile.java Thu Aug 12 17:56:45 2021
@@ -108,7 +108,7 @@ public class ScratchFile implements Clos
     public ScratchFile(MemoryUsageSetting memUsageSetting) throws IOException
     {
         maxMainMemoryIsRestricted = (!memUsageSetting.useMainMemory()) || memUsageSetting.isMainMemoryRestricted();
-        useScratchFile = maxMainMemoryIsRestricted ? memUsageSetting.useTempFile() : false;
+        useScratchFile = maxMainMemoryIsRestricted && memUsageSetting.useTempFile();
         scratchFileDirectory = useScratchFile ? memUsageSetting.getTempDir() : null;
 
         if ((scratchFileDirectory != null) && (!scratchFileDirectory.isDirectory()))

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java?rev=1892289&r1=1892288&r2=1892289&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java Thu Aug 12 17:56:45 2021
@@ -330,7 +330,7 @@ public abstract class PDAbstractAppearan
         cs.drawShape(width, hasStroke, 
                      // make sure to only paint a background color (/IC value) 
                      // for interior color styles, even if an /IC value is set.
-                     INTERIOR_COLOR_STYLES.contains(style) ? hasBackground : false);
+                     INTERIOR_COLOR_STYLES.contains(style) && hasBackground);
     }
 
     /**

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java?rev=1892289&r1=1892288&r2=1892289&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java Thu Aug 12 17:56:45 2021
@@ -48,7 +48,7 @@ import org.junit.jupiter.api.Test;
  * Tests the {@link org.apache.pdfbox.multipdf.LayerUtility} class.
  *
  */
-public class TestLayerUtility
+class TestLayerUtility
 {
     private static final File TESTRESULTSDIR = new File("target/test-output");