Author: akazakov Date: 2009-08-19 12:18:51 -0400 (Wed, 19 Aug 2009) New Revision: 17163 Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java Log: https://jira.jboss.org/jira/browse/JBIDE-4760 Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-08-19 14:56:24 UTC (rev 17162) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-08-19 16:18:51 UTC (rev 17163) @@ -274,60 +274,63 @@ return unique.toArray(new ICompletionProposal[unique.size()]); } - private ICompletionProposal findExistingProposal(List<ICompletionProposal> proposals, ICompletionProposal proposal) { + private ICompletionProposal findExistingProposal( + List<ICompletionProposal> proposals, ICompletionProposal proposal) { if (proposals == null || proposal == null) return null; for (ICompletionProposal existingProposal : proposals) { String exReplString = null; String exDispString = null; - String exInfoString = null; - + if (existingProposal instanceof CustomCompletionProposal) { - exReplString = ((CustomCompletionProposal)existingProposal).getReplacementString(); + exReplString = ((CustomCompletionProposal) existingProposal) + .getReplacementString(); } exDispString = unQuote(existingProposal.getDisplayString()); - exInfoString = unQuote(existingProposal.getAdditionalProposalInfo()); - exReplString = getReplacementWord(exReplString == null ? exDispString : exReplString); - + exReplString = getReplacementWord(exReplString == null ? exDispString + : exReplString); + String replString = null; String dispString = null; - String infoString = null; - + if (proposal instanceof CustomCompletionProposal) { - replString = ((CustomCompletionProposal)proposal).getReplacementString(); + replString = ((CustomCompletionProposal) proposal) + .getReplacementString(); } dispString = unQuote(proposal.getDisplayString()); - infoString = unQuote(proposal.getAdditionalProposalInfo()); - replString = getReplacementWord(replString == null ? dispString : replString); - - if (exReplString != null && replString != null && - (exReplString.equals(replString) || - exReplString.startsWith(replString) || - replString.startsWith(exReplString))) + replString = getReplacementWord(replString == null ? dispString + : replString); + + if (exReplString != null && replString != null + && exReplString.equals(replString)) return existingProposal; } - + return null; } - + private String getReplacementWord(String replacement) { - replacement = (replacement == null ? - "" : //$NON-NLS-1$ - replacement); - int index = replacement.indexOf('>'); //$NON-NLS-1$ + replacement = (replacement == null ? "" : //$NON-NLS-1$ + replacement); + int index = replacement.indexOf('>'); //$NON-NLS-1$ if (index != -1) { replacement = replacement.substring(0, index).trim(); if (replacement.endsWith("/")) //$NON-NLS-1$ - replacement = replacement.substring(0, replacement.length() - 1).trim(); + replacement = replacement + .substring(0, replacement.length() - 1).trim(); } - index = replacement.indexOf('='); + index = replacement.indexOf("="); //$NON-NLS-1$ if (index != -1) { replacement = replacement.substring(0, index).trim(); } + index = replacement.indexOf(" "); //$NON-NLS-1$ + if (index != -1) { + replacement = replacement.substring(0, index).trim(); + } return replacement; } - + private String unQuote(String str) { str = (str == null ? "" : //$NON-NLS-1$