[jbosstools-commits] JBoss Tools SVN: r12258 - in trunk/common/plugins/org.jboss.tools.common.el.core: src/org/jboss/tools/common/el/core/resolver and 1 other directory.
Author: vrubezhny
Date: 2008-12-03 14:03:24 -0500 (Wed, 03 Dec 2008)
New Revision: 12258
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELOperandResolveStatus.java
Log:
JBIDE-3133 New icons for proposals in JSF/Seam Code Assist.
The icons support is added to the resolver.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2008-12-03
18:55:59 UTC (rev 12257)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2008-12-03
19:03:24 UTC (rev 12258)
@@ -19,4 +19,5 @@
org.eclipse.wst.sse.ui,
org.jboss.tools.common,
org.jboss.tools.common.model,
- org.jboss.tools.common.resref.core;reprovide=true
+ org.jboss.tools.common.resref.core;reprovide=true,
+ org.jboss.tools.common.kb;bundle-version="2.0.0"
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELOperandResolveStatus.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELOperandResolveStatus.java 2008-12-03
18:55:59 UTC (rev 12257)
+++
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELOperandResolveStatus.java 2008-12-03
19:03:24 UTC (rev 12258)
@@ -16,6 +16,7 @@
import java.util.TreeSet;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
+import org.jboss.tools.common.kb.KbProposal;
/**
* Status of EL resolving.
@@ -24,7 +25,7 @@
public class ELOperandResolveStatus {
private ELInvocationExpression tokens;
Map<String, TypeInfoCollector.MethodInfo> unpairedGettersOrSetters;
- Set<String> proposals;
+ Set<KbProposal> proposals;
private ELInvocationExpression lastResolvedToken;
private boolean isMapOrCollectionOrBundleAmoungTheTokens = false;
private TypeInfoCollector.MemberInfo memberOfResolvedOperand;
@@ -68,6 +69,7 @@
* @return true if EL is resolved.
*/
public boolean isOK() {
+// return !getProposals().isEmpty() || isMapOrCollectionOrBundleAmoungTheTokens();
return !getProposals().isEmpty() || isMapOrCollectionOrBundleAmoungTheTokens();
}
@@ -129,16 +131,17 @@
}
/**
- * @return Set of proposals for EL.
+ *
+ * @return Set of proposals for EL
*/
- public Set<String> getProposals() {
- return proposals == null ? new TreeSet<String>() : proposals;
+ public Set<KbProposal> getProposals() {
+ return proposals == null ? new TreeSet<KbProposal>() : proposals;
}
/**
- * @param proposals Set of proposals.
+ * @param proposals Set of KbProposal proposals.
*/
- public void setProposals(Set<String> proposals) {
+ public void setProposals(Set<KbProposal> proposals) {
this.proposals = proposals;
}