jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1717678 - in /jmeter/trunk: src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java src/core/org/apache/jmeter/resources/messages.properties src/core/org/apache/jmeter/resources/messages_fr.properties xdocs/changes.xml
Date Wed, 02 Dec 2015 20:36:35 GMT
Author: pmouawad
Date: Wed Dec  2 20:36:35 2015
New Revision: 1717678

URL: http://svn.apache.org/viewvc?rev=1717678&view=rev
Log:
Bug 58680 - Module Controller : ui enhancement
#resolve #36
Bugzilla Id: 58680

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
    jmeter/trunk/xdocs/changes.xml

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=1717678&r1=1717677&r2=1717678&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 Wed
Dec  2 20:36:35 2015
@@ -182,6 +182,7 @@ public class ModuleControllerGui extends
             @Override
             public void valueChanged(TreeSelectionEvent e) {
                 warningLabel.setVisible(false);
+                expandButton.setEnabled(true);
             }
         };
         moduleToRunTreeNodes.addTreeSelectionListener(tsl);
@@ -203,8 +204,10 @@ public class ModuleControllerGui extends
             warningLabel.setText(JMeterUtils.getResString("module_controller_warning") //
$NON-NLS-1$
                     + renderPath(controller.getNodePath()));
             warningLabel.setVisible(true);
+            expandButton.setEnabled(false);
         } else {
             warningLabel.setVisible(false);
+            expandButton.setEnabled(true);
         }
         reinitialize();
     }
@@ -302,7 +305,7 @@ public class ModuleControllerGui extends
 
         JPanel modulesPanel = new JPanel();
         
-        expandButton = new JButton(JMeterUtils.getResString("expand")); //$NON-NLS-1$
+        expandButton = new JButton(JMeterUtils.getResString("find_target_element")); //$NON-NLS-1$
         expandButton.addActionListener(this);
         modulesPanel.add(expandButton);
         modulesPanel.setLayout(new BoxLayout(modulesPanel, BoxLayout.Y_AXIS));

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1717678&r1=1717677&r2=1717678&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed Dec  2 20:36:35
2015
@@ -290,7 +290,7 @@ evalvar_name_param=Name of variable
 example_data=Sample Data
 example_title=Example Sampler
 exit=Exit
-expand=Expand
+find_target_element=Find target element
 expected_return_code_title=Expected Return Code: 
 expiration=Expiration
 expression_field=CSS/JQuery expression\:

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1717678&r1=1717677&r2=1717678&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Wed Dec  2 20:36:35
2015
@@ -283,7 +283,7 @@ evalvar_name_param=Nom de variable
 example_data=Exemple de donn\u00E9e
 example_title=Echantillon exemple
 exit=Quitter
-expand=D\u00E9plier
+find_target_element=Trouver l'\u00E9l\u00E9ment cible
 expected_return_code_title=Code retour attendu \: 
 expiration=Expiration
 expression_field=Expression CSS/JQuery \:

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1717678&r1=1717677&r2=1717678&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed Dec  2 20:36:35 2015
@@ -104,6 +104,7 @@ Summary
     <li><bug>58675</bug>Module controller error message can easily be missed.
Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
     <li><bug>58673</bug>Module controller : when the target element is
disabled the default jtree icons are displayed. Contributed by Benoit Wiart (benoit dot wiart
at gmail.com)</li>
     <li><bug>58674</bug>Module controller : it should not be possible to
select more than one node in the tree. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
+    <li><bug>58680</bug>Module Controller : ui enhancement. Contributed
by Benoit Wiart (benoit dot wiart at gmail.com)</li>
 </ul>
 
 <h3>Listeners</h3>



Mime
View raw message