You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/02/27 21:20:24 UTC
svn commit: r917034 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
wtk/src/org/apache/pivot/wtk/TextArea.java
wtk/src/org/apache/pivot/wtk/TextInput.java
Author: gbrown
Date: Sat Feb 27 20:20:23 2010
New Revision: 917034
URL: http://svn.apache.org/viewvc?rev=917034&view=rev
Log:
Resolve issue PIVOT-422.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java?rev=917034&r1=917033&r2=917034&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java Sat Feb 27 20:20:23 2010
@@ -381,7 +381,7 @@
}
case SAVE_AS: {
- okButton.setEnabled(saveAsTextInput.getTextLength() > 0);
+ okButton.setEnabled(saveAsTextInput.getCharacterCount() > 0);
break;
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java?rev=917034&r1=917033&r2=917034&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java Sat Feb 27 20:20:23 2010
@@ -414,6 +414,16 @@
setSelection(selectionStart + 1, selectionLength);
}
+ /**
+ * Returns character count of the document.
+ *
+ * @return
+ * The document's character count, or <tt>-1</tt> if the document is <tt>null</tt>.
+ */
+ public int getCharacterCount() {
+ return (document == null) ? -1 : document.getCharacterCount();
+ }
+
public void delete(Direction direction) {
if (direction == null) {
throw new IllegalArgumentException("direction is null.");
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java?rev=917034&r1=917033&r2=917034&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java Sat Feb 27 20:20:23 2010
@@ -365,7 +365,13 @@
}
}
- public int getTextLength() {
+ /**
+ * Returns the character count of the text node.
+ *
+ * @return
+ * The text node's length, or <tt>-1</tt> if the text node is <tt>null</tt>.
+ */
+ public int getCharacterCount() {
return (textNode == null) ? -1 : textNode.getCharacterCount();
}