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 2020/05/06 16:42:58 UTC
svn commit: r1877445 - in
/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui:
ImageTypeMenu.java RenderDestinationMenu.java RotationMenu.java
Author: tilman
Date: Wed May 6 16:42:58 2020
New Revision: 1877445
URL: http://svn.apache.org/viewvc?rev=1877445&view=rev
Log:
PDFBOX-4071: use switch, improve exception text
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/ImageTypeMenu.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RenderDestinationMenu.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RotationMenu.java
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/ImageTypeMenu.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/ImageTypeMenu.java?rev=1877445&r1=1877444&r2=1877445&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/ImageTypeMenu.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/ImageTypeMenu.java Wed May 6 16:42:58 2020
@@ -70,25 +70,22 @@ public final class ImageTypeMenu extends
*/
public void setImageTypeSelection(String selection)
{
- if (IMAGETYPE_RGB.equals(selection))
+ switch (selection)
{
- rgbItem.setSelected(true);
- }
- else if (IMAGETYPE_ARGB.equals(selection))
- {
- argbItem.setSelected(true);
- }
- else if (IMAGETYPE_GRAY.equals(selection))
- {
- grayItem.setSelected(true);
- }
- else if (IMAGETYPE_BITONAL.equals(selection))
- {
- bitonalItem.setSelected(true);
- }
- else
- {
- throw new IllegalArgumentException();
+ case IMAGETYPE_RGB:
+ rgbItem.setSelected(true);
+ break;
+ case IMAGETYPE_ARGB:
+ argbItem.setSelected(true);
+ break;
+ case IMAGETYPE_GRAY:
+ grayItem.setSelected(true);
+ break;
+ case IMAGETYPE_BITONAL:
+ bitonalItem.setSelected(true);
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid ImageType selection: " + selection);
}
}
@@ -117,25 +114,18 @@ public final class ImageTypeMenu extends
public static ImageType getImageType(String actionCommand)
{
- if (IMAGETYPE_RGB.equals(actionCommand))
- {
- return ImageType.RGB;
- }
- else if (IMAGETYPE_ARGB.equals(actionCommand))
- {
- return ImageType.ARGB;
- }
- else if (IMAGETYPE_GRAY.equals(actionCommand))
- {
- return ImageType.GRAY;
- }
- else if (IMAGETYPE_BITONAL.equals(actionCommand))
- {
- return ImageType.BINARY;
- }
- else
+ switch (actionCommand)
{
- throw new IllegalArgumentException();
+ case IMAGETYPE_RGB:
+ return ImageType.RGB;
+ case IMAGETYPE_ARGB:
+ return ImageType.ARGB;
+ case IMAGETYPE_GRAY:
+ return ImageType.GRAY;
+ case IMAGETYPE_BITONAL:
+ return ImageType.BINARY;
+ default:
+ throw new IllegalArgumentException("Invalid ImageType actionCommand: " + actionCommand);
}
}
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RenderDestinationMenu.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RenderDestinationMenu.java?rev=1877445&r1=1877444&r2=1877445&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RenderDestinationMenu.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RenderDestinationMenu.java Wed May 6 16:42:58 2020
@@ -68,21 +68,19 @@ public final class RenderDestinationMenu
*/
public void setRenderDestinationSelection(String selection)
{
- if (RENDER_DESTINATION_EXPORT.equals(selection))
+ switch (selection)
{
- exportItem.setSelected(true);
- }
- else if (RENDER_DESTINATION_PRINT.equals(selection))
- {
- printItem.setSelected(true);
- }
- else if (RENDER_DESTINATION_VIEW.equals(selection))
- {
- viewItem.setSelected(true);
- }
- else
- {
- throw new IllegalArgumentException();
+ case RENDER_DESTINATION_EXPORT:
+ exportItem.setSelected(true);
+ break;
+ case RENDER_DESTINATION_PRINT:
+ printItem.setSelected(true);
+ break;
+ case RENDER_DESTINATION_VIEW:
+ viewItem.setSelected(true);
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid RenderDestination selection: " + selection);
}
}
@@ -107,21 +105,16 @@ public final class RenderDestinationMenu
public static RenderDestination getRenderDestination(String actionCommand)
{
- if (RENDER_DESTINATION_EXPORT.equals(actionCommand))
- {
- return RenderDestination.EXPORT;
- }
- else if (RENDER_DESTINATION_PRINT.equals(actionCommand))
- {
- return RenderDestination.PRINT;
- }
- else if (RENDER_DESTINATION_VIEW.equals(actionCommand))
- {
- return RenderDestination.VIEW;
- }
- else
+ switch (actionCommand)
{
- throw new IllegalArgumentException();
+ case RENDER_DESTINATION_EXPORT:
+ return RenderDestination.EXPORT;
+ case RENDER_DESTINATION_PRINT:
+ return RenderDestination.PRINT;
+ case RENDER_DESTINATION_VIEW:
+ return RenderDestination.VIEW;
+ default:
+ throw new IllegalArgumentException("Invalid RenderDestination actionCommand: " + actionCommand);
}
}
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RotationMenu.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RotationMenu.java?rev=1877445&r1=1877444&r2=1877445&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RotationMenu.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RotationMenu.java Wed May 6 16:42:58 2020
@@ -69,25 +69,22 @@ public final class RotationMenu extends
*/
public void setRotationSelection(String selection)
{
- if (ROTATE_0_DEGREES.equals(selection))
+ switch (selection)
{
- rotate0Item.setSelected(true);
- }
- else if (ROTATE_90_DEGREES.equals(selection))
- {
- rotate90Item.setSelected(true);
- }
- else if (ROTATE_180_DEGREES.equals(selection))
- {
- rotate180Item.setSelected(true);
- }
- else if (ROTATE_270_DEGREES.equals(selection))
- {
- rotate270Item.setSelected(true);
- }
- else
- {
- throw new IllegalArgumentException();
+ case ROTATE_0_DEGREES:
+ rotate0Item.setSelected(true);
+ break;
+ case ROTATE_90_DEGREES:
+ rotate90Item.setSelected(true);
+ break;
+ case ROTATE_180_DEGREES:
+ rotate180Item.setSelected(true);
+ break;
+ case ROTATE_270_DEGREES:
+ rotate270Item.setSelected(true);
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid rotation selection: " + selection);
}
}
@@ -116,25 +113,18 @@ public final class RotationMenu extends
public static int getRotationDegrees(String actionCommand)
{
- if (ROTATE_0_DEGREES.equals(actionCommand))
- {
- return 0;
- }
- else if (ROTATE_90_DEGREES.equals(actionCommand))
- {
- return 90;
- }
- else if (ROTATE_180_DEGREES.equals(actionCommand))
- {
- return 180;
- }
- else if (ROTATE_270_DEGREES.equals(actionCommand))
- {
- return 270;
- }
- else
+ switch (actionCommand)
{
- throw new IllegalArgumentException();
+ case ROTATE_0_DEGREES:
+ return 0;
+ case ROTATE_90_DEGREES:
+ return 90;
+ case ROTATE_180_DEGREES:
+ return 180;
+ case ROTATE_270_DEGREES:
+ return 270;
+ default:
+ throw new IllegalArgumentException("Invalid RotationDegrees actionCommand " + actionCommand);
}
}