added code completion for HTML mode

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / text / template / TemplateProposal.java

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 ca3ac38..8350ec3 100644 (file)
--- 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
@@ -9,9 +9,9 @@ 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.phpdt.internal.corext.template.php.PHPUnitContext;
+import net.sourceforge.phpdt.internal.corext.template.php.PHPTemplateMessages;
+import net.sourceforge.phpdt.internal.ui.text.java.IPHPCompletionProposal;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import org.eclipse.core.runtime.CoreException;
 import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionManager;
@@ -32,12 +32,12 @@ import org.eclipse.swt.widgets.Shell;
 /**
  * A template proposal.
  */
-public class TemplateProposal implements IJavaCompletionProposal {
+public class TemplateProposal implements IPHPCompletionProposal {
 
        private final Template fTemplate;
        private final TemplateContext fContext;
        private final ITextViewer fViewer;
-//     private final Image fImage;
+       private final Image fImage;
        private final IRegion fRegion;
 
        private TemplateBuffer fTemplateBuffer;
@@ -50,7 +50,7 @@ public class TemplateProposal implements IJavaCompletionProposal {
         * @param context   the context in which the template was requested.
         * @param image     the icon of the proposal.
         */     
-       public TemplateProposal(Template template, TemplateContext context, IRegion region, ITextViewer viewer){ //, Image image) {
+       public TemplateProposal(Template template, TemplateContext context, IRegion region, ITextViewer viewer, Image image) {
 //             Assert.isNotNull(template);
 //             Assert.isNotNull(context);
 //             Assert.isNotNull(region);
@@ -59,7 +59,7 @@ public class TemplateProposal implements IJavaCompletionProposal {
                fTemplate= template;
                fContext= context;
                fViewer= viewer;
-//             fImage= image;
+               fImage= image;
                fRegion= region;
        }
 
@@ -114,7 +114,7 @@ public class TemplateProposal implements IJavaCompletionProposal {
                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$
+                       if (variable.getName().equals(PHPTemplateMessages.getString("GlobalVariables.variable.name.cursor"))) //$NON-NLS-1$
                                return variable.getOffsets()[0];
                }
 
@@ -156,8 +156,7 @@ public class TemplateProposal implements IJavaCompletionProposal {
         * @see ICompletionProposal#getImage()
         */
        public Image getImage() {
-//             return fImage;
-     return null;
+               return fImage;
        }
 
        /*
@@ -221,8 +220,8 @@ public class TemplateProposal 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 ' ':