Author: tpalsulich
Date: Sun Mar 22 20:38:15 2015
New Revision: 1668476
URL: http://svn.apache.org/r1668476
Log:
Style changes for GDALParser.
Don't return inside of a finally block, use a StringBuilder instead of a
StringBuffer, and use String.contains(...) instead of String.indexOf(...) != 1.
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java?rev=1668476&r1=1668475&r2=1668476&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java
(original)
+++
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/gdal/GDALParser.java
Sun Mar 22 20:38:15 2015
@@ -86,7 +86,7 @@ public class GDALParser extends Abstract
TikaInputStream tis = (TikaInputStream) stream;
String pCommand = this.command;
try {
- if (this.command.indexOf(INPUT_FILE_TOKEN) != -1) {
+ if (this.command.contains(INPUT_FILE_TOKEN)) {
pCommand = this.command.replace(INPUT_FILE_TOKEN, tis.getFile()
.getPath());
}
@@ -376,15 +376,14 @@ public class GDALParser extends Abstract
process.waitFor();
} catch (InterruptedException ignore) {
}
-
- return output;
}
+ return output;
}
private String extractOutput(InputStream stream) throws SAXException,
IOException {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Reader reader = new InputStreamReader(stream, IOUtils.UTF_8);
try {
char[] buffer = new char[1024];
@@ -393,8 +392,8 @@ public class GDALParser extends Abstract
}
} finally {
reader.close();
- return sb.toString();
}
+ return sb.toString();
}
private void processOutput(ContentHandler handler, Metadata metadata,
