[autocomplete] 73/143: Patches from Thorsten @ pader sync: Made RUndoManager public, can override RSyntaxTextArea to provide subclass implementation. Made AutoComplete.java honor contract for null "already entered text" and hide popup window if it is visible.

[Benjamin Mesing]

This is an automated email from the git hooks/post-receive script.

ben pushed a commit to branch master
in repository autocomplete.

commit 73fa0c79e2c5808be3c725504d2b98603b0cd562
Author: bobbylight <robert at fifesoft.com>
Date:   Wed Dec 28 00:31:32 2011 +0000

    Patches from Thorsten @ pader sync:
    Made RUndoManager public, can override RSyntaxTextArea to provide subclass implementation.  Made AutoComplete.java honor contract for null "already entered text" and hide popup window if it is visible.
---
 build.xml                                        |    2 +-
 src/org/fife/ui/autocomplete/AutoCompletion.java |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 4d5bc98..65b942f 100644
--- a/build.xml
+++ b/build.xml
@@ -23,7 +23,7 @@
 
 
 	<!-- Set global properties for this build. -->
-	<property name="version"          value="1.5.2"/>
+	<property name="version"          value="2.0.0"/>
 	<property name="source-dir"       location="src"/>
 	<property name="class-dir"        location="ant-classes"/>
 	<property name="dist-dir"         location="dist"/>
diff --git a/src/org/fife/ui/autocomplete/AutoCompletion.java b/src/org/fife/ui/autocomplete/AutoCompletion.java
index da89584..712d878 100644
--- a/src/org/fife/ui/autocomplete/AutoCompletion.java
+++ b/src/org/fife/ui/autocomplete/AutoCompletion.java
@@ -692,11 +692,16 @@ public class AutoCompletion {
 	 */
 	protected int refreshPopupWindow() {
 
+		// A return value of null => don't suggest completions
+		String text = provider.getAlreadyEnteredText(textComponent);
+		if (text==null && !isPopupVisible()) {
+			return getLineOfCaret();
+		}
+
 		// If the popup is currently visible, and they type a space (or any
 		// character that resets the completion list to "all completions"),
 		// the popup window should be hidden instead of being reset to show
 		// everything.
-		String text = provider.getAlreadyEnteredText(textComponent);
 		int textLen = text==null ? 0 : text.length();
 		if (textLen==0) {
 			if (isPopupVisible()) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/autocomplete.git