diff -r 95270d3460e8 src/com/sun/javatest/agent/ActiveAgentPool.java --- a/src/com/sun/javatest/agent/ActiveAgentPool.java +++ b/src/com/sun/javatest/agent/ActiveAgentPool.java @@ -354,7 +354,7 @@ synchronized Entry next() { Entry e = null; if (v.size() > 0) { - e = (Entry)(v.elementAt(0)); + e = v.elementAt(0); v.removeElementAt(0); notifyRemovedFromPool(e); } @@ -395,7 +395,7 @@ } } - private Vector v = new Vector(); + private Vector v = new Vector<>(); private Observer[] observers = new Observer[0]; } diff -r 95270d3460e8 src/com/sun/javatest/agent/Agent.java --- a/src/com/sun/javatest/agent/Agent.java +++ b/src/com/sun/javatest/agent/Agent.java @@ -203,8 +203,8 @@ else { traceOut.println("set map:"); map.setTracing(tracing, traceOut); - for (Enumeration e = map.enumerate(); e.hasMoreElements(); ) { - String[] entry = (String[])(e.nextElement()); + for (Enumeration e = map.enumerate(); e.hasMoreElements(); ) { + String[] entry = e.nextElement(); traceOut.println("map-from: " + entry[0]); traceOut.println("map-to: " + entry[1]); } @@ -335,7 +335,7 @@ // interrupt any threads that are running for (int i = 0; i < threads.size(); i++) { - Thread t = (Thread)(threads.elementAt(i)); + Thread t = threads.elementAt(i); if (tracing) traceOut.println("INTERRUPTING THREAD " + t.getName()); t.interrupt(); @@ -347,7 +347,7 @@ // close any tasks that are running for (int i = 0; i < tasks.size(); i++) { - Task t = (Task)(tasks.elementAt(i)); + Task t = tasks.elementAt(i); if (tracing) { Connection c = t.connection; // maybe null; if it is, task is already closing traceOut.println("CLOSING TASK " + (c == null ? "[unknown]" : c.getName())); @@ -542,8 +542,8 @@ private boolean closing; private Thread mainThread; private int maxThreads; - private Vector threads = new Vector(); - private Vector tasks = new Vector(); + private Vector threads = new Vector<>(); + private Vector tasks = new Vector<>(); private Notifier notifier = new Notifier(); private Object currSystemStreamOwner = null; private PrintStream saveOut; @@ -936,7 +936,7 @@ } - private Status executeMain(Class c, String[] args, + private Status executeMain(Class c, String[] args, PrintWriter testLog, PrintWriter testRef) throws IOException, ClassNotFoundException, IllegalAccessException { notifier.execMain(connection, tag, c.getName(), args); @@ -1107,7 +1107,7 @@ private ClassLoader getAgentClassLoader(boolean useSharedClassLoader) throws InstantiationException, IllegalAccessException { - Class classLoaderClass; + Class classLoaderClass; try { String s = getClass().getName(); String pkg = s.substring(0, s.lastIndexOf('.')); diff -r 95270d3460e8 src/com/sun/javatest/agent/AgentMain.java --- a/src/com/sun/javatest/agent/AgentMain.java +++ b/src/com/sun/javatest/agent/AgentMain.java @@ -374,7 +374,7 @@ switch (mode) { case ACTIVE: try { - Class c = Class.forName(pkg + ".ActiveConnectionFactory"); + Class c = Class.forName(pkg + ".ActiveConnectionFactory"); Constructor m = c.getConstructor(new Class[] {String.class, int.class}); Object[] args = { activeHost, new Integer(activePort) }; return (ConnectionFactory)(m.newInstance(args)); @@ -391,7 +391,7 @@ case PASSIVE: try { - Class c = Class.forName(pkg + ".PassiveConnectionFactory"); + Class c = Class.forName(pkg + ".PassiveConnectionFactory"); Constructor m = c.getConstructor(new Class[] {int.class, int.class}); Object[] args = { new Integer(passivePort), new Integer(concurrency + 1) }; return (ConnectionFactory)(m.newInstance(args)); @@ -412,7 +412,7 @@ case SERIAL: try { - Class c = Class.forName(pkg + ".SerialPortConnectionFactory"); + Class c = Class.forName(pkg + ".SerialPortConnectionFactory"); Constructor m = c.getConstructor(new Class[] {String.class, String.class, int.class}); Object[] args = {serialPort, Agent.productName, new Integer(10*1000)}; return (ConnectionFactory)(m.newInstance(args)); diff -r 95270d3460e8 src/com/sun/javatest/agent/AgentManager.java --- a/src/com/sun/javatest/agent/AgentManager.java +++ b/src/com/sun/javatest/agent/AgentManager.java @@ -538,7 +538,7 @@ // might be better not to flush these ... for (Enumeration e = zips.keys(); e.hasMoreElements(); ) { File f = (File)(e.nextElement()); - ZipFile z = (ZipFile)(zips.get(f)); + ZipFile z = zips.get(f); zips.remove(f); z.close(); } @@ -604,7 +604,7 @@ private byte[] readFromJar(String name, File jarFile) { //System.err.println("readFromJar: " + name + " " + jarFile); try { - ZipFile z = (ZipFile)zips.get(jarFile); + ZipFile z = zips.get(jarFile); if (z == null) { z = new ZipFile(jarFile); zips.put(jarFile, z); @@ -641,7 +641,7 @@ private File[] split(String s) { char pathCh = File.pathSeparatorChar; - Vector v = new Vector(); + Vector v = new Vector<>(); int start = 0; for (int i = s.indexOf(pathCh); i != -1; i = s.indexOf(pathCh, start)) { add(s.substring(start, i), v); @@ -654,7 +654,7 @@ return path; } - private void add(String s, Vector v) { + private void add(String s, Vector v) { if (s.length() != 0) v.addElement(new File(s)); } @@ -666,7 +666,7 @@ private File[] classPath; private boolean sharedCl; private int timeout = 0; - private Hashtable zips = new Hashtable(); + private Hashtable zips = new Hashtable<>(); } } diff -r 95270d3460e8 src/com/sun/javatest/agent/AgentMonitorTool.java --- a/src/com/sun/javatest/agent/AgentMonitorTool.java +++ b/src/com/sun/javatest/agent/AgentMonitorTool.java @@ -178,7 +178,7 @@ add(timeoutField, fc); timeoutLabel.setLabelFor(timeoutField); - listData = new DefaultListModel(); + listData = new DefaultListModel<>(); list = uif.createList("tool.pool", listData); list.setPrototypeCellValue("abcdefghiklmnopqrstuvwxyz"); list.setVisibleRowCount(3); @@ -339,8 +339,8 @@ private JTextField portField; private JLabel timeoutLabel; private JTextField timeoutField; - private JList list; - private DefaultListModel listData; + private JList list; + private DefaultListModel listData; } private class CurrentAgentsSubpanel extends JPanel @@ -352,13 +352,13 @@ setLayout(new GridBagLayout()); uif.setToolTip(this, "tool.curr"); - listData = new DefaultListModel(); + listData = new DefaultListModel<>(); list = uif.createList("tool.list.curr", listData); list.setVisibleRowCount(5); list.setCellRenderer(new DefaultListCellRenderer() { public Component getListCellRendererComponent(JList list, Object o, int index, boolean isSelected, boolean cellHasFocus) { - String name = ((Entry)o).toString(); + String name = o.toString(); return super.getListCellRendererComponent(list, name, index, isSelected, cellHasFocus); } }); @@ -421,7 +421,7 @@ } public synchronized void valueChanged(ListSelectionEvent ev) { - Entry e = (Entry)(list.getSelectedValue()); + Entry e = list.getSelectedValue(); if (e == null) { addressField.setText(""); tagField.setText(""); @@ -470,7 +470,7 @@ } else { for (int i = 0; i < listData.size(); i++) { - Entry e = (Entry)(listData.elementAt(i)); + Entry e = listData.elementAt(i); if (e.connection == c) { listData.removeElement(e); break; @@ -504,8 +504,8 @@ boolean localizeArgs; } - private JList list; - private DefaultListModel listData; + private JList list; + private DefaultListModel listData; private Entry selectedEntry; private JLabel addressLabel; private JTextField addressField; diff -r 95270d3460e8 src/com/sun/javatest/agent/AgentPanel.java --- a/src/com/sun/javatest/agent/AgentPanel.java +++ b/src/com/sun/javatest/agent/AgentPanel.java @@ -690,7 +690,7 @@ public synchronized void addTask(TaskState task) { if (tasks.size() >= maxTasks) { for (int i = 0; i < tasks.size(); i++) { - String s = (String) getItem(i); + String s = getItem(i); // skip over active tasks that will be updated later if (s.startsWith("CONN") || s.startsWith("EXEC")) continue; @@ -706,7 +706,7 @@ public synchronized TaskState getTask(Connection c) { for (int i = 0; i < tasks.size(); i++) { - TaskState ts = (TaskState)(tasks.elementAt(i)); + TaskState ts = tasks.elementAt(i); if (ts.connection == c) return ts; } @@ -714,7 +714,7 @@ } public synchronized TaskState getSelectedTask() { - return (TaskState)(tasks.elementAt(super.getSelectedIndex())); + return tasks.elementAt(super.getSelectedIndex()); } public synchronized void removeAll() { @@ -758,7 +758,7 @@ } private int maxTasks = 10; - private Vector tasks = new Vector(); + private Vector tasks = new Vector<>(); } @@ -973,7 +973,7 @@ } - private Vector tasks = new Vector(); + private Vector tasks = new Vector<>(); private int[] statusCounts = new int[Status.NUM_STATES]; private int exceptionsCount; diff -r 95270d3460e8 src/com/sun/javatest/agent/Folder.java --- a/src/com/sun/javatest/agent/Folder.java +++ b/src/com/sun/javatest/agent/Folder.java @@ -143,7 +143,7 @@ public void showTab(String name, boolean visible) { for (int i = 0; i < entries.size(); i++) { - Entry e = (Entry)entries.elementAt(i); + Entry e = entries.elementAt(i); if (e.name.equals(name)) { if (e.visibleTab != visible) { e.visibleTab = visible; @@ -157,7 +157,7 @@ public String getNextVisibleTab() { int currentIndex = Math.max(0, getCurrentIndex()); for (int i = currentIndex + 1; i < entries.size(); i++) { - Entry e = (Entry)entries.elementAt(i); + Entry e = entries.elementAt(i); if (e.visibleTab) return e.name; } @@ -167,7 +167,7 @@ public String getPrevVisibleTab() { int currentIndex = getCurrentIndex(); for (int i = currentIndex - 1; i >= 0; i--) { - Entry e = (Entry)entries.elementAt(i); + Entry e = entries.elementAt(i); if (e.visibleTab) return e.name; } @@ -176,7 +176,7 @@ public Component current() { for (int i = 0; i < entries.size(); i++) { - Entry e = (Entry)entries.elementAt(i); + Entry e = entries.elementAt(i); if (e.comp.isVisible()) return e.comp; } @@ -185,7 +185,7 @@ public void show(Component comp) { for (int i = 0; i < entries.size(); i++) { - Entry e = (Entry)entries.elementAt(i); + Entry e = entries.elementAt(i); if (e.comp == comp) { show(e); return; @@ -195,7 +195,7 @@ public void show(String name) { for (int i = 0; i < entries.size(); i++) { - Entry e = (Entry)entries.elementAt(i); + Entry e = entries.elementAt(i); if (e.name.equals(name)) { show(e); return; @@ -215,7 +215,7 @@ int tabHeight = fm.getHeight() + tabpad; Entry selected = null; for (int i = 0; i < entries.size(); i++) { - Entry e = (Entry)entries.elementAt(i); + Entry e = entries.elementAt(i); if (e.comp.isVisible()) { selected = e; break; @@ -234,7 +234,7 @@ int x = border + hgap; int baseLine = tabHeight + vgap; for (int i = 0; i < entries.size(); i++) { - Entry e = (Entry)entries.elementAt(i); + Entry e = entries.elementAt(i); int tabH = (e.visibleTab || e.comp.isVisible() ? tabHeight : tabHeight / 3); int w = fm.stringWidth(e.name); Polygon tab = new Polygon(); @@ -282,7 +282,7 @@ FontMetrics fm = getFontMetrics(getFont()); int w = border + 2 * hgap + tabSpace; for (int i = 0; i < entries.size(); i++) { - Entry e = (Entry)entries.elementAt(i); + Entry e = entries.elementAt(i); w += slant + (fm == null ? 0 : fm.stringWidth(e.name)) + slant + tabSpace; } return w; @@ -309,7 +309,7 @@ private int getCurrentIndex() { for (int i = 0; i < entries.size(); i++) { - Entry e = (Entry)entries.elementAt(i); + Entry e = entries.elementAt(i); if (e.comp.isVisible()) return i; } @@ -318,7 +318,7 @@ private Entry getCurrentEntry() { int i = getCurrentIndex(); - return (i == -1 ? null : (Entry)(entries.elementAt(i)) ); + return (i == -1 ? null : entries.elementAt(i)); } void mousePressed(int mouseX, int mouseY) { @@ -326,7 +326,7 @@ if (vgap < mouseY && mouseY < border + fm.getHeight() + vgap) { int x = border + hgap; for (int i = 0; i < entries.size(); i++) { - Entry e = (Entry)entries.elementAt(i); + Entry e = entries.elementAt(i); int w = fm.stringWidth(e.name); x += slant + w + slant + tabSpace; if (mouseX < x) { @@ -339,7 +339,7 @@ private ItemListener itemListener; - private Vector entries = new Vector(); + private Vector entries = new Vector<>(); private int border; private int slant; private int tabSpace; diff -r 95270d3460e8 src/com/sun/javatest/agent/Map.java --- a/src/com/sun/javatest/agent/Map.java +++ b/src/com/sun/javatest/agent/Map.java @@ -61,7 +61,7 @@ */ public static Map readFile(String name) throws IOException { try { - Class c = Class.forName("java.io.FileReader"); // optional API in Jersonal Java + Class c = Class.forName("java.io.FileReader"); // optional API in Jersonal Java Constructor m = c.getConstructor(new Class[] {String.class}); Reader r = (Reader)(m.newInstance(new Object[] {name})); return new Map(r); @@ -133,8 +133,8 @@ (r instanceof BufferedReader ? (BufferedReader)r : new BufferedReader(r)) ; // data arrives in rows, but we want it in columns - Vector from = new Vector(); - Vector to = new Vector(); + Vector from = new Vector<>(); + Vector to = new Vector<>(); String line; while ((line = in.readLine()) != null) { line = line.trim(); @@ -203,8 +203,8 @@ * Enumerate the entries of the map. * @return an enumeration of the translation entries within the map */ - public Enumeration enumerate() { - Vector v = new Vector(fromValues.length); + public Enumeration enumerate() { + Vector v = new Vector<>(fromValues.length); for (int i = 0; i < fromValues.length; i++) { v.addElement(new String[] {fromValues[i], toValues[i]}); } diff -r 95270d3460e8 src/com/sun/javatest/agent/SocketConnection.java --- a/src/com/sun/javatest/agent/SocketConnection.java +++ b/src/com/sun/javatest/agent/SocketConnection.java @@ -184,7 +184,7 @@ } private static String getHostName(InetAddress addr) { - String s = (String) (addressCache.get(addr)); + String s = addressCache.get(addr); if (s == null) { s = addr.getHostName(); addressCache.put(addr, s); @@ -238,5 +238,5 @@ private boolean closed; private Thread waitThread; private static Timer timer = new Timer(); - private static Hashtable addressCache = new Hashtable(); + private static Hashtable addressCache = new Hashtable<>(); } diff -r 95270d3460e8 src/com/sun/javatest/audit/Audit.java --- a/src/com/sun/javatest/audit/Audit.java +++ b/src/com/sun/javatest/audit/Audit.java @@ -106,10 +106,10 @@ */ public Audit(TestFinderQueue tfq, ExcludeList excludeList, WorkDirectory workDir) { - Vector badChecksumTestsV = new Vector(); - Vector badTestDescriptionsV = new Vector(); - Vector badTestCaseTestsV = new Vector(); - Vector badTestsV = new Vector(); + Vector badChecksumTestsV = new Vector<>(); + Vector badTestDescriptionsV = new Vector<>(); + Vector badTestCaseTestsV = new Vector<>(); + Vector badTestsV = new Vector<>(); workDir.getTestResultTable().waitUntilReady(); @@ -136,9 +136,9 @@ Map.Entry e = (Map.Entry) (i.next()); String key = (String) (e.getKey()); String value = (String) (e.getValue()); - Vector allValuesForKey = (Vector)(envTable.get(key)); + Vector allValuesForKey = envTable.get(key); if (allValuesForKey == null) { - allValuesForKey = new Vector(); + allValuesForKey = new Vector<>(); envTable.put(key, allValuesForKey); } if (!allValuesForKey.contains(value)) @@ -169,7 +169,7 @@ for (Enumeration e = envTable.keys(); e.hasMoreElements(); ) { String key = (String)(e.nextElement()); - Vector allValuesForKey = (Vector)(envTable.get(key)); + Vector allValuesForKey = envTable.get(key); envCounts[allValuesForKey.size() == 1 ? 0 : 1]++; } @@ -492,7 +492,7 @@ out.println(); out.print(i18n.getString("adt.envList.title")); - SortedSet ss = new TreeSet(); + SortedSet ss = new TreeSet<>(); for (Enumeration e = envTable.keys(); e.hasMoreElements(); ) { String key = (String)(e.nextElement()); ss.add(key); @@ -500,7 +500,7 @@ for (Iterator iter = ss.iterator(); iter.hasNext(); ) { String key = (String) (iter.next()); - Vector allValuesForKey = (Vector)(envTable.get(key)); + Vector allValuesForKey = envTable.get(key); if (allValuesForKey.size() == 1) { if (showAll) out.println(i18n.getString("adt.envKeyValue", @@ -692,7 +692,7 @@ // Create an array of possible date formats to parse dates in .jtr files. // Most likely is Unix C time in English; the array will be reordered in use // by moving the recently used entries to the front of the array. - Vector v = new Vector(); + Vector v = new Vector<>(); // generic Java default // 10-Sep-99 3:25:11 PM @@ -733,7 +733,7 @@ private Date latestStart; private DateFormat[] dateFormats; - private Hashtable envTable = new Hashtable(); + private Hashtable> envTable = new Hashtable<>(); private PrintStream out; private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(Audit.class); } diff -r 95270d3460e8 src/com/sun/javatest/audit/ListPane.java --- a/src/com/sun/javatest/audit/ListPane.java +++ b/src/com/sun/javatest/audit/ListPane.java @@ -61,7 +61,7 @@ } } - private class ListModel extends AbstractListModel { + private class ListModel extends AbstractListModel