[autocomplete] 65/143: Fix for possible NPE with parameterized completion choices.

[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 dd58be05d088197b07b9b5226a12b5080bb147f0
Author: bobbylight <robert at fifesoft.com>
Date:   Sun Jan 30 06:08:31 2011 +0000

    Fix for possible NPE with parameterized completion choices.
---
 .../autocomplete/ParameterizedCompletionChoicesWindow.java |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/org/fife/ui/autocomplete/ParameterizedCompletionChoicesWindow.java b/src/org/fife/ui/autocomplete/ParameterizedCompletionChoicesWindow.java
index 690cd96..1bff62f 100644
--- a/src/org/fife/ui/autocomplete/ParameterizedCompletionChoicesWindow.java
+++ b/src/org/fife/ui/autocomplete/ParameterizedCompletionChoicesWindow.java
@@ -243,11 +243,13 @@ public class ParameterizedCompletionChoicesWindow extends JWindow {
 		if (choicesListList!=null && param>=0 && param<choicesListList.size()) {
 
 			List choices = (List)choicesListList.get(param);
-			for (Iterator i=choices.iterator(); i.hasNext(); ) {
-				Completion c = (Completion)i.next();
-				String choice = c.getReplacementText();
-				if (prefix==null || Util.startsWithIgnoreCase(choice, prefix)) {
-					temp.add(c);
+			if (choices!=null) {
+				for (Iterator i=choices.iterator(); i.hasNext(); ) {
+					Completion c = (Completion)i.next();
+					String choice = c.getReplacementText();
+					if (prefix==null || Util.startsWithIgnoreCase(choice, prefix)) {
+						temp.add(c);
+					}
 				}
 			}
 

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