[jbosstools-commits] JBoss Tools SVN: r16062 - in trunk/seam: tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent and 1 other directory.
Author: akazakov
Date: 2009-06-19 07:14:14 -0400 (Fri, 19 Jun 2009)
New Revision: 16062
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4512 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 2009-06-19
05:31:30 UTC (rev 16061)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2009-06-19
11:14:14 UTC (rev 16062)
@@ -28,7 +28,6 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.ExecutionArguments;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
@@ -218,7 +217,7 @@
try {
if(TypeInfoCollector.isInstanceofType(type, "java.util.Map")) {
suffix = collectionAdditionForMapDataModel;
- } else {
+ } else if(TypeInfoCollector.isInstanceofType(type,
"java.util.Collection")) {
suffix = collectionAdditionForCollectionDataModel;
}
} catch (JavaModelException e) {
@@ -372,13 +371,12 @@
if(!(operand instanceof ELInvocationExpression) || file == null) {
return new SeamELOperandResolveStatus(null);
}
-
-
+
ELInvocationExpression expr = (ELInvocationExpression)operand;
boolean isIncomplete = expr.getType() == ELObjectType.EL_PROPERTY_INVOCATION
&& ((ELPropertyInvocation)expr).getName() == null;
boolean isArgument = expr.getType() == ELObjectType.EL_ARGUMENT_INVOCATION;
-
+
SeamELOperandResolveStatus status = new SeamELOperandResolveStatus(expr);
ELInvocationExpression left = expr;
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml 2009-06-19
05:31:30 UTC (rev 16061)
+++
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml 2009-06-19
11:14:14 UTC (rev 16062)
@@ -38,6 +38,10 @@
<h:dataTable value="#{testComponentForVars.array}"
var="thrItem">
<h:outputText value="#{thrItem.name}"/>
</h:dataTable>
+
+ <h:dataTable value="#{testComponentForVars.test}"
var="singleValue">
+ <h:outputText value="#{singleValue.items}"/>
+ </h:dataTable>
</h:dataTable>
</ui:define>