Loading...

jmeter-dev@jakarta.apache.org

[Prev] Thread [Next]  |  [Prev] Date [Next]

svn commit: r804423 - in /jakarta/jmeter/trunk: src/reports/org/apache/jmeter/report/gui/action/ test/src/org/apache/jmeter/gui/action/ sebb Fri Aug 14 18:30:13 2009

Author: sebb
Date: Sat Aug 15 01:04:14 2009
New Revision: 804423

URL: http://svn.apache.org/viewvc?rev=804423&view=rev
Log:
Fix up some raw types

Modified:
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/AbstractAction.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportAddParent.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCheckDirty.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCopy.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCut.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportDragNDrop.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportEditCommand.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportEnableComponent.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportExitCommand.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportHelp.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportPaste.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportRemove.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSaveGraphics.java
    
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportStart.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/AbstractAction.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/AbstractAction.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/AbstractAction.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/AbstractAction.java
 Sat Aug 15 01:04:14 2009
@@ -44,7 +44,7 @@
     /**
      * @see Command#getActionNames()
      */
-    abstract public Set getActionNames();
+    abstract public Set<String> getActionNames();
 
     /**
      * @param e

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportActionRouter.java
 Sat Aug 15 01:04:14 2009
@@ -40,15 +40,17 @@
 import org.apache.log.Logger;
 
 public final class ReportActionRouter implements ActionListener {
-    private Map commands = new HashMap();
+    private Map<String, Set<Command>> commands = new HashMap<String, 
Set<Command>>();
 
     private static ReportActionRouter router;
 
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    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 ReportActionRouter() {
     }
@@ -65,11 +67,11 @@
     private void performAction(final ActionEvent e) {
         try {
             ReportGuiPackage.getInstance().updateCurrentNode();
-            Set commandObjects = (Set) commands.get(e.getActionCommand());
-            Iterator iter = commandObjects.iterator();
+            Set<Command> commandObjects = commands.get(e.getActionCommand());
+            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);
@@ -95,10 +97,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());
@@ -109,12 +111,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;
                 }
@@ -126,11 +128,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;
                 }
@@ -152,11 +154,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);
@@ -174,9 +176,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);
@@ -194,11 +196,11 @@
      *            org.apache.jmeter.report.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);
@@ -215,9 +217,9 @@
      *            org.apache.jmeter.report.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);
@@ -225,9 +227,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++) {
@@ -237,9 +239,9 @@
         }
     }
 
-    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();
                 for (int i = 0; i < listeners.length; i++) {
@@ -251,31 +253,31 @@
 
     private void populateCommandMap() {
         log.info("populateCommandMap called");
-        List listClasses;
+        List<String> listClasses;
         Command command;
-        Iterator iterClasses;
-        Class commandClass;
+        Iterator<String> iterClasses;
+        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.warn("!!!!!Uh-oh, didn't find any action handlers!!!!!");
             }
             iterClasses = listClasses.iterator();
             while (iterClasses.hasNext()) {
-                String strClassName = (String) iterClasses.next();
+                String strClassName = iterClasses.next();
                 if 
(strClassName.startsWith("org.apache.jmeter.report.gui.action")) {
                     // log.info("classname:: " + strClassName);
                     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/reports/org/apache/jmeter/report/gui/action/ReportAddParent.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportAddParent.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportAddParent.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportAddParent.java
 Sat Aug 15 01:04:14 2009
@@ -33,7 +33,7 @@
 public class ReportAddParent 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("Add Parent");
     }
@@ -53,7 +53,7 @@
 
     }
 
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportAddToTree.java
 Sat Aug 15 01:04:14 2009
@@ -36,10 +36,10 @@
 public class ReportAddToTree implements Command {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private Map allJMeterComponentCommands;
+    private Map<String, String> allJMeterComponentCommands;
 
     public ReportAddToTree() {
-        allJMeterComponentCommands = new HashMap();
+        allJMeterComponentCommands = new HashMap<String, String>();
         allJMeterComponentCommands.put("Add", "Add");
     }
 
@@ -48,7 +48,7 @@
      *
      * @return the ActionNames value
      */
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return allJMeterComponentCommands.keySet();
     }
 

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCheckDirty.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCheckDirty.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCheckDirty.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCheckDirty.java
 Sat Aug 15 01:04:14 2009
@@ -30,6 +30,7 @@
 import org.apache.jmeter.report.gui.action.ReportActionRouter;
 import org.apache.jmeter.report.gui.action.ReportExitCommand;
 import org.apache.jmeter.report.gui.tree.ReportTreeNode;
+import org.apache.jmeter.testelement.TestElement;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.collections.HashTreeTraverser;
 import org.apache.jorphan.collections.ListedHashTree;
@@ -39,7 +40,7 @@
 public class ReportCheckDirty extends AbstractAction implements 
HashTreeTraverser, ActionListener {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static Map previousGuiItems;
+    private static Map<ReportTreeNode, TestElement> previousGuiItems;
 
     public static final String CHECK_DIRTY = "check_dirty";
 
@@ -60,7 +61,7 @@
 
     boolean dirty = false;
 
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add(CHECK_DIRTY);
         commands.add(SUB_TREE_SAVED);
@@ -70,7 +71,7 @@
     }
 
     public ReportCheckDirty() {
-        previousGuiItems = new HashMap();
+        previousGuiItems = new HashMap<ReportTreeNode, TestElement>();
         
ReportActionRouter.getInstance().addPreActionListener(ReportExitCommand.class, 
this);
     }
 
@@ -130,7 +131,7 @@
         } else if (removeMode) {
             previousGuiItems.remove(treeNode);
         } else {
-            previousGuiItems.put(treeNode, treeNode.getTestElement().clone());
+            previousGuiItems.put(treeNode, (TestElement) 
treeNode.getTestElement().clone());
         }
     }
 
@@ -154,7 +155,7 @@
      * @see org.apache.jmeter.gui.action.Command#getActionNames()
      */
     @Override
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 }

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java
 Sat Aug 15 01:04:14 2009
@@ -36,7 +36,7 @@
  */
 public class ReportClose implements Command {
 
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add("close");
     }
@@ -52,7 +52,7 @@
      *
      * @return the ActionNames value
      */
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCopy.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCopy.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCopy.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCopy.java
 Sat Aug 15 01:04:14 2009
@@ -36,7 +36,7 @@
 
     private static final String COPY = "Copy";
 
-    private static final HashSet commands = new HashSet();
+    private static final HashSet<String> commands = new HashSet<String>();
     static {
         commands.add(COPY);
     }
@@ -45,7 +45,7 @@
      * @see org.apache.jmeter.report.gui.action.Command#getActionNames()
      */
     @Override
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCut.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCut.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCut.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCut.java
 Sat Aug 15 01:04:14 2009
@@ -29,7 +29,7 @@
 public class ReportCut extends AbstractAction {
     public static final String CUT = "Cut";//$NON-NLS-1$
 
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add(CUT);
     }
@@ -38,7 +38,7 @@
      * @see org.apache.jmeter.gui.action.Command#getActionNames()
      */
     @Override
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportDragNDrop.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportDragNDrop.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportDragNDrop.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportDragNDrop.java
 Sat Aug 15 01:04:14 2009
@@ -39,7 +39,7 @@
 
     public static final String INSERT_AFTER = 
"drag_n_drop.insert_after";//$NON-NLS-1$
 
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add(ADD);
         commands.add(INSERT_BEFORE);
@@ -123,7 +123,7 @@
      * @see org.apache.jmeter.gui.action.Command#getActionNames()
      */
     @Override
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 }

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportEditCommand.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportEditCommand.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportEditCommand.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportEditCommand.java
 Sat Aug 15 01:04:14 2009
@@ -27,7 +27,7 @@
 import org.apache.jmeter.gui.NamePanel;
 
 public class ReportEditCommand implements Command {
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add("edit");
     }
@@ -51,7 +51,7 @@
         }
     }
 
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 }

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportEnableComponent.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportEnableComponent.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportEnableComponent.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportEnableComponent.java
 Sat Aug 15 01:04:14 2009
@@ -35,7 +35,7 @@
 
     public static final String DISABLE = "disable";
 
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add(ENABLE);
         commands.add(DISABLE);
@@ -67,7 +67,7 @@
     /**
      * @see org.apache.jmeter.gui.action.Command#getActionNames()
      */
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 }

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportExitCommand.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportExitCommand.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportExitCommand.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportExitCommand.java
 Sat Aug 15 01:04:14 2009
@@ -34,7 +34,7 @@
 
     public static final String EXIT = "exit";
 
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add(EXIT);
     }
@@ -50,7 +50,7 @@
      *
      * @return The ActionNames value
      */
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportHelp.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportHelp.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportHelp.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportHelp.java
 Sat Aug 15 01:04:14 2009
@@ -41,7 +41,7 @@
 
     public static final String HELP = "help";
 
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
 
     public static final String HELP_DOCS = "file:///" + 
JMeterUtils.getJMeterHome() + "/printable_docs/usermanual/";
 
@@ -115,7 +115,7 @@
     /**
      * @see org.apache.jmeter.gui.action.Command#getActionNames()
      */
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 }

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
 Sat Aug 15 01:04:14 2009
@@ -49,7 +49,7 @@
 
     XStream loadService = new XStream();
 
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add("open");
         commands.add("merge");
@@ -59,7 +59,7 @@
         super();
     }
 
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportPaste.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportPaste.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportPaste.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportPaste.java
 Sat Aug 15 01:04:14 2009
@@ -35,7 +35,7 @@
 
     public static final String PASTE = "Paste"; //$NON-NLS-1$
 
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add(PASTE);
     }
@@ -44,7 +44,7 @@
      * @see org.apache.jmeter.gui.action.Command#getActionNames()
      */
     @Override
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportRemove.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportRemove.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportRemove.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportRemove.java
 Sat Aug 15 01:04:14 2009
@@ -32,7 +32,7 @@
 import org.apache.jmeter.testelement.TestElement;
 
 public class ReportRemove implements Command {
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add("remove");
     }
@@ -48,7 +48,7 @@
      *
      * @return the ActionNames value
      */
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
 Sat Aug 15 01:04:14 2009
@@ -52,7 +52,7 @@
 
     // NOTUSED private String chosenFile;
 
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add(SAVE_AS);
         commands.add(SAVE_ALL_AS);
@@ -70,7 +70,7 @@
      *
      * @return the ActionNames value
      */
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSaveGraphics.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSaveGraphics.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSaveGraphics.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSaveGraphics.java
 Sat Aug 15 01:04:14 2009
@@ -48,7 +48,7 @@
 
     public static final String SAVE_GRAPHICS = "save_graphics"; // $NON-NLS-1$
 
-    private static final Set commands = new HashSet();
+    private static final Set<String> commands = new HashSet<String>();
     static {
         commands.add(SAVE_GRAPHICS);
     }
@@ -66,7 +66,7 @@
      *
      * @return the ActionNames value
      */
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportStart.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportStart.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportStart.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportStart.java
 Sat Aug 15 01:04:14 2009
@@ -31,7 +31,7 @@
 public class ReportStart 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);
         commands.add(ActionNames.ACTION_STOP);
@@ -52,7 +52,7 @@
      * @return the ActionNames value
      */
     @Override
-    public Set getActionNames() {
+    public Set<String> getActionNames() {
         return commands;
     }
 

Modified: 
jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java?rev=804423&r1=804422&r2=804423&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java 
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java 
Sat Aug 15 01:04:14 2009
@@ -40,7 +40,7 @@
     private static final File testfiledir = new File(basedir,"bin/testfiles");
     private static final File demofiledir = new File(basedir,"xdocs/demos");
     
-    private static final Set notTestPlan = new HashSet();// not full test plans
+    private static final Set<String> notTestPlan = new HashSet<String>();// 
not full test plans
     
     static{
         notTestPlan.add("load_bug_list.jmx");// used by TestAnchorModifier



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]