Author: sebb Date: Sat Aug 15 00:49:07 2009 New Revision: 804421 URL: http://svn.apache.org/viewvc?rev=804421&view=rev Log: Fix up some raw types
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java Sat Aug 15 00:49:07 2009 @@ -70,7 +70,7 @@ /** * Provide the list of Action names that are available in this command. */ - public Set getActionNames() { + public Set<String> getActionNames() { return AboutCommand.commandSet; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java Sat Aug 15 00:49:07 2009 @@ -40,7 +40,7 @@ /** * @see Command#getActionNames() */ - abstract public Set getActionNames(); + abstract public Set<String> getActionNames(); /** * @param e Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java Sat Aug 15 00:49:07 2009 @@ -40,15 +40,17 @@ import org.apache.log.Logger; public final class ActionRouter implements ActionListener { - private Map commands = new HashMap(); + private static final Logger log = LoggingManager.getLoggerForClass(); private static ActionRouter router; - private static final Logger log = LoggingManager.getLoggerForClass(); + private Map<String, Set<Command>> commands = new HashMap<String, Set<Command>>(); - private Map preActionListeners = new HashMap(); + private Map<String, HashSet<ActionListener>> preActionListeners = + new HashMap<String, HashSet<ActionListener>>(); - private Map postActionListeners = new HashMap(); + private Map<String, HashSet<ActionListener>> postActionListeners = + new HashMap<String, HashSet<ActionListener>>(); private ActionRouter() { } @@ -71,11 +73,11 @@ log.error("performAction(" + actionCommand + ") updateCurrentGui() on" + e.toString() + " caused", err); JMeterUtils.reportErrorToUser("Problem updating GUI - see log file for details"); } - Set commandObjects = (Set) commands.get(actionCommand); - Iterator iter = commandObjects.iterator(); + Set<Command> commandObjects = commands.get(actionCommand); + Iterator<Command> iter = commandObjects.iterator(); while (iter.hasNext()) { try { - Command c = (Command) iter.next(); + Command c = iter.next(); preActionPerformed(c.getClass(), e); c.doAction(e); postActionPerformed(c.getClass(), e); @@ -101,10 +103,10 @@ performAction(e); } - public Set getAction(String actionName) { - Set set = new HashSet(); - Set commandObjects = (Set) commands.get(actionName); - Iterator iter = commandObjects.iterator(); + public Set<Command> getAction(String actionName) { + Set<Command> set = new HashSet<Command>(); + Set<Command> commandObjects = commands.get(actionName); + Iterator<Command> iter = commandObjects.iterator(); while (iter.hasNext()) { try { set.add(iter.next()); @@ -115,12 +117,12 @@ return set; } - public Command getAction(String actionName, Class actionClass) { - Set commandObjects = (Set) commands.get(actionName); - Iterator iter = commandObjects.iterator(); + public Command getAction(String actionName, Class<?> actionClass) { + Set<Command> commandObjects = commands.get(actionName); + Iterator<Command> iter = commandObjects.iterator(); while (iter.hasNext()) { try { - Command com = (Command) iter.next(); + Command com = iter.next(); if (com.getClass().equals(actionClass)) { return com; } @@ -132,11 +134,11 @@ } public Command getAction(String actionName, String className) { - Set commandObjects = (Set) commands.get(actionName); - Iterator iter = commandObjects.iterator(); + Set<Command> commandObjects = commands.get(actionName); + Iterator<Command> iter = commandObjects.iterator(); while (iter.hasNext()) { try { - Command com = (Command) iter.next(); + Command com = iter.next(); if (com.getClass().getName().equals(className)) { return com; } @@ -158,11 +160,11 @@ * @param listener * the ActionListener to receive the notifications */ - public void addPreActionListener(Class action, ActionListener listener) { + public void addPreActionListener(Class<?> action, ActionListener listener) { if (action != null) { - HashSet set = (HashSet) preActionListeners.get(action.getName()); + HashSet<ActionListener> set = preActionListeners.get(action.getName()); if (set == null) { - set = new HashSet(); + set = new HashSet<ActionListener>(); } set.add(listener); preActionListeners.put(action.getName(), set); @@ -180,9 +182,9 @@ * @param listener * the ActionListener to receive the notifications */ - public void removePreActionListener(Class action, ActionListener listener) { + public void removePreActionListener(Class<?> action, ActionListener listener) { if (action != null) { - HashSet set = (HashSet) preActionListeners.get(action.getName()); + HashSet<ActionListener> set = preActionListeners.get(action.getName()); if (set != null) { set.remove(listener); preActionListeners.put(action.getName(), set); @@ -200,11 +202,11 @@ * org.apache.jmeter.gui.action.Command. * @param listener */ - public void addPostActionListener(Class action, ActionListener listener) { + public void addPostActionListener(Class<?> action, ActionListener listener) { if (action != null) { - HashSet set = (HashSet) postActionListeners.get(action.getName()); + HashSet<ActionListener> set = postActionListeners.get(action.getName()); if (set == null) { - set = new HashSet(); + set = new HashSet<ActionListener>(); } set.add(listener); postActionListeners.put(action.getName(), set); @@ -221,9 +223,9 @@ * org.apache.jmeter.gui.action.Command. * @param listener */ - public void removePostActionListener(Class action, ActionListener listener) { + public void removePostActionListener(Class<?> action, ActionListener listener) { if (action != null) { - HashSet set = (HashSet) postActionListeners.get(action.getName()); + HashSet<ActionListener> set = postActionListeners.get(action.getName()); if (set != null) { set.remove(listener); postActionListeners.put(action.getName(), set); @@ -231,9 +233,9 @@ } } - protected void preActionPerformed(Class action, ActionEvent e) { + protected void preActionPerformed(Class<? extends Command> action, ActionEvent e) { if (action != null) { - HashSet listenerSet = (HashSet) preActionListeners.get(action.getName()); + HashSet<ActionListener> listenerSet = preActionListeners.get(action.getName()); if (listenerSet != null && listenerSet.size() > 0) { Object[] listeners = listenerSet.toArray(); for (int i = 0; i < listeners.length; i++) { @@ -243,44 +245,44 @@ } } - protected void postActionPerformed(Class action, ActionEvent e) { + protected void postActionPerformed(Class<? extends Command> action, ActionEvent e) { if (action != null) { - HashSet listenerSet = (HashSet) postActionListeners.get(action.getName()); + HashSet<ActionListener> listenerSet = postActionListeners.get(action.getName()); if (listenerSet != null && listenerSet.size() > 0) { - Object[] listeners = listenerSet.toArray(); + ActionListener[] listeners = (ActionListener[]) listenerSet.toArray(); for (int i = 0; i < listeners.length; i++) { - ((ActionListener) listeners[i]).actionPerformed(e); + listeners[i].actionPerformed(e); } } } } private void populateCommandMap() { - List listClasses; + List<String> listClasses; Command command; - Iterator iterClasses; - Class commandClass; + Class<?> commandClass; try { listClasses = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] { Class .forName("org.apache.jmeter.gui.action.Command") }); - commands = new HashMap(listClasses.size()); + commands = new HashMap<String, Set<Command>>(listClasses.size()); if (listClasses.size() == 0) { log.fatalError("!!!!!Uh-oh, didn't find any action handlers!!!!!"); throw new JMeterError("No action handlers found - check JMeterHome and libraries"); } + Iterator<String> iterClasses; iterClasses = listClasses.iterator(); while (iterClasses.hasNext()) { - String strClassName = (String) iterClasses.next(); + String strClassName = iterClasses.next(); if (strClassName.startsWith("org.apache.jmeter.gui")) { commandClass = Class.forName(strClassName); if (!Modifier.isAbstract(commandClass.getModifiers())) { command = (Command) commandClass.newInstance(); - Iterator iter = command.getActionNames().iterator(); + Iterator<String> iter = command.getActionNames().iterator(); while (iter.hasNext()) { - String commandName = (String) iter.next(); - Set commandObjects = (Set) commands.get(commandName); + String commandName = iter.next(); + Set<Command> commandObjects = commands.get(commandName); if (commandObjects == null) { - commandObjects = new HashSet(); + commandObjects = new HashSet<Command>(); commands.put(commandName, commandObjects); } commandObjects.add(command); Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java Sat Aug 15 00:49:07 2009 @@ -35,7 +35,7 @@ public class AddParent implements Command { private static final Logger log = LoggingManager.getLoggerForClass(); - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.ADD_PARENT); @@ -57,7 +57,7 @@ } - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java Sat Aug 15 00:49:07 2009 @@ -30,7 +30,7 @@ import org.apache.jmeter.util.JMeterUtils; public class Analyze implements Command { - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.ANALYZE_FILE); @@ -39,7 +39,7 @@ public Analyze() { } - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java Sat Aug 15 00:49:07 2009 @@ -33,7 +33,7 @@ * @version $Revision$ */ public class ChangeLanguage implements Command { - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); private static final Logger log = LoggingManager.getLoggerForClass(); @@ -65,7 +65,7 @@ /** * @see org.apache.jmeter.gui.action.Command#getActionNames() */ - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java Sat Aug 15 00:49:07 2009 @@ -27,6 +27,7 @@ import org.apache.jmeter.gui.GuiPackage; import org.apache.jmeter.gui.tree.JMeterTreeNode; +import org.apache.jmeter.testelement.TestElement; import org.apache.jorphan.collections.HashTree; import org.apache.jorphan.collections.HashTreeTraverser; import org.apache.jorphan.collections.ListedHashTree; @@ -40,7 +41,7 @@ public class CheckDirty extends AbstractAction implements HashTreeTraverser, ActionListener { private static final Logger log = LoggingManager.getLoggerForClass(); - private final Map previousGuiItems; + private final Map<JMeterTreeNode, TestElement> previousGuiItems; private boolean checkMode = false; @@ -48,7 +49,7 @@ private boolean dirty = false; - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.CHECK_DIRTY); @@ -60,7 +61,7 @@ } public CheckDirty() { - previousGuiItems = new HashMap(); + previousGuiItems = new HashMap<JMeterTreeNode, TestElement>(); ActionRouter.getInstance().addPreActionListener(ExitCommand.class, this); } @@ -129,7 +130,7 @@ } else if (removeMode) { previousGuiItems.remove(treeNode); } else { - previousGuiItems.put(treeNode, treeNode.getTestElement().clone()); + previousGuiItems.put(treeNode, (TestElement) treeNode.getTestElement().clone()); } } @@ -153,7 +154,7 @@ * @see Command#getActionNames() */ @Override - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java Sat Aug 15 00:49:07 2009 @@ -39,7 +39,7 @@ public class Clear implements Command { private static final Logger log = LoggingManager.getLoggerForClass(); - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.CLEAR); @@ -50,7 +50,7 @@ public Clear() { } - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } @@ -71,8 +71,7 @@ JMeterTreeNode node = null; JMeterGUIComponent guiComp = null; try { - Object next = iter.next(); - node = (JMeterTreeNode) next; + node = (JMeterTreeNode) iter.next(); guiComp = guiPackage.getGui(node.getTestElement()); if (guiComp instanceof Clearable){ Clearable item = (Clearable) guiComp; Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java Sat Aug 15 00:49:07 2009 @@ -34,7 +34,7 @@ */ public class Close implements Command { - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.CLOSE); @@ -51,7 +51,7 @@ * * @return the ActionNames value */ - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java Sat Aug 15 00:49:07 2009 @@ -32,7 +32,7 @@ */ public class CollapseExpand implements Command { - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.COLLAPSE_ALL); @@ -50,7 +50,7 @@ * * @return the ActionNames value */ - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java Sat Aug 15 00:49:07 2009 @@ -41,7 +41,7 @@ private static JMeterTreeNode copiedNodes[] = null; - private static final HashSet commands = new HashSet(); + private static final HashSet<String> commands = new HashSet<String>(); static { commands.add(ActionNames.COPY); @@ -51,7 +51,7 @@ * @see org.apache.jmeter.gui.action.Command#getActionNames() */ @Override - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java Sat Aug 15 00:49:07 2009 @@ -27,9 +27,9 @@ public class CreateFunctionDialog extends AbstractAction { private FunctionHelper helper = null; - private static Set commands; + private static final Set<String> commands; static { - commands = new HashSet(); + commands = new HashSet<String>(); commands.add(ActionNames.FUNCTIONS); } @@ -41,7 +41,7 @@ * Provide the list of Action names that are available in this command. */ @Override - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java Sat Aug 15 00:49:07 2009 @@ -29,7 +29,7 @@ * Implements the Cut menu item command */ public class Cut extends AbstractAction { - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.CUT); @@ -39,7 +39,7 @@ * @see Command#getActionNames() */ @Override - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/DragNDrop.java Sat Aug 15 00:49:07 2009 @@ -32,7 +32,7 @@ import org.apache.jmeter.testelement.WorkBench; public class DragNDrop extends AbstractAction { - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.DRAG_ADD); @@ -88,7 +88,7 @@ return ok; } - protected void removeNodesFromParents(JMeterTreeNode[] nodes) { + private void removeNodesFromParents(JMeterTreeNode[] nodes) { for (int i = 0; i < nodes.length; i++) { GuiPackage.getInstance().getTreeModel().removeNodeFromParent(nodes[i]); } @@ -98,7 +98,7 @@ * @see Command#getActionNames() */ @Override - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java Sat Aug 15 00:49:07 2009 @@ -29,7 +29,7 @@ * Implements the Edit menu item. */ public class EditCommand implements Command { - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.EDIT); @@ -54,7 +54,7 @@ } } - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java Sat Aug 15 00:49:07 2009 @@ -33,7 +33,7 @@ public class EnableComponent implements Command { private static final Logger log = LoggingManager.getLoggerForClass(); - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.ENABLE); @@ -66,7 +66,7 @@ /** * @see org.apache.jmeter.gui.action.Command#getActionNames() */ - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java Sat Aug 15 00:49:07 2009 @@ -29,7 +29,7 @@ public class ExitCommand implements Command { - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.EXIT); @@ -46,7 +46,7 @@ * * @return The ActionNames value */ - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java Sat Aug 15 00:49:07 2009 @@ -41,7 +41,7 @@ public class Help implements Command { private static final Logger log = LoggingManager.getLoggerForClass(); - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); private static final String HELP_DOCS = "file:///" // $NON-NLS-1$ + JMeterUtils.getJMeterHome() @@ -117,7 +117,7 @@ /** * @see org.apache.jmeter.gui.action.Command#getActionNames() */ - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java Sat Aug 15 00:49:07 2009 @@ -57,7 +57,7 @@ private static final boolean expandTree = JMeterUtils.getPropDefault("onload.expandtree", true); //$NON-NLS-1$ - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.OPEN); @@ -68,7 +68,7 @@ super(); } - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java Sat Aug 15 00:49:07 2009 @@ -27,6 +27,7 @@ import java.util.Set; import java.util.prefs.Preferences; +import javax.swing.JComponent; import javax.swing.JMenuItem; import javax.swing.JSeparator; @@ -39,7 +40,7 @@ private static final String USER_PREFS_KEY = "recent_file_"; //$NON-NLS-1$ /** The number of menu items used for recent files */ private static final int NUMBER_OF_MENU_ITEMS = 9; - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.OPEN_RECENT); @@ -53,7 +54,7 @@ } @Override - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } @@ -81,8 +82,8 @@ * * @return a List of JMenuItem and a JSeparator, representing recent files */ - public static List getRecentFileMenuItems() { - LinkedList menuItems = new LinkedList(); + public static List<JComponent> getRecentFileMenuItems() { + LinkedList<JComponent> menuItems = new LinkedList<JComponent>(); // Get the preference for the recent files for(int i = 0; i < NUMBER_OF_MENU_ITEMS; i++) { // Create the menu item @@ -117,10 +118,10 @@ * @param loadedFileName the file name of the project file that has just * been loaded */ - public static void updateRecentFileMenuItems(List menuItems, String loadedFileName) { + public static void updateRecentFileMenuItems(List<JComponent> menuItems, String loadedFileName) { // Get the preference for the recent files - LinkedList newRecentFiles = new LinkedList(); + LinkedList<String> newRecentFiles = new LinkedList<String>(); // Check if the new file is already in the recent list boolean alreadyExists = false; for(int i = 0; i < NUMBER_OF_MENU_ITEMS; i++) { @@ -140,7 +141,7 @@ } // Store the recent files for(int i = 0; i < NUMBER_OF_MENU_ITEMS; i++) { - String fileName = (String)newRecentFiles.get(i); + String fileName = newRecentFiles.get(i); if(fileName != null) { setRecentFile(i, fileName); } @@ -153,7 +154,7 @@ * Set the content and visibility of menu items and menu separator, * based on the recent file stored user preferences. */ - private static void updateMenuItems(List menuItems) { + private static void updateMenuItems(List<JComponent> menuItems) { // Assume no recent files boolean someRecentFiles = false; // Update the menu items Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java Sat Aug 15 00:49:07 2009 @@ -37,7 +37,7 @@ private static final String JMETER_LAF = "jmeter.laf"; // $NON-NLS-1$ - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { UIManager.LookAndFeelInfo[] lfs = UIManager.getInstalledLookAndFeels(); @@ -115,7 +115,7 @@ } } - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java Sat Aug 15 00:49:07 2009 @@ -40,7 +40,7 @@ private static final Logger log = LoggingManager.getLoggerForClass(); - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.PASTE); @@ -50,7 +50,7 @@ * @see Command#getActionNames() */ @Override - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java Sat Aug 15 00:49:07 2009 @@ -45,7 +45,7 @@ private static final String REMOTE_HOSTS_SEPARATOR = ","; // $NON-NLS-1$ - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.REMOTE_START); @@ -56,7 +56,7 @@ commands.add(ActionNames.REMOTE_EXIT_ALL); } - private final Map remoteEngines = new HashMap(); + private final Map<String, JMeterEngine> remoteEngines = new HashMap<String, JMeterEngine>(); public RemoteStart() { } @@ -115,7 +115,7 @@ */ private void doRemoteStop(String name) { GuiPackage.getInstance().getMainFrame().showStoppingMessage(name); - JMeterEngine engine = (JMeterEngine) remoteEngines.get(name); + JMeterEngine engine = remoteEngines.get(name); engine.stopTest(); } @@ -127,7 +127,7 @@ * */ private void doRemoteExit(String name) { - JMeterEngine engine = (JMeterEngine) remoteEngines.get(name); + JMeterEngine engine = remoteEngines.get(name); if (engine == null) { return; } @@ -143,7 +143,7 @@ * */ private void doRemoteStart(String name) { - JMeterEngine engine = (JMeterEngine) remoteEngines.get(name); + JMeterEngine engine = remoteEngines.get(name); if (engine != null) { try { engine.runTest(); @@ -157,7 +157,7 @@ * Initializes remote engines */ private void doRemoteInit(String name) { - JMeterEngine engine = (JMeterEngine) remoteEngines.get(name); + JMeterEngine engine = remoteEngines.get(name); if (engine == null) { try { log.info("Initialising remote engine: "+name); @@ -176,7 +176,7 @@ } @Override - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java Sat Aug 15 00:49:07 2009 @@ -34,7 +34,7 @@ */ public class Remove implements Command { - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.REMOVE); @@ -51,7 +51,7 @@ * * @return the ActionNames value */ - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java Sat Aug 15 00:49:07 2009 @@ -32,7 +32,7 @@ * */ public class RevertProject implements Command { - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.REVERT_PROJECT); @@ -42,7 +42,7 @@ super(); } - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Sat Aug 15 00:49:07 2009 @@ -54,7 +54,7 @@ public static final String JMX_FILE_EXTENSION = ".jmx"; // $NON-NLS-1$ - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.SAVE_AS); // Save (Selection) As @@ -73,7 +73,7 @@ * * @return the ActionNames value */ - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java Sat Aug 15 00:49:07 2009 @@ -45,7 +45,7 @@ */ public class SaveGraphics implements Command { - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.SAVE_GRAPHICS); @@ -66,7 +66,7 @@ * * @return the ActionNames value */ - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java?rev=804421&r1=804420&r2=804421&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java Sat Aug 15 00:49:07 2009 @@ -39,7 +39,7 @@ public class Start extends AbstractAction { private static final Logger log = LoggingManager.getLoggerForClass(); - private static final Set commands = new HashSet(); + private static final Set<String> commands = new HashSet<String>(); static { commands.add(ActionNames.ACTION_START); @@ -61,7 +61,7 @@ * @return the ActionNames value */ @Override - public Set getActionNames() { + public Set<String> getActionNames() { return commands; } --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org