Author: sebb Date: Sat Aug 15 19:22:55 2009 New Revision: 804518 URL: http://svn.apache.org/viewvc?rev=804518&view=rev Log: Fix up some raw types
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledField.java jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/PreCompiler.java Sat Aug 15 19:22:55 2009 @@ -58,11 +58,7 @@ isRemote = remote; } - /* - * (non-Javadoc) - * - * @see HashTreeTraverser#addNode(Object, HashTree) - */ + /** {...@inheritdoc} */ public void addNode(Object node, HashTree subTree) { if(isRemote && node instanceof ResultCollector) { @@ -85,7 +81,7 @@ } if (node instanceof TestPlan) { ((TestPlan)node).prepareForPreCompile(); //A hack to make user-defined variables in the testplan element more dynamic - Map args = ((TestPlan) node).getUserDefinedVariables(); + Map<String, String> args = ((TestPlan) node).getUserDefinedVariables(); replacer.setUserDefinedVariables(args); JMeterVariables vars = new JMeterVariables(); vars.putAll(args); @@ -94,25 +90,17 @@ if (node instanceof Arguments) { ((Arguments)node).setRunningVersion(true); - Map args = ((Arguments) node).getArgumentsAsMap(); + Map<String, String> args = ((Arguments) node).getArgumentsAsMap(); replacer.addVariables(args); JMeterContextService.getContext().getVariables().putAll(args); } } - /* - * (non-Javadoc) - * - * @see HashTreeTraverser#subtractNode() - */ + /** {...@inheritdoc} */ public void subtractNode() { } - /* - * (non-Javadoc) - * - * @see HashTreeTraverser#processPath() - */ + /** {...@inheritdoc} */ public void processPath() { } } Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java Sat Aug 15 19:22:55 2009 @@ -25,8 +25,10 @@ import java.util.LinkedList; import java.util.List; +import javax.swing.AbstractButton; import javax.swing.ButtonGroup; import javax.swing.ButtonModel; +import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JRadioButton; @@ -48,7 +50,7 @@ private final ButtonGroup bGroup = new ButtonGroup(); - private final ArrayList mChangeListeners = new ArrayList(3); + private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<ChangeListener>(3); /** * @@ -111,9 +113,9 @@ * @param resourcename name of resource whose button is to be selected */ public void setText(String resourcename) { - Enumeration en = this.bGroup.getElements(); + Enumeration<AbstractButton> en = this.bGroup.getElements(); while (en.hasMoreElements()) { - ButtonModel model = ((JRadioButton) en.nextElement()).getModel(); + ButtonModel model = en.nextElement().getModel(); if (model.getActionCommand().equals(resourcename)) { this.bGroup.setSelected(model, true); } else { @@ -131,11 +133,7 @@ this.mLabel.setText(JMeterUtils.getResString(label_resource)); } - /* - * (non-Javadoc) - * - * @see org.apache.jorphan.gui.JLabeledField#addChangeListener(javax.swing.event.ChangeListener) - */ + /** {...@inheritdoc} */ public void addChangeListener(ChangeListener pChangeListener) { this.mChangeListeners.add(pChangeListener); } @@ -147,7 +145,7 @@ private void notifyChangeListeners() { ChangeEvent ce = new ChangeEvent(this); for (int index = 0; index < mChangeListeners.size(); index++) { - ((ChangeListener) mChangeListeners.get(index)).stateChanged(ce); + mChangeListeners.get(index).stateChanged(ce); } } @@ -155,10 +153,10 @@ * Method will return all the label and JRadioButtons. ButtonGroup is * excluded from the list. */ - public List getComponentList() { - List comps = new LinkedList(); + public List<JComponent> getComponentList() { + List<JComponent> comps = new LinkedList<JComponent>(); comps.add(mLabel); - Enumeration en = this.bGroup.getElements(); + Enumeration<AbstractButton> en = this.bGroup.getElements(); while (en.hasMoreElements()) { comps.add(en.nextElement()); } Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledField.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledField.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledField.java (original) +++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledField.java Sat Aug 15 19:22:55 2009 @@ -20,6 +20,7 @@ import java.util.List; +import javax.swing.JComponent; import javax.swing.event.ChangeListener; /** @@ -34,5 +35,5 @@ public void addChangeListener(ChangeListener pChangeListener); - public List getComponentList(); + public List<JComponent> getComponentList(); } \ No newline at end of file Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java (original) +++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java Sat Aug 15 19:22:55 2009 @@ -25,6 +25,7 @@ import java.util.LinkedList; import java.util.List; +import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -46,7 +47,7 @@ private JTextArea mTextArea; // Maybe move to vector if MT problems occur - private ArrayList mChangeListeners = new ArrayList(3); + private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<ChangeListener>(3); // A temporary cache for the focus listener private String oldValue = ""; @@ -84,8 +85,9 @@ } } - public List getComponentList() { - List comps = new LinkedList(); + /** {...@inheritdoc} */ + public List<JComponent> getComponentList() { + List<JComponent> comps = new LinkedList<JComponent>(); comps.add(mLabel); comps.add(mTextArea); return comps; @@ -173,6 +175,7 @@ return mLabel.getText(); } + /** {...@inheritdoc} */ @Override public void setEnabled(boolean enable) { super.setEnabled(enable); @@ -229,7 +232,7 @@ private void notifyChangeListeners() { ChangeEvent ce = new ChangeEvent(this); for (int index = 0; index < mChangeListeners.size(); index++) { - ((ChangeListener) mChangeListeners.get(index)).stateChanged(ce); + mChangeListeners.get(index).stateChanged(ce); } } } \ No newline at end of file Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java (original) +++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java Sat Aug 15 19:22:55 2009 @@ -26,6 +26,7 @@ import java.util.LinkedList; import java.util.List; +import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; @@ -46,7 +47,7 @@ private JTextField mTextField; // Maybe move to vector if MT problems occur - private final ArrayList mChangeListeners = new ArrayList(3); + private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<ChangeListener>(3); // A temporary cache for the focus listener private String oldValue = ""; @@ -86,13 +87,15 @@ init(); } - public List getComponentList() { - List comps = new LinkedList(); + /** {...@inheritdoc} */ + public List<JComponent> getComponentList() { + List<JComponent> comps = new LinkedList<JComponent>(); comps.add(mLabel); comps.add(mTextField); return comps; } + /** {...@inheritdoc} */ @Override public void setEnabled(boolean enable) { super.setEnabled(enable); @@ -229,7 +232,7 @@ protected void notifyChangeListeners() { ChangeEvent ce = new ChangeEvent(this); for (int index = 0; index < mChangeListeners.size(); index++) { - ((ChangeListener) mChangeListeners.get(index)).stateChanged(ce); + mChangeListeners.get(index).stateChanged(ce); } } } Modified: jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java (original) +++ jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java Sat Aug 15 19:22:55 2009 @@ -404,7 +404,7 @@ sresult.setSuccessful(false); StringBuffer buf = new StringBuffer(); buf.append( getFailure() ); - Enumeration en = tr.errors(); + Enumeration<?> en = tr.errors(); while (en.hasMoreElements()){ Object item = en.nextElement(); if (getAppendError() && item instanceof TestFailure) { @@ -447,9 +447,9 @@ public static Object getClassInstance(String className, String label){ Object testclass = null; if (className != null){ - Constructor con = null; - Constructor strCon = null; - Class theclazz = null; + Constructor<?> con = null; + Constructor<?> strCon = null; + Class<?> theclazz = null; Object[] strParams = null; Object[] params = null; try @@ -533,7 +533,7 @@ // log.info("class " + clazz.getClass().getName() + // " method name is " + RUNTEST); try { - Class[] param = {TestResult.class}; + Class<?>[] param = {TestResult.class}; return clazz.getClass().getMethod(RUNTEST,param); } catch (NoSuchMethodException e) { log.warn(e.getMessage()); Modified: jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java (original) +++ jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java Sat Aug 15 19:22:55 2009 @@ -37,7 +37,7 @@ public class MonitorHandler extends DefaultHandler { // private boolean startDoc = false; // private boolean endDoc = false; - private Stack stacktree = new Stack(); + private Stack<Object> stacktree = new Stack<Object>(); private ObjectFactory factory = null; @@ -75,11 +75,13 @@ this.factory = factory; } + /** {...@inheritdoc} */ @Override public void startDocument() throws SAXException { // this.startDoc = true; } + /** {...@inheritdoc} */ @Override public void endDocument() throws SAXException { // this.startDoc = false; Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java Sat Aug 15 19:22:55 2009 @@ -82,6 +82,7 @@ setProperty(new CollectionProperty(AUTH_LIST, new ArrayList())); } + /** {...@inheritdoc} */ @Override public void clear() { super.clear(); @@ -196,6 +197,7 @@ return null; } + /** {...@inheritdoc} */ @Override public void addConfigElement(ConfigElement config) { } @@ -208,6 +210,7 @@ getAuthObjects().addItem(new Authorization()); } + /** {...@inheritdoc} */ @Override public boolean expectsModification() { return false; Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java Sat Aug 15 19:22:55 2009 @@ -464,6 +464,7 @@ } } + /** {...@inheritdoc} */ public void testStarted() { initialCookies = getCookies(); cookieSpec = CookiePolicy.getCookieSpec(getPolicy()); @@ -472,16 +473,20 @@ } } + /** {...@inheritdoc} */ public void testEnded() { } + /** {...@inheritdoc} */ public void testStarted(String host) { testStarted(); } + /** {...@inheritdoc} */ public void testEnded(String host) { } + /** {...@inheritdoc} */ public void testIterationStart(LoopIterationEvent event) { if (getClearEachIteration()) { log.debug("Initialise cookies from pre-defined list"); Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java Sat Aug 15 19:22:55 2009 @@ -65,6 +65,7 @@ setProperty(new CollectionProperty(HEADERS, new ArrayList())); } + /** {...@inheritdoc} */ @Override public void clear() { super.clear(); Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java Sat Aug 15 19:22:55 2009 @@ -202,7 +202,7 @@ } public static void convertArgumentsToHTTP(Arguments args) { - List newArguments = new LinkedList(); + List<Argument> newArguments = new LinkedList<Argument>(); PropertyIterator iter = args.getArguments().iterator(); while (iter.hasNext()) { Argument arg = (Argument) iter.next().getObjectValue(); Modified: jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java (original) +++ jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java Sat Aug 15 19:22:55 2009 @@ -51,7 +51,7 @@ /** * Map containing the initialization parameters for the JavaSamplerClient. */ - private Map params = null; + private Map<String, String> params = null; /** * Create a new JavaSampler with the specified initialization parameters. @@ -82,7 +82,7 @@ * @return an Iterator of Strings listing the names of the parameters which * have been specified for this test. */ - public Iterator getParameterNamesIterator() { + public Iterator<String> getParameterNamesIterator() { return params.keySet().iterator(); } @@ -115,7 +115,7 @@ if (params == null || !params.containsKey(name)) { return defaultValue; } - return (String) params.get(name); + return params.get(name); } /** @@ -138,7 +138,7 @@ throw new NumberFormatException("No value for parameter named '" + name + "'."); } - return Integer.decode((String) params.get(name)).intValue(); + return Integer.decode(params.get(name)).intValue(); } /** @@ -164,7 +164,7 @@ } try { - return Integer.decode((String) params.get(name)).intValue(); + return Integer.decode(params.get(name)).intValue(); } catch (NumberFormatException e) { log.warn("Value for parameter '" + name + "' not an integer: '" + params.get(name) + "'. Using default: '" + defaultValue + "'.", e); @@ -192,7 +192,7 @@ throw new NumberFormatException("No value for parameter named '" + name + "'."); } - return Long.decode((String) params.get(name)).longValue(); + return Long.decode(params.get(name)).longValue(); } /** @@ -216,7 +216,7 @@ return defaultValue; } try { - return Long.decode((String) params.get(name)).longValue(); + return Long.decode(params.get(name)).longValue(); } catch (NumberFormatException e) { log.warn("Value for parameter '" + name + "' not a long: '" + params.get(name) + "'. Using default: '" + defaultValue + "'.", e); Modified: jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java (original) +++ jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java Sat Aug 15 19:22:55 2009 @@ -333,9 +333,9 @@ */ private void listParameters(JavaSamplerContext context) { if (getLogger().isDebugEnabled()) { - Iterator argsIt = context.getParameterNamesIterator(); + Iterator<String> argsIt = context.getParameterNamesIterator(); while (argsIt.hasNext()) { - String name = (String) argsIt.next(); + String name = argsIt.next(); getLogger().debug(name + "=" + context.getParameter(name)); } } Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java (original) +++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java Sat Aug 15 19:22:55 2009 @@ -71,9 +71,11 @@ super(); } + /** {...@inheritdoc} */ public void testStarted(String test) { } + /** {...@inheritdoc} */ public void testEnded(String test) { testEnded(); } @@ -96,6 +98,7 @@ public void testStarted() { } + /** {...@inheritdoc} */ public void testIterationStart(LoopIterationEvent event) { } @@ -115,7 +118,7 @@ } counter--; try { - Thread.currentThread().sleep(PAUSE_MILLIS); + Thread.sleep(PAUSE_MILLIS); } catch (InterruptedException ie) { // do nothing, getting interrupted is acceptable } @@ -140,7 +143,7 @@ } counter--; try { - Thread.currentThread().sleep(PAUSE_MILLIS); + Thread.sleep(PAUSE_MILLIS); } catch (InterruptedException ie) { // do nothing, getting interrupted is acceptable } Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java (original) +++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java Sat Aug 15 19:22:55 2009 @@ -36,12 +36,12 @@ */ public class InitialContextFactory { - private static final java.util.HashMap MAP = new HashMap(); + private static final HashMap<String, Context> MAP = new HashMap<String, Context>(); private static final Logger log = LoggingManager.getLoggerForClass(); public static synchronized Context lookupContext(String jndi, String url, boolean useAuth, String user, String pwd) { - Context ctx = (Context) MAP.get(jndi + url); + Context ctx = MAP.get(jndi + url); if (ctx == null) { Properties props = new Properties(); props.setProperty(Context.INITIAL_CONTEXT_FACTORY, jndi); @@ -92,9 +92,9 @@ * clear all the InitialContext objects. */ public static void close() { - Iterator itr = MAP.keySet().iterator(); + Iterator<?> itr = MAP.keySet().iterator(); while (itr.hasNext()) { - Context ctx = (Context) MAP.get(itr.next()); + Context ctx = MAP.get(itr.next()); try { ctx.close(); } catch (NamingException e) { Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java Sat Aug 15 19:22:55 2009 @@ -151,9 +151,7 @@ { ReportGui.class.getName(), "org/apache/jmeter/images/new/book.png" } }; - /* (non-Javadoc) - * @see org.apache.jmeter.plugin.JMeterPlugin#getIconMappings() - */ + /** {...@inheritdoc} */ public String[][] getIconMappings() { String iconProp = JMeterUtils.getPropDefault("jmeter.icons", "org/apache/jmeter/images/icon.properties"); Properties p = JMeterUtils.loadProperties(iconProp); @@ -163,7 +161,7 @@ } log.info("Loaded icon properties from " + iconProp); String[][] iconlist = new String[p.size()][3]; - Enumeration pe = p.keys(); + Enumeration<Object> pe = p.keys(); int i = 0; while (pe.hasMoreElements()) { String key = (String) pe.nextElement(); @@ -178,9 +176,7 @@ return iconlist; } - /* (non-Javadoc) - * @see org.apache.jmeter.plugin.JMeterPlugin#getResourceBundles() - */ + /** {...@inheritdoc} */ public String[][] getResourceBundles() { return new String[0][]; } @@ -347,11 +343,11 @@ // Process command line property definitions (can occur multiple times) Properties jmeterProps = JMeterUtils.getJMeterProperties(); - List clOptions = parser.getArguments(); + List<CLOption> clOptions = parser.getArguments(); int size = clOptions.size(); for (int i = 0; i < size; i++) { - CLOption option = (CLOption) clOptions.get(i); + CLOption option = clOptions.get(i); String name = option.getArgument(0); String value = option.getArgument(1); Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java Sat Aug 15 19:22:55 2009 @@ -36,42 +36,40 @@ import org.apache.jmeter.util.JMeterUtils; public class ReportFilePanel extends HorizontalPanel implements ActionListener { - JTextField filename = new JTextField(20); + private final JTextField filename = new JTextField(20); - JLabel label = new JLabel(JMeterUtils.getResString("file_visualizer_filename")); + private final JLabel label = new JLabel(JMeterUtils.getResString("file_visualizer_filename")); - JButton browse = new JButton(JMeterUtils.getResString("browse")); + private final JButton browse = new JButton(JMeterUtils.getResString("browse")); - List listeners = new LinkedList(); + private final List<ChangeListener> listeners = new LinkedList<ChangeListener>(); - String title; + private final String title; - String filetype; + private final String filetype; /** * Constructor for the FilePanel object. */ public ReportFilePanel() { - title = ""; - init(); + this(""); } public ReportFilePanel(String title) { - this.title = title; - init(); + this(title, null); } public ReportFilePanel(String title, String filetype) { - this(title); + this.title = title; this.filetype = filetype; + init(); } /** * Constructor for the FilePanel object. */ public ReportFilePanel(ChangeListener l, String title) { - this.title = title; - init(); + this(title); listeners.add(l); } @@ -122,12 +120,13 @@ } private void fireFileChanged() { - Iterator iter = listeners.iterator(); + Iterator<ChangeListener> iter = listeners.iterator(); while (iter.hasNext()) { - ((ChangeListener) iter.next()).stateChanged(new ChangeEvent(this)); + iter.next().stateChanged(new ChangeEvent(this)); } } + /** {...@inheritdoc} */ public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("browse")) { JFileChooser chooser = ReportFileDialoger.promptToOpenFile(new String[] { filetype }); Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java Sat Aug 15 19:22:55 2009 @@ -42,7 +42,7 @@ NamedTreeNode { private static final Logger log = LoggingManager.getLoggerForClass(); - private ReportTreeModel treeModel; + private final ReportTreeModel treeModel; // boolean enabled = true; @@ -108,7 +108,7 @@ } } - public Collection getMenuCategories() { + public Collection<String> getMenuCategories() { try { return ReportGuiPackage.getInstance().getGui(getTestElement()) .getMenuCategories(); @@ -142,14 +142,17 @@ .getDocAnchor(); } + /** {...@inheritdoc} */ public void setName(String name) { ((TestElement) getUserObject()).setName(name); } + /** {...@inheritdoc} */ public String getName() { return ((TestElement) getUserObject()).getName(); } + /** {...@inheritdoc} */ public void nameChanged() { treeModel.nodeChanged(this); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java?rev=804518&r1=804517&r2=804518&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java Sat Aug 15 19:22:55 2009 @@ -38,6 +38,7 @@ super(name); } + /** {...@inheritdoc} */ @Override public void setUp() { variables = new TestPlan(); @@ -59,15 +60,15 @@ assertTrue(replacer.containsKey("server")); TestElement element = new TestPlan(); element.setProperty(new StringProperty("domain", "jakarta.apache.org")); - List<Object> args = new ArrayList<Object>(); - args.add("username is jack"); - args.add("his_password"); - element.setProperty(new CollectionProperty("args", args)); + List<Object> argsin = new ArrayList<Object>(); + argsin.add("username is jack"); + argsin.add("his_password"); + element.setProperty(new CollectionProperty("args", argsin)); replacer.reverseReplace(element); assertEquals("${server}", element.getPropertyAsString("domain")); - args = (List<Object>) element.getProperty("args").getObjectValue(); - assertEquals("username is ${username}", ((JMeterProperty) args.get(0)).getStringValue()); - assertEquals("${password}", ((JMeterProperty) args.get(1)).getStringValue()); + List<JMeterProperty> args = (List<JMeterProperty>) element.getProperty("args").getObjectValue(); + assertEquals("username is ${username}", args.get(0).getStringValue()); + assertEquals("${password}", args.get(1).getStringValue()); } public void testReplace() throws Exception { @@ -81,11 +82,7 @@ assertEquals("jakarta.apache.org", element.getPropertyAsString("domain")); } - /* - * (non-Javadoc) - * - * @see junit.framework.TestCase#tearDown() - */ + /** {...@inheritdoc} */ @Override protected void tearDown() throws Exception { JMeterContextService.getContext().setSamplingStarted(false); --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org