From: jsurfer <jsurfer>
Date: Sun, 12 Sep 2004 10:13:26 +0000 (+0000)
Subject: don't show <b>...</b> in Content Assist for predefined functions
X-Git-Url: http://secure.phpeclipse.com

don't show <b>...</b> in Content Assist for predefined functions
---

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/BuiltInProposal.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/BuiltInProposal.java
index 6f3485b..1a8504c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/BuiltInProposal.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/BuiltInProposal.java
@@ -29,15 +29,11 @@ public class BuiltInProposal extends AbstractProposal { // implements IPHPComple
   private final TemplateContext fContext;
   private final PHPFunction fFunction;
 
-  //private TemplateBuffer fTemplateBuffer;
   private String fOldText;
-  //  private final Image fImage_builtin;
 
   private final IRegion fRegion;
-  //  private IRegion fSelectedRegion; // initialized by apply()
 
   private final String fBuiltinFunctionName;
-  //  private final ITextViewer fViewer;
 
   /**
    * Creates a template proposal with a template and its context.
@@ -106,7 +102,7 @@ public class BuiltInProposal extends AbstractProposal { // implements IPHPComple
    * @see ICompletionProposal#getAdditionalProposalInfo()
    */
   public String getAdditionalProposalInfo() {
-    return textToHTML(fFunction.getDescription()); // fTemplateBuffer.getString());
+    return textToHTML(fFunction.getDescription()); 
   }
 
   /*
@@ -121,7 +117,6 @@ public class BuiltInProposal extends AbstractProposal { // implements IPHPComple
    */
   public String getDisplayString() {
     return fBuiltinFunctionName + TemplateMessages.getString("TemplateProposal.delimiter") + fFunction.getUsage(); // $NON-NLS-1$ //$NON-NLS-1$
-    //		return fTemplate.getName() + ObfuscatorMessages.getString("TemplateProposal.delimiter") + fTemplate.getDescription(); // $NON-NLS-1$ //$NON-NLS-1$
   }
 
   /*
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
index 5d50dee..2a165c5 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
@@ -25,7 +25,6 @@ import net.sourceforge.phpdt.core.ToolFactory;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
-import net.sourceforge.phpdt.internal.corext.template.php.CompilationUnitContextType;
 import net.sourceforge.phpdt.internal.corext.template.php.JavaContext;
 import net.sourceforge.phpdt.internal.corext.template.php.JavaContextType;
 import net.sourceforge.phpdt.internal.ui.PHPUiImages;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPElement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPElement.java
index a64d4db..a72254d 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPElement.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPElement.java
@@ -13,7 +13,7 @@ public abstract class PHPElement {
     this.ElementName = ElementName;
   }
   public final void setUsage(String usage) {
-    this.ElementUsage = "<b>"+usage+"</b>";
+    this.ElementUsage = usage;
   }
 
   //Getters
@@ -26,7 +26,7 @@ public abstract class PHPElement {
   }
 
   public String getHoverText() {
-    return getUsage();
+    return "<b>"+getUsage()+"</b>";
   }
   
   public PHPElement() {