[autocomplete] 98/143: Moved the template and comment completions for Java and JavaScript into a common cache that can be overridden. Added some more common completions to JavaScript Add comment completions to java and javascript

[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 448b611dce7f6a6b7f8085556f53923dbf9e9a4c
Author: Steve Upton <steve at upton.me.uk>
Date:   Tue Jul 17 14:09:33 2012 +0000

    Moved the template and comment completions for Java and JavaScript into a common cache that can be overridden.
    Added some more common completions to JavaScript
    Add comment completions to java and javascript
---
 .../fife/ui/autocomplete/CompletionCellRenderer.java    |    2 +-
 src/org/fife/ui/autocomplete/TemplateCompletion.java    |   15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/org/fife/ui/autocomplete/CompletionCellRenderer.java b/src/org/fife/ui/autocomplete/CompletionCellRenderer.java
index d67de22..bb09dcf 100644
--- a/src/org/fife/ui/autocomplete/CompletionCellRenderer.java
+++ b/src/org/fife/ui/autocomplete/CompletionCellRenderer.java
@@ -345,7 +345,7 @@ public class CompletionCellRenderer extends DefaultListCellRenderer {
 		StringBuffer sb = new StringBuffer(PREFIX);
 		sb.append(tc.getInputText());
 
-		String definition = tc.getDefinitionString();
+		String definition = tc.getShortDescription();
 		if (definition!=null) {
 			sb.append(" - ");
 			if (!selected) {
diff --git a/src/org/fife/ui/autocomplete/TemplateCompletion.java b/src/org/fife/ui/autocomplete/TemplateCompletion.java
index a71e043..2f41ded 100644
--- a/src/org/fife/ui/autocomplete/TemplateCompletion.java
+++ b/src/org/fife/ui/autocomplete/TemplateCompletion.java
@@ -64,6 +64,10 @@ public class TemplateCompletion extends AbstractCompletion
 	private String inputText;
 
 	private String definitionString;
+	
+	private String shortDescription;
+	
+	private String summary;
 
 	/**
 	 * The template's parameters.
@@ -72,10 +76,12 @@ public class TemplateCompletion extends AbstractCompletion
 
 
 	public TemplateCompletion(CompletionProvider provider,
-				String inputText, String definitionString, String template) {
+				String inputText, String definitionString, String template, String shortDescription, String summary) {
 		super(provider);
 		this.inputText = inputText;
 		this.definitionString = definitionString;
+		this.shortDescription = shortDescription;
+		this.summary = summary;
 		pieces = new ArrayList(3);
 		params = new ArrayList(3);
 		parse(template);
@@ -119,8 +125,7 @@ public class TemplateCompletion extends AbstractCompletion
 
 
 	public String getSummary() {
-		// TODO Auto-generated method stub
-		return null;
+		return summary;
 	}
 
 
@@ -128,6 +133,10 @@ public class TemplateCompletion extends AbstractCompletion
 		return definitionString;
 	}
 
+	public String getShortDescription() {
+		return shortDescription;
+	}
+	
 
 	/**
 	 * {@inheritDoc}

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