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/30 21:08:27 UTC
svn commit: r990900 -
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
Author: tvolkert
Date: Mon Aug 30 19:08:27 2010
New Revision: 990900
URL: http://svn.apache.org/viewvc?rev=990900&view=rev
Log:
Fixed bug in strictValidation preview handler in TerraTextInputSkin -- was failing if validator was null. This extra check yielded cascading else blocks, so I switched the implementation to default the vote to APPROVE because it seemed to make the code a little easier to read.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=990900&r1=990899&r2=990900&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java Mon Aug 30 19:08:27 2010
@@ -1301,24 +1301,23 @@ public class TerraTextInputSkin extends
// Text input character events
@Override
public Vote previewInsertText(TextInput textInput, String text, int index) {
- Vote vote;
+ Vote vote = Vote.APPROVE;
+
if (textInput.isStrictValidation()) {
Validator validator = textInput.getValidator();
- StringBuilder textBuilder = new StringBuilder();
-
- CharSequence characters = textInput.getCharacters();
- textBuilder.append(characters.subSequence(0, index));
- textBuilder.append(text);
- textBuilder.append(characters.subSequence(index, characters.length()));
+ if (validator != null) {
+ StringBuilder textBuilder = new StringBuilder();
- if (validator.isValid(textBuilder.toString())) {
- vote = Vote.APPROVE;
- } else {
- vote = Vote.DENY;
- Toolkit.getDefaultToolkit().beep();
+ CharSequence characters = textInput.getCharacters();
+ textBuilder.append(characters.subSequence(0, index));
+ textBuilder.append(text);
+ textBuilder.append(characters.subSequence(index, characters.length()));
+
+ if (!validator.isValid(textBuilder.toString())) {
+ vote = Vote.DENY;
+ Toolkit.getDefaultToolkit().beep();
+ }
}
- } else {
- vote = Vote.APPROVE;
}
return vote;
@@ -1336,20 +1335,19 @@ public class TerraTextInputSkin extends
@Override
public Vote previewRemoveText(TextInput textInput, int index, int count) {
- Vote vote;
+ Vote vote = Vote.APPROVE;
+
if (textInput.isStrictValidation()) {
Validator validator = textInput.getValidator();
- StringBuilder textBuilder = new StringBuilder(textInput.getCharacters());
- textBuilder.delete(index, index + count);
-
- if (validator.isValid(textBuilder.toString())) {
- vote = Vote.APPROVE;
- } else {
- vote = Vote.DENY;
- Toolkit.getDefaultToolkit().beep();
+ if (validator != null) {
+ StringBuilder textBuilder = new StringBuilder(textInput.getCharacters());
+ textBuilder.delete(index, index + count);
+
+ if (!validator.isValid(textBuilder.toString())) {
+ vote = Vote.DENY;
+ Toolkit.getDefaultToolkit().beep();
+ }
}
- } else {
- vote = Vote.APPROVE;
}
return vote;