diff options
author | Noel Grandin <noel@peralex.com> | 2012-06-27 18:20:18 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-06-29 22:03:02 +0200 |
commit | 30d4c3c7ce75ed2180a439c2a3526dae7f4660d5 (patch) | |
tree | a057e459dc9b975ed0b34bd4785b52acdd2f12b9 /xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java | |
parent | b9e203cb95e78782262c078891d4f0ac99850e1e (diff) |
Java5 update - convert to using generics where feasible
Change-Id: I65b8a40aff54a1128d66e7c46bbcdea459bcc2ce
Diffstat (limited to 'xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java')
-rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java | 17 |
1 files changed, 9 insertions, 8 deletions
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 0bd127318e25..8fb8d89977fe 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java @@ -30,6 +30,7 @@ import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.ConverterFactory; import org.openoffice.xmerge.Document; import org.openoffice.xmerge.DocumentMerger; +import org.openoffice.xmerge.util.registry.ConverterInfo; import org.openoffice.xmerge.util.registry.ConverterInfoMgr; import org.openoffice.xmerge.util.registry.ConverterInfoReader; @@ -51,7 +52,7 @@ public final class Driver { private String mergeFile = null; /** Command-line parmeter. */ - private ArrayList deviceFiles = new ArrayList(); + private ArrayList<String> deviceFiles = new ArrayList<String>(); /** Command-line parmeter shortcuts. */ private String mimeTypes[] = { @@ -78,12 +79,12 @@ public final class Driver { " property file"); } - Iterator jarInfoEnumeration; + Iterator<ConverterInfo> jarInfoEnumeration; ConverterInfoReader cir; - Iterator jarFileEnum = cil.getJarFileEnum(); + Iterator<String> jarFileEnum = cil.getJarFileEnum(); while (jarFileEnum.hasNext()) { - String jarName = (String) jarFileEnum.next(); + String jarName = jarFileEnum.next(); try { cir = new ConverterInfoReader(jarName, false); jarInfoEnumeration = cir.getConverterInfoEnumeration(); @@ -134,9 +135,9 @@ public final class Driver { } try { - Iterator dfEnum = deviceFiles.iterator(); + Iterator<String> dfEnum = deviceFiles.iterator(); while (dfEnum.hasNext()) { - processFile = (String)dfEnum.next(); + processFile = dfEnum.next(); File f = new File(processFile); // Make sure the input file actually exists before using it @@ -165,7 +166,7 @@ public final class Driver { if (dataOut != null ) { if (mergeFile == null) { - Iterator docEnum = dataOut.getDocumentEnumeration(); + Iterator<Object> docEnum = dataOut.getDocumentEnumeration(); while (docEnum.hasNext()) { Document docOut = (Document)docEnum.next(); String fileName = docOut.getFileName(); @@ -185,7 +186,7 @@ public final class Driver { FileInputStream mergeIS = new FileInputStream(mergeFile); Document mergeDoc = myConvert.getOfficeDocument(mergeFile, mergeIS); DocumentMerger merger = myConvert.getDocumentMerger(mergeDoc); - Iterator mergeDocEnum = dataOut.getDocumentEnumeration(); + Iterator<Object> mergeDocEnum = dataOut.getDocumentEnumeration(); Document convertedFile = (Document)mergeDocEnum.next(); merger.merge(convertedFile); |