Author: sebb Date: Sat Aug 15 01:34:36 2009 New Revision: 804424 URL: http://svn.apache.org/viewvc?rev=804424&view=rev Log: Fix up some raw types
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java Sat Aug 15 01:34:36 2009 @@ -129,7 +129,7 @@ } try { Pattern pattern = JMeterUtils.getPatternCache().getPattern(regex, Perl5Compiler.READ_ONLY_MASK); - List matches = new ArrayList(); + List<MatchResult> matches = new ArrayList<MatchResult>(); int x = 0; boolean done = false; do { @@ -276,8 +276,9 @@ if (template != null) { return; } - List pieces = new ArrayList(); - List combined = new LinkedList(); + List<String> pieces = new ArrayList<String>(); + // Contains Strings and Integers + List<Object> combined = new LinkedList<Object>(); String rawTemplate = getTemplate(); PatternMatcher matcher = JMeterUtils.getMatcher(); Pattern templatePattern = JMeterUtils.getPatternCache().getPattern("\\$(\\d+)\\$" // $NON-NLS-1$ @@ -292,7 +293,7 @@ if (startsWith) { pieces.remove(0);// Remove initial empty entry } - Iterator iter = pieces.iterator(); + Iterator<String> iter = pieces.iterator(); while (iter.hasNext()) { boolean matchExists = matcher.contains(input, templatePattern); if (startsWith) { @@ -335,7 +336,7 @@ * the entry number in the list * @return MatchResult */ - private MatchResult getCorrectMatch(List matches, int entry) { + private MatchResult getCorrectMatch(List<MatchResult> matches, int entry) { int matchSize = matches.size(); if (matchSize <= 0 || entry > matchSize){ @@ -344,10 +345,10 @@ if (entry == 0) // Random match { - return (MatchResult) matches.get(JMeterUtils.getRandomInt(matchSize)); + return matches.get(JMeterUtils.getRandomInt(matchSize)); } - return (MatchResult) matches.get(entry - 1); + return matches.get(entry - 1); } public void setRegex(String regex) { Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java Sat Aug 15 01:34:36 2009 @@ -26,6 +26,7 @@ import org.apache.jmeter.testelement.AbstractTestElement; import org.apache.jmeter.testelement.TestListener; import org.apache.jmeter.threads.JMeterContextService; +import org.apache.jmeter.threads.ThreadGroup; import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.logging.LoggingManager; import org.apache.log.Logger; @@ -70,7 +71,8 @@ private final static ThroughputInfo allThreadsInfo = new ThroughputInfo(); //For holding the ThrougputInfo objects for all ThreadGroups. Keyed by ThreadGroup objects - private final static Map threadGroupsInfoMap = new Hashtable(); + private final static Map<ThreadGroup, ThroughputInfo> threadGroupsInfoMap = + new Hashtable<ThreadGroup, ThroughputInfo>(); /** @@ -167,7 +169,7 @@ JMeterContextService.getContext().getThreadGroup(); ThroughputInfo groupInfo; synchronized (threadGroupsInfoMap) { - groupInfo = (ThroughputInfo)threadGroupsInfoMap.get(group); + groupInfo = threadGroupsInfoMap.get(group); if (groupInfo == null) { groupInfo = new ThroughputInfo(); threadGroupsInfoMap.put(group, groupInfo); Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java Sat Aug 15 01:34:36 2009 @@ -99,7 +99,7 @@ } @Override - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.NON_TEST_ELEMENTS }); } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java Sat Aug 15 01:34:36 2009 @@ -65,7 +65,7 @@ * @return a Collection of Strings, where each element is one of the * constants defined in MenuFactory */ - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.ASSERTIONS }); } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java Sat Aug 15 01:34:36 2009 @@ -56,7 +56,7 @@ * @return a Collection of Strings, where each element is one of the * constants defined in MenuFactory */ - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.CONFIG_ELEMENTS }); } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java Sat Aug 15 01:34:36 2009 @@ -131,7 +131,7 @@ * constants defined in MenuFactory */ @Override - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { if (standalone) { return super.getMenuCategories(); } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ObsoleteGui.java Sat Aug 15 01:34:36 2009 @@ -63,7 +63,7 @@ return null; } - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return null; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java Sat Aug 15 01:34:36 2009 @@ -55,7 +55,7 @@ * @return a Collection of Strings, where each element is one of the * constants defined in MenuFactory */ - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.CONTROLLERS }); } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java Sat Aug 15 01:34:36 2009 @@ -128,7 +128,7 @@ * @return a Collection of Strings, where each element is one of the * constants defined in MenuFactory */ - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return null; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java Sat Aug 15 01:34:36 2009 @@ -53,7 +53,7 @@ * @return a Collection of Strings, where each element is one of the * constants defined in MenuFactory */ - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return null; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java Sat Aug 15 01:34:36 2009 @@ -176,7 +176,7 @@ * * @see org.apache.jmeter.gui.util.MenuFactory */ - Collection getMenuCategories(); + Collection<String> getMenuCategories(); /** * Sets the tree node which this component is associated with. Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java Sat Aug 15 01:34:36 2009 @@ -98,12 +98,7 @@ return ""; // $NON-NLS-1$ } - /** - * Set the name displayed in this component. - * - * @param name - * the name to display - */ + /** {...@inheritdoc} */ @Override public void setName(String name) { super.setName(name); @@ -119,53 +114,44 @@ return node; } - /** - * Set the tree node which this component provides the name for. - * - * @param node - * the tree node corresponding to this component - */ + /** {...@inheritdoc} */ public void setNode(TreeNode node) { this.node = node; } - /* Implements JMeterGUIComponent.configure(TestElement) */ + /** {...@inheritdoc} */ public void configure(TestElement testElement) { setName(testElement.getName()); } - /* Implements JMeterGUIComponent.createPopupMenu() */ + /** {...@inheritdoc} */ public JPopupMenu createPopupMenu() { return null; } - /* Implements JMeterGUIComponent.getStaticLabel() */ + /** {...@inheritdoc} */ public String getStaticLabel() { return JMeterUtils.getResString(getLabelResource()); } - /* - * (non-Javadoc) - * - * @see org.apache.jmeter.gui.JMeterGUIComponent#getLabelResource() - */ + /** {...@inheritdoc} */ public String getLabelResource() { return "root"; // $NON-NLS-1$ } - /* Implements JMeterGUIComponent.getMenuCategories() */ - public Collection getMenuCategories() { + /** {...@inheritdoc} */ + public Collection<String> getMenuCategories() { return null; } - /* Implements JMeterGUIComponent.createTestElement() */ + /** {...@inheritdoc} */ public TestElement createTestElement() { WorkBench wb = new WorkBench(); modifyTestElement(wb); return wb; } - /* Implements JMeterGUIComponent.modifyTestElement(TestElement) */ + /** {...@inheritdoc} */ public void modifyTestElement(TestElement wb) { wb.setName(getName()); wb.setProperty(new StringProperty(TestElement.GUI_CLASS, this.getClass().getName())); Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java Sat Aug 15 01:34:36 2009 @@ -82,9 +82,10 @@ public static final String LISTENERS = "menu_listener"; //$NON-NLS-1$ - private static final Map menuMap = new HashMap(); + private static final Map<String, List<MenuInfo>> menuMap = + new HashMap<String, List<MenuInfo>>(); - private static final Set elementsToSkip = new HashSet(); + private static final Set<String> elementsToSkip = new HashSet<String>(); // MENU_ADD_xxx - controls which items are in the ADD menu // MENU_PARENT_xxx - controls which items are in the Insert Parent menu @@ -114,20 +115,20 @@ private static final String[] MENU_PARENT_SAMPLER = new String[] { MenuFactory.CONTROLLERS }; - private static final List timers, controllers, samplers, configElements, + private static final List<MenuInfo> timers, controllers, samplers, configElements, assertions, listeners, nonTestElements, postProcessors, preProcessors; static { - timers = new LinkedList(); - controllers = new LinkedList(); - samplers = new LinkedList(); - configElements = new LinkedList(); - assertions = new LinkedList(); - listeners = new LinkedList(); - postProcessors = new LinkedList(); - preProcessors = new LinkedList(); - nonTestElements = new LinkedList(); + timers = new LinkedList<MenuInfo>(); + controllers = new LinkedList<MenuInfo>(); + samplers = new LinkedList<MenuInfo>(); + configElements = new LinkedList<MenuInfo>(); + assertions = new LinkedList<MenuInfo>(); + listeners = new LinkedList<MenuInfo>(); + postProcessors = new LinkedList<MenuInfo>(); + preProcessors = new LinkedList<MenuInfo>(); + nonTestElements = new LinkedList<MenuInfo>(); menuMap.put(TIMERS, timers); menuMap.put(ASSERTIONS, assertions); menuMap.put(CONFIG_ELEMENTS, configElements); @@ -291,7 +292,7 @@ * @return the menu */ public static JMenu makeMenu(String category, String actionCommand) { - return makeMenu((Collection) menuMap.get(category), actionCommand, JMeterUtils.getResString(category)); + return makeMenu(menuMap.get(category), actionCommand, JMeterUtils.getResString(category)); } /** @@ -303,11 +304,11 @@ * @param menuName * @return the menu */ - public static JMenu makeMenu(Collection menuInfo, String actionCommand, String menuName) { - Iterator iter = menuInfo.iterator(); + public static JMenu makeMenu(Collection<MenuInfo> menuInfo, String actionCommand, String menuName) { JMenu menu = new JMenu(menuName); + Iterator<MenuInfo> iter = menuInfo.iterator(); while (iter.hasNext()) { - MenuInfo info = (MenuInfo) iter.next(); + MenuInfo info = iter.next(); menu.add(makeMenuItem(info, actionCommand)); } return menu; @@ -391,12 +392,12 @@ private static void initializeMenus() { try { - List guiClasses = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] { + List<String> guiClasses = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] { JMeterGUIComponent.class, TestBean.class }); Collections.sort(guiClasses); - Iterator iter = guiClasses.iterator(); + Iterator<String> iter = guiClasses.iterator(); while (iter.hasNext()) { - String name = (String) iter.next(); + String name = iter.next(); /* * JMeterTreeNode and TestBeanGUI are special GUI classes, and @@ -411,7 +412,7 @@ JMeterGUIComponent item; try { - Class c = Class.forName(name); + Class<?> c = Class.forName(name); if (TestBean.class.isAssignableFrom(c)) { item = new TestBeanGUI(c); } else { @@ -430,7 +431,7 @@ } else { elementsToSkip.add(name); } - Collection categories = item.getMenuCategories(); + Collection<String> categories = item.getMenuCategories(); if (categories == null) { log.debug(name + " participates in no menus."); continue; @@ -549,7 +550,7 @@ } // Is any node an instance of one of the classes? - private static boolean foundClass(JMeterTreeNode nodes[],Class classes[]){ + private static boolean foundClass(JMeterTreeNode nodes[],Class<?> classes[]){ for (int i = 0; i < nodes.length; i++) { JMeterTreeNode node = nodes[i]; for (int j=0; j < classes.length; j++) { @@ -562,7 +563,7 @@ } // Is any node an instance of one of the classes, but not an exception? - private static boolean foundClass(JMeterTreeNode nodes[],Class classes[], Class except){ + private static boolean foundClass(JMeterTreeNode nodes[],Class<?> classes[], Class<?> except){ for (int i = 0; i < nodes.length; i++) { JMeterTreeNode node = nodes[i]; Object userObject = node.getUserObject(); Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java Sat Aug 15 01:34:36 2009 @@ -34,7 +34,7 @@ return MenuFactory.getDefaultExtractorMenu(); } - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.POST_PROCESSORS }); } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java Sat Aug 15 01:34:36 2009 @@ -32,7 +32,7 @@ return MenuFactory.getDefaultExtractorMenu(); } - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.PRE_PROCESSORS }); } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java Sat Aug 15 01:34:36 2009 @@ -55,7 +55,7 @@ * @return a Collection of Strings, where each element is one of the * constants defined in MenuFactory */ - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.SAMPLERS }); } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Sat Aug 15 01:34:36 2009 @@ -88,11 +88,11 @@ public class TestBeanGUI extends AbstractJMeterGuiComponent implements JMeterGUIComponent { private static final Logger log = LoggingManager.getLoggerForClass(); - private final Class testBeanClass; + private final Class<?> testBeanClass; private transient BeanInfo beanInfo; - private final Class customizerClass; + private final Class<?> customizerClass; /** * The single customizer if the customizer class implements @@ -106,7 +106,8 @@ * needs to be limited, though, to avoid memory issues when editing very * large test plans. */ - private final Map customizers = new LRUMap(20); + @SuppressWarnings("unchecked") + private final Map<TestElement, Customizer> customizers = new LRUMap(20); /** * Index of the customizer in the JPanel's child component list: @@ -116,7 +117,7 @@ /** * The property name to value map that the active customizer edits: */ - private final Map propertyMap = new HashMap(); + private final Map<String, Object> propertyMap = new HashMap<String, Object>(); /** * Whether the GUI components have been created. @@ -124,14 +125,14 @@ private boolean initialized = false; static { - List paths = new LinkedList(); + List<String> paths = new LinkedList<String>(); paths.add("org.apache.jmeter.testbeans.gui");// $NON-NLS-1$ paths.addAll(Arrays.asList(PropertyEditorManager.getEditorSearchPath())); String s = JMeterUtils.getPropDefault("propertyEditorSearchPath", null);// $NON-NLS-1$ if (s != null) { paths.addAll(Arrays.asList(JOrphanUtils.split(s, ",", "")));// $NON-NLS-1$ // $NON-NLS-2$ } - PropertyEditorManager.setEditorSearchPath((String[]) paths.toArray(new String[0])); + PropertyEditorManager.setEditorSearchPath(paths.toArray(new String[0])); } // Dummy for JUnit test @@ -141,7 +142,7 @@ customizerClass = null; } - public TestBeanGUI(Class testBeanClass) { + public TestBeanGUI(Class<?> testBeanClass) { super(); log.debug("testing class: " + testBeanClass.getName()); // A quick verification, just in case: @@ -326,7 +327,7 @@ if (initialized){ remove(customizerIndexInPanel); } - Customizer c = (Customizer) customizers.get(element); + Customizer c = customizers.get(element); if (c == null) { c = createCustomizer(); c.setObject(propertyMap); @@ -338,13 +339,9 @@ initialized = true; } - /* - * (non-Javadoc) - * - * @see org.apache.jmeter.gui.JMeterGUIComponent#getMenuCategories() - */ - public Collection getMenuCategories() { - List menuCategories = new LinkedList(); + /** {...@inheritdoc} */ + public Collection<String> getMenuCategories() { + List<String> menuCategories = new LinkedList<String>(); BeanDescriptor bd = beanInfo.getBeanDescriptor(); // We don't want to show expert beans in the menus unless we're Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java Sat Aug 15 01:34:36 2009 @@ -89,7 +89,7 @@ initGui(); } - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return null; } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java Sat Aug 15 01:34:36 2009 @@ -56,7 +56,7 @@ * @return a Collection of Strings, where each element is one of the * constants defined in MenuFactory */ - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.TIMERS }); } } \ No newline at end of file Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractListenerGui.java Sat Aug 15 01:34:36 2009 @@ -55,7 +55,7 @@ * @return a Collection of Strings, where each element is one of the * constants defined in MenuFactory */ - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.LISTENERS }); } Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java Sat Aug 15 01:34:36 2009 @@ -89,7 +89,7 @@ } @Override - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.NON_TEST_ELEMENTS }); } Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java Sat Aug 15 01:34:36 2009 @@ -288,11 +288,7 @@ private static class InnerTableModel extends AbstractTableModel { private static final long serialVersionUID = 4638155137475747946L; - AuthManager manager; - - public InnerTableModel(AuthManager man) { - manager = man; - } + final AuthManager manager; public InnerTableModel() { manager = new AuthManager(); @@ -318,7 +314,7 @@ } @Override - public Class getColumnClass(int column) { + public Class<?> getColumnClass(int column) { return getValueAt(0, column).getClass(); } Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java Sat Aug 15 01:34:36 2009 @@ -85,7 +85,7 @@ // removed expiration because it's just an annoyance for static cookies }; - private static final Class[] columnClasses = { + private static final Class<?>[] columnClasses = { String.class, String.class, String.class, Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Sat Aug 15 01:34:36 2009 @@ -195,6 +195,7 @@ init(); } + /** {...@inheritdoc} */ @Override public TestElement createTestElement() { model = makeProxyControl(); @@ -208,11 +209,7 @@ return local; } - /** - * Modifies a given TestElement to mirror the data in the gui components. - * - * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement) - */ + /** {...@inheritdoc} */ @Override public void modifyTestElement(TestElement el) { if (excludeTable.isEditing()) {// Bug 42948 @@ -250,34 +247,37 @@ } protected void setIncludeListInProxyControl(ProxyControl element) { - List includeList = getDataList(includeModel, INCLUDE_COL); + List<String> includeList = getDataList(includeModel, INCLUDE_COL); element.setIncludeList(includeList); } protected void setExcludeListInProxyControl(ProxyControl element) { - List excludeList = getDataList(excludeModel, EXCLUDE_COL); + List<String> excludeList = getDataList(excludeModel, EXCLUDE_COL); element.setExcludeList(excludeList); } - private List getDataList(PowerTableModel p_model, String colName) { + private List<String> getDataList(PowerTableModel p_model, String colName) { String[] dataArray = p_model.getData().getColumn(colName); - List list = new LinkedList(); + List<String> list = new LinkedList<String>(); for (int i = 0; i < dataArray.length; i++) { list.add(dataArray[i]); } return list; } + /** {...@inheritdoc} */ @Override public String getLabelResource() { return "proxy_title"; // $NON-NLS-1$ } + /** {...@inheritdoc} */ @Override - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { MenuFactory.NON_TEST_ELEMENTS }); } + /** {...@inheritdoc} */ @Override public void configure(TestElement element) { log.debug("Configuring gui with " + element); @@ -319,17 +319,13 @@ * activated whenever the Proxy is selected in the Test Plan * Also handles samplerTypeName */ + /** {...@inheritdoc} */ public void itemStateChanged(ItemEvent e) { // System.err.println(e.paramString()); enableRestart(); } - /*************************************************************************** - * !ToDo (Method description) - * - * @param action - * !ToDo (Parameter description) - **************************************************************************/ + /** {...@inheritdoc} */ public void actionPerformed(ActionEvent action) { String command = action.getActionCommand(); @@ -407,30 +403,15 @@ } } - /*************************************************************************** - * !ToDo (Method description) - * - * @param e - * !ToDo (Parameter description) - **************************************************************************/ + /** {...@inheritdoc} */ public void keyPressed(KeyEvent e) { } - /*************************************************************************** - * !ToDo (Method description) - * - * @param e - * !ToDo (Parameter description) - **************************************************************************/ + /** {...@inheritdoc} */ public void keyTyped(KeyEvent e) { } - /*************************************************************************** - * !ToDo (Method description) - * - * @param e - * !ToDo (Parameter description) - **************************************************************************/ + /** {...@inheritdoc} */ public void keyReleased(KeyEvent e) { String fieldName = e.getComponent().getName(); @@ -827,6 +808,7 @@ return tn; } + /** {...@inheritdoc} */ @Override public String toString() { return label; Modified: jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java (original) +++ jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java Sat Aug 15 01:34:36 2009 @@ -108,7 +108,7 @@ * constants defined in MenuFactory */ @Override - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return null; } @@ -128,11 +128,11 @@ /* Implements JMeterGUIComponent.modifyTestElement(TestElement) */ public void modifyTestElement(TestElement args) { stopTableEditing(); - Iterator modelData = tableModel.iterator(); LDAPArguments arguments = null; if (args instanceof LDAPArguments) { arguments = (LDAPArguments) args; arguments.clear(); + Iterator modelData = tableModel.iterator(); while (modelData.hasNext()) { LDAPArgument arg = (LDAPArgument) modelData.next(); arg.setMetaData("="); Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java Sat Aug 15 01:34:36 2009 @@ -121,7 +121,7 @@ * constants defined in MenuFactory */ @Override - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return null; } Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java?rev=804424&r1=804423&r2=804424&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java Sat Aug 15 01:34:36 2009 @@ -79,7 +79,7 @@ /* (non-Javadoc) * @see org.apache.jmeter.gui.JMeterGUIComponent#getMenuCategories() */ - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { return Arrays.asList(new String[] { ReportMenuFactory.TABLES }); } --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org