Author: sebb
Date: Tue Oct 25 16:07:54 2005
New Revision: 328503
URL: http://svn.apache.org/viewcvs?rev=328503&view=rev
Log:
Change getText() and getSelectedItems() to never return null
This fixes two errors in JUnit tests.
Modified:
jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java?rev=328503&r1=328502&r2=328503&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
Tue Oct 25 16:07:54 2005
@@ -36,7 +36,9 @@
import javax.swing.event.ChangeListener;
public class JLabeledChoice extends JPanel implements JLabeledField {
- private JLabel mLabel = new JLabel();
+ private static final Object[] EMPTY_OBJECT_ARRAY = new Object [0];
+
+ private JLabel mLabel = new JLabel();
private JComboBox choiceList;
@@ -172,14 +174,23 @@
/**
* Returns the text in the Text Field.
*
- * @return The text in the Text Field.
+ * @return The text in the Text Field. Never returns null.
*/
public String getText() {
- return (String) choiceList.getSelectedItem();
+ Object item = choiceList.getSelectedItem();
+ if (item == null) {
+ return "";
+ } else {
+ return (String) item;
+ }
}
public Object[] getSelectedItems() {
- return choiceList.getSelectedObjects();
+ Object list[]=choiceList.getSelectedObjects();
+ if (list==null) {
+ return EMPTY_OBJECT_ARRAY;
+ }
+ return list;
}
public String[] getItems() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
