diff options
Diffstat (limited to 'xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry')
3 files changed, 55 insertions, 54 deletions
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()); } } |