Author: akazakov Date: 2008-02-22 07:32:39 -0500 (Fri, 22 Feb 2008) New Revision: 6531 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java Log: http://jira.jboss.org/jira/browse/JBIDE-1813 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-02-22 11:54:02 UTC (rev 6530) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-02-22 12:32:39 UTC (rev 6531) @@ -121,15 +121,18 @@ if(proposals==null) { return null; } - HashMap uniqProposals = new HashMap(proposals.length); - ArrayList uniqProposalList = new ArrayList(proposals.length); + HashMap<String, ICompletionProposal> uniqProposals = new HashMap<String, ICompletionProposal>(proposals.length); + ArrayList<ICompletionProposal> uniqProposalList = new ArrayList<ICompletionProposal>(proposals.length); for(int i=0; i<proposals.length; i++) { - int eq = proposals[i].getDisplayString().indexOf('='); - String str = proposals[i].getDisplayString();; + String str = proposals[i].getDisplayString(); + if(str.startsWith("\"") && str.endsWith("\"") && str.length()>2) { + str = str.substring(0, str.length()-1).substring(1); + } + int eq = str.indexOf('='); if(eq>0) { str = str.substring(0, eq); } - Object proposal = uniqProposals.get(str); + ICompletionProposal proposal = uniqProposals.get(str); if(proposal==null || proposals[i] instanceof AutoContentAssistantProposal) { uniqProposals.put(str, proposals[i]); uniqProposalList.add(proposals[i]);