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/11/21 18:00:25 UTC
svn commit: r1870103 - in /pdfbox/branches/2.0:
debugger/src/main/java/org/apache/pdfbox/debugger/ui/
examples/src/main/java/org/apache/pdfbox/examples/pdmodel/
fontbox/src/main/java/org/apache/fontbox/cff/
pdfbox/src/main/java/org/apache/pdfbox/pdmode...
Author: tilman
Date: Thu Nov 21 18:00:25 2019
New Revision: 1870103
URL: http://svn.apache.org/viewvc?rev=1870103&view=rev
Log:
PDFBOX-4071: SonarQube fix
Modified:
pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/ui/ErrorDialog.java
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateGradientShadingPDF.java
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateSeparationColorBox.java
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationStamp.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java
pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
Modified: pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/ui/ErrorDialog.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/ui/ErrorDialog.java?rev=1870103&r1=1870102&r2=1870103&view=diff
==============================================================================
--- pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/ui/ErrorDialog.java (original)
+++ pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/ui/ErrorDialog.java Thu Nov 21 18:00:25 2019
@@ -39,6 +39,8 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextPane;
import javax.swing.KeyStroke;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.WindowConstants;
/**
* A dialog to display a runtime exception stack trace.
@@ -110,7 +112,7 @@ public class ErrorDialog extends JDialog
{
setIconImage(((ImageIcon) icon).getImage());
}
- setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
error = t;
message = createErrorMessage(error);
main = createContent();
@@ -252,8 +254,8 @@ public class ErrorDialog extends JDialog
stacktrace = new JTextPane();
stacktrace.setEditable(false);
return new JScrollPane(stacktrace,
- JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
- JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
+ ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
}
/**
Modified: pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateGradientShadingPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateGradientShadingPDF.java?rev=1870103&r1=1870102&r2=1870103&view=diff
==============================================================================
--- pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateGradientShadingPDF.java (original)
+++ pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateGradientShadingPDF.java Thu Nov 21 18:00:25 2019
@@ -23,9 +23,9 @@ import javax.imageio.ImageIO;
import javax.imageio.stream.MemoryCacheImageOutputStream;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSFloat;
import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -69,16 +69,16 @@ public class CreateGradientShadingPDF
COSDictionary fdict = new COSDictionary();
fdict.setInt(COSName.FUNCTION_TYPE, 2);
COSArray domain = new COSArray();
- domain.add(COSInteger.get(0));
- domain.add(COSInteger.get(1));
+ domain.add(COSInteger.ZERO);
+ domain.add(COSInteger.ONE);
COSArray c0 = new COSArray();
- c0.add(COSFloat.get("1"));
- c0.add(COSFloat.get("0"));
- c0.add(COSFloat.get("0"));
+ c0.add(COSInteger.ONE);
+ c0.add(COSInteger.ZERO);
+ c0.add(COSInteger.ZERO);
COSArray c1 = new COSArray();
- c1.add(COSFloat.get("0.5"));
- c1.add(COSFloat.get("1"));
- c1.add(COSFloat.get("0.5"));
+ c1.add(COSNumber.get("0.5"));
+ c1.add(COSInteger.ONE);
+ c1.add(COSNumber.get("0.5"));
fdict.setItem(COSName.DOMAIN, domain);
fdict.setItem(COSName.C0, c0);
fdict.setItem(COSName.C1, c1);
Modified: pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateSeparationColorBox.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateSeparationColorBox.java?rev=1870103&r1=1870102&r2=1870103&view=diff
==============================================================================
--- pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateSeparationColorBox.java (original)
+++ pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateSeparationColorBox.java Thu Nov 21 18:00:25 2019
@@ -19,9 +19,9 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSFloat;
import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -58,26 +58,26 @@ public class CreateSeparationColorBox
COSDictionary fdict = new COSDictionary();
fdict.setInt(COSName.FUNCTION_TYPE, 2);
COSArray range = new COSArray();
- range.add(COSInteger.get(0));
- range.add(COSInteger.get(1));
- range.add(COSInteger.get(0));
- range.add(COSInteger.get(1));
- range.add(COSInteger.get(0));
- range.add(COSInteger.get(1));
+ range.add(COSInteger.ZERO);
+ range.add(COSInteger.ONE);
+ range.add(COSInteger.ZERO);
+ range.add(COSInteger.ONE);
+ range.add(COSInteger.ZERO);
+ range.add(COSInteger.ONE);
fdict.setItem(COSName.RANGE, range);
COSArray domain = new COSArray();
- domain.add(COSInteger.get(0));
- domain.add(COSInteger.get(1));
+ domain.add(COSInteger.ZERO);
+ domain.add(COSInteger.ONE);
fdict.setItem(COSName.DOMAIN, domain);
COSArray c0 = new COSArray();
- c0.add(COSFloat.get("1"));
- c0.add(COSFloat.get("1"));
- c0.add(COSFloat.get("1"));
+ c0.add(COSInteger.ONE);
+ c0.add(COSInteger.ONE);
+ c0.add(COSInteger.ONE);
fdict.setItem(COSName.C0, c0);
COSArray c1 = new COSArray();
- c1.add(COSFloat.get("1"));
- c1.add(COSFloat.get("1"));
- c1.add(COSFloat.get("0"));
+ c1.add(COSInteger.ONE);
+ c1.add(COSInteger.ONE);
+ c1.add(COSInteger.ZERO);
fdict.setItem(COSName.C1, c1);
fdict.setInt(COSName.N, 1);
PDFunctionType2 func = new PDFunctionType2(fdict);
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java?rev=1870103&r1=1870102&r2=1870103&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java Thu Nov 21 18:00:25 2019
@@ -47,7 +47,7 @@ public class Type1CharString
private Point2D.Float leftSideBearing = null;
private Point2D.Float current = null;
private boolean isFlex = false;
- private final List<Point.Float> flexPoints = new ArrayList<Point2D.Float>();
+ private final List<Point2D.Float> flexPoints = new ArrayList<Point2D.Float>();
protected List<Object> type1Sequence;
protected int commandCount;
@@ -369,12 +369,12 @@ public class Type1CharString
}
// reference point is relative to start point
- Point.Float reference = flexPoints.get(0);
+ Point2D.Float reference = flexPoints.get(0);
reference.setLocation(current.getX() + reference.getX(),
current.getY() + reference.getY());
// first point is relative to reference point
- Point.Float first = flexPoints.get(1);
+ Point2D.Float first = flexPoints.get(1);
first.setLocation(reference.getX() + first.getX(), reference.getY() + first.getY());
// make the first point relative to the start point
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationStamp.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationStamp.java?rev=1870103&r1=1870102&r2=1870103&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationStamp.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationStamp.java Thu Nov 21 18:00:25 2019
@@ -30,9 +30,8 @@ import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBoolean;
import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSFloat;
-import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.util.Hex;
@@ -327,12 +326,12 @@ public class FDFAnnotationStamp extends
if ("INT".equalsIgnoreCase(child.getTagName()))
{
LOG.debug(parentAttrKey + " value(" + i + "): " + child.getAttribute("VAL"));
- array.add(COSFloat.get(childAttrVal));
+ array.add(COSNumber.get(childAttrVal));
}
else if ("FIXED".equalsIgnoreCase(child.getTagName()))
{
LOG.debug(parentAttrKey + " value(" + i + "): " + child.getAttribute("VAL"));
- array.add(COSInteger.get(childAttrVal));
+ array.add(COSNumber.get(childAttrVal));
}
else if ("NAME".equalsIgnoreCase(child.getTagName()))
{
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java?rev=1870103&r1=1870102&r2=1870103&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java Thu Nov 21 18:00:25 2019
@@ -513,11 +513,11 @@ public final class PDICCBased extends PD
switch (alternateColorSpace.getNumberOfComponents())
{
case 1:
- return ICC_ColorSpace.TYPE_GRAY;
+ return ColorSpace.TYPE_GRAY;
case 3:
- return ICC_ColorSpace.TYPE_RGB;
+ return ColorSpace.TYPE_RGB;
case 4:
- return ICC_ColorSpace.TYPE_CMYK;
+ return ColorSpace.TYPE_CMYK;
default:
// should not happen as all ICC color spaces in PDF must have 1,3, or 4 components
return -1;
Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java?rev=1870103&r1=1870102&r2=1870103&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java Thu Nov 21 18:00:25 2019
@@ -21,6 +21,7 @@
package org.apache.pdfbox.preflight.content;
+import java.awt.color.ColorSpace;
import static org.apache.pdfbox.preflight.PreflightConstants.ERROR_GRAPHIC_INVALID_COLOR_SPACE_CMYK;
import static org.apache.pdfbox.preflight.PreflightConstants.ERROR_GRAPHIC_INVALID_COLOR_SPACE_MISSING;
import static org.apache.pdfbox.preflight.PreflightConstants.ERROR_GRAPHIC_INVALID_COLOR_SPACE_RGB;
@@ -28,7 +29,6 @@ import static org.apache.pdfbox.prefligh
import static org.apache.pdfbox.preflight.PreflightConstants.ERROR_GRAPHIC_UNEXPECTED_VALUE_FOR_KEY;
import static org.apache.pdfbox.preflight.PreflightConstants.MAX_GRAPHIC_STATES;
-import java.awt.color.ICC_ColorSpace;
import java.io.IOException;
import java.util.List;
@@ -536,8 +536,8 @@ public abstract class PreflightStreamEng
int type = ((PDICCBased)cs).getColorSpaceType();
switch (expectedIccType)
{
- case RGB: return type == ICC_ColorSpace.TYPE_RGB;
- case CMYK: return type == ICC_ColorSpace.TYPE_CMYK;
+ case RGB: return type == ColorSpace.TYPE_RGB;
+ case CMYK: return type == ColorSpace.TYPE_CMYK;
default: return true;
}
}
Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java?rev=1870103&r1=1870102&r2=1870103&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java Thu Nov 21 18:00:25 2019
@@ -21,6 +21,7 @@
package org.apache.pdfbox.preflight.graphic;
+import java.awt.color.ColorSpace;
import java.awt.color.ICC_ColorSpace;
import java.awt.color.ICC_Profile;
import java.io.IOException;
@@ -89,7 +90,7 @@ public class ICCProfileWrapper
*/
public boolean isRGBColorSpace()
{
- return ICC_ColorSpace.TYPE_RGB == colorSpace.getType();
+ return ColorSpace.TYPE_RGB == colorSpace.getType();
}
/**
@@ -99,7 +100,7 @@ public class ICCProfileWrapper
*/
public boolean isCMYKColorSpace()
{
- return ICC_ColorSpace.TYPE_CMYK == colorSpace.getType();
+ return ColorSpace.TYPE_CMYK == colorSpace.getType();
}
/**
@@ -109,7 +110,7 @@ public class ICCProfileWrapper
*/
public boolean isGrayColorSpace()
{
- return ICC_ColorSpace.TYPE_GRAY == colorSpace.getType();
+ return ColorSpace.TYPE_GRAY == colorSpace.getType();
}
/**