diff options
Diffstat (limited to 'xmerge/source/xmerge')
22 files changed, 207 insertions, 226 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java index 0f2e98546c0d..1629f768b9dc 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java @@ -18,9 +18,9 @@ package org.openoffice.xmerge; -import java.io.InputStream; import java.io.IOException; -import java.util.Enumeration; +import java.io.InputStream; +import java.util.Iterator; import org.openoffice.xmerge.util.registry.ConverterInfo; @@ -212,9 +212,9 @@ public class Convert implements Cloneable { DocumentSerializerFactory myDocSerializerFactory = ci.getDocSerializerFactory(); - Enumeration e = inputCD.getDocumentEnumeration(); + Iterator e = inputCD.getDocumentEnumeration(); - Document doc = (Document) e.nextElement(); + Document doc = (Document) e.next(); DocumentSerializer ser = myDocSerializerFactory.createDocumentSerializer(doc); dataOut = ser.serialize(); @@ -266,9 +266,9 @@ public class Convert implements Cloneable { DocumentSerializerFactory myDocSerializerFactory = ci.getDocSerializerFactory(); - Enumeration e = inputCD.getDocumentEnumeration(); + Iterator e = inputCD.getDocumentEnumeration(); - Document doc = (Document) e.nextElement(); + Document doc = (Document) e.next(); DocumentSerializer ser = myDocSerializerFactory.createDocumentSerializer(doc); dataOut = ser instanceof DocumentSerializer2 ? ((DocumentSerializer2) ser).serialize(sFromURL,sToURL) : diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java index 305de052cf1a..035453459d3d 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java @@ -18,8 +18,8 @@ package org.openoffice.xmerge; -import java.util.Vector; -import java.util.Enumeration; +import java.util.ArrayList; +import java.util.Iterator; /** * <p><code>ConvertData</code> is used as a container for passing @@ -34,7 +34,7 @@ public class ConvertData { /** * Vector of <code>Document</code> objects. */ - private Vector v = new Vector(); + private ArrayList v = new ArrayList(); /** * Name of the <code>ConvertData</code> object. @@ -49,7 +49,7 @@ public class ConvertData { */ public void reset() { name = null; - v.removeAllElements(); + v.clear(); } /** @@ -89,8 +89,8 @@ public class ConvertData { * @return The <code>Enumeration</code> to access the * <code>Vector</code> of <code>Document</code> objects. */ - public Enumeration getDocumentEnumeration() { - Enumeration enumerate = v.elements(); + public Iterator getDocumentEnumeration() { + Iterator enumerate = v.iterator(); return (enumerate); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java index dda143bfd667..2832a44ec37b 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java @@ -18,13 +18,14 @@ package org.openoffice.xmerge.converter.xml; -import org.w3c.dom.NodeList; -import org.w3c.dom.Node; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Element; -import org.openoffice.xmerge.util.*; -import java.util.Vector; import java.lang.reflect.Constructor; +import java.util.ArrayList; + +import org.openoffice.xmerge.util.Debug; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** @@ -41,7 +42,7 @@ import java.lang.reflect.Constructor; */ public class StyleCatalog { - private Vector styles; // The actual styles + private ArrayList styles; // The actual styles /** * Constructor @@ -50,7 +51,7 @@ public class StyleCatalog { * for efficiency purposes. */ public StyleCatalog(int initialEntries) { - styles = new Vector(initialEntries); + styles = new ArrayList(initialEntries); } @@ -159,7 +160,7 @@ public class StyleCatalog { * @param s The <code>Style</code> to add. */ public void add(Style s) { - styles.addElement(s); + styles.add(s); } @@ -182,7 +183,7 @@ public class StyleCatalog { Class styleClass) { int nStyles = styles.size(); for (int i = 0; i < nStyles; i++) { - Style s = (Style)styles.elementAt(i); + Style s = (Style)styles.get(i); if ((name != null) && (s.getName() != null) && (!s.getName().equals(name))) continue; @@ -217,7 +218,7 @@ public class StyleCatalog { int matchCount = 0; int nStyles = styles.size(); for (int j = 0; j < nStyles; j++) { - Style p = ((Style)styles.elementAt(j)).getResolved(); + Style p = ((Style)styles.get(j)).getResolved(); if (p.isSubset(s)) matchCount++; } @@ -225,7 +226,7 @@ public class StyleCatalog { Style[] matchArray = new Style[matchCount]; matchCount = 0; for (int j = 0; j < nStyles; j++) { - Style p = ((Style)styles.elementAt(j)).getResolved(); + Style p = ((Style)styles.get(j)).getResolved(); if (p.isSubset(s)) matchArray[matchCount++] = p; } return matchArray; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java index 8398af67a37d..b8f9341d33c7 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java @@ -18,16 +18,16 @@ package org.openoffice.xmerge.converter.xml.sxc; -import java.util.Vector; -import java.util.Enumeration; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.NodeList; -import org.w3c.dom.Node; -import org.w3c.dom.Element; +import java.util.ArrayList; +import java.util.Iterator; import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.XmlUtil; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * This is a class representing the different attributes for a worksheet @@ -42,7 +42,7 @@ public class BookSettings implements OfficeConstants { private boolean hasColumnRowHeaders = true; private String activeSheet = new String(); - private Vector worksheetSettings = new Vector(); + private ArrayList worksheetSettings = new ArrayList(); /** * Constructor for a <code>BookSettings</code>. Reads document settings @@ -59,7 +59,7 @@ public class BookSettings implements OfficeConstants { * * @param worksheetSettings If it's a row the height, a column the width */ - public BookSettings(Vector worksheetSettings) { + public BookSettings(ArrayList worksheetSettings) { this.worksheetSettings = worksheetSettings; } @@ -86,7 +86,7 @@ public class BookSettings implements OfficeConstants { * * @return <code>Vector</code> of <code>SheetSettings</code> */ - public Vector getSheetSettings() { + public ArrayList getSheetSettings() { return worksheetSettings; } @@ -140,8 +140,8 @@ public class BookSettings implements OfficeConstants { this.settings = settings; Element configItemMapNamed = (Element) settings.createElement(TAG_CONFIG_ITEM_MAP_NAMED); configItemMapNamed.setAttribute(ATTRIBUTE_CONFIG_NAME, "Tables"); - for(Enumeration e = worksheetSettings.elements();e.hasMoreElements();) { - SheetSettings s = (SheetSettings) e.nextElement(); + for(Iterator e = worksheetSettings.iterator();e.hasNext();) { + SheetSettings s = (SheetSettings) e.next(); s.writeNode(settings, configItemMapNamed); } addConfigItem(root, "ActiveTable", "string", activeSheet); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java index e0d037a2ca9f..fdb35ba1cc74 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java @@ -19,9 +19,8 @@ package org.openoffice.xmerge.converter.xml.sxc; import java.io.IOException; -import java.util.Enumeration; +import java.util.Iterator; -import org.openoffice.xmerge.converter.xml.sxc.Format; import org.openoffice.xmerge.ConvertData; /** @@ -50,7 +49,7 @@ public abstract class SpreadsheetDecoder { * * @return The Enumeration */ - public abstract Enumeration getNameDefinitions(); + public abstract Iterator getNameDefinitions(); /** * Returns an <code>BookSettings</code> @@ -64,7 +63,7 @@ public abstract class SpreadsheetDecoder { * * @return The Enumeration */ - public abstract Enumeration getColumnRowInfos(); + public abstract Iterator getColumnRowInfos(); /** * Returns the number of populated rows in the current WorkSheet. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java index 8b3d72e8789f..63c3cd423589 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java @@ -19,7 +19,7 @@ package org.openoffice.xmerge.converter.xml.sxc; import java.io.IOException; -import java.util.Vector; +import java.util.ArrayList; /** * <p>This class is a abstract class for encoding an SXC into an @@ -99,7 +99,7 @@ public abstract class SpreadsheetEncoder { * @param columnRows An <code>IntArrayList</code> of column * widths. */ - public abstract void setColumnRows(Vector columnRows) throws IOException; + public abstract void setColumnRows(ArrayList columnRows) throws IOException; /** * Set the name definition of this spreadsheet diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java index 34a76ef32aa8..f1119bc761e4 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java @@ -18,25 +18,21 @@ package org.openoffice.xmerge.converter.xml.sxc; -import org.w3c.dom.NodeList; -import org.w3c.dom.Node; -import org.w3c.dom.Element; - import java.io.IOException; import java.util.Enumeration; +import java.util.Iterator; -import org.openoffice.xmerge.Document; import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.ConvertException; +import org.openoffice.xmerge.Document; import org.openoffice.xmerge.DocumentDeserializer; import org.openoffice.xmerge.converter.xml.OfficeConstants; -import org.openoffice.xmerge.converter.xml.sxc.SxcDocument; -import org.openoffice.xmerge.converter.xml.sxc.BookSettings; -import org.openoffice.xmerge.converter.xml.sxc.NameDefinition; -import org.openoffice.xmerge.converter.xml.sxc.CellStyle; import org.openoffice.xmerge.converter.xml.Style; import org.openoffice.xmerge.converter.xml.StyleCatalog; import org.openoffice.xmerge.util.Debug; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * <p>General spreadsheet implementation of <code>DocumentDeserializer</code> @@ -255,8 +251,8 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants, } // Add the Defined Name table if there is one - Enumeration nameDefinitionTable = decoder.getNameDefinitions(); - if(nameDefinitionTable.hasMoreElements()) { + Iterator nameDefinitionTable = decoder.getNameDefinitions(); + if(nameDefinitionTable.hasNext()) { processNameDefinition(node, nameDefinitionTable); } @@ -304,15 +300,15 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants, * * @throws IOException If any I/O error occurs. */ - protected void processNameDefinition(Node root, Enumeration eNameDefinitions) throws IOException { + protected void processNameDefinition(Node root, Iterator eNameDefinitions) throws IOException { Debug.log(Debug.TRACE, "<NAMED-EXPRESSIONS>"); Element namedExpressionsElement = (Element) doc.createElement(TAG_NAMED_EXPRESSIONS); - while(eNameDefinitions.hasMoreElements()) { + while(eNameDefinitions.hasNext()) { - NameDefinition tableEntry = (NameDefinition) eNameDefinitions.nextElement(); + NameDefinition tableEntry = (NameDefinition) eNameDefinitions.next(); tableEntry.writeNode(doc, namedExpressionsElement); } @@ -380,9 +376,9 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants, */ protected void processColumns(Node root) throws IOException { - for(Enumeration e = decoder.getColumnRowInfos();e.hasMoreElements();) { + for(Iterator e = decoder.getColumnRowInfos();e.hasNext();) { - ColumnRowInfo ci = (ColumnRowInfo) e.nextElement(); + ColumnRowInfo ci = (ColumnRowInfo) e.next(); if(ci.isColumn()) { ColumnStyle cStyle = new ColumnStyle("Default",SxcConstants.COLUMN_STYLE_FAMILY, SxcConstants.DEFAULT_STYLE, ci.getSize(), null); @@ -486,8 +482,8 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants, rowElement = (Element) doc.createElement(TAG_TABLE_ROW); - for(Enumeration e = decoder.getColumnRowInfos();e.hasMoreElements();) { - ColumnRowInfo cri = (ColumnRowInfo) e.nextElement(); + for(Iterator e = decoder.getColumnRowInfos();e.hasNext();) { + ColumnRowInfo cri = (ColumnRowInfo) e.next(); if(cri.isRow() && cri.getRepeated()==newRow-1) { // We have the correct Row BIFFRecord for this row RowStyle rStyle = new RowStyle("Default",SxcConstants.ROW_STYLE_FAMILY, diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java index 985ccdf72123..f0a651cbbb55 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java @@ -19,28 +19,22 @@ package org.openoffice.xmerge.converter.xml.sxc; import java.awt.Color; - -import org.w3c.dom.NodeList; -import org.w3c.dom.Node; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Element; - import java.io.IOException; -import java.util.Vector; -import java.util.Enumeration; +import java.util.ArrayList; +import java.util.Iterator; -import org.openoffice.xmerge.Document; import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.ConvertException; +import org.openoffice.xmerge.Document; import org.openoffice.xmerge.DocumentSerializer; - import org.openoffice.xmerge.converter.xml.OfficeConstants; -import org.openoffice.xmerge.converter.xml.sxc.SxcDocument; -import org.openoffice.xmerge.converter.xml.sxc.CellStyle; import org.openoffice.xmerge.converter.xml.StyleCatalog; - import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.XmlUtil; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * <p>General spreadsheet implementation of <code>DocumentSerializer</code> @@ -89,7 +83,7 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, * An array of column widths of the current worksheet. Width is * measured in number of characters. */ - private Vector ColumnRowList; + private ArrayList ColumnRowList; /** Width, in characters, of the current cell display data. */ private int displayWidth = 0; @@ -308,7 +302,7 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, Debug.log(Debug.TRACE, "<TABLE>"); - ColumnRowList = new Vector(); + ColumnRowList = new ArrayList(); // Get table attributes // TODO - extract style from attribute @@ -631,8 +625,8 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, if (fmt.isDefault() && styleName.length()==0) { int index = 1; - for(Enumeration e = ColumnRowList.elements();e.hasMoreElements();) { - ColumnRowInfo cri = (ColumnRowInfo) e.nextElement(); + for(Iterator e = ColumnRowList.iterator();e.hasNext();) { + ColumnRowInfo cri = (ColumnRowInfo) e.next(); if(cri.isColumn()) { if(colID>=index && colID<(index+cri.getRepeated())) { fmt = new Format(cri.getFormat()); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java index c334119740f2..0f383062f7fc 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java @@ -18,41 +18,33 @@ package org.openoffice.xmerge.converter.xml.xslt; -import java.io.InputStream; -import java.io.IOException; -import java.util.Enumeration; -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.Iterator; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.URIResolver; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; - - -import org.openoffice.xmerge.Document; import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.ConvertException; +import org.openoffice.xmerge.Document; import org.openoffice.xmerge.DocumentDeserializer; import org.openoffice.xmerge.converter.dom.DOMDocument; -import org.openoffice.xmerge.converter.xml.xslt.GenericOfficeDocument; import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.registry.ConverterInfo; -// Imported TraX classes -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.Transformer; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; -import javax.xml.transform.URIResolver; -import javax.xml.transform.Source; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -// Imported java classes -import java.io.FileNotFoundException; - /** * <p>Xslt implementation of @@ -106,14 +98,14 @@ public final class DocumentDeserializerImpl */ public Document deserialize() throws ConvertException, IOException { log("\nFound the XSLT deserializer"); - Enumeration enumerate = cd.getDocumentEnumeration(); + Iterator enumerate = cd.getDocumentEnumeration(); org.w3c.dom.Document domDoc=null; DOMDocument docOut=null; GenericOfficeDocument doc = null; ByteArrayOutputStream baos =null; GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output"); - while (enumerate.hasMoreElements()) { - docOut = (DOMDocument) enumerate.nextElement(); + while (enumerate.hasNext()) { + docOut = (DOMDocument) enumerate.next(); } domDoc = docOut.getContentDOM(); try{ diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java index a4fd578bcf66..e7a5ed991d3c 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java @@ -18,24 +18,23 @@ package org.openoffice.xmerge.converter.xml.xslt; -import org.openoffice.xmerge.Document; +import java.io.IOException; +import java.io.InputStream; +import java.util.Iterator; +import java.util.Properties; + import org.openoffice.xmerge.ConvertData; -import org.openoffice.xmerge.DocumentSerializer; -import org.openoffice.xmerge.DocumentSerializerFactory; +import org.openoffice.xmerge.ConverterCapabilities; +import org.openoffice.xmerge.Document; import org.openoffice.xmerge.DocumentDeserializer; import org.openoffice.xmerge.DocumentDeserializerFactory; +import org.openoffice.xmerge.DocumentMerger; +import org.openoffice.xmerge.DocumentMergerFactory; +import org.openoffice.xmerge.DocumentSerializer; +import org.openoffice.xmerge.DocumentSerializerFactory; import org.openoffice.xmerge.PluginFactory; import org.openoffice.xmerge.converter.dom.DOMDocument; -import org.openoffice.xmerge.converter.xml.xslt.GenericOfficeDocument; import org.openoffice.xmerge.util.registry.ConverterInfo; -import org.openoffice.xmerge.DocumentMerger; -import org.openoffice.xmerge.DocumentMergerFactory; -import org.openoffice.xmerge.ConverterCapabilities; - -import java.io.InputStream; -import java.util.Enumeration; -import java.io.IOException; -import java.util.Properties; /** * <p>Xslt implementation of the <code>PluginFactory</code>. @@ -142,9 +141,9 @@ public final class PluginFactoryImpl extends PluginFactory String ext= ".txt"; String mimeType = null; ConverterInfo ci = this.getConverterInfo(); - Enumeration enumerate = ci.getDeviceMime(); - while (enumerate.hasMoreElements()) { - mimeType= (String) enumerate.nextElement(); + Iterator enumerate = ci.getDeviceMime(); + while (enumerate.hasNext()) { + mimeType= (String) enumerate.next(); } try { props.load(is); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java index 7d83f165da35..2ab19045f613 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java @@ -18,7 +18,7 @@ package org.openoffice.xmerge.merger.diff; -import java.util.Vector; +import java.util.ArrayList; import org.openoffice.xmerge.merger.Difference; /** @@ -54,7 +54,7 @@ public class CharArrayLCSAlgorithm { // in those 2 sequences diffTable = createDiffTable(orgSeq, modSeq); - Vector diffResult = new Vector(); + ArrayList diffResult = new ArrayList(); generateResult(diffTable, orgSeqlen, modSeqlen, diffResult); @@ -64,7 +64,7 @@ public class CharArrayLCSAlgorithm { // generateResult is called recursively if (diffResult.size() > 0) { diffArray = new Difference[diffResult.size()]; - diffResult.copyInto(diffArray); + diffResult.toArray(diffArray); } diffTable = null; @@ -154,7 +154,7 @@ public class CharArrayLCSAlgorithm { * and positions filled in. */ private void generateResult(int[][] diffTable, - int i, int j, Vector diffVector) { + int i, int j, ArrayList diffVector) { // handle the first element if (i == 0 || j == 0) { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java index 6a6f9fa6a44d..7e3775526dc1 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java @@ -22,7 +22,7 @@ import org.w3c.dom.Node; import org.openoffice.xmerge.converter.xml.OfficeConstants; -import java.util.Vector; +import java.util.ArrayList; import java.util.List; @@ -57,7 +57,7 @@ public class CharacterParser { */ public CharacterParser(Node node) { textNodes = new TextNodeIterator(node); - nodeList_ = new Vector(); + nodeList_ = new ArrayList(); parseNodes(); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java index c541b89fb4e1..3f35dcbfde30 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java @@ -18,7 +18,7 @@ package org.openoffice.xmerge.merger.diff; -import java.util.Vector; +import java.util.ArrayList; import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.Difference; import org.openoffice.xmerge.merger.Iterator; @@ -50,7 +50,7 @@ public class IteratorLCSAlgorithm implements DiffAlgorithm { printDiffTable(diffTable); } - Vector diffResult = new Vector(); + ArrayList diffResult = new ArrayList(); generateResult(diffTable, orgSeqlen, modSeqlen, diffResult); @@ -60,7 +60,7 @@ public class IteratorLCSAlgorithm implements DiffAlgorithm { // generateResult is called recursively if (diffResult.size() > 0) { diffArray = new Difference[diffResult.size()]; - diffResult.copyInto(diffArray); + diffResult.toArray(diffArray); } diffTable = null; @@ -161,7 +161,7 @@ public class IteratorLCSAlgorithm implements DiffAlgorithm { * and positions fill in. */ private void generateResult(int[][] diffTable, - int i, int j, Vector diffVector) { + int i, int j, ArrayList diffVector) { // handle the first element if (i == 0 && j == 0) { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java index 7bd32bfcd767..86140d1d7b17 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java @@ -21,7 +21,7 @@ package org.openoffice.xmerge.merger.diff; import org.w3c.dom.Node; import org.w3c.dom.Element; -import java.util.Vector; +import java.util.ArrayList; import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.Difference; import org.openoffice.xmerge.merger.Iterator; @@ -76,7 +76,7 @@ public class IteratorRowCompare implements DiffAlgorithm { int orgSeqlen = orgSeq.elementCount(); int modSeqlen = modSeq.elementCount(); - Vector diffVector = new Vector(); + ArrayList diffVector = new ArrayList(); // i and j are counters to keep track the current position in the // iterator @@ -194,7 +194,7 @@ public class IteratorRowCompare implements DiffAlgorithm { // convert the vector to array Difference[] diffArray = new Difference[diffVector.size()]; - diffVector.copyInto(diffArray); + diffVector.toArray(diffArray); return diffArray; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java index ccbc3172736c..971d94864d89 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java @@ -18,17 +18,16 @@ package org.openoffice.xmerge.merger.diff; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.NamedNodeMap; +import java.util.ArrayList; +import java.util.List; import org.openoffice.xmerge.ConverterCapabilities; import org.openoffice.xmerge.merger.Iterator; import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.Resources; - -import java.util.Vector; -import java.util.List; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** @@ -61,7 +60,7 @@ public abstract class NodeIterator implements Iterator { */ public NodeIterator(ConverterCapabilities cc, Node node) { cc_ = cc; - nodeList = new Vector(); + nodeList = new ArrayList(); root = node; markTree(node); } @@ -137,7 +136,7 @@ public abstract class NodeIterator implements Iterator { public void refresh() { - nodeList = new Vector(); + nodeList = new ArrayList(); markTree(root); currentPosition = 0; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java index cc182c2ba2db..ece388c5c2ba 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java @@ -18,12 +18,12 @@ package org.openoffice.xmerge.test; +import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.BufferedInputStream; +import java.util.ArrayList; +import java.util.Iterator; import java.util.Properties; -import java.util.Vector; -import java.util.Enumeration; /** * Loads a properties file so that registry knows which plug-ins @@ -35,7 +35,7 @@ public class ConverterInfoList { private static String defaultPropsFile = "ConverterInfoList.properties"; - private Vector jars; + private ArrayList jars; private Properties props = null; @@ -68,7 +68,7 @@ public class ConverterInfoList { int i = 1; String jarFileName = new String(); - jars = new Vector(); + jars = new ArrayList(); while ((jarFileName = props.getProperty("jarname" + i)) != null) { jars.add(jarFileName); @@ -88,9 +88,9 @@ public class ConverterInfoList { * <code>String</code> describes a plug-in to be * loaded into the registry. */ - public Enumeration getJarFileEnum() { + public Iterator getJarFileEnum() { - return jars.elements(); + return jars.iterator(); } } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java index 9a4816b03536..0bd127318e25 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java @@ -18,20 +18,20 @@ package org.openoffice.xmerge.test; -import java.util.Vector; -import java.util.Enumeration; -import java.io.FileOutputStream; -import java.io.FileInputStream; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Iterator; import org.openoffice.xmerge.Convert; -import org.openoffice.xmerge.Document; import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.ConverterFactory; -import org.openoffice.xmerge.test.ConverterInfoList; +import org.openoffice.xmerge.Document; +import org.openoffice.xmerge.DocumentMerger; import org.openoffice.xmerge.util.registry.ConverterInfoMgr; import org.openoffice.xmerge.util.registry.ConverterInfoReader; -import org.openoffice.xmerge.DocumentMerger; /** * This class is a command-line driver for the converter framework. @@ -51,7 +51,7 @@ public final class Driver { private String mergeFile = null; /** Command-line parmeter. */ - private Vector deviceFiles = new Vector(); + private ArrayList deviceFiles = new ArrayList(); /** Command-line parmeter shortcuts. */ private String mimeTypes[] = { @@ -78,12 +78,12 @@ public final class Driver { " property file"); } - Enumeration jarInfoEnumeration; + Iterator jarInfoEnumeration; ConverterInfoReader cir; - Enumeration jarFileEnum = cil.getJarFileEnum(); - while (jarFileEnum.hasMoreElements()) { - String jarName = (String) jarFileEnum.nextElement(); + Iterator jarFileEnum = cil.getJarFileEnum(); + while (jarFileEnum.hasNext()) { + String jarName = (String) jarFileEnum.next(); try { cir = new ConverterInfoReader(jarName, false); jarInfoEnumeration = cir.getConverterInfoEnumeration(); @@ -134,9 +134,9 @@ public final class Driver { } try { - Enumeration dfEnum = deviceFiles.elements(); - while (dfEnum.hasMoreElements()) { - processFile = (String)dfEnum.nextElement(); + Iterator dfEnum = deviceFiles.iterator(); + while (dfEnum.hasNext()) { + processFile = (String)dfEnum.next(); File f = new File(processFile); // Make sure the input file actually exists before using it @@ -165,9 +165,9 @@ public final class Driver { if (dataOut != null ) { if (mergeFile == null) { - Enumeration docEnum = dataOut.getDocumentEnumeration(); - while (docEnum.hasMoreElements()) { - Document docOut = (Document)docEnum.nextElement(); + Iterator docEnum = dataOut.getDocumentEnumeration(); + while (docEnum.hasNext()) { + Document docOut = (Document)docEnum.next(); String fileName = docOut.getFileName(); try { FileOutputStream fos = new FileOutputStream(fileName); @@ -185,8 +185,8 @@ public final class Driver { FileInputStream mergeIS = new FileInputStream(mergeFile); Document mergeDoc = myConvert.getOfficeDocument(mergeFile, mergeIS); DocumentMerger merger = myConvert.getDocumentMerger(mergeDoc); - Enumeration mergeDocEnum = dataOut.getDocumentEnumeration(); - Document convertedFile = (Document)mergeDocEnum.nextElement(); + Iterator mergeDocEnum = dataOut.getDocumentEnumeration(); + Document convertedFile = (Document)mergeDocEnum.next(); merger.merge(convertedFile); mergeIS.close(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java index 6756d2fbd918..42ce0a9a427c 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java @@ -121,7 +121,7 @@ public class ActiveSyncDriver { } // Get the document and write it out. - Document doc = (Document)dataOut.getDocumentEnumeration().nextElement(); + Document doc = (Document)dataOut.getDocumentEnumeration().next(); if (doc == null) { return false; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java index a58888b725ad..2bd53b2ea975 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java @@ -25,7 +25,7 @@ import org.w3c.dom.Text; import org.openoffice.xmerge.converter.xml.OfficeConstants; -import java.util.Vector; +import java.util.ArrayList; /** @@ -46,7 +46,7 @@ public class OfficeUtil implements OfficeConstants { * representing the text. */ public static Node[] parseText(String text, Document parentDoc) { - Vector nodeVec = new Vector(); + ArrayList nodeVec = new ArrayList(); /* * Break up the text from the text run into Open @@ -80,7 +80,7 @@ public class OfficeUtil implements OfficeConstants { if (closerIndex > 0) { String beginningText = text.substring(0, closerIndex); Text textNode = parentDoc.createTextNode(beginningText); - nodeVec.addElement(textNode); + nodeVec.add(textNode); } text = text.substring(closerIndex); @@ -120,7 +120,7 @@ public class OfficeUtil implements OfficeConstants { // Now create and populate an array to return the nodes in. Node nodes[] = new Node[nodeVec.size()]; for (int i = 0; i < nodeVec.size(); i++) - nodes[i] = (Node)nodeVec.elementAt(i); + nodes[i] = (Node)nodeVec.get(i); return nodes; } }
\ No newline at end of file diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java index 92e1f7b6bad4..259cee0d3401 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java @@ -18,15 +18,16 @@ package org.openoffice.xmerge.util.registry; -import java.util.Vector; -import java.util.Enumeration; +import java.lang.reflect.Constructor; import java.net.URL; import java.net.URLClassLoader; -import java.lang.reflect.Constructor; -import org.openoffice.xmerge.PluginFactory; -import org.openoffice.xmerge.DocumentSerializerFactory; +import java.util.ArrayList; +import java.util.Iterator; + import org.openoffice.xmerge.DocumentDeserializerFactory; import org.openoffice.xmerge.DocumentMergerFactory; +import org.openoffice.xmerge.DocumentSerializerFactory; +import org.openoffice.xmerge.PluginFactory; /** * Class for storing the information about a converter plugin. @@ -53,7 +54,7 @@ public class ConverterInfo { private String piJarName; private String piOfficeMime; - private Vector piDeviceMime; + private ArrayList piDeviceMime; private String piDisplayName; private String piDescription; private String piVersion; @@ -87,7 +88,7 @@ public class ConverterInfo { * be loaded. */ public ConverterInfo(String jarName, String officeMime, - Vector deviceMime, String displayName, String description, + ArrayList deviceMime, String displayName, String description, String version, String vendor, String impl,String xsltSerial, String xsltDeserial) throws RegistryException { @@ -165,7 +166,7 @@ public class ConverterInfo { public ConverterInfo(String jarName, String officeMime, - Vector deviceMime, String displayName, String description, + ArrayList deviceMime, String displayName, String description, String version, String vendor, String impl) throws RegistryException { @@ -289,8 +290,8 @@ public class ConverterInfo { * @return An <code>Enumeration</code> of <code>String</code> * objects indicating the device mime-type. */ - public Enumeration getDeviceMime() { - return(piDeviceMime.elements()); + public Iterator getDeviceMime() { + return(piDeviceMime.iterator()); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java index e31468ff7c97..f6d7689e537f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java @@ -32,13 +32,13 @@ import java.io.*; */ public final class ConverterInfoMgr { - private static Vector converterInfoList; + private static ArrayList converterInfoList; /** * Constructor */ static { - converterInfoList = new Vector(); + converterInfoList = new ArrayList(); } /** @@ -73,7 +73,7 @@ public final class ConverterInfoMgr { "Converter must have valid office mime specified."); throw re; } - if (! ci.getDeviceMime().hasMoreElements()) { + if (! ci.getDeviceMime().hasNext()) { RegistryException re = new RegistryException( "Converter must have valid device mime specified."); throw re; @@ -82,9 +82,9 @@ public final class ConverterInfoMgr { // Verify there is no converter with the same Display Name in // the registry. // - Enumeration ciEnum = converterInfoList.elements(); - while (ciEnum.hasMoreElements()) { - converterInfo = (ConverterInfo)ciEnum.nextElement(); + Iterator ciEnum = converterInfoList.iterator(); + while (ciEnum.hasNext()) { + converterInfo = (ConverterInfo)ciEnum.next(); if (ci.getDisplayName().equals(converterInfo.getDisplayName())) { RegistryException re = new RegistryException( "Converter with specified display name already exists."); @@ -112,10 +112,10 @@ public final class ConverterInfoMgr { * @throws RegistryException If a <code>ConverterInfo</code> in the * <code>Vector</code> is not valid. */ - public static void addPlugIn(Enumeration jarEnum) throws RegistryException { + public static void addPlugIn(Iterator jarEnum) throws RegistryException { - while (jarEnum.hasMoreElements()) { - ConverterInfo converterInfo = (ConverterInfo)jarEnum.nextElement(); + while (jarEnum.hasNext()) { + ConverterInfo converterInfo = (ConverterInfo)jarEnum.next(); addPlugIn(converterInfo); } } @@ -128,8 +128,8 @@ public final class ConverterInfoMgr { * <code>ConverterInfo</code> objects, an empty * <code>Vector</code> if none exist. */ - public static Enumeration getConverterInfoEnumeration() { - return (converterInfoList.elements()); + public static Iterator getConverterInfoEnumeration() { + return (converterInfoList.iterator()); } /** @@ -183,10 +183,10 @@ public final class ConverterInfoMgr { ConverterInfo converterInfo; boolean rc = false; - Enumeration ciEnum = converterInfoList.elements(); - while (ciEnum.hasMoreElements()) + Iterator ciEnum = converterInfoList.iterator(); + while (ciEnum.hasNext()) { - converterInfo = (ConverterInfo)ciEnum.nextElement(); + converterInfo = (ConverterInfo)ciEnum.next(); if (name.equals(converterInfo.getDisplayName())) { converterInfoList.remove(converterInfo); rc = true; @@ -218,17 +218,17 @@ public final class ConverterInfoMgr { // Loop over elements comparing with deviceFromMime // - Enumeration ciEnum = converterInfoList.elements(); - while (ciEnum.hasMoreElements()) { + Iterator ciEnum = converterInfoList.iterator(); + while (ciEnum.hasNext()) { - converterInfo = (ConverterInfo)ciEnum.nextElement(); + converterInfo = (ConverterInfo)ciEnum.next(); String toDeviceInfo = (String)converterInfo.getOfficeMime(); - Enumeration fromEnum = converterInfo.getDeviceMime(); + Iterator fromEnum = converterInfo.getDeviceMime(); // Loop over the deviceMime types. // - while (fromEnum.hasMoreElements()) { - String fromDeviceInfo = (String)fromEnum.nextElement(); + while (fromEnum.hasNext()) { + String fromDeviceInfo = (String)fromEnum.next(); if (deviceMime.trim().equals(fromDeviceInfo) && officeMime.trim().equals(toDeviceInfo)) { return (converterInfo); @@ -261,36 +261,36 @@ public final class ConverterInfoMgr { // Loop over elements comparing with deviceFromMime // - Enumeration cifEnum = converterInfoList.elements(); - while (cifEnum.hasMoreElements()) { + Iterator cifEnum = converterInfoList.iterator(); + while (cifEnum.hasNext()) { - converterInfo[0] = (ConverterInfo)cifEnum.nextElement(); + converterInfo[0] = (ConverterInfo)cifEnum.next(); String fromOfficeInfo = converterInfo[0].getOfficeMime(); - Enumeration fromEnum = converterInfo[0].getDeviceMime(); + Iterator fromEnum = converterInfo[0].getDeviceMime(); // Loop over the deviceMime types looking for a deviceFromMime // match. // - while (fromEnum.hasMoreElements()) { - String fromDeviceInfo = (String)fromEnum.nextElement(); + while (fromEnum.hasNext()) { + String fromDeviceInfo = (String)fromEnum.next(); if (deviceFromMime.trim().equals(fromDeviceInfo)) { // Found a a match for deviceFrom. Now loop over the // elements comparing with deviceToMime // - Enumeration citEnum = converterInfoList.elements(); - while (citEnum.hasMoreElements()) { + Iterator citEnum = converterInfoList.iterator(); + while (citEnum.hasNext()) { - converterInfo[1] = (ConverterInfo)citEnum.nextElement(); + converterInfo[1] = (ConverterInfo)citEnum.next(); String toOfficeInfo = converterInfo[1].getOfficeMime(); - Enumeration toEnum = converterInfo[1].getDeviceMime(); + Iterator toEnum = converterInfo[1].getDeviceMime(); // Loop over deviceMime types looking for a // deviceToMime match. // - while (toEnum.hasMoreElements()) { - String toDeviceInfo = (String)toEnum.nextElement(); + while (toEnum.hasNext()) { + String toDeviceInfo = (String)toEnum.next(); if (deviceToMime.trim().equals(toDeviceInfo) && fromOfficeInfo.equals(toOfficeInfo)) { @@ -365,7 +365,7 @@ public final class ConverterInfoMgr { } if (cir != null) { - Enumeration jarInfoEnum = cir.getConverterInfoEnumeration(); + Iterator jarInfoEnum = cir.getConverterInfoEnumeration(); try { ConverterInfoMgr.addPlugIn(jarInfoEnum); } catch (Exception e) { @@ -471,25 +471,25 @@ public final class ConverterInfoMgr { // } else if (c == 'V') { - Enumeration ciEnum = ConverterInfoMgr.getConverterInfoEnumeration(); + Iterator ciEnum = ConverterInfoMgr.getConverterInfoEnumeration(); int ciCnt = 0; - while (ciEnum.hasMoreElements()) + while (ciEnum.hasNext()) { System.out.println(""); System.out.println(" Displaying converter number " + ciCnt); - ConverterInfo converterInfo = (ConverterInfo)ciEnum.nextElement(); + ConverterInfo converterInfo = (ConverterInfo)ciEnum.next(); System.out.println(" DisplayName : " + converterInfo.getDisplayName()); System.out.println(" JarFile : " + converterInfo.getJarName()); System.out.println(" Description : " + converterInfo.getDescription()); System.out.println(" Version : " + converterInfo.getVersion()); System.out.println(" OfficeMime : " + converterInfo.getOfficeMime()); - Enumeration fromEnum = converterInfo.getDeviceMime(); + Iterator fromEnum = converterInfo.getDeviceMime(); int feCnt = 1; - while (fromEnum.hasMoreElements()) + while (fromEnum.hasNext()) { System.out.println(" DeviceMime : (#" + feCnt + ") : " + - (String)fromEnum.nextElement()); + (String)fromEnum.next()); feCnt++; } if (feCnt == 1) { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java index 5c1d400e8bb5..bcf0819bb141 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java @@ -50,7 +50,7 @@ public class ConverterInfoReader { private final static String TAG_XSLT_SERIAL = "converter-xslt-serialize"; private String jarfilename; private Document document; - private Vector converterInfoList; + private ArrayList converterInfoList; /** @@ -87,7 +87,7 @@ public class ConverterInfoReader { JarFile jarfile; URL url; - converterInfoList = new Vector(); + converterInfoList = new ArrayList(); jarfilename = jar; // Get Jar via URL @@ -161,7 +161,7 @@ public class ConverterInfoReader { Node detailNode; String elementTagName; String officeMime = null; - Vector deviceMime = new Vector(); + ArrayList deviceMime = new ArrayList(); String name = null; String desc = null; String version = null; @@ -260,8 +260,8 @@ public class ConverterInfoReader { * @return An <code>Enumeration</code> of <code>ConverterInfo</code> * objects. */ - public Enumeration getConverterInfoEnumeration() { - return (converterInfoList.elements()); + public Iterator getConverterInfoEnumeration() { + return (converterInfoList.iterator()); } } |