Author: sebb Date: Fri Aug 14 19:07:29 2009 New Revision: 804322 URL: http://svn.apache.org/viewvc?rev=804322&view=rev Log: Add @Override and @Deprecated annotations
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.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/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/ReportPaste.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportStart.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportCellRenderer.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/HTMLReportWriter.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/AbstractTable.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/BarChart.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPlan.java jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/Table.java 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=804322&r1=804321&r2=804322&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 Fri Aug 14 19:07:29 2009 @@ -72,6 +72,7 @@ * Need to update this to make the context popupmenu correct * @return a JPopupMenu appropriate for the component. */ + @Override public JPopupMenu createPopupMenu() { JPopupMenu pop = new JPopupMenu(); JMenu addMenu = new JMenu(JMeterUtils.getResString("Add")); @@ -106,6 +107,7 @@ } } + @Override public String getLabelResource() { return "report_plan"; } @@ -118,6 +120,7 @@ * @return a Collection of Strings, where each element is one of the * constants defined in MenuFactory */ + @Override public Collection getMenuCategories() { return null; } @@ -131,6 +134,7 @@ * @param el * the TestElement to configure */ + @Override public void configure(TestElement el) { super.configure(el); Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java Fri Aug 14 19:07:29 2009 @@ -439,6 +439,7 @@ * @param event * the WindowEvent to handle */ + @Override public void windowClosing(WindowEvent event) { ReportActionRouter.getInstance().actionPerformed(new ActionEvent(this, event.getID(), "exit")); } Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java Fri Aug 14 19:07:29 2009 @@ -431,6 +431,7 @@ } } + @Override public void setEnabled(boolean enable) { run_start.setEnabled(!enable); run_stop.setEnabled(enable); 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=804322&r1=804321&r2=804322&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 Fri Aug 14 19:07:29 2009 @@ -57,6 +57,7 @@ return "report_page"; } + @Override public void configureTestElement(TestElement element) { super.configureTestElement(element); } @@ -87,6 +88,7 @@ * a white background instead of the default grey. * @return a panel containing the component title and name panel */ + @Override protected Container makeTitlePanel() { VerticalPanel titlePanel = new VerticalPanel(); titlePanel.setBackground(Color.white); @@ -99,6 +101,7 @@ * This implementaion differs a bit from the normal jmeter gui. it uses * a white background instead of the default grey. */ + @Override protected Component createTitleLabel() { JLabel titleLabel = new JLabel(getStaticLabel()); Font curFont = titleLabel.getFont(); Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java Fri Aug 14 19:07:29 2009 @@ -58,10 +58,12 @@ init(); } + @Override public String getLabelResource() { return "report_bar_chart"; } + @Override public JPopupMenu createPopupMenu() { JPopupMenu pop = new JPopupMenu(); ReportMenuFactory.addFileMenu(pop); @@ -134,6 +136,7 @@ bc.setURL(url.getText()); } + @Override public void configure(TestElement element) { super.configure(element); BarChart bc = (BarChart)element; Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java Fri Aug 14 19:07:29 2009 @@ -59,10 +59,12 @@ init(); } + @Override public String getLabelResource() { return "report_line_graph"; } + @Override public JPopupMenu createPopupMenu() { JPopupMenu pop = new JPopupMenu(); ReportMenuFactory.addFileMenu(pop); @@ -134,6 +136,7 @@ bc.setURLs(urls.getText()); } + @Override public void configure(TestElement element) { super.configure(element); LineChart bc = (LineChart)element; Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java Fri Aug 14 19:07:29 2009 @@ -88,6 +88,7 @@ add(options,BorderLayout.CENTER); } + @Override public JPopupMenu createPopupMenu() { JPopupMenu pop = new JPopupMenu(); JMenu addMenu = new JMenu(JMeterUtils.getResString("Add")); @@ -129,6 +130,7 @@ page.setTitle(pageTitle.getText()); } + @Override public void configure(TestElement element) { super.configure(element); ReportPage page = (ReportPage)element; Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.java Fri Aug 14 19:07:29 2009 @@ -55,6 +55,7 @@ init(); } + @Override public String getLabelResource() { return "report_table"; } @@ -97,6 +98,7 @@ add(options,BorderLayout.CENTER); } + @Override public JPopupMenu createPopupMenu() { JPopupMenu pop = new JPopupMenu(); ReportMenuFactory.addFileMenu(pop); @@ -124,6 +126,7 @@ tb.setTransferRate(String.valueOf(transferRateCheck.isSelected())); } + @Override public void configure(TestElement element) { super.configure(element); Table tb = (Table)element; 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=804322&r1=804321&r2=804322&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 Fri Aug 14 19:07:29 2009 @@ -83,6 +83,7 @@ /** * @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent) */ + @Override public void doAction(ActionEvent e) { String action = e.getActionCommand(); if (action.equals(SUB_TREE_SAVED)) { @@ -152,6 +153,7 @@ /** * @see org.apache.jmeter.gui.action.Command#getActionNames() */ + @Override public Set 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=804322&r1=804321&r2=804322&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 Fri Aug 14 19:07:29 2009 @@ -44,10 +44,12 @@ /* * @see org.apache.jmeter.report.gui.action.Command#getActionNames() */ + @Override public Set getActionNames() { return commands; } + @Override public void doAction(ActionEvent e) { ReportTreeListener treeListener = ReportGuiPackage.getInstance() .getTreeListener(); 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=804322&r1=804321&r2=804322&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 Fri Aug 14 19:07:29 2009 @@ -37,6 +37,7 @@ /** * @see org.apache.jmeter.gui.action.Command#getActionNames() */ + @Override public Set getActionNames() { return commands; } @@ -44,6 +45,7 @@ /** * @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent) */ + @Override public void doAction(ActionEvent e) { ReportGuiPackage guiPack = ReportGuiPackage.getInstance(); ReportTreeNode[] currentNodes = guiPack.getTreeListener().getSelectedNodes(); 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=804322&r1=804321&r2=804322&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 Fri Aug 14 19:07:29 2009 @@ -49,6 +49,7 @@ /** * @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent) */ + @Override public void doAction(ActionEvent e) { String action = e.getActionCommand(); ReportGuiPackage guiPackage = ReportGuiPackage.getInstance(); @@ -121,6 +122,7 @@ /** * @see org.apache.jmeter.gui.action.Command#getActionNames() */ + @Override public Set 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=804322&r1=804321&r2=804322&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 Fri Aug 14 19:07:29 2009 @@ -43,6 +43,7 @@ /** * @see org.apache.jmeter.gui.action.Command#getActionNames() */ + @Override public Set getActionNames() { return commands; } @@ -50,6 +51,7 @@ /** * @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent) */ + @Override public void doAction(ActionEvent e) { ReportTreeNode draggedNodes[] = ReportCopy.getCopiedNodes(); ReportTreeListener treeListener = ReportGuiPackage.getInstance().getTreeListener(); 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=804322&r1=804321&r2=804322&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 Fri Aug 14 19:07:29 2009 @@ -51,10 +51,12 @@ * * @return the ActionNames value */ + @Override public Set getActionNames() { return commands; } + @Override public void doAction(ActionEvent e) { if (e.getActionCommand().equals(ActionNames.ACTION_START)) { popupShouldSave(e); Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportCellRenderer.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportCellRenderer.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportCellRenderer.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportCellRenderer.java Fri Aug 14 19:07:29 2009 @@ -28,6 +28,7 @@ public ReportCellRenderer() { } + @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean p_hasFocus) { super.getTreeCellRendererComponent(tree, ((ReportTreeNode) value).getName(), sel, expanded, leaf, row, Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/HTMLReportWriter.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/HTMLReportWriter.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/HTMLReportWriter.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/HTMLReportWriter.java Fri Aug 14 19:07:29 2009 @@ -30,6 +30,7 @@ super(); } + @Override public ReportSummary writeReport(TestElement element) { return null; } Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java Fri Aug 14 19:07:29 2009 @@ -40,10 +40,12 @@ init(); } + @Override public String getLabelResource() { return "report_writer_html"; } + @Override public JPopupMenu createPopupMenu() { JPopupMenu pop = new JPopupMenu(); ReportMenuFactory.addFileMenu(pop); @@ -88,6 +90,7 @@ wr.setTargetDirectory(outputDirectory.getFilename()); } + @Override public void configure(TestElement element) { super.configure(element); HTMLReportWriter wr = (HTMLReportWriter)element; Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/AbstractTable.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/AbstractTable.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/AbstractTable.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/AbstractTable.java Fri Aug 14 19:07:29 2009 @@ -129,6 +129,7 @@ setProperty(REPORT_TABLE_ERROR_RATE,set); } + @Override public void addTestElement(TestElement el) { if (el != null) { super.addTestElement(el); Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/BarChart.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/BarChart.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/BarChart.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/BarChart.java Fri Aug 14 19:07:29 2009 @@ -64,6 +64,7 @@ return dataset; } + @Override public JComponent renderChart(List data) { ArrayList dset = new ArrayList(); ArrayList xlabels = new ArrayList(); Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java Fri Aug 14 19:07:29 2009 @@ -71,6 +71,7 @@ return dataset; } + @Override public JComponent renderChart(List dataset) { ArrayList dset = new ArrayList(); ArrayList xlabels = new ArrayList(); Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPlan.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPlan.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPlan.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPlan.java Fri Aug 14 19:07:29 2009 @@ -125,6 +125,7 @@ return plan; } + @Override public void addTestElement(TestElement tg) { super.addTestElement(tg); if (tg instanceof ThreadGroup && !isRunningVersion()) { Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/Table.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/Table.java?rev=804322&r1=804321&r2=804322&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/Table.java (original) +++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/Table.java Fri Aug 14 19:07:29 2009 @@ -29,6 +29,7 @@ * for now the method isn't implemented. I still need to decide how * it should be implemented. */ + @Override public String[][] getTableData(List data) { return new String[0][0]; } --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org