diff options
author | Noel Grandin <noel@peralex.com> | 2012-09-07 09:42:15 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-09-10 23:43:37 +0200 |
commit | a5ff5aad59bbe70cfaa0b18ec9df6f787a7160ca (patch) | |
tree | 6313b316dc96b82e5cafec866631d15b01a04e52 /scripting | |
parent | e3d9ff3fd0b753a6712e86703e5f69392d241508 (diff) |
Java5 update, Convert ArrayList and Vector code to use generics
Change-Id: I6cf6fa8e55005ffdc1d173aeee1e374efbb214fd
Diffstat (limited to 'scripting')
-rw-r--r-- | scripting/java/org/openoffice/idesupport/ExtensionFinder.java | 4 | ||||
-rw-r--r-- | scripting/java/org/openoffice/idesupport/JavaFinder.java | 16 | ||||
-rw-r--r-- | scripting/java/org/openoffice/idesupport/xml/Manifest.java | 2 | ||||
-rw-r--r-- | scripting/workben/installer/Final.java | 2 | ||||
-rw-r--r-- | scripting/workben/installer/IdeFinal.java | 2 | ||||
-rw-r--r-- | scripting/workben/installer/IdeVersion.java | 15 | ||||
-rw-r--r-- | scripting/workben/installer/InstallWizard.java | 6 | ||||
-rw-r--r-- | scripting/workben/installer/Version.java | 15 | ||||
-rw-r--r-- | scripting/workben/mod/_scripting/TestDataLoader.java | 4 |
9 files changed, 34 insertions, 32 deletions
diff --git a/scripting/java/org/openoffice/idesupport/ExtensionFinder.java b/scripting/java/org/openoffice/idesupport/ExtensionFinder.java index f3002bb40f00..1edfba296fbd 100644 --- a/scripting/java/org/openoffice/idesupport/ExtensionFinder.java +++ b/scripting/java/org/openoffice/idesupport/ExtensionFinder.java @@ -36,7 +36,7 @@ public class ExtensionFinder implements MethodFinder { public ScriptEntry[] findMethods(File basedir) { String parcelName; - ArrayList files = new ArrayList(10); + ArrayList<ScriptEntry> files = new ArrayList<ScriptEntry>(10); ScriptEntry[] empty = new ScriptEntry[0]; if (basedir == null || basedir.exists() == false || @@ -54,7 +54,7 @@ public class ExtensionFinder implements MethodFinder { return empty; } - private void findFiles(ArrayList list, File basedir, String parcelName) { + private void findFiles(ArrayList<ScriptEntry> list, File basedir, String parcelName) { File[] children = basedir.listFiles(); File f; diff --git a/scripting/java/org/openoffice/idesupport/JavaFinder.java b/scripting/java/org/openoffice/idesupport/JavaFinder.java index f23919699ebe..d8e3ec02117f 100644 --- a/scripting/java/org/openoffice/idesupport/JavaFinder.java +++ b/scripting/java/org/openoffice/idesupport/JavaFinder.java @@ -65,7 +65,7 @@ public class JavaFinder implements MethodFinder { public ScriptEntry[] findMethods(File basedir) { String parcelName; - ArrayList result = new ArrayList(10); + ArrayList<ScriptEntry> result = new ArrayList<ScriptEntry>(10); ScriptEntry[] empty = new ScriptEntry[0]; if (basedir == null || basedir.exists() == false || @@ -132,7 +132,7 @@ public class JavaFinder implements MethodFinder { private ClassLoader getClassLoader() { int len = classpath.size(); - ArrayList urls = new ArrayList(len); + ArrayList<URL> urls = new ArrayList<URL>(len); for (int i = 0; i < len; i++) { try { @@ -150,7 +150,7 @@ public class JavaFinder implements MethodFinder { } private ClassLoader getClassLoader(File basedir) { - ArrayList files = findFiles(basedir, ".jar"); + ArrayList<File> files = findFiles(basedir, ".jar"); files.add(basedir); try { @@ -189,8 +189,8 @@ public class JavaFinder implements MethodFinder { return new URLClassLoader(urls); } - private ArrayList findFiles(File basedir, String suffix) { - ArrayList result = new ArrayList(); + private ArrayList<File> findFiles(File basedir, String suffix) { + ArrayList<File> result = new ArrayList<File>(); File[] children = basedir.listFiles(); for (int i = 0; i < children.length; i++) { @@ -204,15 +204,15 @@ public class JavaFinder implements MethodFinder { private String[] findClassNames(File basedir) { - ArrayList classFiles = findFiles(basedir, CLASS_SUFFIX); + ArrayList<File> classFiles = findFiles(basedir, CLASS_SUFFIX); if(classFiles == null || classFiles.size() == 0) return null; - ArrayList javaFiles = findFiles(basedir, JAVA_SUFFIX); + ArrayList<File> javaFiles = findFiles(basedir, JAVA_SUFFIX); if(javaFiles == null || javaFiles.size() == 0) return null; - ArrayList result = new ArrayList(); + ArrayList<String> result = new ArrayList<String>(); for (int i = 0; i < classFiles.size(); i++) { File classFile = (File)classFiles.get(i); diff --git a/scripting/java/org/openoffice/idesupport/xml/Manifest.java b/scripting/java/org/openoffice/idesupport/xml/Manifest.java index 7b5e2e77e165..6cf90899ccad 100644 --- a/scripting/java/org/openoffice/idesupport/xml/Manifest.java +++ b/scripting/java/org/openoffice/idesupport/xml/Manifest.java @@ -91,7 +91,7 @@ public class Manifest { if (nl == null || (len = nl.getLength()) == 0) return; - ArrayList list = new ArrayList(); + ArrayList<Element> list = new ArrayList<Element>(); for (int i = 0; i < len; i++) { el = (Element)nl.item(i); if (el.getAttribute("manifest:full-path").startsWith(entry)) { diff --git a/scripting/workben/installer/Final.java b/scripting/workben/installer/Final.java index 942103382877..95d2a39d5b05 100644 --- a/scripting/workben/installer/Final.java +++ b/scripting/workben/installer/Final.java @@ -76,7 +76,7 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install nav.enableNext(false); nav.enableBack(false); nav.enableCancel(false); - ArrayList locations = wizard.getLocations(); + ArrayList<?> locations = wizard.getLocations(); //System.out.println("here "+locations.size()); // Returned 1 String progpath=null; diff --git a/scripting/workben/installer/IdeFinal.java b/scripting/workben/installer/IdeFinal.java index 06836d3c07d9..bfc4b4b0766f 100644 --- a/scripting/workben/installer/IdeFinal.java +++ b/scripting/workben/installer/IdeFinal.java @@ -73,7 +73,7 @@ public class IdeFinal extends javax.swing.JPanel implements ActionListener, Inst nav.enableNext(false); nav.enableBack(false); nav.enableCancel(false); - ArrayList locations = wizard.getLocations(); + ArrayList<?> locations = wizard.getLocations(); //System.out.println("here "+locations.size()); // Returned 1 String progpath=null; diff --git a/scripting/workben/installer/IdeVersion.java b/scripting/workben/installer/IdeVersion.java index ea969a0e4217..bf626a3aecba 100644 --- a/scripting/workben/installer/IdeVersion.java +++ b/scripting/workben/installer/IdeVersion.java @@ -22,6 +22,7 @@ import java.awt.*; import java.awt.event.*; import java.io.*; import java.util.*; + import javax.swing.*; import javax.swing.event.*; import javax.swing.table.*; @@ -177,7 +178,7 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta wizard.clearLocations(); int len = tableModel.data.size(); for (int i = 0; i < len; i++) { - ArrayList list = (ArrayList)tableModel.data.get(i); + ArrayList<?> list = (ArrayList<?>)tableModel.data.get(i); if (((Boolean)list.get(0)).booleanValue() == true) wizard.storeLocation((String)list.get(2)); } @@ -265,12 +266,12 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta } class MyTableModelIDE extends AbstractTableModel { - ArrayList data; + ArrayList<ArrayList<Object>> data; String colNames[] = {"", "IDE Name", "IDE Location"}; Object[] longValues = new Object[] {Boolean.TRUE, "Name", "Location"}; MyTableModelIDE (Properties properties, String [] validVersions) { - data = new ArrayList(); + data = new ArrayList<ArrayList<Object>>(); //System.out.println(properties); int len = validVersions.length; @@ -279,7 +280,7 @@ class MyTableModelIDE extends AbstractTableModel { String path = null; if ((path = properties.getProperty(key)) != null) { - ArrayList row = new ArrayList(); + ArrayList<Object> row = new ArrayList<Object>(); row.add(0, new Boolean(false)); row.add(1, key); @@ -314,7 +315,7 @@ class MyTableModelIDE extends AbstractTableModel { col < 0 || col > getColumnCount()) return null; - ArrayList aRow = (ArrayList)data.get(row); + ArrayList<?> aRow = (ArrayList<?>)data.get(row); return aRow.get(col); } @@ -331,7 +332,7 @@ class MyTableModelIDE extends AbstractTableModel { } public void setValueAt(Object value, int row, int col) { - ArrayList aRow = (ArrayList)data.get(row); + ArrayList<Object> aRow = (ArrayList<Object>)data.get(row); aRow.set(col, value); fireTableCellUpdated(row, col); } @@ -343,7 +344,7 @@ class MyTableModelIDE extends AbstractTableModel { public boolean isAnySelected() { Iterator iter = data.iterator(); while (iter.hasNext()) { - ArrayList row = (ArrayList)iter.next(); + ArrayList<?> row = (ArrayList<?>)iter.next(); if (((Boolean)row.get(0)).booleanValue() == true) { return true; } diff --git a/scripting/workben/installer/InstallWizard.java b/scripting/workben/installer/InstallWizard.java index aeac007c296a..096b873b8c4f 100644 --- a/scripting/workben/installer/InstallWizard.java +++ b/scripting/workben/installer/InstallWizard.java @@ -89,7 +89,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener //setBackground(Color.WHITE); setBackground(new Color(0,0,0)); - locations = new ArrayList(); + locations = new ArrayList<String>(); //Point center = GraphicsEnvironment.getLocalGraphicsEnvironment().getCenterPoint(); Point center = new Point( 400, 400 ); int windowWidth=200; @@ -208,7 +208,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener locations.add(path); } - public static ArrayList getLocations() + public static ArrayList<String> getLocations() { return locations; } @@ -370,7 +370,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener private IdeVersion ideversion = null; private IdeFinal idefinal = null; private IdeWelcome idewelcome = null; - private static ArrayList locations = null; + private static ArrayList<String> locations = null; public static String VERSIONS = "VERSIONS"; public static String WELCOME = "WELCOME"; diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java index 2a7f30be9e52..e2527823b9b7 100644 --- a/scripting/workben/installer/Version.java +++ b/scripting/workben/installer/Version.java @@ -22,6 +22,7 @@ import java.awt.*; import java.awt.event.*; import java.io.*; import java.util.*; + import javax.swing.*; import javax.swing.event.*; import javax.swing.table.*; @@ -210,7 +211,7 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table wizard.clearLocations(); int len = tableModel.data.size(); for (int i = 0; i < len; i++) { - ArrayList list = (ArrayList)tableModel.data.get(i); + ArrayList<?> list = (ArrayList<?>)tableModel.data.get(i); if (((Boolean)list.get(0)).booleanValue() == true) wizard.storeLocation((String)list.get(2)); } @@ -242,12 +243,12 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table } class MyTableModel extends AbstractTableModel { - ArrayList data; + ArrayList<ArrayList<Object>> data; String colNames[] = {"", "Name", "Location"}; Object[] longValues = new Object[] {Boolean.TRUE, "Name", "Location"}; MyTableModel (Properties properties, String [] validVersions) { - data = new ArrayList(); + data = new ArrayList<ArrayList<Object>>(); boolean isWindows = (System.getProperty("os.name").indexOf("Windows") != -1); int len = validVersions.length; @@ -269,7 +270,7 @@ class MyTableModel extends AbstractTableModel { File pkgChk = new File( pkgChkPath ); if ( pkgChk.exists() ) { - ArrayList row = new ArrayList(); + ArrayList<Object> row = new ArrayList<Object>(); row.add(0, new Boolean(false)); row.add(1, key); @@ -305,7 +306,7 @@ class MyTableModel extends AbstractTableModel { col < 0 || col > getColumnCount()) return null; - ArrayList aRow = (ArrayList)data.get(row); + ArrayList<?> aRow = (ArrayList<?>)data.get(row); return aRow.get(col); } @@ -322,7 +323,7 @@ class MyTableModel extends AbstractTableModel { } public void setValueAt(Object value, int row, int col) { - ArrayList aRow = (ArrayList)data.get(row); + ArrayList<Object> aRow = data.get(row); aRow.set(col, value); fireTableCellUpdated(row, col); } @@ -334,7 +335,7 @@ class MyTableModel extends AbstractTableModel { public boolean isAnySelected() { Iterator iter = data.iterator(); while (iter.hasNext()) { - ArrayList row = (ArrayList)iter.next(); + ArrayList<?> row = (ArrayList<?>)iter.next(); if (((Boolean)row.get(0)).booleanValue() == true) { return true; } diff --git a/scripting/workben/mod/_scripting/TestDataLoader.java b/scripting/workben/mod/_scripting/TestDataLoader.java index c4a6da539df8..530b8f2d7a07 100644 --- a/scripting/workben/mod/_scripting/TestDataLoader.java +++ b/scripting/workben/mod/_scripting/TestDataLoader.java @@ -50,7 +50,7 @@ public class TestDataLoader { in = new BufferedReader(new FileReader(f)); String s, previous, current; - ArrayList list = new ArrayList(11); + ArrayList<Parameters> list = new ArrayList<Parameters>(11); if ((s = in.readLine()) != null) { StringTokenizer st = new StringTokenizer(s, ";"); @@ -70,7 +70,7 @@ public class TestDataLoader { if (!current.equals(previous)) { tEnv.addObjRelation(previous, list); previous = current; - list = new ArrayList(11); + list = new ArrayList<Parameters>(11); } list.add(getParameters(st)); |