You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/10/18 18:47:09 UTC
svn commit: r1765494 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/
Author: pmouawad
Date: Tue Oct 18 18:47:09 2016
New Revision: 1765494
URL: http://svn.apache.org/viewvc?rev=1765494&view=rev
Log:
Make all classes extend AbstractAction
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java?rev=1765494&r1=1765493&r2=1765494&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java Tue Oct 18 18:47:09 2016
@@ -47,7 +47,7 @@ import org.apache.jmeter.util.JMeterUtil
* protocols, config options, etc.
*
*/
-public class AboutCommand implements Command {
+public class AboutCommand extends AbstractAction {
private static final Set<String> commandSet;
private static JDialog about;
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java?rev=1765494&r1=1765493&r2=1765494&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java Tue Oct 18 18:47:09 2016
@@ -23,6 +23,7 @@ import java.util.Set;
import javax.swing.JOptionPane;
+import org.apache.jmeter.exceptions.IllegalUserActionException;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
@@ -35,7 +36,7 @@ public abstract class AbstractAction imp
* @see Command#doAction(ActionEvent)
*/
@Override
- public void doAction(ActionEvent e) {
+ public void doAction(ActionEvent e) throws IllegalUserActionException {
}
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java?rev=1765494&r1=1765493&r2=1765494&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java Tue Oct 18 18:47:09 2016
@@ -32,7 +32,7 @@ import org.apache.log.Logger;
/**
* Implements the Add Parent menu command
*/
-public class AddParent implements Command {
+public class AddParent extends AbstractAction {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final Set<String> commands = new HashSet<>();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java?rev=1765494&r1=1765493&r2=1765494&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java Tue Oct 18 18:47:09 2016
@@ -33,7 +33,7 @@ import org.apache.jmeter.util.JMeterUtil
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-public class AddToTree implements Command {
+public class AddToTree extends AbstractAction {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final Set<String> commandSet;
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java?rev=1765494&r1=1765493&r2=1765494&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java Tue Oct 18 18:47:09 2016
@@ -34,9 +34,9 @@ import org.apache.jorphan.util.JMeterErr
import org.apache.log.Logger;
/**
- * @version $Revision$
+ *
*/
-public class ChangeLanguage implements Command {
+public class ChangeLanguage extends AbstractAction {
private static final Set<String> commands = new HashSet<>();
private static final Logger log = LoggingManager.getLoggerForClass();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java?rev=1765494&r1=1765493&r2=1765494&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java Tue Oct 18 18:47:09 2016
@@ -40,9 +40,9 @@ import org.apache.jorphan.logging.Loggin
import org.apache.log.Logger;
/**
- * Implements the Add Parent menu command
+ * Allows to change Controller implementation
*/
-public class ChangeParent implements Command {
+public class ChangeParent extends AbstractAction {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final Set<String> commands = new HashSet<>();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java?rev=1765494&r1=1765493&r2=1765494&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java Tue Oct 18 18:47:09 2016
@@ -35,7 +35,7 @@ import org.apache.log.Logger;
* - Clear All (Data)
* - Reset (Clear GUI)
*/
-public class Clear implements Command {
+public class Clear extends AbstractAction {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final Set<String> commands = new HashSet<>();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java?rev=1765494&r1=1765493&r2=1765494&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java Tue Oct 18 18:47:09 2016
@@ -34,7 +34,7 @@ import org.apache.jmeter.util.JMeterUtil
* test plan.
*
*/
-public class Close implements Command {
+public class Close extends AbstractAction {
private static final Set<String> commands = new HashSet<>();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java?rev=1765494&r1=1765493&r2=1765494&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java Tue Oct 18 18:47:09 2016
@@ -30,7 +30,7 @@ import org.apache.jmeter.gui.GuiPackage;
* Processes the Collapse All and Expand All options.
*
*/
-public class CollapseExpand implements Command {
+public class CollapseExpand extends AbstractAction {
private static final Set<String> commands = new HashSet<>();
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -29,7 +29,7 @@ import org.apache.jmeter.gui.NamePanel;
/**
* Implements the Edit menu item.
*/
-public class EditCommand implements Command {
+public class EditCommand extends AbstractAction {
private static final Set<String> commands = new HashSet<>();
static {
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -30,7 +30,7 @@ import org.apache.log.Logger;
/**
* Implements the Enable menu item.
*/
-public class EnableComponent implements Command {
+public class EnableComponent extends AbstractAction {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final Set<String> commands = new HashSet<>();
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -27,7 +27,7 @@ import javax.swing.JOptionPane;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.util.JMeterUtils;
-public class ExitCommand implements Command {
+public class ExitCommand extends AbstractAction {
private static final Set<String> commands = new HashSet<>();
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -39,7 +39,7 @@ import org.apache.log.Logger;
/**
* Implements the Help menu item.
*/
-public class Help implements Command {
+public class Help extends AbstractAction {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final Set<String> commands = new HashSet<>();
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -50,7 +50,7 @@ import com.thoughtworks.xstream.converte
* Handles the Open (load a new file) and Merge commands.
*
*/
-public class Load implements Command {
+public class Load extends AbstractAction {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final boolean expandTree = JMeterUtils.getPropDefault("onload.expandtree", false); //$NON-NLS-1$
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -31,7 +31,7 @@ import org.apache.jmeter.gui.GuiPackage;
* Hide / unhide LoggerPanel.
*
*/
-public class LoggerPanelEnableDisable implements Command {
+public class LoggerPanelEnableDisable extends AbstractAction {
private static final Set<String> commands = new HashSet<>();
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -40,7 +40,7 @@ import org.apache.log.Logger;
/**
* Implements the Look and Feel menu item.
*/
-public class LookAndFeelCommand implements Command {
+public class LookAndFeelCommand extends AbstractAction {
private static final Logger log = LoggingManager.getLoggerForClass();
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -33,7 +33,7 @@ import org.apache.jmeter.util.JMeterUtil
/**
* Implements the Remove menu item.
*/
-public class Remove implements Command {
+public class Remove extends AbstractAction {
private static final Set<String> commands = new HashSet<>();
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -22,6 +22,7 @@ import java.awt.event.ActionEvent;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
+
import javax.swing.JOptionPane;
import org.apache.jmeter.gui.GuiPackage;
@@ -31,7 +32,7 @@ import org.apache.jmeter.util.JMeterUtil
* Handles the Revert Project command.
*
*/
-public class RevertProject implements Command {
+public class RevertProject extends AbstractAction {
private static final Set<String> commands = new HashSet<>();
static {
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -52,7 +52,7 @@ import org.apache.jmeter.util.SSLManager
* already defined via the property.
*
*/
-public class SSLManagerCommand implements Command {
+public class SSLManagerCommand extends AbstractAction {
private static final Set<String> commandSet;
static {
Set<String> commands = new HashSet<>();
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -65,7 +65,7 @@ import org.apache.log.Logger;
* Save TestPlan As
* Save (Selection) As
*/
-public class Save implements Command {
+public class Save extends AbstractAction {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final List<File> EMPTY_FILE_LIST = Collections.emptyList();
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -28,8 +28,8 @@ import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
import org.apache.jmeter.exceptions.IllegalUserActionException;
-import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.GuiPackage;
+import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.util.FileDialoger;
import org.apache.jmeter.save.SaveGraphicsService;
import org.apache.jmeter.util.JMeterUtils;
@@ -43,7 +43,7 @@ import org.apache.jmeter.visualizers.Pri
* file if no extension is provided. If either .png or .tif is in the filename,
* it will call SaveGraphicsService to save in the format.
*/
-public class SaveGraphics implements Command {
+public class SaveGraphics extends AbstractAction {
private static final Set<String> commands = new HashSet<>();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java?rev=1765494&r1=1765493&r2=1765494&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java Tue Oct 18 18:47:09 2016
@@ -31,7 +31,7 @@ import org.apache.jorphan.collections.Ha
* Menu command to serve Undo/Redo
* @since 2.12
*/
-public class UndoCommand implements Command {
+public class UndoCommand extends AbstractAction {
private static final Set<String> commands = new HashSet<>();
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=1765494&r1=1765493&r2=1765494&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 Oct 18 18:47:09 2016
@@ -41,7 +41,7 @@ import org.apache.log.Logger;
* Also enables/disables debug for the test element.
*
*/
-public class What implements Command {
+public class What extends AbstractAction {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final Set<String> commandSet;