From: Javen O'Neal Date: Thu, 20 Oct 2016 01:54:56 +0000 (+0000) Subject: Eclipse automated refactor/cleanup: convert for loops to for-each loops X-Git-Tag: REL_3_16_BETA1~69 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f14210b101b707b4ce09d87a1d0720ac0c696caf;p=poi.git Eclipse automated refactor/cleanup: convert for loops to for-each loops git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1765736 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/poi/util/StringUtil.java b/src/java/org/apache/poi/util/StringUtil.java index 2b8c81fdd1..20a6824c9b 100644 --- a/src/java/org/apache/poi/util/StringUtil.java +++ b/src/java/org/apache/poi/util/StringUtil.java @@ -577,7 +577,7 @@ public class StringUtil { // Could be replaced with org.apache.commons.lang3.StringUtils#join @Internal public static String join(Object[] array, String separator) { - if (array.length == 0) return ""; + if (array == null || array.length == 0) return ""; StringBuilder sb = new StringBuilder(); sb.append(array[0]); for (int i=1; i lst = new ArrayList(); Record[] coreRecs = _ppt.getMostRecentCoreRecords(); - for (int i = 0; i < coreRecs.length; i++) { - Record coreRec = coreRecs[i]; + for (final Record coreRec : coreRecs) { if(coreRec.getRecordType() == RecordTypes.MainMaster.typeID){ Record[] recs = coreRec.getChildRecords(); int cnt = 0; - for (int j = 0; j < recs.length; j++) { - Record rec = recs[j]; + for (final Record rec : recs) { if (rec instanceof TxMasterStyleAtom) { lst.add((TxMasterStyleAtom) rec); cnt++; @@ -221,10 +219,10 @@ public final class TestTxMasterStyleAtom extends TestCase { TxMasterStyleAtom txstyle = null; Document doc = (Document)coreRec; Record[] rec = doc.getEnvironment().getChildRecords(); - for (int j = 0; j < rec.length; j++) { - if (rec[j] instanceof TxMasterStyleAtom) { + for (final Record atom : rec) { + if (atom instanceof TxMasterStyleAtom) { if (txstyle != null) fail("Document.Environment must contain 1 TxMasterStyleAtom"); - txstyle = (TxMasterStyleAtom)rec[j]; + txstyle = (TxMasterStyleAtom)atom; } } if (txstyle == null) { diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java index 6cb0a76869..b707df2236 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java @@ -59,8 +59,8 @@ public final class TestRecordSetup { if(r instanceof RecordContainer) { RecordContainer rc = (RecordContainer)r; Record[] children = rc.getChildRecords(); - for(int i=0; i -1); + assertContains(extractor.getText(), "First header column!"); // Unicode doc = HWPFTestDataSamples.openSampleFile(filename5); extractor = new WordExtractor(doc); - assertEquals("This is a simple header, with a \u20ac euro symbol in it.\n\n", extractor - .getHeaderText()); - text = extractor.getText(); - assertTrue(text.indexOf("This is a simple header") > -1); + assertEquals("This is a simple header, with a \u20ac euro symbol in it.\n\n", extractor.getHeaderText()); + assertContains(extractor.getText(), "This is a simple header"); } public void testWithFooter() { @@ -209,31 +216,21 @@ public final class TestWordExtractor extends TestCase { extractor = new WordExtractor(doc); assertEquals("Footer Left\tFooter Middle Footer Right\n", extractor.getFooterText()); - - String text = extractor.getText(); - assertTrue(text.indexOf("Footer Left") > -1); + assertContains(extractor.getText(), "Footer Left"); // Unicode doc = HWPFTestDataSamples.openSampleFile(filename5); extractor = new WordExtractor(doc); - assertEquals("The footer, with Moli\u00e8re, has Unicode in it.\n", extractor - .getFooterText()); - text = extractor.getText(); - assertTrue(text.indexOf("The footer, with") > -1); + assertEquals("The footer, with Moli\u00e8re, has Unicode in it.\n", extractor.getFooterText()); + assertContains(extractor.getText(), "The footer, with"); } public void testFootnote() { HWPFDocument doc = HWPFTestDataSamples.openSampleFile(filename6); extractor = new WordExtractor(doc); - String[] text = extractor.getFootnoteText(); - StringBuffer b = new StringBuffer(); - for (int i = 0; i < text.length; i++) { - b.append(text[i]); - } - - assertTrue(b.toString().contains("TestFootnote")); + assertExtractedContains(extractor.getFootnoteText(), "TestFootnote"); assertEquals(0x00, doc.getRange().getSection(0).getFootnoteNumberingFormat()); // msonfcArabic assertEquals(0x00, doc.getRange().getSection(0).getFootnoteRestartQualifier()); // rncCont assertEquals(0, doc.getRange().getSection(0).getFootnoteNumberingOffset()); @@ -244,13 +241,7 @@ public final class TestWordExtractor extends TestCase { HWPFDocument doc = HWPFTestDataSamples.openSampleFile(filename6); extractor = new WordExtractor(doc); - String[] text = extractor.getEndnoteText(); - StringBuffer b = new StringBuffer(); - for (int i = 0; i < text.length; i++) { - b.append(text[i]); - } - - assertTrue(b.toString().contains("TestEndnote")); + assertExtractedContains(extractor.getEndnoteText(), "TestEndnote"); assertEquals(0x02, doc.getRange().getSection(0).getEndnoteNumberingFormat()); // msonfcLCRoman assertEquals(0x00, doc.getRange().getSection(0).getEndnoteRestartQualifier()); // rncCont assertEquals(0, doc.getRange().getSection(0).getEndnoteNumberingOffset()); @@ -261,13 +252,7 @@ public final class TestWordExtractor extends TestCase { HWPFDocument doc = HWPFTestDataSamples.openSampleFile(filename6); extractor = new WordExtractor(doc); - String[] text = extractor.getCommentsText(); - StringBuffer b = new StringBuffer(); - for (int i = 0; i < text.length; i++) { - b.append(text[i]); - } - - assertTrue(b.toString().contains("TestComment")); + assertExtractedContains(extractor.getCommentsText(), "TestComment"); } public void testWord95() throws Exception { @@ -330,6 +315,8 @@ public final class TestWordExtractor extends TestCase { String text = extractor.getText(); assertTrue(text.contains("\u0425\u0425\u0425\u0425\u0425")); assertTrue(text.contains("\u0423\u0423\u0423\u0423\u0423")); + + extractor.close(); } public void testFirstParagraphFix() throws Exception { @@ -351,7 +338,8 @@ public final class TestWordExtractor extends TestCase { // Open the two filesystems DirectoryNode[] files = new DirectoryNode[2]; - files[0] = (new POIFSFileSystem(docTests.openResourceAsStream("test2.doc"))).getRoot(); + POIFSFileSystem poifs = new POIFSFileSystem(docTests.openResourceAsStream("test2.doc")); + files[0] = poifs.getRoot(); NPOIFSFileSystem npoifsFileSystem = new NPOIFSFileSystem(docTests.getFile("test2.doc")); files[1] = npoifsFileSystem.getRoot(); @@ -368,6 +356,7 @@ public final class TestWordExtractor extends TestCase { assertEquals(p_text1_block, extractor.getText()); } + poifs.close(); npoifsFileSystem.close(); } @@ -407,10 +396,10 @@ public final class TestWordExtractor extends TestCase { try { // Now overall String text = ext.getText(); - assertTrue(text.indexOf("TEMPLATE = Normal") > -1); - assertTrue(text.indexOf("SUBJECT = sample subject") > -1); - assertTrue(text.indexOf("MANAGER = sample manager") > -1); - assertTrue(text.indexOf("COMPANY = sample company") > -1); + assertContains(text, "TEMPLATE = Normal"); + assertContains(text, "SUBJECT = sample subject"); + assertContains(text, "MANAGER = sample manager"); + assertContains(text, "COMPANY = sample company"); } finally { ext.close(); } diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java b/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java index 1312cf8aa3..ffcaa3a799 100644 --- a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java +++ b/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java @@ -699,11 +699,11 @@ public class TestWrite return f.getName().startsWith("Test") && TestReadAllFiles.checkExclude(f); } }); - for (int i = 0; i < fileList.length; i++) { + for (final File file : fileList) { try { - testRecreate(fileList[i]); + testRecreate(file); } catch (Exception e) { - throw new IOException("While handling file " + fileList[i], e); + throw new IOException("While handling file " + file, e); } } } @@ -729,10 +729,9 @@ public class TestWrite copy.deleteOnExit(); final OutputStream out = new FileOutputStream(copy); final POIFSFileSystem poiFs = new POIFSFileSystem(); - for (int i = 0; i < psf1.length; i++) - { + for (POIFile file : psf1) { final InputStream in = - new ByteArrayInputStream(psf1[i].getBytes()); + new ByteArrayInputStream(file.getBytes()); final PropertySet psIn = PropertySetFactory.create(in); final MutablePropertySet psOut = new MutablePropertySet(psIn); final ByteArrayOutputStream psStream = @@ -741,7 +740,7 @@ public class TestWrite psStream.close(); final byte[] streamData = psStream.toByteArray(); poiFs.createDocument(new ByteArrayInputStream(streamData), - psf1[i].getName()); + file.getName()); poiFs.writeFilesystem(out); } poiFs.close(); diff --git a/src/testcases/org/apache/poi/hpsf/basic/Util.java b/src/testcases/org/apache/poi/hpsf/basic/Util.java index 299f69797a..668b1858ad 100644 --- a/src/testcases/org/apache/poi/hpsf/basic/Util.java +++ b/src/testcases/org/apache/poi/hpsf/basic/Util.java @@ -28,7 +28,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Properties; @@ -252,8 +251,8 @@ final class Util { { final Properties p = System.getProperties(); final List names = new LinkedList(); - for (Iterator i = p.stringPropertyNames().iterator(); i.hasNext();) - names.add(i.next()); + for (String name : p.stringPropertyNames()) + names.add(name); Collections.sort(names); for (String name : names) { String value = p.getProperty(name); diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java b/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java index c57eee387d..eaf4b52c11 100644 --- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java +++ b/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java @@ -211,9 +211,9 @@ public final class TestMissingRecordAwareHSSFListener extends TestCase { // Check the numbers of the last seen columns LastCellOfRowDummyRecord[] lrs = new LastCellOfRowDummyRecord[24]; int lrscount = 0; - for(int i=0; idx2. It doesn't make sense for client anchors.) */ public void testConvertAnchor() { - HSSFClientAnchor[] anchor = { + HSSFClientAnchor[] anchors = { new HSSFClientAnchor( 0 , 0 , 0 , 0 ,(short)0, 1,(short)1,3), new HSSFClientAnchor( 100 , 0 , 900 , 255 ,(short)0, 1,(short)1,3), new HSSFClientAnchor( 900 , 0 , 100 , 255 ,(short)0, 1,(short)1,3) }; - for (int i = 0; i < anchor.length; i++) { - EscherClientAnchorRecord record = (EscherClientAnchorRecord)ConvertAnchor.createAnchor(anchor[i]); - assertEquals(anchor[i].getDx1(), record.getDx1()); - assertEquals(anchor[i].getDx2(), record.getDx2()); - assertEquals(anchor[i].getDy1(), record.getDy1()); - assertEquals(anchor[i].getDy2(), record.getDy2()); - assertEquals(anchor[i].getCol1(), record.getCol1()); - assertEquals(anchor[i].getCol2(), record.getCol2()); - assertEquals(anchor[i].getRow1(), record.getRow1()); - assertEquals(anchor[i].getRow2(), record.getRow2()); + for (HSSFClientAnchor anchor : anchors) { + EscherClientAnchorRecord record = (EscherClientAnchorRecord)ConvertAnchor.createAnchor(anchor); + assertEquals(anchor.getDx1(), record.getDx1()); + assertEquals(anchor.getDx2(), record.getDx2()); + assertEquals(anchor.getDy1(), record.getDy1()); + assertEquals(anchor.getDy2(), record.getDy2()); + assertEquals(anchor.getCol1(), record.getCol1()); + assertEquals(anchor.getCol2(), record.getCol2()); + assertEquals(anchor.getRow1(), record.getRow1()); + assertEquals(anchor.getRow2(), record.getRow2()); } } diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java index b9ff69543a..6c6631a9b1 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java @@ -20,7 +20,6 @@ package org.apache.poi.hssf.usermodel; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.util.Iterator; import java.util.List; import javax.imageio.ImageIO; @@ -46,8 +45,7 @@ public final class TestHSSFPictureData extends TestCase{ List lst = (List)(List)wb.getAllPictures(); //assertEquals(2, lst.size()); - for (Iterator it = lst.iterator(); it.hasNext(); ) { - HSSFPictureData pict = (HSSFPictureData)it.next(); + for (final HSSFPictureData pict : lst) { String ext = pict.suggestFileExtension(); byte[] data = pict.getData(); if (ext.equals("jpeg")){ diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java b/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java index 6aebd7488d..bbe1e39f6f 100644 --- a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java @@ -340,10 +340,9 @@ public final class TestDocumentInputStream extends TestCase { while (stream.available() >= buffer.length) { assertEquals(_buffer_size, stream.read(buffer)); - for (int j = 0; j < buffer.length; j++) - { + for (byte data : buffer) { assertEquals("in main loop, byte " + offset, - _workbook_data[ offset ], buffer[ j ]); + _workbook_data[ offset ], data); offset++; } assertEquals("offset " + offset, _workbook_size - offset, diff --git a/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java b/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java index a2ff6ceb1f..2d6ef1845c 100644 --- a/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java +++ b/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java @@ -213,10 +213,9 @@ public final class TestSmallDocumentBlock extends TestCase { assertEquals("testing block at offset " + offset, 64, out_data.length); - for (int j = 0; j < out_data.length; j++) - { + for (byte b : out_data) { assertEquals("testing byte at offset " + offset, - data[ offset ], out_data[ j ]); + data[ offset ], b); offset++; } } diff --git a/src/testcases/org/apache/poi/util/TestByteField.java b/src/testcases/org/apache/poi/util/TestByteField.java index 2c3c4996d7..ca2a1495f2 100644 --- a/src/testcases/org/apache/poi/util/TestByteField.java +++ b/src/testcases/org/apache/poi/util/TestByteField.java @@ -87,11 +87,10 @@ public final class TestByteField extends TestCase { // as expected } - for (int j = 0; j < _test_array.length; j++) - { + for (byte b : _test_array) { array = new byte[ 1 ]; - new ByteField(0, _test_array[ j ], array); - assertEquals(_test_array[ j ], new ByteField(0, array).get()); + new ByteField(0, b, array); + assertEquals(b, new ByteField(0, array).get()); } } @@ -151,11 +150,10 @@ public final class TestByteField extends TestCase { ByteField field = new ByteField(0); byte[] array = new byte[ 1 ]; - for (int j = 0; j < _test_array.length; j++) - { - field.set(_test_array[ j ]); + for (byte b : _test_array) { + field.set(b); field.writeToBytes(array); - assertEquals("testing ", _test_array[ j ], array[ 0 ]); + assertEquals("testing ", b, array[ 0 ]); } } } diff --git a/src/testcases/org/apache/poi/util/TestIntList.java b/src/testcases/org/apache/poi/util/TestIntList.java index 1037c2eaf3..abf50158bc 100644 --- a/src/testcases/org/apache/poi/util/TestIntList.java +++ b/src/testcases/org/apache/poi/util/TestIntList.java @@ -47,9 +47,8 @@ public final class TestIntList extends TestCase { 0, 1, 2, 3, 5 }; - for (int j = 0; j < testArray.length; j++) - { - list.add(testArray[ j ]); + for (int element : testArray) { + list.add(element); } for (int j = 0; j < testArray.length; j++) { diff --git a/src/testcases/org/apache/poi/util/TestIntegerField.java b/src/testcases/org/apache/poi/util/TestIntegerField.java index a26f09cca0..228d398ea2 100644 --- a/src/testcases/org/apache/poi/util/TestIntegerField.java +++ b/src/testcases/org/apache/poi/util/TestIntegerField.java @@ -89,11 +89,10 @@ public final class TestIntegerField extends TestCase { // as expected } - for (int j = 0; j < _test_array.length; j++) - { + for (int element : _test_array) { array = new byte[ 4 ]; - new IntegerField(0, _test_array[ j ], array); - assertEquals(_test_array[ j ], new IntegerField(0, array).get()); + new IntegerField(0, element, array); + assertEquals(element, new IntegerField(0, array).get()); } } @@ -172,9 +171,8 @@ public final class TestIntegerField extends TestCase { IntegerField field = new IntegerField(0); byte[] array = new byte[ 4 ]; - for (int j = 0; j < _test_array.length; j++) - { - field.set(_test_array[ j ]); + for (int b : _test_array) { + field.set(b); field.writeToBytes(array); int val = array[ 3 ] << 24; @@ -182,7 +180,7 @@ public final class TestIntegerField extends TestCase { val += (array[ 2 ] << 16) & 0x00FF0000; val += (array[ 1 ] << 8) & 0x0000FF00; val += (array[ 0 ] & 0x000000FF); - assertEquals("testing ", _test_array[ j ], val); + assertEquals("testing ", b, val); } } } diff --git a/src/testcases/org/apache/poi/util/TestLongField.java b/src/testcases/org/apache/poi/util/TestLongField.java index a37e88ed3b..f613bae1c9 100644 --- a/src/testcases/org/apache/poi/util/TestLongField.java +++ b/src/testcases/org/apache/poi/util/TestLongField.java @@ -93,11 +93,10 @@ public final class TestLongField extends TestCase { // as expected } - for (int j = 0; j < _test_array.length; j++) - { + for (long element : _test_array) { array = new byte[ 8 ]; - new LongField(0, _test_array[ j ], array); - assertEquals(_test_array[ j ], new LongField(0, array).get()); + new LongField(0, element, array); + assertEquals(element, new LongField(0, array).get()); } } @@ -201,9 +200,8 @@ public final class TestLongField extends TestCase { LongField field = new LongField(0); byte[] array = new byte[ 8 ]; - for (int j = 0; j < _test_array.length; j++) - { - field.set(_test_array[ j ]); + for (long element : _test_array) { + field.set(element); field.writeToBytes(array); long val = (( long ) array[ 7 ]) << 56; @@ -215,7 +213,7 @@ public final class TestLongField extends TestCase { val += ((( long ) array[ 2 ]) << 16) & 0x0000000000FF0000L; val += ((( long ) array[ 1 ]) << 8) & 0x000000000000FF00L; val += (array[ 0 ] & 0x00000000000000FFL); - assertEquals("testing ", _test_array[ j ], val); + assertEquals("testing ", element, val); } } } diff --git a/src/testcases/org/apache/poi/util/TestShortField.java b/src/testcases/org/apache/poi/util/TestShortField.java index dd93c1a48d..9e1fec64b5 100644 --- a/src/testcases/org/apache/poi/util/TestShortField.java +++ b/src/testcases/org/apache/poi/util/TestShortField.java @@ -87,11 +87,10 @@ public final class TestShortField extends TestCase { // as expected } - for (int j = 0; j < _test_array.length; j++) - { + for (short element : _test_array) { array = new byte[ 2 ]; - new ShortField(0, _test_array[ j ], array); - assertEquals(_test_array[ j ], new ShortField(0, array).get()); + new ShortField(0, element, array); + assertEquals(element, new ShortField(0, array).get()); } } @@ -160,15 +159,14 @@ public final class TestShortField extends TestCase { ShortField field = new ShortField(0); byte[] array = new byte[ 2 ]; - for (int j = 0; j < _test_array.length; j++) - { - field.set(_test_array[ j ]); + for (short element : _test_array) { + field.set(element); field.writeToBytes(array); short val = ( short ) (array[ 1 ] << 8); val &= ( short ) 0xFF00; val += ( short ) (array[ 0 ] & 0x00FF); - assertEquals("testing ", _test_array[ j ], val); + assertEquals("testing ", element, val); } } } diff --git a/src/testcases/org/apache/poi/util/TestStringUtil.java b/src/testcases/org/apache/poi/util/TestStringUtil.java index 122ec408d9..ec9792a259 100644 --- a/src/testcases/org/apache/poi/util/TestStringUtil.java +++ b/src/testcases/org/apache/poi/util/TestStringUtil.java @@ -191,6 +191,10 @@ public class TestStringUtil { assertEquals("abc", StringUtil.join(",", "abc")); // degenerate case: one thing to join, no trailing comma assertEquals("abc|def|ghi", StringUtil.join("|", "abc", "def", "ghi")); assertEquals("5|8.5|true|string", StringUtil.join("|", 5, 8.5, true, "string")); //assumes Locale prints number decimal point as a period rather than a comma + + String[] arr = new String[] { "Apache", "POI", "project" }; + assertEquals("no separator", "ApachePOIproject", StringUtil.join(arr)); + assertEquals("separator", "Apache POI project", StringUtil.join(arr, " ")); } @Test