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 22:15:03 UTC
svn commit: r1612693 - in /tika/trunk/tika-parsers/src:
main/java/org/apache/tika/parser/chm/
main/java/org/apache/tika/parser/chm/core/
main/java/org/apache/tika/parser/image/
main/java/org/apache/tika/parser/image/xmp/
main/java/org/apache/tika/parse...
Author: tpalsulich
Date: Tue Jul 22 20:15:02 2014
New Revision: 1612693
URL: http://svn.apache.org/r1612693
Log:
Use foreach loops instead of for/while, when possible.
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/ChmParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmCommons.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.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/chm/TestChmBlockInfo.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtractor.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/ChmParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/ChmParser.java?rev=1612693&r1=1612692&r2=1612693&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/ChmParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/ChmParser.java Tue Jul 22 20:15:02 2014
@@ -65,10 +65,7 @@ public class ChmParser extends AbstractP
XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
xhtml.startDocument();
- Iterator<DirectoryListingEntry> it =
- chmExtractor.getChmDirList().getDirectoryListingEntryList().iterator();
- while (it.hasNext()) {
- DirectoryListingEntry entry = it.next();
+ for (DirectoryListingEntry entry : chmExtractor.getChmDirList().getDirectoryListingEntryList()) {
if (entry.getName().endsWith(".html") || entry.getName().endsWith(".htm")) {
xhtml.characters(extract(chmExtractor.extractChmEntry(entry)));
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmCommons.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmCommons.java?rev=1612693&r1=1612692&r2=1612693&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmCommons.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmCommons.java Tue Jul 22 20:15:02 2014
@@ -211,10 +211,9 @@ public class ChmCommons {
&& !ChmCommons.isEmpty(fileToBeSaved)) {
try {
output = new FileOutputStream(fileToBeSaved);
- if (output != null)
- for (int i = 0; i < buffer.length; i++) {
- output.write(buffer[i]);
- }
+ for (byte[] bufferEntry : buffer) {
+ output.write(bufferEntry);
+ }
} catch (FileNotFoundException e) {
throw new TikaException(e.getMessage());
} catch (IOException e) {
@@ -324,12 +323,9 @@ public class ChmCommons {
*/
public static int indexOf(List<DirectoryListingEntry> list, String pattern) {
int place = 0;
- for (Iterator<DirectoryListingEntry> iterator = list.iterator(); iterator.hasNext();) {
- DirectoryListingEntry directoryListingEntry = iterator.next();
- if (directoryListingEntry.toString().contains(pattern)) {
- return place;
- } else
- ++place;
+ for (DirectoryListingEntry directoryListingEntry : list) {
+ if (directoryListingEntry.toString().contains(pattern)) return place;
+ ++place;
}
return -1;// not found
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java?rev=1612693&r1=1612692&r2=1612693&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java Tue Jul 22 20:15:02 2014
@@ -226,8 +226,8 @@ public class ChmExtractor {
*/
public List<String> enumerateChm() {
List<String> listOfEntries = new ArrayList<String>();
- for (Iterator<DirectoryListingEntry> it = getChmDirList().getDirectoryListingEntryList().iterator(); it.hasNext();) {
- listOfEntries.add(it.next().getName());
+ for (DirectoryListingEntry directoryListingEntry : getChmDirList().getDirectoryListingEntryList()) {
+ listOfEntries.add(directoryListingEntry.getName());
}
return listOfEntries;
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java?rev=1612693&r1=1612692&r2=1612693&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java Tue Jul 22 20:15:02 2014
@@ -125,9 +125,9 @@ public class ImageMetadataExtractor {
protected void handle(Iterator<Directory> directories) throws MetadataException {
while (directories.hasNext()) {
Directory directory = directories.next();
- for (int i = 0; i < handlers.length; i++) {
- if (handlers[i].supports(directory.getClass())) {
- handlers[i].handle(directory, metadata);
+ for (DirectoryHandler handler : handlers) {
+ if (handler.supports(directory.getClass())) {
+ handler.handle(directory, metadata);
}
}
}
@@ -162,9 +162,7 @@ public class ImageMetadataExtractor {
public void handle(Directory directory, Metadata metadata)
throws MetadataException {
if (directory.getTags() != null) {
- Iterator<?> tags = directory.getTags().iterator();
- while (tags.hasNext()) {
- Tag tag = (Tag) tags.next();
+ for (Tag tag : directory.getTags()) {
metadata.set(tag.getTagName(), tag.getDescription());
}
}
@@ -183,9 +181,7 @@ public class ImageMetadataExtractor {
public void handle(Directory directory, Metadata metadata)
throws MetadataException {
if (directory.getTags() != null) {
- Iterator<?> tags = directory.getTags().iterator();
- while (tags.hasNext()) {
- Tag tag = (Tag) tags.next();
+ for (Tag tag : directory.getTags()) {
String name = tag.getTagName();
if (!MetadataFields.isMetadataField(name) && tag.getDescription() != null) {
String value = tag.getDescription().trim();
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java?rev=1612693&r1=1612692&r2=1612693&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java Tue Jul 22 20:15:02 2014
@@ -143,9 +143,8 @@ public class ImageParser extends Abstrac
if (names == null) {
return;
}
- int length = names.length;
- for (int i = 0; i < length; i++) {
- loadNode(metadata, imageMetadata.getAsTree(names[i]), "", false);
+ for (String name : names) {
+ loadNode(metadata, imageMetadata.getAsTree(name), "", false);
}
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java?rev=1612693&r1=1612692&r2=1612693&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/xmp/JempboxExtractor.java Tue Jul 22 20:15:02 2014
@@ -68,9 +68,8 @@ public class JempboxExtractor {
metadata.set(TikaCoreProperties.CREATOR, joinCreators(dc.getCreators()));
}
if (dc.getSubjects() != null && dc.getSubjects().size() > 0) {
- Iterator<String> keywords = dc.getSubjects().iterator();
- while (keywords.hasNext()) {
- metadata.add(TikaCoreProperties.KEYWORDS, keywords.next());
+ for (String keyword : dc.getSubjects()) {
+ metadata.add(TikaCoreProperties.KEYWORDS, keyword);
}
// TODO should we set KEYWORDS too?
// All tested photo managers set the same in Iptc.Application2.Keywords and Xmp.dc.subject
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java?rev=1612693&r1=1612692&r2=1612693&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/MailContentHandler.java Tue Jul 22 20:15:02 2014
@@ -26,11 +26,7 @@ import org.apache.james.mime4j.dom.addre
import org.apache.james.mime4j.dom.address.AddressList;
import org.apache.james.mime4j.dom.address.Mailbox;
import org.apache.james.mime4j.dom.address.MailboxList;
-import org.apache.james.mime4j.dom.field.AddressListField;
-import org.apache.james.mime4j.dom.field.DateTimeField;
-import org.apache.james.mime4j.dom.field.MailboxListField;
-import org.apache.james.mime4j.dom.field.ParsedField;
-import org.apache.james.mime4j.dom.field.UnstructuredField;
+import org.apache.james.mime4j.dom.field.*;
import org.apache.james.mime4j.field.LenientFieldParser;
import org.apache.james.mime4j.parser.ContentHandler;
import org.apache.james.mime4j.stream.BodyDescriptor;
@@ -164,8 +160,8 @@ class MailContentHandler implements Cont
MailboxListField fromField = (MailboxListField) parsedField;
MailboxList mailboxList = fromField.getMailboxList();
if (fromField.isValidField() && mailboxList != null) {
- for (int i = 0; i < mailboxList.size(); i++) {
- String from = getDisplayString(mailboxList.get(i));
+ for (Address address : mailboxList) {
+ String from = getDisplayString(address);
metadata.add(Metadata.MESSAGE_FROM, from);
metadata.add(TikaCoreProperties.CREATOR, from);
}
@@ -205,8 +201,8 @@ class MailContentHandler implements Cont
AddressListField toField = (AddressListField) field;
if (toField.isValidField()) {
AddressList addressList = toField.getAddressList();
- for (int i = 0; i < addressList.size(); ++i) {
- metadata.add(metadataField, getDisplayString(addressList.get(i)));
+ for (Address address : addressList) {
+ metadata.add(metadataField, getDisplayString(address));
}
} else {
String to = stripOutFieldPrefix(field,
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java?rev=1612693&r1=1612692&r2=1612693&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java Tue Jul 22 20:15:02 2014
@@ -174,11 +174,10 @@ public class HSLFExtractor extends Abstr
}
xhtml.startElement("div", "class", "slide-master-content");
- for (int i = 0; i < shapes.length; i++){
- Shape sh = shapes[i];
- if (sh != null && ! MasterSheet.isPlaceholder(sh)){
- if (sh instanceof TextShape){
- TextShape tsh = (TextShape)sh;
+ for (Shape shape : shapes){
+ if (shape != null && ! MasterSheet.isPlaceholder(shape)){
+ if (shape instanceof TextShape){
+ TextShape tsh = (TextShape)shape;
String text = tsh.getText();
if (text != null){
xhtml.element("p", text);
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java?rev=1612693&r1=1612692&r2=1612693&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java Tue Jul 22 20:15:02 2014
@@ -124,22 +124,17 @@ public class NetCDFParser extends Abstra
xhtml.characters(" ");
xhtml.characters(var.getNameAndDimensions()); //variable name and dimensions
xhtml.characters(";");
- //xhtml.newline();
xhtml.newline();
-
- List<Attribute> list = (var.getAttributes()); //list of variable attributes
-
- for(int i=0; i < list.size(); i++){
-
- Attribute element = (list.get(i));
- String text = element.toString();
-
- xhtml.characters(" :");
- xhtml.characters(text);
- xhtml.characters(";");
- xhtml.newline();
- }
+
+ for(Attribute element : var.getAttributes()){
+ String text = element.toString();
+
+ xhtml.characters(" :");
+ xhtml.characters(text);
+ xhtml.characters(";");
+ xhtml.newline();
+ }
}
xhtml.endDocument();
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=1612693&r1=1612692&r2=1612693&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 20:15:02 2014
@@ -546,8 +546,8 @@ public class CharsetDetector {
String[] charsetNames = new String [recognizers.size()];
int out = 0;
- for (int i = 0; i < recognizers.size(); i++) {
- String name = recognizers.get(i).getName();
+ for (CharsetRecognizer recognizer : recognizers) {
+ String name = recognizer.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=1612693&r1=1612692&r2=1612693&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 20:15:02 2014
@@ -1284,12 +1284,11 @@ abstract class CharsetRecog_sbcs extends
ByteBuffer resultBuffer;
byte unshapedLamAlef[] = {(byte)0xb1, (byte)0x56};
-
- for (int i=0; i<inputBytes.length; i++){
- if (isLamAlef(inputBytes[i]))
+ for (byte inputByte : inputBytes){
+ if (isLamAlef(inputByte))
resultBigBuffer.put(unshapedLamAlef);
else
- resultBigBuffer.put(inputBytes[i]);
+ resultBigBuffer.put(inputByte);
}
resultBuffer = ByteBuffer.allocate(resultBigBuffer.position());
resultBuffer.put(resultBigBuffer.array(),0, resultBigBuffer.position());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java?rev=1612693&r1=1612692&r2=1612693&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java Tue Jul 22 20:15:02 2014
@@ -107,9 +107,7 @@ public class TestChmBlockInfo {
@Test
public void testGetChmBlockInfo() {
- for (Iterator<DirectoryListingEntry> it = chmDirListCont
- .getDirectoryListingEntryList().iterator(); it.hasNext();) {
- DirectoryListingEntry directoryListingEntry = it.next();
+ for (DirectoryListingEntry directoryListingEntry : chmDirListCont.getDirectoryListingEntryList()) {
chmBlockInfo = ChmBlockInfo.getChmBlockInfoInstance(
directoryListingEntry, (int) clrt.getBlockLen(),
chmLzxcControlData);
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtractor.java?rev=1612693&r1=1612692&r2=1612693&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtractor.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtractor.java Tue Jul 22 20:15:02 2014
@@ -55,9 +55,8 @@ public class TestChmExtractor {
public void testExtractChmEntry() throws TikaException{
ChmDirectoryListingSet entries = chmExtractor.getChmDirList();
int count = 0;
- for (Iterator<DirectoryListingEntry> it = entries
- .getDirectoryListingEntryList().iterator(); it.hasNext();) {
- chmExtractor.extractChmEntry(it.next());
+ for (DirectoryListingEntry directoryListingEntry : entries.getDirectoryListingEntryList()) {
+ chmExtractor.extractChmEntry(directoryListingEntry);
++count;
}
assertEquals(TestParameters.VP_CHM_ENTITIES_NUMBER, count);