? 115569.txt
Index: src/org/netbeans/lib/editor/codetemplates/CodeTemplateCompletionItem.java
===================================================================
RCS file: /cvs/editor/codetemplates/src/org/netbeans/lib/editor/codetemplates/CodeTemplateCompletionItem.java,v
retrieving revision 1.18
diff -u -r1.18 CodeTemplateCompletionItem.java
--- src/org/netbeans/lib/editor/codetemplates/CodeTemplateCompletionItem.java	17 Jun 2007 23:19:08 -0000	1.18
+++ src/org/netbeans/lib/editor/codetemplates/CodeTemplateCompletionItem.java	1 Oct 2007 12:49:16 -0000
@@ -24,6 +24,7 @@
 import java.awt.Graphics;
 import java.awt.event.KeyEvent;
 import javax.swing.ImageIcon;
+import javax.swing.KeyStroke;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
@@ -53,8 +54,11 @@
     
     private String rightText;
     
-    public CodeTemplateCompletionItem(CodeTemplate codeTemplate) {
+    private JTextComponent component;
+    
+    public CodeTemplateCompletionItem(CodeTemplate codeTemplate, JTextComponent component) {
         this.codeTemplate = codeTemplate;
+        this.component = component;
     }
     
     private String getLeftText() {
@@ -101,6 +105,13 @@
     }
     
     public void processKeyEvent(KeyEvent evt) {
+        CodeTemplateManagerOperation operation = CodeTemplateManagerOperation.get(component.getDocument());
+        KeyStroke expandKeyStroke = operation.getExpansionKey();
+
+        if (expandKeyStroke.equals(KeyStroke.getKeyStrokeForEvent(evt))) {
+            defaultAction(component);
+            evt.consume();
+        }
     }
     
     public boolean instantSubstitution(JTextComponent component) {
Index: src/org/netbeans/lib/editor/codetemplates/CodeTemplateCompletionProvider.java
===================================================================
RCS file: /cvs/editor/codetemplates/src/org/netbeans/lib/editor/codetemplates/CodeTemplateCompletionProvider.java,v
retrieving revision 1.8
diff -u -r1.8 CodeTemplateCompletionProvider.java
--- src/org/netbeans/lib/editor/codetemplates/CodeTemplateCompletionProvider.java	11 Jun 2007 07:03:07 -0000	1.8
+++ src/org/netbeans/lib/editor/codetemplates/CodeTemplateCompletionProvider.java	1 Oct 2007 12:49:16 -0000
@@ -156,7 +156,7 @@
                 queryResult = new ArrayList<CodeTemplateCompletionItem>(cts.size());
                 for (CodeTemplate ct : cts) {
                     if (accept(ct, filters)) {
-                        queryResult.add(new CodeTemplateCompletionItem(ct));
+                        queryResult.add(new CodeTemplateCompletionItem(ct, component));
                     }
                 }
                 resultSet.addAllItems(queryResult);