You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2012/11/27 01:15:16 UTC
svn commit: r1413956 [2/3] - in /jmeter/trunk/src/core/org/apache/jmeter: ./
assertions/gui/ config/ config/gui/ control/ control/gui/ engine/
engine/util/ functions/ functions/gui/ gui/ gui/action/ gui/tree/ gui/util/
processor/gui/ reporters/ reporte...
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java Tue Nov 27 00:14:39 2012
@@ -39,6 +39,7 @@ public class EditCommand implements Comm
public EditCommand() {
}
+ @Override
public void doAction(ActionEvent e) {
GuiPackage guiPackage = GuiPackage.getInstance();
JMeterGUIComponent currentGui = guiPackage.getCurrentGui();
@@ -56,6 +57,7 @@ public class EditCommand implements Comm
}
}
+ @Override
public Set<String> getActionNames() {
return commands;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java Tue Nov 27 00:14:39 2012
@@ -44,6 +44,7 @@ public class EnableComponent implements
/**
* @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent)
*/
+ @Override
public void doAction(ActionEvent e) {
JMeterTreeNode[] nodes = GuiPackage.getInstance().getTreeListener().getSelectedNodes();
@@ -79,6 +80,7 @@ public class EnableComponent implements
/**
* @see org.apache.jmeter.gui.action.Command#getActionNames()
*/
+ @Override
public Set<String> getActionNames() {
return commands;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java Tue Nov 27 00:14:39 2012
@@ -46,6 +46,7 @@ public class ExitCommand implements Comm
*
* @return The ActionNames value
*/
+ @Override
public Set<String> getActionNames() {
return commands;
}
@@ -56,6 +57,7 @@ public class ExitCommand implements Comm
* @param e
* Description of Parameter
*/
+ @Override
public void doAction(ActionEvent e) {
ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.CHECK_DIRTY));
if (GuiPackage.getInstance().isDirty()) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java Tue Nov 27 00:14:39 2012
@@ -68,6 +68,7 @@ public class Help implements Command {
/**
* @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent)
*/
+ @Override
public void doAction(ActionEvent e) {
if (helpWindow == null) {
helpWindow = new EscapeDialog(new Frame(),// independent frame to
@@ -105,6 +106,7 @@ public class Help implements Command {
/**
* @see org.apache.jmeter.gui.action.Command#getActionNames()
*/
+ @Override
public Set<String> getActionNames() {
return commands;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java Tue Nov 27 00:14:39 2012
@@ -69,10 +69,12 @@ public class Load implements Command {
super();
}
+ @Override
public Set<String> getActionNames() {
return commands;
}
+ @Override
public void doAction(ActionEvent e) {
JFileChooser chooser = FileDialoger.promptToOpenFile(new String[] { ".jmx" }); //$NON-NLS-1$
if (chooser == null) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java Tue Nov 27 00:14:39 2012
@@ -50,6 +50,7 @@ public class LoggerPanelEnableDisable im
*
* @return the ActionNames value
*/
+ @Override
public Set<String> getActionNames() {
return commands;
}
@@ -60,6 +61,7 @@ public class LoggerPanelEnableDisable im
* @param e
* the generic UI action event
*/
+ @Override
public void doAction(ActionEvent e) {
GuiPackage guiInstance = GuiPackage.getInstance();
JSplitPane splitPane = ((JSplitPane)guiInstance.getLoggerPanel().getParent());
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java Tue Nov 27 00:14:39 2012
@@ -132,6 +132,7 @@ public class LookAndFeelCommand implemen
public LookAndFeelCommand() {
}
+ @Override
public void doAction(ActionEvent ev) {
try {
String className = ev.getActionCommand().substring(ActionNames.LAF_PREFIX.length()).replace('/', '.');
@@ -149,6 +150,7 @@ public class LookAndFeelCommand implemen
}
}
+ @Override
public Set<String> getActionNames() {
return commands;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java Tue Nov 27 00:14:39 2012
@@ -48,7 +48,8 @@ public class RawTextSearcher implements
/**
* {@inheritDoc}
*/
- public boolean search(List<String> textTokens) {
+ @Override
+ public boolean search(List<String> textTokens) {
boolean result = false;
for (String searchableToken : textTokens) {
if(!StringUtils.isEmpty(searchableToken)) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/RegexpSearcher.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RegexpSearcher.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/RegexpSearcher.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/RegexpSearcher.java Tue Nov 27 00:14:39 2012
@@ -52,7 +52,8 @@ public class RegexpSearcher implements S
/**
* {@inheritDoc}
*/
- public boolean search(List<String> textTokens) {
+ @Override
+ public boolean search(List<String> textTokens) {
for (String searchableToken : textTokens) {
if(!StringUtils.isEmpty(searchableToken)) {
Matcher matcher = null;
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java Tue Nov 27 00:14:39 2012
@@ -55,10 +55,12 @@ public class Remove implements Command {
*
* @return the ActionNames value
*/
+ @Override
public Set<String> getActionNames() {
return commands;
}
+ @Override
public void doAction(ActionEvent e) {
int isConfirm = SKIP_CONFIRM ? JOptionPane.YES_OPTION :
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java Tue Nov 27 00:14:39 2012
@@ -42,10 +42,12 @@ public class RevertProject implements Co
super();
}
+ @Override
public Set<String> getActionNames() {
return commands;
}
+ @Override
public void doAction(ActionEvent e) {
// Get the file name of the current project
String projectFile = GuiPackage.getInstance().getTestPlanFile();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java Tue Nov 27 00:14:39 2012
@@ -67,6 +67,7 @@ public class SSLManagerCommand implement
* dialog box. The Dialog Box is NOT modal, because those should be avoided
* if at all possible.
*/
+ @Override
public void doAction(ActionEvent e) {
if (e.getActionCommand().equals(ActionNames.SSL_MANAGER)) {
this.sslManager();
@@ -76,6 +77,7 @@ public class SSLManagerCommand implement
/**
* Provide the list of Action names that are available in this command.
*/
+ @Override
public Set<String> getActionNames() {
return SSLManagerCommand.commandSet;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Tue Nov 27 00:14:39 2012
@@ -72,10 +72,12 @@ public class Save implements Command {
*
* @return the ActionNames value
*/
+ @Override
public Set<String> getActionNames() {
return commands;
}
+ @Override
public void doAction(ActionEvent e) throws IllegalUserActionException {
HashTree subTree = null;
boolean fullSave = false; // are we saving the whole tree?
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java Tue Nov 27 00:14:39 2012
@@ -66,10 +66,12 @@ public class SaveGraphics implements Com
*
* @return the ActionNames value
*/
+ @Override
public Set<String> getActionNames() {
return commands;
}
+ @Override
public void doAction(ActionEvent e) throws IllegalUserActionException {
if (!commands.contains(e.getActionCommand())) {
throw new IllegalUserActionException("Invalid user command:" + e.getActionCommand());
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java Tue Nov 27 00:14:39 2012
@@ -94,6 +94,7 @@ public class SearchTreeDialog extends JD
*/
private static final long serialVersionUID = -6543764044868772971L;
+ @Override
public void actionPerformed(ActionEvent actionEvent) {
setVisible(false);
}
@@ -105,6 +106,7 @@ public class SearchTreeDialog extends JD
*/
private static final long serialVersionUID = -3661361497864527363L;
+ @Override
public void actionPerformed(ActionEvent actionEvent) {
doSearch(actionEvent);
}
@@ -161,6 +163,7 @@ public class SearchTreeDialog extends JD
* Do search
* @param e {@link ActionEvent}
*/
+ @Override
public void actionPerformed(ActionEvent e) {
if(e.getSource()==cancelButton) {
searchTF.requestFocusInWindow();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/StopStoppables.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/StopStoppables.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/StopStoppables.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/StopStoppables.java Tue Nov 27 00:14:39 2012
@@ -56,6 +56,7 @@ public class StopStoppables extends Abst
/* (non-Javadoc)
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ToolBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ToolBar.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ToolBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ToolBar.java Tue Nov 27 00:14:39 2012
@@ -47,6 +47,7 @@ public class ToolBar implements Command
*
* @return the ActionNames value
*/
+ @Override
public Set<String> getActionNames() {
return commands;
}
@@ -57,6 +58,7 @@ public class ToolBar implements Command
* @param e
* the generic UI action event
*/
+ @Override
public void doAction(ActionEvent e) {
if (ActionNames.TOOLBAR.equals(e.getActionCommand())) {
GuiPackage guiInstance = GuiPackage.getInstance();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java Tue Nov 27 00:14:39 2012
@@ -56,6 +56,7 @@ public class What implements Command {
}
+ @Override
public void doAction(ActionEvent e) throws IllegalUserActionException {
JMeterTreeNode node= GuiPackage.getInstance().getTreeListener().getCurrentNode();
TestElement te = (TestElement)node.getUserObject();
@@ -81,6 +82,7 @@ public class What implements Command {
/**
* Provide the list of Action names that are available in this command.
*/
+ @Override
public Set<String> getActionNames() {
return commandSet;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java Tue Nov 27 00:14:39 2012
@@ -158,15 +158,18 @@ public class JMeterTreeListener implemen
return currentPath;
}
+ @Override
public void valueChanged(TreeSelectionEvent e) {
log.debug("value changed, updating currentPath");
currentPath = e.getNewLeadSelectionPath();
actionHandler.actionPerformed(new ActionEvent(this, 3333, "edit")); // $NON-NLS-1$
}
+ @Override
public void mouseClicked(MouseEvent ev) {
}
+ @Override
public void mouseReleased(MouseEvent e) {
if (dragging && isValidDragAction(draggedNodes, getCurrentNode())) {
dragging = false;
@@ -214,6 +217,7 @@ public class JMeterTreeListener implemen
return isValid;
}
+ @Override
public void mouseEntered(MouseEvent e) {
}
@@ -238,6 +242,7 @@ public class JMeterTreeListener implemen
return false;
}
+ @Override
public void mousePressed(MouseEvent e) {
// Get the Main Frame.
MainFrame mainFrame = GuiPackage.getInstance().getMainFrame();
@@ -261,6 +266,7 @@ public class JMeterTreeListener implemen
}
}
+ @Override
public void mouseDragged(MouseEvent e) {
if (!dragging) {
dragging = true;
@@ -274,12 +280,15 @@ public class JMeterTreeListener implemen
changeSelectionIfDragging(e);
}
+ @Override
public void mouseMoved(MouseEvent e) {
}
+ @Override
public void mouseExited(MouseEvent ev) {
}
+ @Override
public void keyPressed(KeyEvent e) {
if (KeyStrokes.matches(e,KeyStrokes.COPY)) {
ActionRouter actionRouter = ActionRouter.getInstance();
@@ -300,9 +309,11 @@ public class JMeterTreeListener implemen
}
}
+ @Override
public void keyReleased(KeyEvent e) {
}
+ @Override
public void keyTyped(KeyEvent e) {
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java Tue Nov 27 00:14:39 2012
@@ -175,16 +175,19 @@ public class JMeterTreeNode extends Defa
}
/** {@inheritDoc} */
+ @Override
public void setName(String name) {
((TestElement) getUserObject()).setName(name);
}
/** {@inheritDoc} */
+ @Override
public String getName() {
return ((TestElement) getUserObject()).getName();
}
/** {@inheritDoc} */
+ @Override
public void nameChanged() {
if (treeModel != null) { // may be null during startup
treeModel.nodeChanged(this);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/EscapeDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/EscapeDialog.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/EscapeDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/EscapeDialog.java Tue Nov 27 00:14:39 2012
@@ -51,6 +51,7 @@ public class EscapeDialog extends JDialo
*/
private static final long serialVersionUID = 2208129319916921772L;
+ @Override
public void actionPerformed(ActionEvent e) {
setVisible(false);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java Tue Nov 27 00:14:39 2012
@@ -191,6 +191,7 @@ public class FileListPanel extends JPane
new Class[] { String.class });
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (e.getSource() == clear) {
this.clearFiles();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java Tue Nov 27 00:14:39 2012
@@ -131,6 +131,7 @@ public class FilePanelEntry extends Hori
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().equals(ACTION_BROWSE)) {
JFileChooser chooser;
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FocusRequester.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FocusRequester.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FocusRequester.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FocusRequester.java Tue Nov 27 00:14:39 2012
@@ -44,6 +44,7 @@ public class FocusRequester implements R
}
}
+ @Override
public void run() {
comp.requestFocus();
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JDateField.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JDateField.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JDateField.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JDateField.java Tue Nov 27 00:14:39 2012
@@ -187,9 +187,11 @@ public class JDateField extends JTextFie
FocusClass() {
}
+ @Override
public void focusGained(FocusEvent e) {
}
+ @Override
public void focusLost(FocusEvent e) {
try {
dateFormat.parse(getText());
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java Tue Nov 27 00:14:39 2012
@@ -104,6 +104,7 @@ public class JLabeledRadioI18N extends J
* The implementation will get the resource name from the selected radio button
* in the JButtonGroup.
*/
+ @Override
public String getText() {
return this.bGroup.getSelection().getActionCommand();
}
@@ -114,6 +115,7 @@ public class JLabeledRadioI18N extends J
* not selected.
* @param resourcename name of resource whose button is to be selected
*/
+ @Override
public void setText(String resourcename) {
Enumeration<AbstractButton> en = this.bGroup.getElements();
while (en.hasMoreElements()) {
@@ -131,11 +133,13 @@ public class JLabeledRadioI18N extends J
*
* @param label_resource
*/
+ @Override
public final void setLabel(String label_resource) {
this.mLabel.setText(JMeterUtils.getResString(label_resource));
}
/** {@inheritDoc} */
+ @Override
public void addChangeListener(ChangeListener pChangeListener) {
this.mChangeListeners.add(pChangeListener);
}
@@ -155,6 +159,7 @@ public class JLabeledRadioI18N extends J
* Method will return all the label and JRadioButtons. ButtonGroup is
* excluded from the list.
*/
+ @Override
public List<JComponent> getComponentList() {
List<JComponent> comps = new LinkedList<JComponent>();
comps.add(mLabel);
@@ -168,6 +173,7 @@ public class JLabeledRadioI18N extends J
/**
* When a radio button is clicked, an ActionEvent is triggered.
*/
+ @Override
public void actionPerformed(ActionEvent e) {
this.notifyChangeListeners();
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Tue Nov 27 00:14:39 2012
@@ -575,6 +575,7 @@ public class JMeterMenuBar extends JMenu
}
/** {@inheritDoc} */
+ @Override
public void localeChanged(LocaleChangeEvent event) {
updateMenuElement(fileMenu);
updateMenuElement(editMenu);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java Tue Nov 27 00:14:39 2012
@@ -174,6 +174,7 @@ public class JMeterToolBar extends JTool
/**
* {@inheritDoc}
*/
+ @Override
public void localeChanged(LocaleChangeEvent event) {
this.removeAll();
setupToolbarContent(this);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java Tue Nov 27 00:14:39 2012
@@ -678,6 +678,7 @@ public final class MenuFactory {
MenuInfoComparator(boolean caseBlind){
this.caseBlind = caseBlind;
}
+ @Override
public int compare(MenuInfo o1, MenuInfo o2) {
String lab1 = o1.getLabel();
String lab2 = o2.getLabel();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java Tue Nov 27 00:14:39 2012
@@ -28,6 +28,7 @@ public class TextAreaCellRenderer implem
private JTextArea rend = new JTextArea("");
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value,
boolean isSelected, boolean hasFocus,
int row, int column) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java Tue Nov 27 00:14:39 2012
@@ -129,6 +129,7 @@ public class TextAreaTableCellEditor ext
*
* @see EditorDelegate#getCellEditorValue
*/
+ @Override
public Object getCellEditorValue() {
return delegate.getCellEditorValue();
}
@@ -182,6 +183,7 @@ public class TextAreaTableCellEditor ext
//
/** Implements the <code>TreeCellEditor</code> interface. */
+ @Override
public Component getTreeCellEditorComponent(JTree tree, Object value, boolean isSelected, boolean expanded,
boolean leaf, int row) {
String stringValue = tree.convertValueToText(value, isSelected, expanded, leaf, row, false);
@@ -194,6 +196,7 @@ public class TextAreaTableCellEditor ext
// Implementing the CellEditor Interface
//
/** Implements the <code>TableCellEditor</code> interface. */
+ @Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
delegate.setValue(value);
return new JScrollPane(editorComponent);
@@ -312,10 +315,12 @@ public class TextAreaTableCellEditor ext
TextAreaTableCellEditor.this.stopCellEditing();
}
+ @Override
public void focusLost(FocusEvent ev) {
TextAreaTableCellEditor.this.stopCellEditing();
}
+ @Override
public void focusGained(FocusEvent ev) {
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextBoxDialoger.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextBoxDialoger.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextBoxDialoger.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextBoxDialoger.java Tue Nov 27 00:14:39 2012
@@ -150,6 +150,7 @@ public class TextBoxDialoger implements
dialog.setVisible(false);
}
+ @Override
public void actionPerformed(ActionEvent e) {
String command = e.getActionCommand();
Modified: jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java Tue Nov 27 00:14:39 2012
@@ -37,6 +37,7 @@ public abstract class AbstractPostProces
private static final long serialVersionUID = 240L;
+ @Override
public Collection<String> getMenuCategories() {
return Arrays.asList(new String[] { MenuFactory.POST_PROCESSORS });
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPreProcessorGui.java Tue Nov 27 00:14:39 2012
@@ -30,10 +30,12 @@ public abstract class AbstractPreProcess
private static final long serialVersionUID = 240L;
+ @Override
public JPopupMenu createPopupMenu() {
return MenuFactory.getDefaultExtractorMenu();
}
+ @Override
public Collection<String> getMenuCategories() {
return Arrays.asList(new String[] { MenuFactory.PRE_PROCESSORS });
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Tue Nov 27 00:14:39 2012
@@ -238,6 +238,7 @@ public class ResultCollector extends Abs
setFilenameProperty(f);
}
+ @Override
public void testEnded(String host) {
synchronized(LOCK){
instanceCount--;
@@ -252,6 +253,7 @@ public class ResultCollector extends Abs
}
}
+ @Override
public void testStarted(String host) {
synchronized(LOCK){
instanceCount++;
@@ -271,10 +273,12 @@ public class ResultCollector extends Abs
}
}
+ @Override
public void testEnded() {
testEnded(TEST_IS_LOCAL);
}
+ @Override
public void testStarted() {
testStarted(TEST_IS_LOCAL);
}
@@ -475,9 +479,11 @@ public class ResultCollector extends Abs
return true;
}
+ @Override
public void sampleStarted(SampleEvent e) {
}
+ @Override
public void sampleStopped(SampleEvent e) {
}
@@ -487,6 +493,7 @@ public class ResultCollector extends Abs
* @param event
* the sample event that was received
*/
+ @Override
public void sampleOccurred(SampleEvent event) {
SampleResult result = event.getResult();
@@ -592,6 +599,7 @@ public class ResultCollector extends Abs
// This is required so that
// @see org.apache.jmeter.gui.tree.JMeterTreeModel.getNodesOfType()
// can find the Clearable nodes - the userObject has to implement the interface.
+ @Override
public void clearData() {
}
}
\ No newline at end of file
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java Tue Nov 27 00:14:39 2012
@@ -135,6 +135,7 @@ public class ResultSaver extends Abstrac
*
* @see org.apache.jmeter.samplers.SampleListener#sampleOccurred(org.apache.jmeter.samplers.SampleEvent)
*/
+ @Override
public void sampleOccurred(SampleEvent e) {
processSample(e.getResult(), new Counter());
}
@@ -234,6 +235,7 @@ public class ResultSaver extends Abstrac
/**
* {@inheritDoc}
*/
+ @Override
public void sampleStarted(SampleEvent e) {
// not used
}
@@ -241,6 +243,7 @@ public class ResultSaver extends Abstrac
/**
* {@inheritDoc}
*/
+ @Override
public void sampleStopped(SampleEvent e) {
// not used
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java Tue Nov 27 00:14:39 2012
@@ -166,6 +166,7 @@ public class Summariser extends Abstract
*
* @see org.apache.jmeter.samplers.SampleListener#sampleOccurred(org.apache.jmeter.samplers.SampleEvent)
*/
+ @Override
public void sampleOccurred(SampleEvent e) {
SampleResult s = e.getResult();
@@ -288,11 +289,13 @@ public class Summariser extends Abstract
}
/** {@inheritDoc} */
+ @Override
public void sampleStarted(SampleEvent e) {
// not used
}
/** {@inheritDoc} */
+ @Override
public void sampleStopped(SampleEvent e) {
// not used
}
@@ -309,11 +312,13 @@ public class Summariser extends Abstract
/** {@inheritDoc} */
+ @Override
public void testStarted() {
testStarted("local");
}
/** {@inheritDoc} */
+ @Override
public void testEnded() {
testEnded("local");
}
@@ -329,6 +334,7 @@ public class Summariser extends Abstract
* <p>
* {@inheritDoc}
*/
+ @Override
public void testStarted(String host) {
synchronized (lock) {
myName = getName();
@@ -347,6 +353,7 @@ public class Summariser extends Abstract
* <p>
* {@inheritDoc}
*/
+ @Override
public void testEnded(String host) {
Set<Entry<String, Totals>> totals = null;
synchronized (lock) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java Tue Nov 27 00:14:39 2012
@@ -67,6 +67,7 @@ public class ResultSaverGui extends Abst
/**
* @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
*/
+ @Override
public String getLabelResource() {
return "resultsaver_title"; // $NON-NLS-1$
}
@@ -90,6 +91,7 @@ public class ResultSaverGui extends Abst
/**
* @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
*/
+ @Override
public TestElement createTestElement() {
ResultSaver resultSaver = new ResultSaver();
modifyTestElement(resultSaver);
@@ -101,6 +103,7 @@ public class ResultSaverGui extends Abst
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement te) {
super.configureTestElement(te);
te.setProperty(ResultSaver.FILENAME, filename.getText());
@@ -183,6 +186,7 @@ public class ResultSaverGui extends Abst
}
// Needed to avoid Class cast error in Clear.java
+ @Override
public void clearData() {
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java Tue Nov 27 00:14:39 2012
@@ -37,6 +37,7 @@ public class SummariserGui extends Abstr
init();
}
+ @Override
public String getLabelResource() {
return "summariser_title"; //$NON-NLS-1$
}
@@ -49,6 +50,7 @@ public class SummariserGui extends Abstr
/**
* @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
*/
+ @Override
public TestElement createTestElement() {
Summariser summariser = new Summariser();
modifyTestElement(summariser);
@@ -60,6 +62,7 @@ public class SummariserGui extends Abstr
*
* @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
*/
+ @Override
public void modifyTestElement(TestElement summariser) {
super.configureTestElement(summariser);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampleSender.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampleSender.java Tue Nov 27 00:14:39 2012
@@ -44,7 +44,8 @@ public abstract class AbstractSampleSend
super();
}
- public void testEnded() {
+ @Override
+ public void testEnded() {
// Not used
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampler.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampler.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampler.java Tue Nov 27 00:14:39 2012
@@ -28,6 +28,7 @@ public abstract class AbstractSampler ex
/**
* {@inheritDoc}
*/
+ @Override
public boolean applies(ConfigTestElement configElement) {
return true;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java Tue Nov 27 00:14:39 2012
@@ -90,6 +90,7 @@ public class AsynchSampleSender extends
clientConfiguredCapacity : serverConfiguredCapacity;
}
+ @Override
public void testEnded(String host) {
log.debug("Test Ended on " + host);
try {
@@ -103,6 +104,7 @@ public class AsynchSampleSender extends
}
}
+ @Override
public void sampleOccurred(SampleEvent e) {
try {
if (!queue.offer(e)){ // we failed to add the element first time
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java Tue Nov 27 00:14:39 2012
@@ -117,6 +117,7 @@ public class BatchSampleSender extends A
* @param host
* the host that the test has ended on.
*/
+ @Override
public void testEnded(String host) {
log.info("Test Ended on " + host);
try {
@@ -140,6 +141,7 @@ public class BatchSampleSender extends A
* @param e
* a Sample Event
*/
+ @Override
public void sampleOccurred(SampleEvent e) {
synchronized (sampleStore) {
sampleStore.add(e);
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java Tue Nov 27 00:14:39 2012
@@ -62,11 +62,13 @@ public class DataStrippingSampleSender e
log.info("Using DataStrippingSampleSender for this run");
}
+ @Override
public void testEnded(String host) {
log.info("Test Ended on " + host);
if(decoratedSender != null) decoratedSender.testEnded(host);
}
+ @Override
public void sampleOccurred(SampleEvent event) {
//Strip the response data before writing, but only for a successful request.
SampleResult result = event.getResult();
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java Tue Nov 27 00:14:39 2012
@@ -67,9 +67,11 @@ public class DiskStoreSampleSender exten
log.info("Using DiskStoreSampleSender for this test run"); // client log file
}
+ @Override
public void testEnded(String host) {
log.info("Test Ended on " + host);
singleExecutor.submit(new Runnable(){
+ @Override
public void run() {
try {
oos.close(); // ensure output is flushed
@@ -122,10 +124,12 @@ public class DiskStoreSampleSender exten
}
}
+ @Override
public void sampleOccurred(final SampleEvent e) {
// sampleOccurred is called from multiple threads; not safe to write from multiple threads.
// also decouples the file IO from sample generation
singleExecutor.submit(new Runnable() {
+ @Override
public void run() {
try {
oos.writeObject(e);
@@ -150,6 +154,7 @@ public class DiskStoreSampleSender exten
temporaryFile = File.createTempFile("SerialisedSampleSender", ".ser");
temporaryFile.deleteOnExit();
singleExecutor.submit(new Runnable(){
+ @Override
public void run() {
OutputStream anOutputStream;
try {
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java Tue Nov 27 00:14:39 2012
@@ -54,6 +54,7 @@ public class HoldSampleSender extends Ab
log.info("Using HoldSampleSender for this test run"); // client
}
+ @Override
public void testEnded(String host) {
log.info("Test Ended on " + host);
try {
@@ -74,6 +75,7 @@ public class HoldSampleSender extends Ab
}
+ @Override
public void sampleOccurred(SampleEvent e) {
synchronized (sampleStore) {
sampleStore.add(e);
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java Tue Nov 27 00:14:39 2012
@@ -56,6 +56,7 @@ public class RemoteListenerWrapper exten
sender = null;
}
+ @Override
public void testStarted() {
log.debug("Test Started()");
try {
@@ -72,10 +73,12 @@ public class RemoteListenerWrapper exten
}
+ @Override
public void testEnded() {
sender.testEnded();
}
+ @Override
public void testStarted(String host) {
log.debug("Test Started on " + host);
try {
@@ -91,10 +94,12 @@ public class RemoteListenerWrapper exten
}
}
+ @Override
public void testEnded(String host) {
sender.testEnded(host);
}
+ @Override
public void sampleOccurred(SampleEvent e) {
sender.sampleOccurred(e);
}
@@ -107,6 +112,7 @@ public class RemoteListenerWrapper exten
// in the right order. Each stored event must then be tagged with something
// that lets you distinguish between occured, started and ended.
+ @Override
public void sampleStarted(SampleEvent e) {
log.debug("Sample started");
try {
@@ -116,6 +122,7 @@ public class RemoteListenerWrapper exten
}
}
+ @Override
public void sampleStopped(SampleEvent e) {
log.debug("Sample stopped");
try {
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java Tue Nov 27 00:14:39 2012
@@ -53,24 +53,28 @@ public class RemoteSampleListenerImpl ex
}
}
+ @Override
public void testStarted() {
if (testListener != null) {
testListener.testStarted();
}
}
+ @Override
public void testStarted(String host) {
if (testListener != null) {
testListener.testStarted(host);
}
}
+ @Override
public void testEnded() {
if (testListener != null) {
testListener.testEnded();
}
}
+ @Override
public void testEnded(String host) {
if (testListener != null) {
testListener.testEnded(host);
@@ -85,6 +89,7 @@ public class RemoteSampleListenerImpl ex
* @param samples
* the list of sample events to be fired locally
*/
+ @Override
public void processBatch(List<SampleEvent> samples) {
if (samples != null && sampleListener != null) {
for (SampleEvent e : samples) {
@@ -93,6 +98,7 @@ public class RemoteSampleListenerImpl ex
}
}
+ @Override
public void sampleOccurred(SampleEvent e) {
if (sampleListener != null) {
sampleListener.sampleOccurred(e);
@@ -102,6 +108,7 @@ public class RemoteSampleListenerImpl ex
/**
* A sample has started.
*/
+ @Override
public void sampleStarted(SampleEvent e) {
if (sampleListener != null) {
sampleListener.sampleStarted(e);
@@ -111,6 +118,7 @@ public class RemoteSampleListenerImpl ex
/**
* A sample has stopped.
*/
+ @Override
public void sampleStopped(SampleEvent e) {
if (sampleListener != null) {
sampleListener.sampleStopped(e);
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java Tue Nov 27 00:14:39 2012
@@ -45,6 +45,7 @@ public class RemoteSampleListenerWrapper
public RemoteSampleListenerWrapper() {
}
+ @Override
public void sampleOccurred(SampleEvent e) {
try {
listener.sampleOccurred(e);
@@ -53,6 +54,7 @@ public class RemoteSampleListenerWrapper
}
}
+ @Override
public void sampleStarted(SampleEvent e) {
try {
listener.sampleStarted(e);
@@ -61,6 +63,7 @@ public class RemoteSampleListenerWrapper
}
}
+ @Override
public void sampleStopped(SampleEvent e) {
try {
listener.sampleStopped(e);
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java Tue Nov 27 00:14:39 2012
@@ -45,6 +45,7 @@ public class RemoteTestListenerWrapper e
listener = l;
}
+ @Override
public void testStarted() {
try {
listener.testStarted();
@@ -54,6 +55,7 @@ public class RemoteTestListenerWrapper e
}
+ @Override
public void testEnded() {
try {
listener.testEnded();
@@ -62,6 +64,7 @@ public class RemoteTestListenerWrapper e
}
}
+ @Override
public void testStarted(String host) {
try {
listener.testStarted(host);
@@ -70,6 +73,7 @@ public class RemoteTestListenerWrapper e
}
}
+ @Override
public void testEnded(String host) {
try {
listener.testEnded(host);
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/StandardSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/StandardSampleSender.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/StandardSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/StandardSampleSender.java Tue Nov 27 00:14:39 2012
@@ -51,6 +51,7 @@ public class StandardSampleSender extend
log.info("Using StandardSampleSender for this test run");
}
+ @Override
public void testEnded(String host) {
log.info("Test Ended on " + host);
try {
@@ -60,6 +61,7 @@ public class StandardSampleSender extend
}
}
+ @Override
public void sampleOccurred(SampleEvent e) {
try {
listener.sampleOccurred(e);
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java Tue Nov 27 00:14:39 2012
@@ -120,6 +120,7 @@ public class StatisticalSampleSender ext
*
* @param host the hostname that the test has ended on.
*/
+ @Override
public void testEnded(String host) {
log.info("Test Ended on " + host);
try {
@@ -141,6 +142,7 @@ public class StatisticalSampleSender ext
*
* @param e a Sample Event
*/
+ @Override
public void sampleOccurred(SampleEvent e) {
synchronized (sampleStore) {
// Locate the statistical sample colector
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java Tue Nov 27 00:14:39 2012
@@ -44,6 +44,7 @@ public abstract class AbstractSamplerGui
*
* @return a JPopupMenu appropriate for the component.
*/
+ @Override
public JPopupMenu createPopupMenu() {
return MenuFactory.getDefaultSamplerMenu();
}
@@ -57,6 +58,7 @@ public abstract class AbstractSamplerGui
* @return a Collection of Strings, where each element is one of the
* constants defined in MenuFactory
*/
+ @Override
public Collection<String> getMenuCategories() {
return Arrays.asList(new String[] { MenuFactory.SAMPLERS });
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java Tue Nov 27 00:14:39 2012
@@ -57,6 +57,7 @@ public class ScriptWrapperConverter impl
/**
* {@inheritDoc}
*/
+ @Override
public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { // superclass is not typed
return arg0.equals(ScriptWrapper.class);
}
@@ -64,6 +65,7 @@ public class ScriptWrapperConverter impl
/**
* {@inheritDoc}
*/
+ @Override
public void marshal(Object arg0, HierarchicalStreamWriter writer, MarshallingContext context) {
ScriptWrapper wrap = (ScriptWrapper) arg0;
String version = SaveService.getVERSION();
@@ -79,6 +81,7 @@ public class ScriptWrapperConverter impl
/**
* {@inheritDoc}
*/
+ @Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
ScriptWrapper wrap = new ScriptWrapper();
wrap.version = reader.getAttribute(ATT_VERSION);
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java Tue Nov 27 00:14:39 2012
@@ -37,11 +37,13 @@ public class BooleanPropertyConverter im
}
/** {@inheritDoc} */
+ @Override
public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) {// superclass does not use types
return arg0.equals(BooleanProperty.class);
}
/** {@inheritDoc} */
+ @Override
public void marshal(Object obj, HierarchicalStreamWriter writer, MarshallingContext arg2) {
BooleanProperty prop = (BooleanProperty) obj;
writer.addAttribute(ConversionHelp.ATT_NAME, ConversionHelp.encode(prop.getName()));
@@ -50,6 +52,7 @@ public class BooleanPropertyConverter im
}
/** {@inheritDoc} */
+ @Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
final String name = ConversionHelp.getPropertyName(reader, context);
if (name == null) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java Tue Nov 27 00:14:39 2012
@@ -37,11 +37,13 @@ public class IntegerPropertyConverter im
}
/** {@inheritDoc} */
+ @Override
public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { // superclass does not use types
return arg0.equals(IntegerProperty.class);
}
/** {@inheritDoc} */
+ @Override
public void marshal(Object obj, HierarchicalStreamWriter writer, MarshallingContext arg2) {
IntegerProperty prop = (IntegerProperty) obj;
writer.addAttribute(ConversionHelp.ATT_NAME, ConversionHelp.encode(prop.getName()));
@@ -49,6 +51,7 @@ public class IntegerPropertyConverter im
}
/** {@inheritDoc} */
+ @Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
final String name = ConversionHelp.getPropertyName(reader, context);
if (name == null) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java Tue Nov 27 00:14:39 2012
@@ -37,11 +37,13 @@ public class LongPropertyConverter imple
}
/** {@inheritDoc} */
+ @Override
public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { // superclass does not use types
return arg0.equals(LongProperty.class);
}
/** {@inheritDoc} */
+ @Override
public void marshal(Object obj, HierarchicalStreamWriter writer, MarshallingContext arg2) {
LongProperty prop = (LongProperty) obj;
writer.addAttribute(ConversionHelp.ATT_NAME, ConversionHelp.encode(prop.getName()));
@@ -49,6 +51,7 @@ public class LongPropertyConverter imple
}
/** {@inheritDoc} */
+ @Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
final String name = ConversionHelp.getPropertyName(reader, context);
if (name == null) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java Tue Nov 27 00:14:39 2012
@@ -39,12 +39,14 @@ public class SampleEventConverter implem
}
/** {@inheritDoc} */
+ @Override
public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { // superclass does not use types
return SampleEvent.class.equals(arg0);
}
/** {@inheritDoc} */
// TODO save hostname; save sample type (plain or http)
+ @Override
public void marshal(Object source, HierarchicalStreamWriter writer,
MarshallingContext context) {
SampleEvent evt = (SampleEvent) source;
@@ -54,6 +56,7 @@ public class SampleEventConverter implem
/** {@inheritDoc} */
// TODO does not work yet; need to determine the sample type
+ @Override
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
SampleEvent evt = new SampleEvent();
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java Tue Nov 27 00:14:39 2012
@@ -37,11 +37,13 @@ public class StringPropertyConverter imp
}
/** {@inheritDoc} */
+ @Override
public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { // superclass does not use types
return StringProperty.class.equals(arg0);
}
/** {@inheritDoc} */
+ @Override
public void marshal(Object obj, HierarchicalStreamWriter writer, MarshallingContext arg2) {
StringProperty prop = (StringProperty) obj;
writer.addAttribute(ConversionHelp.ATT_NAME, ConversionHelp.encode(prop.getName()));
@@ -49,6 +51,7 @@ public class StringPropertyConverter imp
}
/** {@inheritDoc} */
+ @Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
final String name = ConversionHelp.getPropertyName(reader, context);
if (name == null) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/swing/HtmlPane.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/swing/HtmlPane.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/swing/HtmlPane.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/swing/HtmlPane.java Tue Nov 27 00:14:39 2012
@@ -35,6 +35,7 @@ public class HtmlPane extends JTextPane
public HtmlPane() {
this.addHyperlinkListener(new HyperlinkListener() {
+ @Override
public void hyperlinkUpdate(HyperlinkEvent e) {
if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
String ref = e.getURL().getRef();
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanBeanInfo.java Tue Nov 27 00:14:39 2012
@@ -41,6 +41,7 @@ import java.beans.PropertyDescriptor;
*/
public class TestBeanBeanInfo implements BeanInfo {
+ @Override
public BeanInfo[] getAdditionalBeanInfo() {
return new BeanInfo[0];
}
@@ -48,6 +49,7 @@ public class TestBeanBeanInfo implements
/**
* {@inheritDoc}
*/
+ @Override
public BeanDescriptor getBeanDescriptor() {
return null;
}
@@ -55,6 +57,7 @@ public class TestBeanBeanInfo implements
/**
* {@inheritDoc}
*/
+ @Override
public int getDefaultEventIndex() {
return 0;
}
@@ -62,6 +65,7 @@ public class TestBeanBeanInfo implements
/**
* {@inheritDoc}
*/
+ @Override
public int getDefaultPropertyIndex() {
return 0;
}
@@ -69,6 +73,7 @@ public class TestBeanBeanInfo implements
/**
* {@inheritDoc}
*/
+ @Override
public EventSetDescriptor[] getEventSetDescriptors() {
return new EventSetDescriptor[0];
}
@@ -76,6 +81,7 @@ public class TestBeanBeanInfo implements
/**
* {@inheritDoc}
*/
+ @Override
public Image getIcon(int iconKind) {
return null;
}
@@ -83,6 +89,7 @@ public class TestBeanBeanInfo implements
/**
* {@inheritDoc}
*/
+ @Override
public MethodDescriptor[] getMethodDescriptors() {
return new MethodDescriptor[0];
}
@@ -90,6 +97,7 @@ public class TestBeanBeanInfo implements
/**
* {@inheritDoc}
*/
+ @Override
public PropertyDescriptor[] getPropertyDescriptors() {
return new PropertyDescriptor[0];
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java Tue Nov 27 00:14:39 2012
@@ -163,6 +163,7 @@ class ComboStringEditor extends Property
/**
* {@inheritDoc}
*/
+ @Override
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
if (e.getItem() == EDIT) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java Tue Nov 27 00:14:39 2012
@@ -113,6 +113,7 @@ class FieldStringEditor extends Property
/**
* {@inheritDoc}
*/
+ @Override
public void actionPerformed(ActionEvent e) {
firePropertyChange();
}
@@ -120,12 +121,14 @@ class FieldStringEditor extends Property
/**
* {@inheritDoc}
*/
+ @Override
public void focusGained(FocusEvent e) {
}
/**
* {@inheritDoc}
*/
+ @Override
public void focusLost(FocusEvent e) {
firePropertyChange();
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java Tue Nov 27 00:14:39 2012
@@ -97,6 +97,7 @@ public class FileEditor implements Prope
/**
* {@inheritDoc}
*/
+ @Override
public void actionPerformed(ActionEvent e) {
JFileChooser chooser = FileDialoger.promptToOpenFile();
@@ -110,6 +111,7 @@ public class FileEditor implements Prope
/**
* @param listener
*/
+ @Override
public void addPropertyChangeListener(PropertyChangeListener listener) {
editor.addPropertyChangeListener(listener);
}
@@ -117,6 +119,7 @@ public class FileEditor implements Prope
/**
* @return the text
*/
+ @Override
public String getAsText() {
return editor.getAsText();
}
@@ -124,6 +127,7 @@ public class FileEditor implements Prope
/**
* @return custom editor panel
*/
+ @Override
public Component getCustomEditor() {
return panel;
}
@@ -131,6 +135,7 @@ public class FileEditor implements Prope
/**
* @return the Java initialisation string
*/
+ @Override
public String getJavaInitializationString() {
return editor.getJavaInitializationString();
}
@@ -138,6 +143,7 @@ public class FileEditor implements Prope
/**
* @return the editor tags
*/
+ @Override
public String[] getTags() {
return editor.getTags();
}
@@ -145,6 +151,7 @@ public class FileEditor implements Prope
/**
* @return the value
*/
+ @Override
public Object getValue() {
return editor.getValue();
}
@@ -152,6 +159,7 @@ public class FileEditor implements Prope
/**
* @return true if the editor is paintable
*/
+ @Override
public boolean isPaintable() {
return editor.isPaintable();
}
@@ -160,6 +168,7 @@ public class FileEditor implements Prope
* @param gfx
* @param box
*/
+ @Override
public void paintValue(Graphics gfx, Rectangle box) {
editor.paintValue(gfx, box);
}
@@ -167,6 +176,7 @@ public class FileEditor implements Prope
/**
* @param listener
*/
+ @Override
public void removePropertyChangeListener(PropertyChangeListener listener) {
editor.removePropertyChangeListener(listener);
}
@@ -175,6 +185,7 @@ public class FileEditor implements Prope
* @param text
* @throws java.lang.IllegalArgumentException
*/
+ @Override
public void setAsText(String text) throws IllegalArgumentException {
editor.setAsText(text);
}
@@ -182,6 +193,7 @@ public class FileEditor implements Prope
/**
* @param value
*/
+ @Override
public void setValue(Object value) {
editor.setValue(value);
}
@@ -189,6 +201,7 @@ public class FileEditor implements Prope
/**
* @return true if supports a custom editor
*/
+ @Override
public boolean supportsCustomEditor() {
return editor.supportsCustomEditor();
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/PasswordEditor.java Tue Nov 27 00:14:39 2012
@@ -109,6 +109,7 @@ public class PasswordEditor extends Prop
/**
* {@inheritDoc}
*/
+ @Override
public void actionPerformed(ActionEvent e) {
firePropertyChange();
}
@@ -116,12 +117,14 @@ public class PasswordEditor extends Prop
/**
* {@inheritDoc}
*/
+ @Override
public void focusGained(FocusEvent e) {
}
/**
* {@inheritDoc}
*/
+ @Override
public void focusLost(FocusEvent e) {
firePropertyChange();
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java Tue Nov 27 00:14:39 2012
@@ -160,6 +160,7 @@ public class TableEditor extends Propert
* For the table editor, the CLASSNAME attribute must simply be the name of the class of object it will hold
* where each row holds one object.
*/
+ @Override
public void setDescriptor(PropertyDescriptor descriptor) {
this.descriptor = descriptor;
String value = (String)descriptor.getValue(CLASSNAME);
@@ -241,14 +242,17 @@ public class TableEditor extends Propert
return null;
}
+ @Override
public void tableChanged(TableModelEvent e) {
this.firePropertyChange();
}
+ @Override
public void focusGained(FocusEvent e) {
}
+ @Override
public void focusLost(FocusEvent e) {
final int editingRow = table.getEditingRow();
final int editingColumn = table.getEditingColumn();
@@ -270,6 +274,7 @@ public class TableEditor extends Propert
private class AddListener implements ActionListener
{
+ @Override
public void actionPerformed(ActionEvent e)
{
try
@@ -284,6 +289,7 @@ public class TableEditor extends Propert
private class RemoveListener implements ActionListener
{
+ @Override
public void actionPerformed(ActionEvent e)
{
int row = table.getSelectedRow();
@@ -295,6 +301,7 @@ public class TableEditor extends Propert
private class ClearListener implements ActionListener
{
+ @Override
public void actionPerformed(ActionEvent e)
{
model.clearData();
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Tue Nov 27 00:14:39 2012
@@ -210,7 +210,8 @@ public class TestBeanGUI extends Abstrac
/**
* {@inheritDoc}
*/
- public TestElement createTestElement() {
+ @Override
+public TestElement createTestElement() {
try {
TestElement element = (TestElement) testBeanClass.newInstance();
// In other GUI component, clearGUI resets the value to defaults one as there is one GUI per Element
@@ -239,6 +240,7 @@ public class TestBeanGUI extends Abstrac
/**
* {@inheritDoc}
*/
+ @Override
public void modifyTestElement(TestElement element) {
// Fetch data from screen fields
if (customizer instanceof GenericTestBeanCustomizer) {
@@ -277,6 +279,7 @@ public class TestBeanGUI extends Abstrac
/**
* {@inheritDoc}
*/
+ @Override
public JPopupMenu createPopupMenu() {
if (Timer.class.isAssignableFrom(testBeanClass))
{
@@ -358,6 +361,7 @@ public class TestBeanGUI extends Abstrac
}
/** {@inheritDoc} */
+ @Override
public Collection<String> getMenuCategories() {
List<String> menuCategories = new LinkedList<String>();
BeanDescriptor bd = beanInfo.getBeanDescriptor();
@@ -460,6 +464,7 @@ public class TestBeanGUI extends Abstrac
/**
* {@inheritDoc}
*/
+ @Override
public String getLabelResource() {
// @see getStaticLabel
return null;
@@ -490,7 +495,8 @@ public class TestBeanGUI extends Abstrac
* Handle Locale Change by reloading BeanInfo
* @param event {@link LocaleChangeEvent}
*/
- public void localeChanged(LocaleChangeEvent event) {
+ @Override
+ public void localeChanged(LocaleChangeEvent event) {
try {
beanInfo = Introspector.getBeanInfo(testBeanClass);
setupGuiClasses();
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java Tue Nov 27 00:14:39 2012
@@ -37,10 +37,12 @@ public class TextAreaEditor extends Prop
private JScrollPane scroller;
/** {@inheritDoc} */
+ @Override
public void focusGained(FocusEvent e) {
}
/** {@inheritDoc} */
+ @Override
public void focusLost(FocusEvent e) {
firePropertyChange();
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java?rev=1413956&r1=1413955&r2=1413956&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java Tue Nov 27 00:14:39 2012
@@ -426,6 +426,7 @@ class WrapperEditor extends PropertyEdit
guiEditor.setValue(value);
}
+ @Override
public void propertyChange(PropertyChangeEvent event) {
String text = fixGetAsTextBug(guiEditor.getAsText());
if (isValidValue(text)) {