Author: vrubezhny Date: 2008-12-18 10:09:01 -0500 (Thu, 18 Dec 2008) New Revision: 12676 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java Log: JBIDE-1975 OpenOn for #{messages.***} in Seam EL. Issue is fixed 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-12-18 15:06:37 UTC (rev 12675) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-12-18 15:09:01 UTC (rev 12676) @@ -53,11 +53,9 @@ import org.jboss.tools.seam.core.ISeamElement; import org.jboss.tools.seam.core.ISeamMessages; import org.jboss.tools.seam.core.ISeamProject; -import org.jboss.tools.seam.core.ISeamScope; import org.jboss.tools.seam.core.ISeamXmlFactory; import org.jboss.tools.seam.core.ScopeType; import org.jboss.tools.seam.core.SeamCorePlugin; -import org.jboss.tools.seam.internal.core.SeamMessagesComponent; import org.jboss.tools.seam.internal.core.el.SeamExpressionResolver.MessagesInfo; /** @@ -929,9 +927,9 @@ return content.length(); } - public static boolean isSeamMessagesComponentVariable(ISeamContextVariable variable) { + public static ISeamMessages getSeamMessagesComponentVariable(ISeamContextVariable variable) { if (variable instanceof ISeamMessages) { - return true; + return (ISeamMessages)variable; } else if (variable instanceof ISeamXmlFactory) { ISeamXmlFactory factory = (ISeamXmlFactory)variable; String value = factory.getValue(); @@ -948,7 +946,7 @@ for (ISeamContextVariable var : resolvedValues) { if (var.getName().equals(value)) { if (var instanceof ISeamMessages) { - return true; + return (ISeamMessages)var; } } } @@ -956,9 +954,13 @@ } } else if(variable instanceof ISeamContextShortVariable) { ISeamContextShortVariable sv = (ISeamContextShortVariable)variable; - return isSeamMessagesComponentVariable(sv.getOriginal()); + return getSeamMessagesComponentVariable(sv.getOriginal()); } - return false; + return null; } + + public static boolean isSeamMessagesComponentVariable(ISeamContextVariable variable) { + return (null != getSeamMessagesComponentVariable(variable)); + } }