Author: vrubezhny Date: 2008-04-10 14:39:22 -0400 (Thu, 10 Apr 2008) New Revision: 7495 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java Log: http://jira.jboss.com/jira/browse/JBIDE-2011 Resources with dot's are handled wrong in code completion Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-04-10 18:39:14 UTC (rev 7494) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-04-10 18:39:22 UTC (rev 7495) @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -573,7 +574,21 @@ // return all the methods + properties for (TypeInfoCollector.MemberInfo mbr : members) { if (mbr instanceof MessagesInfo) { - proposals.addAll(((MessagesInfo)mbr).getKeys()); + // Surround the "long" keys containing the dots with [' '] + TreeSet<String> keys = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); + keys.addAll(((MessagesInfo)mbr).getKeys()); + Iterator<String> sortedKeys = keys.iterator(); + while(sortedKeys.hasNext()) { + String key = sortedKeys.next(); + if (key == null || key.length() == 0) + continue; + if (key.indexOf('.') != -1) { + proposals.add("['" + key + "']"); + } else { + proposals.add(key); + } + } +// proposals.addAll(((MessagesInfo)mbr).getKeys()); continue; } if (mbr.getMemberType() == null) {