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 21:05:28 UTC
svn commit: r1612647 - in /tika/trunk/tika-parsers/src:
main/java/org/apache/tika/parser/chm/lzx/
main/java/org/apache/tika/parser/microsoft/
main/java/org/apache/tika/parser/pdf/ main/java/org/apache/tika/parser/rtf/
main/java/org/apache/tika/parser/t...
Author: tpalsulich
Date: Tue Jul 22 19:05:28 2014
New Revision: 1612647
URL: http://svn.apache.org/r1612647
Log:
Remove several redundant type casts.
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/lzx/ChmLzxBlock.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/lzx/ChmSection.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFObjDataParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/TextExtractor.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/CharsetRecog_sbcs.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/lzx/ChmLzxBlock.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/lzx/ChmLzxBlock.java?rev=1612647&r1=1612646&r2=1612647&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/lzx/ChmLzxBlock.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/lzx/ChmLzxBlock.java Tue Jul 22 19:05:28 2014
@@ -375,7 +375,7 @@ public class ChmLzxBlock {
getState().getAlignedTreeTable()[t]);
matchoffset += t;
} else if (extra == 3) {
- int g = (int) getChmSection().getDesyncBits(
+ int g = getChmSection().getDesyncBits(
ChmConstants.LZX_NUM_PRIMARY_LENGTHS, 0);
int t = getState().getAlignedTreeTable()[g];
if (t >= getState().getMainTreeElements()) {
@@ -457,7 +457,7 @@ public class ChmLzxBlock {
int matchlen = 0, matchfooter = 0, extra, rundest, runsrc;
int matchoffset = 0;
for (i = getContentLength(); i < len; i++) {
- int f = (int) getChmSection().getDesyncBits(
+ int f = getChmSection().getDesyncBits(
ChmConstants.LZX_MAINTREE_TABLEBITS, 0);
assertShortArrayNotNull(getState().getMainTreeTable());
s = getState().getMainTreeTable()[f];
@@ -476,7 +476,7 @@ public class ChmLzxBlock {
s -= ChmConstants.LZX_NUM_CHARS;
matchlen = s & ChmConstants.LZX_NUM_PRIMARY_LENGTHS;
if (matchlen == ChmConstants.LZX_NUM_PRIMARY_LENGTHS) {
- matchfooter = getState().getLengthTreeTable()[(int) getChmSection()
+ matchfooter = getState().getLengthTreeTable()[getChmSection()
.getDesyncBits(ChmConstants.LZX_LENGTH_TABLEBITS, 0)];
if (matchfooter >= ChmConstants.LZX_NUM_SECONDARY_LENGTHS) {
x = ChmConstants.LZX_LENGTH_TABLEBITS;
@@ -569,7 +569,7 @@ public class ChmLzxBlock {
int i = offset; // represents offset
int z, y, x;// local counters
while (i < tablelen) {
- z = pretreetable[(int) getChmSection().getDesyncBits(
+ z = pretreetable[getChmSection().getDesyncBits(
ChmConstants.LZX_PRETREE_TABLEBITS, 0)];
if (z >= ChmConstants.LZX_PRETREE_NUM_ELEMENTS) {// 1 bug, should be
// 20
@@ -588,13 +588,13 @@ public class ChmLzxBlock {
getState().getLengthTreeLengtsTable()[i] = (short) z;
i++;
} else if (z == 17) {
- y = (int) getChmSection().getSyncBits(4);
+ y = getChmSection().getSyncBits(4);
y += 4;
for (int j = 0; j < y; j++)
if (i < getState().getLengthTreeLengtsTable().length)
getState().getLengthTreeLengtsTable()[i++] = 0;
} else if (z == 18) {
- y = (int) getChmSection().getSyncBits(5);
+ y = getChmSection().getSyncBits(5);
y += 20;
for (int j = 0; j < y; j++)
if (i < getState().getLengthTreeLengtsTable().length)
@@ -602,7 +602,7 @@ public class ChmLzxBlock {
} else if (z == 19) {
y = getChmSection().getSyncBits(1);
y += 4;
- z = pretreetable[(int) getChmSection().getDesyncBits(
+ z = pretreetable[getChmSection().getDesyncBits(
ChmConstants.LZX_PRETREE_TABLEBITS, 0)];
if (z >= ChmConstants.LZX_PRETREE_NUM_ELEMENTS) {// 20
x = ChmConstants.LZX_PRETREE_TABLEBITS;// 6
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/lzx/ChmSection.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/lzx/ChmSection.java?rev=1612647&r1=1612646&r2=1612647&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/lzx/ChmSection.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/lzx/ChmSection.java Tue Jul 22 19:05:28 2014
@@ -61,7 +61,7 @@ public class ChmSection {
}
public int unmarshalUByte() {
- return (int) (getByte() & 255);
+ return getByte() & 255;
}
public byte getByte() {
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java?rev=1612647&r1=1612646&r2=1612647&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java Tue Jul 22 19:05:28 2014
@@ -186,7 +186,7 @@ public class SummaryExtractor {
metadata.set(prop, (Date)value);
} else if (value instanceof Boolean) {
Property prop = Property.externalBoolean(key);
- metadata.set(prop, ((Boolean)value).toString());
+ metadata.set(prop, value.toString());
} else if (value instanceof Long) {
Property prop = Property.externalInteger(key);
metadata.set(prop, ((Long)value).intValue());
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=1612647&r1=1612646&r2=1612647&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 19:05:28 2014
@@ -185,13 +185,13 @@ public class PDFParser extends AbstractP
}
PDDocumentInformation info = document.getDocumentInformation();
metadata.set(PagedText.N_PAGES, document.getNumberOfPages());
- extractMultilingualItems(metadata, TikaCoreProperties.TITLE, info.getTitle(), (XMPSchema)dcSchema);
+ extractMultilingualItems(metadata, TikaCoreProperties.TITLE, info.getTitle(), dcSchema);
extractDublinCoreListItems(metadata, TikaCoreProperties.CREATOR, info.getAuthor(), dcSchema);
extractDublinCoreListItems(metadata, TikaCoreProperties.CONTRIBUTOR, null, dcSchema);
addMetadata(metadata, TikaCoreProperties.CREATOR_TOOL, info.getCreator());
addMetadata(metadata, TikaCoreProperties.KEYWORDS, info.getKeywords());
addMetadata(metadata, "producer", info.getProducer());
- extractMultilingualItems(metadata, TikaCoreProperties.DESCRIPTION, null, (XMPSchema)dcSchema);
+ extractMultilingualItems(metadata, TikaCoreProperties.DESCRIPTION, null, dcSchema);
// TODO: Move to description in Tika 2.0
addMetadata(metadata, TikaCoreProperties.TRANSITION_SUBJECT_TO_OO_SUBJECT, info.getSubject());
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFObjDataParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFObjDataParser.java?rev=1612647&r1=1612646&r2=1612647&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFObjDataParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFObjDataParser.java Tue Jul 22 19:05:28 2014
@@ -153,7 +153,7 @@ class RTFObjDataParser {
if (type == POIFSDocumentType.OLE10_NATIVE) {
try {
// Try to un-wrap the OLE10Native record:
- Ole10Native ole = Ole10Native.createFromEmbeddedOleObject((DirectoryNode)root);
+ Ole10Native ole = Ole10Native.createFromEmbeddedOleObject(root);
ret = ole.getDataBuffer();
} catch (Ole10NativeException ex) {
// Not a valid OLE10Native record, skip it
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/TextExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/TextExtractor.java?rev=1612647&r1=1612646&r2=1612647&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/TextExtractor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/TextExtractor.java Tue Jul 22 19:05:28 2014
@@ -953,7 +953,7 @@ final class TextExtractor {
ansiSkip = groupState.ucSkip;
} else if (equals("uc")) {
// Change unicode shadow length
- groupState.ucSkip = (int) param;
+ groupState.ucSkip = param;
} else if (equals("bin")) {
if (param >= 0) {
if (groupState.pictDepth == 1) {
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java?rev=1612647&r1=1612646&r2=1612647&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java Tue Jul 22 19:05:28 2014
@@ -217,7 +217,7 @@ public class CharsetDetector {
Collections.sort(matches); // CharsetMatch compares on confidence
Collections.reverse(matches); // Put best match first.
CharsetMatch [] resultArray = new CharsetMatch[matches.size()];
- resultArray = (CharsetMatch[]) matches.toArray(resultArray);
+ resultArray = matches.toArray(resultArray);
return resultArray;
}
@@ -547,7 +547,7 @@ public class CharsetDetector {
int out = 0;
for (int i = 0; i < recognizers.size(); i++) {
- String name = ((CharsetRecognizer)recognizers.get(i)).getName();
+ String name = recognizers.get(i).getName();
if (out == 0 || ! name.equals(charsetNames[out - 1])) {
charsetNames[out++] = name;
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/CharsetRecog_sbcs.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/CharsetRecog_sbcs.java?rev=1612647&r1=1612646&r2=1612647&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/CharsetRecog_sbcs.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/CharsetRecog_sbcs.java Tue Jul 22 19:05:28 2014
@@ -1258,7 +1258,7 @@ abstract class CharsetRecog_sbcs extends
}
protected void matchInit(CharsetDetector det)
{
- prev_fInputBytes = (byte[])det.fInputBytes.clone();
+ prev_fInputBytes = det.fInputBytes.clone();
byte bb[] = unshape(det.fInputBytes);
det.setText(bb);
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java?rev=1612647&r1=1612646&r2=1612647&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java Tue Jul 22 19:05:28 2014
@@ -96,12 +96,12 @@ public class EmptyAndDuplicateElementsXM
private static final long serialVersionUID = 2458579047014545931L;
- protected ElementMetadataHandler getCustomElementHandler(Metadata metadata, Property tikaMetadata, String localPart) {
+ protected ElementMetadataHandler getCustomElementHandler(Metadata metadata, Property tikaProperty, String localPart) {
return new ElementMetadataHandler(
"http://custom",
localPart,
metadata,
- (Property) tikaMetadata);
+ tikaProperty);
}
protected ContentHandler getContentHandler(
@@ -117,12 +117,12 @@ public class EmptyAndDuplicateElementsXM
private static final long serialVersionUID = 3735646809954466229L;
- protected ElementMetadataHandler getCustomElementHandler(Metadata metadata, Property tikaMetadata, String localPart) {
+ protected ElementMetadataHandler getCustomElementHandler(Metadata metadata, Property tikaProperty, String localPart) {
return new ElementMetadataHandler(
"http://custom",
localPart,
metadata,
- (Property) tikaMetadata,
+ tikaProperty,
true,
true);
}