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

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2008-03-14 15:02:55 -0400 (Fri, 14 Mar 2008)
New Revision: 6942

Modified:
   trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
   trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java
Log:
JBIDE-1825

Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java	2008-03-14 18:15:17 UTC (rev 6941)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java	2008-03-14 19:02:55 UTC (rev 6942)
@@ -117,7 +117,7 @@
 		return proposals;
 	}
 
-    private ICompletionProposal[] getUniqProposals(ICompletionProposal[] proposals) {
+    static ICompletionProposal[] getUniqProposals(ICompletionProposal[] proposals) {
     	if(proposals==null) {
     		return null;
     	}

Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java	2008-03-14 18:15:17 UTC (rev 6941)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java	2008-03-14 19:02:55 UTC (rev 6942)
@@ -56,7 +56,8 @@
 		IDocument document = contentAssistSubjectControl.getDocument();
 		String text = document.get();
 		addAttributeValueProposals(proposals, text, documentOffset);
-		return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[0]);
+		ICompletionProposal[] ps = (ICompletionProposal[])proposals.toArray(new ICompletionProposal[0]);
+		return FaceletsHtmlContentAssistProcessor.getUniqProposals(ps);
 	}
 
 	//not implemented