Author: tilman
Date: Sun Oct 22 13:19:17 2023
New Revision: 1913203
URL: http://svn.apache.org/viewvc?rev=1913203&view=rev
Log:
PDFBOX-5703: use comparison operators for enums, as suggested by Axel Howind
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CharStringCommand.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentGroup.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CharStringCommand.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CharStringCommand.java?rev=1913203&r1=1913202&r2=1913203&view=diff
==============================================================================
---
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CharStringCommand.java
(original)
+++
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CharStringCommand.java
Sun Oct 22 13:19:17 2023
@@ -272,11 +272,11 @@ public class CharStringCommand
if (object instanceof CharStringCommand)
{
CharStringCommand that = (CharStringCommand) object;
- if (type1KeyWord != null &&
type1KeyWord.equals(that.getType1KeyWord()))
+ if (type1KeyWord != null && type1KeyWord == that.getType1KeyWord())
{
return true;
}
- if (type2KeyWord != null &&
type2KeyWord.equals(that.getType2KeyWord()))
+ if (type2KeyWord != null && type2KeyWord == that.getType2KeyWord())
{
return true;
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java?rev=1913203&r1=1913202&r2=1913203&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
Sun Oct 22 13:19:17 2023
@@ -289,14 +289,14 @@ public final class PDImageXObject extend
throw new IllegalArgumentException("Image type not supported: " +
file.getName());
}
- if (fileType.equals(FileType.JPEG))
+ if (fileType == FileType.JPEG)
{
try (FileInputStream fis = new FileInputStream(file))
{
return JPEGFactory.createFromStream(doc, fis);
}
}
- if (fileType.equals(FileType.TIFF))
+ if (fileType == FileType.TIFF)
{
try
{
@@ -311,7 +311,7 @@ public final class PDImageXObject extend
fileType = FileType.PNG;
}
}
- if (fileType.equals(FileType.BMP) || fileType.equals(FileType.GIF) ||
fileType.equals(FileType.PNG))
+ if (fileType == FileType.BMP || fileType == FileType.GIF || fileType
== FileType.PNG)
{
BufferedImage bim = ImageIO.read(file);
return LosslessFactory.createFromImage(doc, bim);
@@ -349,11 +349,11 @@ public final class PDImageXObject extend
throw new IllegalArgumentException("Image type not supported: " +
name);
}
- if (fileType.equals(FileType.JPEG))
+ if (fileType == FileType.JPEG)
{
return JPEGFactory.createFromByteArray(document, byteArray);
}
- if (fileType.equals(FileType.PNG))
+ if (fileType == FileType.PNG)
{
// Try to directly convert the image without recoding it.
PDImageXObject image = PNGConverter.convertPNGImage(document,
byteArray);
@@ -362,7 +362,7 @@ public final class PDImageXObject extend
return image;
}
}
- if (fileType.equals(FileType.TIFF))
+ if (fileType == FileType.TIFF)
{
try
{
@@ -377,7 +377,7 @@ public final class PDImageXObject extend
fileType = FileType.PNG;
}
}
- if (fileType.equals(FileType.BMP) || fileType.equals(FileType.GIF) ||
fileType.equals(FileType.PNG))
+ if (fileType == FileType.BMP || fileType == FileType.GIF || fileType
== FileType.PNG)
{
ByteArrayInputStream bais = new ByteArrayInputStream(byteArray);
BufferedImage bim = ImageIO.read(bais);
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentGroup.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentGroup.java?rev=1913203&r1=1913202&r2=1913203&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentGroup.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentGroup.java
Sun Oct 22 13:19:17 2023
@@ -123,12 +123,12 @@ public class PDOptionalContentGroup exte
COSDictionary usage = dict.getCOSDictionary(COSName.USAGE);
if (usage != null)
{
- if (RenderDestination.PRINT.equals(destination))
+ if (RenderDestination.PRINT == destination)
{
COSDictionary print = usage.getCOSDictionary(COSName.PRINT);
state = print == null ? null :
print.getCOSName(COSName.PRINT_STATE);
}
- else if (RenderDestination.VIEW.equals(destination))
+ else if (RenderDestination.VIEW == destination)
{
COSDictionary view = usage.getCOSDictionary(COSName.VIEW);
state = view == null ? null :
view.getCOSName(COSName.VIEW_STATE);
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java?rev=1913203&r1=1913202&r2=1913203&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/PDOptionalContentProperties.java
Sun Oct 22 13:19:17 2023
@@ -288,7 +288,7 @@ public class PDOptionalContentProperties
//i.e. OCProperties/Configs
PDOptionalContentProperties.BaseState baseState = getBaseState();
- boolean enabled = !baseState.equals(BaseState.OFF);
+ boolean enabled = baseState != BaseState.OFF;
//TODO What to do with BaseState.Unchanged?
if (group == null)
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1913203&r1=1913202&r2=1913203&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Sun Oct 22 13:19:17 2023
@@ -574,7 +574,7 @@ public class PageDrawer extends PDFGraph
{
PDGraphicsState state = getGraphicsState();
RenderingMode renderingMode = state.getTextState().getRenderingMode();
- if (!RenderingMode.NEITHER.equals(renderingMode))
+ if (RenderingMode.NEITHER != renderingMode)
{
super.showType3Glyph(textRenderingMatrix, font, code,
displacement);
}
@@ -1828,7 +1828,7 @@ public class PageDrawer extends PDFGraph
private BufferedImage create2ByteGrayAlphaImage(int width, int height)
{
// gray + alpha
- int[] bandOffsets = new int[] {1, 0};
+ int[] bandOffsets = {1, 0};
int bands = bandOffsets.length;
// Color Model used for raw GRAY + ALPHA
@@ -2001,7 +2001,7 @@ public class PageDrawer extends PDFGraph
return true;
}
}
- else if (RenderState.OFF.equals(printState))
+ else if (RenderState.OFF == printState)
{
return true;
}
