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 2017/04/25 19:14:03 UTC
svn commit: r1792644 - in
/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples:
pdmodel/ExtractTTFFonts.java signature/TSAClient.java
Author: tilman
Date: Tue Apr 25 19:14:03 2017
New Revision: 1792644
URL: http://svn.apache.org/viewvc?rev=1792644&view=rev
Log:
PDFBOX-2852: use JDK7 syntax
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java?rev=1792644&r1=1792643&r2=1792644&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java Tue Apr 25 19:14:03 2017
@@ -78,34 +78,33 @@ public final class ExtractTTFFonts
boolean addKey = false;
for (int i = 0; i < args.length; i++)
{
- if (args[i].equals(PASSWORD))
+ switch (args[i])
{
- i++;
- if (i >= args.length)
- {
- usage();
- }
- password = args[i];
- }
- else if (args[i].equals(PREFIX))
- {
- i++;
- if (i >= args.length)
- {
- usage();
- }
- prefix = args[i];
- }
- else if (args[i].equals(ADDKEY))
- {
- addKey = true;
- }
- else
- {
- if (pdfFile == null)
- {
- pdfFile = args[i];
- }
+ case PASSWORD:
+ i++;
+ if (i >= args.length)
+ {
+ usage();
+ }
+ password = args[i];
+ break;
+ case PREFIX:
+ i++;
+ if (i >= args.length)
+ {
+ usage();
+ }
+ prefix = args[i];
+ break;
+ case ADDKEY:
+ addKey = true;
+ break;
+ default:
+ if (pdfFile == null)
+ {
+ pdfFile = args[i];
+ }
+ break;
}
}
if (pdfFile == null)
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java?rev=1792644&r1=1792643&r2=1792644&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java Tue Apr 25 19:14:03 2017
@@ -165,37 +165,24 @@ public class TSAClient
// returns the ASN.1 OID of the given hash algorithm
private ASN1ObjectIdentifier getHashObjectIdentifier(String algorithm)
{
- if (algorithm.equals("MD2"))
+ switch (algorithm)
{
- return new ASN1ObjectIdentifier(PKCSObjectIdentifiers.md2.getId());
- }
- else if (algorithm.equals("MD5"))
- {
- return new ASN1ObjectIdentifier(PKCSObjectIdentifiers.md5.getId());
- }
- else if (algorithm.equals("SHA-1"))
- {
- return new ASN1ObjectIdentifier(OIWObjectIdentifiers.idSHA1.getId());
- }
- else if (algorithm.equals("SHA-224"))
- {
- return new ASN1ObjectIdentifier(NISTObjectIdentifiers.id_sha224.getId());
- }
- else if (algorithm.equals("SHA-256"))
- {
- return new ASN1ObjectIdentifier(NISTObjectIdentifiers.id_sha256.getId());
- }
- else if (algorithm.equals("SHA-384"))
- {
- return new ASN1ObjectIdentifier(NISTObjectIdentifiers.id_sha384.getId());
- }
- else if (algorithm.equals("SHA-512"))
- {
- return new ASN1ObjectIdentifier(NISTObjectIdentifiers.id_sha512.getId());
- }
- else
- {
- return new ASN1ObjectIdentifier(algorithm);
+ case "MD2":
+ return new ASN1ObjectIdentifier(PKCSObjectIdentifiers.md2.getId());
+ case "MD5":
+ return new ASN1ObjectIdentifier(PKCSObjectIdentifiers.md5.getId());
+ case "SHA-1":
+ return new ASN1ObjectIdentifier(OIWObjectIdentifiers.idSHA1.getId());
+ case "SHA-224":
+ return new ASN1ObjectIdentifier(NISTObjectIdentifiers.id_sha224.getId());
+ case "SHA-256":
+ return new ASN1ObjectIdentifier(NISTObjectIdentifiers.id_sha256.getId());
+ case "SHA-384":
+ return new ASN1ObjectIdentifier(NISTObjectIdentifiers.id_sha384.getId());
+ case "SHA-512":
+ return new ASN1ObjectIdentifier(NISTObjectIdentifiers.id_sha512.getId());
+ default:
+ return new ASN1ObjectIdentifier(algorithm);
}
}
}