X-Git-Url: http://git.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..8628871 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,27 +4,19 @@
  */
 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.link.LinkedPositionManager;
 import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI;
-import org.eclipse.jface.dialogs.MessageDialog;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.contentassist.IContextInformation;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Shell;
 //import org.eclipse.jdt.internal.ui.text.link.LinkedPositionManager;
 //import org.eclipse.jdt.internal.ui.text.link.LinkedPositionUI;
 //import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
@@ -32,17 +24,18 @@ import org.eclipse.swt.widgets.Shell;
 /**
  * A PHP identifier proposal.
  */
-public class IdentifierProposal implements IJavaCompletionProposal {
-
-  private final String fTemplate;
+public class IdentifierProposal extends AbstractProposal { //implements IPHPCompletionProposal {
   private final TemplateContext fContext;
-  private final ITextViewer fViewer;
-  //	private final Image fImage;
-  private final IRegion fRegion;
+  private final Image fImage_fun;
+  private final Image fImage_var;
 
   //private TemplateBuffer fTemplateBuffer;
   private String fOldText;
-  private IRegion fSelectedRegion; // initialized by apply()
+  private final IRegion fRegion;
+//  private IRegion fSelectedRegion; // initialized by apply()
+
+  private final String fTemplate;
+//  private final ITextViewer fViewer;
 
   /**
    * Creates a template proposal with a template and its context.
@@ -50,19 +43,18 @@ 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) {
-    //		Assert.isNotNull(template);
-    //		Assert.isNotNull(context);
-    //		Assert.isNotNull(region);
-    //		Assert.isNotNull(viewer);
+  public IdentifierProposal(String template, TemplateContext context, IRegion region, ITextViewer viewer, Image image_fun, Image image_var) {
+    super(viewer);
 
     fTemplate = template;
     fContext = context;
-    fViewer = viewer;
-    //		fImage= image;
+//    fViewer = viewer;
+   	fImage_fun= image_fun;
+    fImage_var= image_var;
     fRegion = region;
   }
 
+
   /*
    * @see ICompletionProposal#apply(IDocument)
    */
@@ -111,26 +103,6 @@ public class IdentifierProposal implements IJavaCompletionProposal {
     //	    }	    
   }
 
-//  private static int getCaretOffset(TemplateBuffer buffer) {
-//    TemplatePosition[] variables = buffer.getVariables();
-//    for (int i = 0; i != variables.length; i++) {
-//      TemplatePosition variable = variables[i];
-//
-//      if (variable.getName().equals(JavaTemplateMessages.getString("GlobalVariables.variable.name.cursor"))) //$NON-NLS-1$
-//        return variable.getOffsets()[0];
-//    }
-//
-//    return buffer.getString().length();
-//  }
-
-  /*
-   * @see ICompletionProposal#getSelection(IDocument)
-   */
-  public Point getSelection(IDocument document) {
-    return new Point(fSelectedRegion.getOffset(), fSelectedRegion.getLength());
-    //	  return null;
-  }
-
   /*
    * @see ICompletionProposal#getAdditionalProposalInfo()
    */
@@ -148,75 +120,28 @@ public class IdentifierProposal implements IJavaCompletionProposal {
   }
 
   /*
+   * @see ICompletionProposal#getContextInformation()
+   */
+  public IContextInformation getContextInformation() {
+    return null;
+  }
+
+  /*
    * @see ICompletionProposal#getDisplayString()
    */
   public String getDisplayString() {
     return fTemplate + TemplateMessages.getString("TemplateProposal.delimiter") + fTemplate; // $NON-NLS-1$ //$NON-NLS-1$
-    //		return fTemplate.getName() + TemplateMessages.getString("TemplateProposal.delimiter") + fTemplate.getDescription(); // $NON-NLS-1$ //$NON-NLS-1$
+    //		return fTemplate.getName() + ObfuscatorMessages.getString("TemplateProposal.delimiter") + fTemplate.getDescription(); // $NON-NLS-1$ //$NON-NLS-1$
   }
 
   /*
    * @see ICompletionProposal#getImage()
    */
   public Image getImage() {
-    //		return fImage;
-    return null;
-  }
-
-  /*
-   * @see ICompletionProposal#getContextInformation()
-   */
-  public IContextInformation getContextInformation() {
-    return null;
-  }
-
-  private static String textToHTML(String string) {
-    StringBuffer buffer = new StringBuffer(string.length());
-    buffer.append("<pre>"); //$NON-NLS-1$
-
-    for (int i = 0; i != string.length(); i++) {
-      char ch = string.charAt(i);
-
-      switch (ch) {
-        case '&' :
-          buffer.append("&amp;"); //$NON-NLS-1$
-          break;
-
-        case '<' :
-          buffer.append("&lt;"); //$NON-NLS-1$
-          break;
-
-        case '>' :
-          buffer.append("&gt;"); //$NON-NLS-1$
-          break;
-
-        case '\t' :
-          buffer.append("    "); //$NON-NLS-1$
-          break;
-
-        case '\n' :
-          buffer.append("<br>"); //$NON-NLS-1$
-          break;
-
-        default :
-          buffer.append(ch);
-          break;
-      }
+    if (fTemplate.charAt(0)=='$') {
+      return fImage_var;
     }
-
-    buffer.append("</pre>"); //$NON-NLS-1$
-    return buffer.toString();
-  }
-
-  private void openErrorDialog(BadLocationException e) {
-    Shell shell = fViewer.getTextWidget().getShell();
-    MessageDialog.openError(shell, TemplateMessages.getString("TemplateEvaluator.error.title"), e.getMessage()); //$NON-NLS-1$
-  }
-
-  private void handleException(CoreException e) {
-    Shell shell = fViewer.getTextWidget().getShell();
-    PHPeclipsePlugin.log(e);
-    //		ExceptionHandler.handle(e, shell, TemplateMessages.getString("TemplateEvaluator.error.title"), null); //$NON-NLS-1$
+ 		return fImage_fun;
   }
 
   /*
@@ -224,8 +149,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 ' ' :