svn commit: r1818938 - in /jmeter/trunk/src/core/org/apache/jmeter/control/gui: IfControllerPanel.java LoopControlPanel.java TransactionControllerGui.java WhileControllerGui.java

[pmouawad]

Author: pmouawad
Date: Thu Dec 21 15:25:43 2017
New Revision: 1818938

URL: http://svn.apache.org/viewvc?rev=1818938&view=rev
Log:
Bug 61919 - UX : Reorder Menus
Add order to Controllers
Bugzilla Id: 61919

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java
    jmeter/trunk/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java
    
jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
    jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java?rev=1818938&r1=1818937&r2=1818938&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java 
Thu Dec 21 15:25:43 2017
@@ -31,6 +31,7 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
 import org.apache.jmeter.control.IfController;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
 import org.apache.jmeter.gui.util.JTextScrollPane;
 import org.apache.jmeter.testelement.TestElement;
@@ -42,7 +43,7 @@ import org.apache.jmeter.util.JMeterUtil
  * standalone or embedded into some other component.
  *
  */
-
+@GUIMenuSortOrder(1)
 public class IfControllerPanel extends AbstractControllerGui implements 
ChangeListener {
 
     private static final long serialVersionUID = 240L;

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java?rev=1818938&r1=1818937&r2=1818938&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java 
Thu Dec 21 15:25:43 2017
@@ -29,6 +29,7 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 
 import org.apache.jmeter.control.LoopController;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
 import org.apache.jmeter.gui.util.FocusRequester;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
@@ -39,7 +40,7 @@ import org.apache.jmeter.util.JMeterUtil
  * standalone or embedded into some other component.
  *
  */
-
+@GUIMenuSortOrder(3)
 public class LoopControlPanel extends AbstractControllerGui implements 
ActionListener {
     private static final long serialVersionUID = 240L;
 

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java?rev=1818938&r1=1818937&r2=1818938&view=diff
==============================================================================
--- 
jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
 (original)
+++ 
jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
 Thu Dec 21 15:25:43 2017
@@ -21,6 +21,7 @@ package org.apache.jmeter.control.gui;
 import javax.swing.JCheckBox;
 
 import org.apache.jmeter.control.TransactionController;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
 import org.apache.jmeter.gui.util.CheckBoxPanel;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
@@ -29,6 +30,7 @@ import org.apache.jorphan.gui.layout.Ver
 /**
  * A Transaction controller component.
  */
+@GUIMenuSortOrder(2)
 public class TransactionControllerGui extends AbstractControllerGui {
 
     private static final long serialVersionUID = 240L;

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java?rev=1818938&r1=1818937&r2=1818938&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java 
Thu Dec 21 15:25:43 2017
@@ -25,11 +25,13 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 
 import org.apache.jmeter.control.WhileController;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
 import org.apache.jmeter.gui.util.JTextScrollPane;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 
+@GUIMenuSortOrder(4)
 public class WhileControllerGui extends AbstractControllerGui {
 
     private static final long serialVersionUID = 240L;