You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by tp...@apache.org on 2014/07/22 20:45:45 UTC
svn commit: r1612644 - in
/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser:
executable/MachineMetadata.java pdf/PDFParser.java
Author: tpalsulich
Date: Tue Jul 22 18:45:44 2014
New Revision: 1612644
URL: http://svn.apache.org/r1612644
Log:
Remove more redundant array initialization.
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/executable/MachineMetadata.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/executable/MachineMetadata.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/executable/MachineMetadata.java?rev=1612644&r1=1612643&r2=1612644&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/executable/MachineMetadata.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/executable/MachineMetadata.java Tue Jul 22 18:45:44 2014
@@ -26,7 +26,7 @@ public interface MachineMetadata {
public static final String PREFIX = "machine:";
public static Property ARCHITECTURE_BITS = Property.internalClosedChoise(PREFIX+"architectureBits",
- new String[] { "8", "16", "32", "64" });
+ "8", "16", "32", "64");
public static final String PLATFORM_SYSV = "System V";
public static final String PLATFORM_HPUX = "HP-UX";
@@ -42,9 +42,9 @@ public interface MachineMetadata {
public static final String PLATFORM_WINDOWS = "Windows";
public static Property PLATFORM = Property.internalClosedChoise(PREFIX+"platform",
- new String[] { PLATFORM_SYSV, PLATFORM_HPUX, PLATFORM_NETBSD, PLATFORM_LINUX,
+ PLATFORM_SYSV, PLATFORM_HPUX, PLATFORM_NETBSD, PLATFORM_LINUX,
PLATFORM_SOLARIS, PLATFORM_AIX, PLATFORM_IRIX, PLATFORM_FREEBSD, PLATFORM_TRU64,
- PLATFORM_ARM, PLATFORM_EMBEDDED, PLATFORM_WINDOWS });
+ PLATFORM_ARM, PLATFORM_EMBEDDED, PLATFORM_WINDOWS);
public static final String MACHINE_x86_32 = "x86-32";
public static final String MACHINE_x86_64 = "x86-64";
@@ -67,23 +67,25 @@ public interface MachineMetadata {
public static final String MACHINE_UNKNOWN = "Unknown";
public static Property MACHINE_TYPE = Property.internalClosedChoise(PREFIX+"machineType",
- new String[] { MACHINE_x86_32, MACHINE_x86_64, MACHINE_IA_64, MACHINE_SPARC,
- MACHINE_M68K, MACHINE_M88K, MACHINE_MIPS, MACHINE_PPC,
- MACHINE_S370, MACHINE_S390,
- MACHINE_ARM, MACHINE_VAX, MACHINE_ALPHA, MACHINE_EFI, MACHINE_M32R,
- MACHINE_SH3, MACHINE_SH4, MACHINE_SH5, MACHINE_UNKNOWN });
+ MACHINE_x86_32, MACHINE_x86_64, MACHINE_IA_64, MACHINE_SPARC,
+ MACHINE_M68K, MACHINE_M88K, MACHINE_MIPS, MACHINE_PPC,
+ MACHINE_S370, MACHINE_S390,
+ MACHINE_ARM, MACHINE_VAX, MACHINE_ALPHA, MACHINE_EFI, MACHINE_M32R,
+ MACHINE_SH3, MACHINE_SH4, MACHINE_SH5, MACHINE_UNKNOWN);
public static final class Endian {
- private String name;
- private boolean msb;
- public String getName() { return name; }
- public boolean isMSB() { return msb; }
- public String getMSB() { if(msb) { return "MSB"; } else { return "LSB"; } }
- private Endian(String name, boolean msb) { this.name = name; this.msb = msb; }
+ private String name;
+ private boolean msb;
+ public String getName() { return name; }
+ @SuppressWarnings("unused")
+ public boolean isMSB() { return msb; }
+ @SuppressWarnings("unused")
+ public String getMSB() { if(msb) { return "MSB"; } else { return "LSB"; } }
+ private Endian(String name, boolean msb) { this.name = name; this.msb = msb; }
- public static final Endian LITTLE = new Endian("Little", false);
- public static final Endian BIG = new Endian("Big", true);
+ public static final Endian LITTLE = new Endian("Little", false);
+ public static final Endian BIG = new Endian("Big", true);
}
public static Property ENDIAN = Property.internalClosedChoise(PREFIX+"endian",
- new String[] { Endian.LITTLE.name, Endian.BIG.name });
+ Endian.LITTLE.name, Endian.BIG.name);
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java?rev=1612644&r1=1612643&r2=1612644&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java Tue Jul 22 18:45:44 2014
@@ -213,10 +213,8 @@ public class PDFParser extends AbstractP
// All remaining metadata is custom
// Copy this over as-is
- List<String> handledMetadata = Arrays.asList(new String[] {
- "Author", "Creator", "CreationDate", "ModDate",
- "Keywords", "Producer", "Subject", "Title", "Trapped"
- });
+ List<String> handledMetadata = Arrays.asList("Author", "Creator", "CreationDate", "ModDate",
+ "Keywords", "Producer", "Subject", "Title", "Trapped");
for(COSName key : info.getDictionary().keySet()) {
String name = key.getName();
if(! handledMetadata.contains(name)) {