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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/TemplateProposal.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/TemplateProposal.java
index 0b9e8b7..2c629b0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/TemplateProposal.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/TemplateProposal.java
@@ -11,21 +11,17 @@ import net.sourceforge.phpdt.internal.corext.template.TemplateMessages;
 import net.sourceforge.phpdt.internal.corext.template.TemplatePosition;
 import net.sourceforge.phpdt.internal.corext.template.php.PHPTemplateMessages;
 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;
 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;
@@ -33,17 +29,15 @@ import org.eclipse.swt.widgets.Shell;
 /**
  * A template proposal.
  */
-public class TemplateProposal implements IPHPCompletionProposal {
-
-  private final Template fTemplate;
+public class TemplateProposal extends AbstractProposal {
   private final TemplateContext fContext;
-  private final ITextViewer fViewer;
   private final Image fImage;
+  private String fOldText;
   private final IRegion fRegion;
 
+  private final Template fTemplate;
+
   private TemplateBuffer fTemplateBuffer;
-  private String fOldText;
-  private IRegion fSelectedRegion; // initialized by apply()
 
   /**
    * Creates a template proposal with a template and its context.
@@ -52,18 +46,27 @@ public class TemplateProposal implements IPHPCompletionProposal {
    * @param image     the icon of the proposal.
    */
   public TemplateProposal(Template template, TemplateContext context, IRegion region, ITextViewer viewer, Image image) {
-    //		Assert.isNotNull(template);
-    //		Assert.isNotNull(context);
-    //		Assert.isNotNull(region);
-    //		Assert.isNotNull(viewer);
+    super(viewer);
 
     fTemplate = template;
     fContext = context;
-    fViewer = viewer;
+    //    fViewer = viewer;
     fImage = image;
     fRegion = region;
   }
 
+  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(PHPTemplateMessages.getString("GlobalVariables.variable.name.cursor"))) //$NON-NLS-1$
+        return variable.getOffsets()[0];
+    }
+
+    return buffer.getString().length();
+  }
+
   /*
    * @see ICompletionProposal#apply(IDocument)
    */
@@ -110,26 +113,6 @@ public class TemplateProposal implements IPHPCompletionProposal {
     }
   }
 
-  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(PHPTemplateMessages.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()
    */
@@ -147,6 +130,13 @@ public class TemplateProposal implements IPHPCompletionProposal {
   }
 
   /*
+   * @see ICompletionProposal#getContextInformation()
+   */
+  public IContextInformation getContextInformation() {
+    return null;
+  }
+
+  /*
    * @see ICompletionProposal#getDisplayString()
    */
   public String getDisplayString() {
@@ -161,62 +151,6 @@ public class TemplateProposal implements IPHPCompletionProposal {
   }
 
   /*
-   * @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;
-      }
-    }
-
-    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, ObfuscatorMessages.getString("TemplateEvaluator.error.title"), null); //$NON-NLS-1$
-  }
-
-  /*
    * @see IJavaCompletionProposal#getRelevance()
    */
   public int getRelevance() {