Author: pmouawad
Date: Sat Jan 20 14:30:11 2018
New Revision: 1821744
URL: http://svn.apache.org/viewvc?rev=1821744&view=rev
Log:
Bug 61919 - UX : Reorder Menus
Bugzilla Id: 61919
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
jmeter/trunk/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java?rev=1821744&r1=1821743&r2=1821744&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
Sat Jan 20 14:30:11 2018
@@ -28,6 +28,7 @@ import javax.swing.JTextArea;
import javax.swing.JTextField;
import org.apache.jmeter.assertions.BeanShellAssertion;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
import org.apache.jmeter.gui.util.FilePanelEntry;
import org.apache.jmeter.gui.util.JSyntaxTextArea;
import org.apache.jmeter.gui.util.JTextScrollPane;
@@ -35,6 +36,7 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.util.JMeterUtils;
+@GUIMenuSortOrder(Integer.MAX_VALUE)
public class BeanShellAssertionGui extends AbstractAssertionGui {
private static final long serialVersionUID = 240L;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java?rev=1821744&r1=1821743&r2=1821744&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
Sat Jan 20 14:30:11 2018
@@ -25,9 +25,11 @@ import javax.swing.Box;
import javax.swing.JPanel;
import org.apache.jmeter.assertions.XPathAssertion;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
+@GUIMenuSortOrder(50)
public class XPathAssertionGui extends AbstractAssertionGui {
private static final long serialVersionUID = 240L;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java?rev=1821744&r1=1821743&r2=1821744&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
Sat Jan 20 14:30:11 2018
@@ -48,9 +48,11 @@ import javax.swing.tree.TreeSelectionMod
import org.apache.jmeter.control.Controller;
import org.apache.jmeter.control.ModuleController;
import org.apache.jmeter.control.TestFragmentController;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.gui.util.MenuFactory;
+import org.apache.jmeter.gui.util.MenuInfo;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.threads.AbstractThreadGroup;
@@ -68,6 +70,7 @@ import org.apache.jorphan.gui.layout.Ver
* - TestFragmentController
*
*/
+@GUIMenuSortOrder(MenuInfo.SORT_ORDER_DEFAULT+2)
public class ModuleControllerGui extends AbstractControllerGui implements
ActionListener {
private static final long serialVersionUID = -4195441608252523573L;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java?rev=1821744&r1=1821743&r2=1821744&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java
Sat Jan 20 14:30:11 2018
@@ -25,9 +25,12 @@ import javax.swing.JPanel;
import javax.swing.JTextField;
import org.apache.jmeter.control.SwitchController;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
+import org.apache.jmeter.gui.util.MenuInfo;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
+@GUIMenuSortOrder(MenuInfo.SORT_ORDER_DEFAULT+2)
public class SwitchControllerGui extends AbstractControllerGui {
private static final long serialVersionUID = 240L;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java?rev=1821744&r1=1821743&r2=1821744&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
Sat Jan 20 14:30:11 2018
@@ -28,11 +28,14 @@ import javax.swing.JPanel;
import javax.swing.JTextField;
import org.apache.jmeter.control.ThroughputController;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
import org.apache.jmeter.gui.util.CheckBoxPanel;
+import org.apache.jmeter.gui.util.MenuInfo;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.layout.VerticalLayout;
+@GUIMenuSortOrder(MenuInfo.SORT_ORDER_DEFAULT+1)
public class ThroughputControllerGui extends AbstractControllerGui {
private static final long serialVersionUID = 240L;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java?rev=1821744&r1=1821743&r2=1821744&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
Sat Jan 20 14:30:11 2018
@@ -41,6 +41,7 @@ import javax.swing.table.JTableHeader;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
import org.apache.jmeter.gui.util.PowerTableModel;
import org.apache.jmeter.gui.util.VerticalPanel;
@@ -54,6 +55,7 @@ import org.apache.jorphan.gui.GuiUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@GUIMenuSortOrder(5)
public class UserParametersGui extends AbstractPreProcessorGui {
private static final long serialVersionUID = 241L;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java?rev=1821744&r1=1821743&r2=1821744&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
Sat Jan 20 14:30:11 2018
@@ -25,6 +25,7 @@ import java.util.ResourceBundle;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer;
import org.apache.jmeter.testelement.AbstractTestElement;
@@ -46,6 +47,7 @@ import org.slf4j.LoggerFactory;
* - delay each thread according to when it last ran
* - delay each thread according to when any thread last ran
*/
+@GUIMenuSortOrder(4)
public class ConstantThroughputTimer extends AbstractTestElement implements
Timer, TestStateListener, TestBean {
private static final long serialVersionUID = 4;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java?rev=1821744&r1=1821743&r2=1821744&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimer.java
Sat Jan 20 14:30:11 2018
@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
+import org.apache.jmeter.gui.GUIMenuSortOrder;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.TestStateListener;
@@ -36,6 +37,7 @@ import org.slf4j.LoggerFactory;
* On top of that, it tries to maintain the exact amount of arrivals for a
given timeframe ({@link #throughputPeriod}.
* @since 4.0
*/
+@GUIMenuSortOrder(3)
public class PreciseThroughputTimer extends AbstractTestElement implements
Cloneable, Timer, TestStateListener, TestBean, ThroughputProvider,
DurationProvider {
private static final Logger log =
LoggerFactory.getLogger(PreciseThroughputTimer.class);
