You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2010/08/20 21:26:33 UTC
svn commit: r987608 - /pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java
Author: tvolkert
Date: Fri Aug 20 19:26:32 2010
New Revision: 987608
URL: http://svn.apache.org/viewvc?rev=987608&view=rev
Log:
Made Prompt BXML-friendly
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java?rev=987608&r1=987607&r2=987608&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java Fri Aug 20 19:26:32 2010
@@ -199,16 +199,7 @@ public class Prompt extends Sheet {
setMessageType(messageType);
setMessage(message);
setBody(body);
-
- if (options != null
- && options.getLength() > 0) {
- for (int i = 0, n = options.getLength(); i < n; i++) {
- optionSequence.add(options.get(i));
- }
-
- setSelectedOptionIndex(0);
- }
-
+ setOptions(options);
setTitle((String)resources.get("defaultTitle"));
installThemeSkin(Prompt.class);
@@ -230,6 +221,14 @@ public class Prompt extends Sheet {
}
}
+ public void setMessageType(String messageType) {
+ if (messageType == null) {
+ throw new IllegalArgumentException("messageType is null.");
+ }
+
+ setMessageType(MessageType.valueOf(messageType.toUpperCase()));
+ }
+
public String getMessage() {
return message;
}
@@ -258,13 +257,21 @@ public class Prompt extends Sheet {
return optionSequence;
}
- public void setOptions(String options) {
+ public void setOptions(Sequence<?> options) {
optionSequence.remove(0, optionSequence.getLength());
- try {
- for (Object option : JSONSerializer.parseList(options)) {
- optionSequence.add(option);
+ if (options != null) {
+ for (int i = 0, n = options.getLength(); i < n; i++) {
+ optionSequence.add(options.get(i));
}
+
+ setSelectedOptionIndex(0);
+ }
+ }
+
+ public void setOptions(String options) {
+ try {
+ setOptions(JSONSerializer.parseList(options));
} catch (SerializationException exception) {
throw new IllegalArgumentException(exception);
}