[jbosstools-commits] JBoss Tools SVN: r12311 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el.
Author: scabanovich
Date: 2008-12-05 09:43:54 -0500 (Fri, 05 Dec 2008)
New Revision: 12311
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
Log:
JBIDE-3133
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-05
13:45:38 UTC (rev 12310)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-12-05
14:43:54 UTC (rev 12311)
@@ -48,9 +48,12 @@
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo;
import org.jboss.tools.common.kb.KbProposal;
import org.jboss.tools.seam.core.ISeamComponent;
+import org.jboss.tools.seam.core.ISeamContextShortVariable;
import org.jboss.tools.seam.core.ISeamContextVariable;
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;
@@ -927,7 +930,7 @@
}
public static boolean isSeamMessagesComponentVariable(ISeamContextVariable variable) {
- if (variable instanceof SeamMessagesComponent) {
+ if (variable instanceof ISeamMessages) {
return true;
} else if (variable instanceof ISeamXmlFactory) {
ISeamXmlFactory factory = (ISeamXmlFactory)variable;
@@ -944,13 +947,16 @@
List<ISeamContextVariable> resolvedValues =
SeamExpressionResolver.resolveVariables(p, null, value, true);
for (ISeamContextVariable var : resolvedValues) {
if (var.getName().equals(value)) {
- if (var instanceof SeamMessagesComponent) {
+ if (var instanceof ISeamMessages) {
return true;
}
}
}
}
}
+ } else if(variable instanceof ISeamContextShortVariable) {
+ ISeamContextShortVariable sv = (ISeamContextShortVariable)variable;
+ return isSeamMessagesComponentVariable(sv.getOriginal());
}
return false;
}