[jbosstools-commits] JBoss Tools SVN: r17569 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.

[jbosstools-commits at lists.jboss.org]

Author: vrubezhny
Date: 2009-09-14 18:22:38 -0400 (Mon, 14 Sep 2009)
New Revision: 17569

Modified:
   trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
   trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
Log:
JBIDE-512 context variable code completion dropdown should show their "source"
JBIDE-2541 Show java-doc for EL content assist item

The values of type, sourceType and JavaDoc are gathered to be displayed in CA

Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java	2009-09-14 22:20:05 UTC (rev 17568)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java	2009-09-14 22:22:38 UTC (rev 17569)
@@ -205,7 +205,13 @@
 			int cursorPosition = replacementString.length();
 			Image image = textProposal.getImage();
 
-			String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); 
+			// JBIDE-512, JBIDE-2541 related changes ===>>>
+//			String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
+			String displayString = textProposal.getLabel();
+			if (displayString == null)
+				displayString = textProposal.getReplacementString() == null ? replacementString : textProposal.getReplacementString();
+
+			// <<<=== JBIDE-512, JBIDE-2541 related changes
 			IContextInformation contextInformation = null;
 			String additionalProposalInfo = textProposal.getContextInfo();
 			int relevance = textProposal.getRelevance();

Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java	2009-09-14 22:20:05 UTC (rev 17568)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java	2009-09-14 22:22:38 UTC (rev 17569)
@@ -603,7 +603,14 @@
 				int cursorPosition = replacementString.length();
 				Image image = textProposal.getImage();
 				
-				String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); 
+				// JBIDE-512, JBIDE-2541 related changes ===>>>
+//				String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
+				String displayString = textProposal.getLabel();
+				if (displayString == null)
+					displayString = textProposal.getReplacementString() == null ? replacementString : textProposal.getReplacementString();
+ 
+				// <<<=== JBIDE-512, JBIDE-2541 related changes
+
 				IContextInformation contextInformation = null;
 				String additionalProposalInfo = (textProposal.getContextInfo() == null ? "" : textProposal.getContextInfo()); //$NON-NLS-1$
 				int relevance = textProposal.getRelevance();