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 2014/09/11 16:33:35 UTC
svn commit: r1624301 - in /jmeter/trunk:
src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
xdocs/changes.xml
Author: sebb
Date: Thu Sep 11 14:33:35 2014
New Revision: 1624301
URL: http://svn.apache.org/r1624301
Log:
JMS GUIs should disable all fields affected by jndi.properties checkbox
Bugzilla Id: 56962
Modified:
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java?rev=1624301&r1=1624300&r2=1624301&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java Thu Sep 11 14:33:35 2014
@@ -301,11 +301,13 @@ public class JMSPublisherGui extends Abs
} else if (event.getSource() == msgChoice) {
updateChoice(msgChoice.getText());
} else if (event.getSource() == useProperties) {
- jndiICF.setEnabled(!useProperties.isSelected());
- urlField.setEnabled(!useProperties.isSelected());
+ final boolean isUseProperties = useProperties.isSelected();
+ jndiICF.setEnabled(!isUseProperties);
+ urlField.setEnabled(!isUseProperties);
+ useAuth.setEnabled(!isUseProperties);
} else if (event.getSource() == useAuth) {
- jmsUser.setEnabled(useAuth.isSelected());
- jmsPwd.setEnabled(useAuth.isSelected());
+ jmsUser.setEnabled(useAuth.isSelected() && useAuth.isEnabled());
+ jmsPwd.setEnabled(useAuth.isSelected() && useAuth.isEnabled());
}
}
/**
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java?rev=1624301&r1=1624300&r2=1624301&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java Thu Sep 11 14:33:35 2014
@@ -266,11 +266,13 @@ public class JMSSubscriberGui extends Ab
@Override
public void stateChanged(ChangeEvent event) {
if (event.getSource() == useProperties) {
- jndiICF.setEnabled(!useProperties.isSelected());
- urlField.setEnabled(!useProperties.isSelected());
+ final boolean isUseProperties = useProperties.isSelected();
+ jndiICF.setEnabled(!isUseProperties);
+ urlField.setEnabled(!isUseProperties);
+ useAuth.setEnabled(!isUseProperties);
} else if (event.getSource() == useAuth) {
- jmsUser.setEnabled(useAuth.isSelected());
- jmsPwd.setEnabled(useAuth.isSelected());
+ jmsUser.setEnabled(useAuth.isSelected() && useAuth.isEnabled());
+ jmsPwd.setEnabled(useAuth.isSelected() && useAuth.isEnabled());
}
}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1624301&r1=1624300&r2=1624301&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Sep 11 14:33:35 2014
@@ -199,6 +199,7 @@ for details on configuring this componen
<li><bugzilla>56763</bugzilla> - Removing the Oracle icons, not used by JMeter (and missing license)</li>
<li><bugzilla>54100</bugzilla> - Switching languages fails to preserve toolbar button states (enabled/disabled)</li>
<li><bugzilla>54648</bugzilla> - JMeter GUI on OS X crashes when using CMD+C (keyboard shortcut or UI menu entry) on an element from the tree</li>
+<li><bugzilla>56962</bugzilla> - JMS GUIs should disable all fields affected by jndi.properties checkbox</li>
</ul>
<!-- =================== Improvements =================== -->