For places where an ordered collection is created and used within the context of...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1613186 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java
index 6ddda437d1dfae5e6079151baf715b745dd2a6a5..b1f70dbca2473f5aa4721bdfd363d6b024d68485 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java
@@ -17,8 +17,8 @@
 
 package org.apache.poi.xssf.usermodel;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 import org.apache.poi.POIXMLDocumentPart;
 import org.apache.poi.util.Internal;
@@ -41,12 +41,9 @@ import org.w3c.dom.Node;
 
 
 public class XSSFMap {
-
     private CTMap ctMap;
-
     private MapInfo mapInfo;
 
-
     public XSSFMap(CTMap ctMap, MapInfo mapInfo) {
         this.ctMap = ctMap;
         this.mapInfo = mapInfo;
@@ -58,7 +55,6 @@ public class XSSFMap {
         return ctMap;
     }
 
-
     @Internal
     public CTSchema getCTSchema() {
         String schemaId = ctMap.getSchemaID();
@@ -78,7 +74,7 @@ public class XSSFMap {
      * @return the list of Single Xml Cells that provide a map rule to this mapping.
      */
     public List<XSSFSingleXmlCell> getRelatedSingleXMLCell() {
-        List<XSSFSingleXmlCell> relatedSimpleXmlCells = new Vector<XSSFSingleXmlCell>();
+        List<XSSFSingleXmlCell> relatedSimpleXmlCells = new ArrayList<XSSFSingleXmlCell>();
 
         int sheetNumber = mapInfo.getWorkbook().getNumberOfSheets();
         for (int i = 0; i < sheetNumber; i++) {
@@ -102,7 +98,7 @@ public class XSSFMap {
      */
     public List<XSSFTable> getRelatedTables() {
 
-        List<XSSFTable> tables = new Vector<XSSFTable>();
+        List<XSSFTable> tables = new ArrayList<XSSFTable>();
         int sheetNumber = mapInfo.getWorkbook().getNumberOfSheets();
 
         for (int i = 0; i < sheetNumber; i++) {

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
index 9d7e4e77b8e1335f696eb17b86c896795bcc6555..ed1d9a27c54d909349b3f1b247c2070e3818e420 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
@@ -20,9 +20,9 @@ package org.apache.poi.xssf.usermodel;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Vector;
 
 import org.apache.poi.POIXMLDocumentPart;
 import org.apache.poi.openxml4j.opc.PackagePart;
@@ -176,9 +176,9 @@ public class XSSFTable extends POIXMLDocumentPart {
        public List<XSSFXmlColumnPr> getXmlColumnPrs() {
                
                if(xmlColumnPr==null){
-                       xmlColumnPr = new Vector<XSSFXmlColumnPr>();
-                       for(CTTableColumn column:ctTable.getTableColumns().getTableColumnList()){
-                               if(column.getXmlColumnPr()!=null){
+                       xmlColumnPr = new ArrayList<XSSFXmlColumnPr>();
+                       for (CTTableColumn column:ctTable.getTableColumns().getTableColumnList()){
+                               if (column.getXmlColumnPr()!=null){
                                        XSSFXmlColumnPr columnPr = new XSSFXmlColumnPr(this,column,column.getXmlColumnPr());
                                        xmlColumnPr.add(columnPr);
                                }

diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java b/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
index 6983c4927f4a9627deabc1b8b76ed1c00cf59b58..e449a555e8fd3913993e781a9d497ad690c4e688 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
@@ -17,21 +17,23 @@
 
 package org.apache.poi.hslf.extractor;
 
-import java.io.*;
-import java.util.Vector;
-
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.util.LittleEndian;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 
+import org.apache.poi.hslf.model.TextRun;
 import org.apache.poi.hslf.record.CString;
 import org.apache.poi.hslf.record.Record;
 import org.apache.poi.hslf.record.RecordTypes;
 import org.apache.poi.hslf.record.StyleTextPropAtom;
-import org.apache.poi.hslf.record.TextHeaderAtom;
 import org.apache.poi.hslf.record.TextBytesAtom;
 import org.apache.poi.hslf.record.TextCharsAtom;
-import org.apache.poi.hslf.model.TextRun;
+import org.apache.poi.hslf.record.TextHeaderAtom;
+import org.apache.poi.poifs.filesystem.DocumentEntry;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.util.LittleEndian;
 
 /**
  * This class will get all the text from a Powerpoint Document, including
@@ -122,7 +124,7 @@ public final class QuickButCruddyTextExtractor {
         */
        public String getTextAsString() {
                StringBuffer ret = new StringBuffer();
-               Vector<String> textV = getTextAsVector();
+               List<String> textV = getTextAsVector();
                for(String text : textV) {
                        ret.append(text);
                        if(! text.endsWith("\n")) {
@@ -133,11 +135,11 @@ public final class QuickButCruddyTextExtractor {
        }
 
        /**
-        * Fetches the ALL the text of the powerpoint file, in a vector of
+        * Fetches the ALL the text of the powerpoint file, in a List of
         *  strings, one per text record
         */
-       public Vector<String> getTextAsVector() {
-               Vector<String> textV = new Vector<String>();
+       public List<String> getTextAsVector() {
+           List<String> textV = new ArrayList<String>();
 
                // Set to the start of the file
                int walkPos = 0;
@@ -158,7 +160,7 @@ public final class QuickButCruddyTextExtractor {
         * If it is a text record, grabs out the text. Whatever happens, returns
         *  the position of the next record, or -1 if no more.
         */
-       public int findTextRecords(int startPos, Vector<String> textV) {
+       public int findTextRecords(int startPos, List<String> textV) {
                // Grab the length, and the first option byte
                // Note that the length doesn't include the 8 byte atom header
                int len = (int)LittleEndian.getUInt(pptContents,startPos+4);

diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
index dca88b51915e89cba657a1b955289c615e29ba2e..8b8146f1324b7f7657a05a34925e4dd2b8c8ea73 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
@@ -17,18 +17,29 @@
 
 package org.apache.poi.hslf.record;
 
-import org.apache.poi.util.LittleEndian;
-import org.apache.poi.util.POILogger;
-
-import org.apache.poi.ddf.*;
-import org.apache.poi.hslf.model.ShapeTypes;
-
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Vector;
-import java.util.Iterator;
+
+import org.apache.poi.ddf.DefaultEscherRecordFactory;
+import org.apache.poi.ddf.EscherBoolProperty;
+import org.apache.poi.ddf.EscherContainerRecord;
+import org.apache.poi.ddf.EscherDgRecord;
+import org.apache.poi.ddf.EscherOptRecord;
+import org.apache.poi.ddf.EscherProperties;
+import org.apache.poi.ddf.EscherRGBProperty;
+import org.apache.poi.ddf.EscherRecord;
+import org.apache.poi.ddf.EscherSimpleProperty;
+import org.apache.poi.ddf.EscherSpRecord;
+import org.apache.poi.ddf.EscherSpgrRecord;
+import org.apache.poi.ddf.EscherTextboxRecord;
+import org.apache.poi.ddf.UnknownEscherRecord;
+import org.apache.poi.hslf.model.ShapeTypes;
+import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.POILogger;
 
 /**
  * These are actually wrappers onto Escher drawings. Make use of
@@ -38,8 +49,6 @@ import java.util.Iterator;
  *  (msofbtClientTextbox) records.
  * Also provides easy access to the EscherTextboxRecords, so that their
  *  text may be extracted and used in Sheets
- *
- * @author Nick Burch
  */
 
 // For now, pretending to be an atom. Might not always be, but that
@@ -84,7 +93,7 @@ public final class PPDrawing extends RecordAtom {
 
                // Build up a tree of Escher records contained within
                final DefaultEscherRecordFactory erf = new DefaultEscherRecordFactory();
-               final Vector<EscherRecord> escherChildren = new Vector<EscherRecord>();
+               final List<EscherRecord> escherChildren = new ArrayList<EscherRecord>();
                findEscherChildren(erf, contents, 8, len-8, escherChildren);
                this.childRecords = (EscherRecord[]) escherChildren.toArray(new EscherRecord[escherChildren.size()]);
 
@@ -92,7 +101,7 @@ public final class PPDrawing extends RecordAtom {
                        this.textboxWrappers = findInDgContainer((EscherContainerRecord) this.childRecords[0]);
                } else {
                        // Find and EscherTextboxRecord's, and wrap them up
-                       final Vector<EscherTextboxWrapper> textboxes = new Vector<EscherTextboxWrapper>();
+                       final List<EscherTextboxWrapper> textboxes = new ArrayList<EscherTextboxWrapper>();
                        findEscherTextboxRecord(childRecords, textboxes);
                        this.textboxWrappers = (EscherTextboxWrapper[]) textboxes.toArray(new EscherTextboxWrapper[textboxes.size()]);
                }
@@ -159,7 +168,7 @@ public final class PPDrawing extends RecordAtom {
        /**
         * Tree walking way of finding Escher Child Records
         */
-       private void findEscherChildren(DefaultEscherRecordFactory erf, byte[] source, int startPos, int lenToGo, Vector<EscherRecord> found) {
+       private void findEscherChildren(DefaultEscherRecordFactory erf, byte[] source, int startPos, int lenToGo, List<EscherRecord> found) {
 
                int escherBytes = LittleEndian.getInt( source, startPos + 4 ) + 8;
 
@@ -196,7 +205,7 @@ public final class PPDrawing extends RecordAtom {
        /**
         * Look for EscherTextboxRecords
         */
-       private void findEscherTextboxRecord(EscherRecord[] toSearch, Vector<EscherTextboxWrapper> found) {
+       private void findEscherTextboxRecord(EscherRecord[] toSearch, List<EscherTextboxWrapper> found) {
                for(int i=0; i<toSearch.length; i++) {
                        if(toSearch[i] instanceof EscherTextboxRecord) {
                                EscherTextboxRecord tbr = (EscherTextboxRecord)toSearch[i];

diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java b/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
index d15944502fc2e63048abfda81ec4c125c5e05ca7..315455d90c3b83290251c3d2a8dda6644e7a8b71 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
@@ -19,7 +19,8 @@ package org.apache.poi.hslf.record;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.poi.util.LittleEndian;
 
@@ -82,7 +83,7 @@ public final class SlideListWithText extends RecordContainer {
                // Group our children together into SlideAtomsSets
                // That way, model layer code can just grab the sets to use,
                //  without having to try to match the children together
-               Vector<SlideAtomsSet> sets = new Vector<SlideAtomsSet>();
+               List<SlideAtomsSet> sets = new ArrayList<SlideAtomsSet>();
                for(int i=0; i<_children.length; i++) {
                        if(_children[i] instanceof SlidePersistAtom) {
                                // Find where the next SlidePersistAtom is
@@ -107,7 +108,7 @@ public final class SlideListWithText extends RecordContainer {
                        }
                }
 
-               // Turn the vector into an array
+               // Turn the list into an array
                slideAtomsSets = sets.toArray( new SlideAtomsSet[sets.size()] );
        }
 

diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
index 8b236b31eed1cd49c1a08da263f3aa8209d545bf..44263ace5c183c1e68655c0dc36cc5c3d62c5b71 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
@@ -18,8 +18,9 @@
 package org.apache.poi.hslf.extractor;
 
 
+import java.util.List;
+
 import junit.framework.TestCase;
-import java.util.Vector;
 
 import org.apache.poi.POIDataSamples;
 
@@ -64,7 +65,7 @@ public final class TestCruddyExtractor extends TestCase {
 
     public void testReadAsVector() {
                // Extract the text from the file as a vector
-               Vector foundTextV = te.getTextAsVector();
+               List<String> foundTextV = te.getTextAsVector();
 
                // Ensure they match
                assertEquals(allTheText.length,foundTextV.size());