X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/IdentifierProposal.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/IdentifierProposal.java
index 39b98e3..ddf59dc 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/IdentifierProposal.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/IdentifierProposal.java
@@ -4,18 +4,15 @@
  */
 package net.sourceforge.phpdt.internal.ui.text.template;
 
-import net.sourceforge.phpdt.internal.corext.template.Template;
-import net.sourceforge.phpdt.internal.corext.template.TemplateBuffer;
 import net.sourceforge.phpdt.internal.corext.template.TemplateContext;
 import net.sourceforge.phpdt.internal.corext.template.TemplateMessages;
-import net.sourceforge.phpdt.internal.corext.template.TemplatePosition;
-import net.sourceforge.phpdt.internal.corext.template.java.CompilationUnitContext;
-import net.sourceforge.phpdt.internal.corext.template.java.JavaTemplateMessages;
-import net.sourceforge.phpdt.internal.ui.text.java.IJavaCompletionProposal;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import org.eclipse.core.runtime.CoreException;
+import net.sourceforge.phpdt.internal.corext.template.php.PHPUnitContext;
+import net.sourceforge.phpdt.internal.ui.text.java.IPHPCompletionProposal;
 import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionManager;
 import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
@@ -32,12 +29,13 @@ import org.eclipse.swt.widgets.Shell;
 /**
  * A PHP identifier proposal.
  */
-public class IdentifierProposal implements IJavaCompletionProposal {
+public class IdentifierProposal implements IPHPCompletionProposal {
 
   private final String fTemplate;
   private final TemplateContext fContext;
   private final ITextViewer fViewer;
-  //	private final Image fImage;
+  private final Image fImage_fun;
+  private final Image fImage_var;
   private final IRegion fRegion;
 
   //private TemplateBuffer fTemplateBuffer;
@@ -50,7 +48,7 @@ public class IdentifierProposal implements IJavaCompletionProposal {
    * @param context   the context in which the template was requested.
    * @param image     the icon of the proposal.
    */
-  public IdentifierProposal(String template, TemplateContext context, IRegion region, ITextViewer viewer) { //, Image image) {
+  public IdentifierProposal(String template, TemplateContext context, IRegion region, ITextViewer viewer, Image image_fun, Image image_var) {
     //		Assert.isNotNull(template);
     //		Assert.isNotNull(context);
     //		Assert.isNotNull(region);
@@ -59,7 +57,8 @@ public class IdentifierProposal implements IJavaCompletionProposal {
     fTemplate = template;
     fContext = context;
     fViewer = viewer;
-    //		fImage= image;
+   	fImage_fun= image_fun;
+    fImage_var= image_var;
     fRegion = region;
   }
 
@@ -159,8 +158,10 @@ public class IdentifierProposal implements IJavaCompletionProposal {
    * @see ICompletionProposal#getImage()
    */
   public Image getImage() {
-    //		return fImage;
-    return null;
+    if (fTemplate.charAt(0)=='$') {
+      return fImage_var;
+    }
+ 		return fImage_fun;
   }
 
   /*
@@ -224,8 +225,8 @@ public class IdentifierProposal implements IJavaCompletionProposal {
    */
   public int getRelevance() {
 
-    if (fContext instanceof CompilationUnitContext) {
-      CompilationUnitContext context = (CompilationUnitContext) fContext;
+    if (fContext instanceof PHPUnitContext) {
+      PHPUnitContext context = (PHPUnitContext) fContext;
       switch (context.getCharacterBeforeStart()) {
         // high relevance after whitespace
         case ' ' :