JBoss Tools SVN: r20834 - trunk/esb/docs/esb_ref_guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2010-03-15 14:09:34 -0400 (Mon, 15 Mar 2010)
New Revision: 20834
Modified:
trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml
Log:
JBDS-1024 Action menu and wizard is customized -added Creating a ESB Action section
Modified: trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml 2010-03-15 18:02:24 UTC (rev 20833)
+++ trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml 2010-03-15 18:09:34 UTC (rev 20834)
@@ -340,7 +340,7 @@
</mediaobject>
</figure>
- <para>Then click <emphasis><property>Next</property></emphasis> and you will be brought to the <emphasis><property>New ESB Action</property></emphasis> wizard. In this wizard the class name should be specified, also you can set a package or add a interface as for any Java class.</para>
+ <para>After that click <emphasis><property>Next</property></emphasis> and you will be brought to the <emphasis><property>New ESB Action</property></emphasis> wizard. In this wizard the class name should be specified, also you can set a package or add a interface as for any Java class.</para>
<figure>
<title>New ESB Action wizard</title>
<mediaobject>
@@ -350,7 +350,7 @@
</mediaobject>
</figure>
- <para>In result, the <property>ESB Action Java File</property> will be created in selected package and it will have <property>org.jboss.soa.esb.actions.AbstractActionPipelineProcessor </property>as superclass. </para>
+ <para>As a result, the <property>ESB Action Java File</property> will be created in the selected package and it will have <property>org.jboss.soa.esb.actions.AbstractActionPipelineProcessor </property>as superclass. </para>
<para>Clicking on <emphasis><property>Finish</property></emphasis> will generate the <property>ESB Action</property> class. Also this class will become available in <property>ESB Editor</property> wizards.</para>
</section>
14 years, 3 months
JBoss Tools SVN: r20833 - in trunk/esb/docs/esb_ref_guide/en-US: images/esb_project and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2010-03-15 14:02:24 -0400 (Mon, 15 Mar 2010)
New Revision: 20833
Added:
trunk/esb/docs/esb_ref_guide/en-US/images/esb_support/03_create_esb.png
trunk/esb/docs/esb_ref_guide/en-US/images/esb_support/04_create_esb.png
Modified:
trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml
trunk/esb/docs/esb_ref_guide/en-US/images/esb_project/01_create_esb_project.png
trunk/esb/docs/esb_ref_guide/en-US/images/esb_support/01_create_esb.png
Log:
JBDS-1024 Action menu and wizard is customized -added Creating a ESB Action chapter, updated screenshot
Modified: trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml 2010-03-15 17:47:31 UTC (rev 20832)
+++ trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml 2010-03-15 18:02:24 UTC (rev 20833)
@@ -272,7 +272,7 @@
</section>
- <section>
+ <section id="creating_esb_file">
<title>Creating a ESB File</title>
<para>In this chapter we suggest a step-by-step walk-through of creating your own
simple file. Let's try to organize a new ESB file.</para>
@@ -327,8 +327,34 @@
file.</para>
</section>
+ <section id="creating_esb_action">
+ <title>Creating a ESB Action</title>
+ <para>From this chapter you will find out how to create a <emphasis><property>ESB Action Java File</property></emphasis>.</para>
+ <para>At first you need to open a <property>ESB</property> or simple <property>Java</property> project. Then you should select <emphasis><property>File > New>Other</property></emphasis> in the main menu or from the context project menu. Then click <emphasis><property>ESB > ESB Action</property></emphasis> in the <emphasis><property>New </property></emphasis> dialog.</para>
+ <figure>
+ <title>Select a wizard - ESB Action</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/esb_support/03_create_esb.png"/>
+ </imageobject>
+
+ </mediaobject>
+ </figure>
+ <para>Then click <emphasis><property>Next</property></emphasis> and you will be brought to the <emphasis><property>New ESB Action</property></emphasis> wizard. In this wizard the class name should be specified, also you can set a package or add a interface as for any Java class.</para>
+ <figure>
+ <title>New ESB Action wizard</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/esb_support/04_create_esb.png"/>
+ </imageobject>
+
+ </mediaobject>
+ </figure>
+ <para>In result, the <property>ESB Action Java File</property> will be created in selected package and it will have <property>org.jboss.soa.esb.actions.AbstractActionPipelineProcessor </property>as superclass. </para>
+ <para>Clicking on <emphasis><property>Finish</property></emphasis> will generate the <property>ESB Action</property> class. Also this class will become available in <property>ESB Editor</property> wizards.</para>
+ </section>
- <section role="updated">
+ <section role="updated">
<title>Configuring ESB Runtime in Preferences</title>
<para>In this chapter you will know how to predefine a JBoss ESB runtime on the Preferences page.</para>
Modified: trunk/esb/docs/esb_ref_guide/en-US/images/esb_project/01_create_esb_project.png
===================================================================
(Binary files differ)
Modified: trunk/esb/docs/esb_ref_guide/en-US/images/esb_support/01_create_esb.png
===================================================================
(Binary files differ)
Added: trunk/esb/docs/esb_ref_guide/en-US/images/esb_support/03_create_esb.png
===================================================================
(Binary files differ)
Property changes on: trunk/esb/docs/esb_ref_guide/en-US/images/esb_support/03_create_esb.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/esb/docs/esb_ref_guide/en-US/images/esb_support/04_create_esb.png
===================================================================
(Binary files differ)
Property changes on: trunk/esb/docs/esb_ref_guide/en-US/images/esb_support/04_create_esb.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 3 months
JBoss Tools SVN: r20832 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-15 13:47:31 -0400 (Mon, 15 Mar 2010)
New Revision: 20832
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-15 16:58:11 UTC (rev 20831)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-15 17:47:31 UTC (rev 20832)
@@ -13,6 +13,7 @@
import java.util.Set;
import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IQualifier;
@@ -53,4 +54,36 @@
// TODO do we need to care about default qualifiers for InjectionPoint in CDI Tools?
// assertContainsQualifierType(point, "javax.enterprise.inject.Default");
}
+
+ /**
+ * section 2.3.1 a0)
+ */
+ public void testNewQualifierAndAnyBindingMutualExclusive() {
+ // TODO
+ }
+
+ /**
+ * section 2.3.2 ba)
+ */
+ public void testQualifierDeclaresBindingAnnotation() {
+ Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.definition.qualifier.Tarantula", "org.jboss.jsr299.tck.tests.definition.qualifier.Tame");
+ assertFalse("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Tarantula type and org.jboss.jsr299.tck.tests.definition.qualifier.Tame qualifier.", beans.isEmpty());
+ }
+
+ /**
+ * section 2.3.3 a)
+ * section 3.1.3 be)
+ */
+ public void testQualifiersDeclaredInJava() {
+ Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.definition.qualifier.Cat", "org.jboss.jsr299.tck.tests.definition.qualifier.SynchronousQualifier");
+ assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Cat type and org.jboss.jsr299.tck.tests.definition.qualifier.SynchronousQualifier qualifier.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ Set<IQualifier> qualifiers = bean.getQualifiers();
+ assertEquals("Wrong number of qualifiers.", 2, qualifiers.size());
+ assertContainsQualifierType(bean, "org.jboss.jsr299.tck.tests.definition.qualifier.SynchronousQualifier");
+ Set<IAnnotationDeclaration> declarations = bean.getQualifierDeclarations();
+ assertEquals("Wrong number of qualifier declarations.", 1, declarations.size());
+ // TODO use correct start position instead of 0.
+ assertLocationEquals(declarations, 0, 12);
+ }
}
\ No newline at end of file
14 years, 3 months
JBoss Tools SVN: r20831 - trunk/struts/docs/struts_tools_ref_guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-03-15 12:58:11 -0400 (Mon, 15 Mar 2010)
New Revision: 20831
Modified:
trunk/struts/docs/struts_tools_ref_guide/en-US/modules.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-1154 - The Obsolete Figure is updated.
Modified: trunk/struts/docs/struts_tools_ref_guide/en-US/modules.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/en-US/modules.xml 2010-03-15 16:36:16 UTC (rev 20830)
+++ trunk/struts/docs/struts_tools_ref_guide/en-US/modules.xml 2010-03-15 16:58:11 UTC (rev 20831)
@@ -45,11 +45,16 @@
<section id="EditingModulesInAnExistingProject1">
<title>Editing Modules in an Existing Project</title>
- <para>To edit modules in an existing project, right click the project and
- select <emphasis>
- <property>JBoss Tools > Modules Configuration</property>.
- </emphasis></para>
- <figure>
+ <para>To edit modules in an existing project, right click the project in Web Project view
+ and select <emphasis>
+ <property>JBoss Tools Struts > Modules Configuration</property>
+ </emphasis>
+ (or right click the project in Package Explorer view
+ and select <emphasis>
+ <property>Configure > Modules Configuration</property>
+ </emphasis>).
+ </para>
+ <figure>
<title>Choosing Modules Configuration</title>
<mediaobject>
<imageobject>
14 years, 3 months
JBoss Tools SVN: r20830 - in trunk/documentation/guides: JBDS_Release_Notes and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-03-15 12:36:16 -0400 (Mon, 15 Mar 2010)
New Revision: 20830
Modified:
trunk/documentation/guides/Beginners_Guide/pom.xml
trunk/documentation/guides/JBDS_Release_Notes/pom.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-1107 -Added Beginners Guide to doc bundle.Corrected two unvalid poms(artifact ids were duplicated).</p>
</body></html>
Modified: trunk/documentation/guides/Beginners_Guide/pom.xml
===================================================================
--- trunk/documentation/guides/Beginners_Guide/pom.xml 2010-03-15 16:28:57 UTC (rev 20829)
+++ trunk/documentation/guides/Beginners_Guide/pom.xml 2010-03-15 16:36:16 UTC (rev 20830)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools</groupId>
- <artifactId>converter-ref-guide${translation}</artifactId>
+ <artifactId>beginers-guide${translation}</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Beginners_Guide</name>
Modified: trunk/documentation/guides/JBDS_Release_Notes/pom.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/pom.xml 2010-03-15 16:28:57 UTC (rev 20829)
+++ trunk/documentation/guides/JBDS_Release_Notes/pom.xml 2010-03-15 16:36:16 UTC (rev 20830)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools</groupId>
- <artifactId>converter-ref-guide${translation}</artifactId>
+ <artifactId>release_notes${translation}</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Release_Notes</name>
14 years, 3 months
JBoss Tools SVN: r20829 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-15 12:28:57 -0400 (Mon, 15 Mar 2010)
New Revision: 20829
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-15 15:37:38 UTC (rev 20828)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-15 16:28:57 UTC (rev 20829)
@@ -14,6 +14,7 @@
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IQualifier;
/**
@@ -36,4 +37,20 @@
assertContainsQualifierType(bean, "javax.enterprise.inject.Default");
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
}
+
+ /**
+ * section 2.3.1, b)
+ * section 11.1 c)
+ * @throws JavaModelException
+ */
+ public void testDefaultQualifierForInjectionPoint() throws JavaModelException {
+ Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.Order");
+ assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Order type.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ Set<IInjectionPoint> points = bean.getInjectionPoints();
+ IInjectionPoint point = points.iterator().next();
+ Set<IQualifier> qualifiers = bean.getQualifiers();
+ // TODO do we need to care about default qualifiers for InjectionPoint in CDI Tools?
+// assertContainsQualifierType(point, "javax.enterprise.inject.Default");
+ }
}
\ No newline at end of file
14 years, 3 months
JBoss Tools SVN: r20828 - trunk/struts/docs/struts_tools_ref_guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-03-15 11:37:38 -0400 (Mon, 15 Mar 2010)
New Revision: 20828
Modified:
trunk/struts/docs/struts_tools_ref_guide/en-US/editors.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-1153 - Corrected the misspelled words: "end" and "plug-ib".
Modified: trunk/struts/docs/struts_tools_ref_guide/en-US/editors.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/en-US/editors.xml 2010-03-15 15:26:33 UTC (rev 20827)
+++ trunk/struts/docs/struts_tools_ref_guide/en-US/editors.xml 2010-03-15 15:37:38 UTC (rev 20828)
@@ -166,7 +166,7 @@
<listitem><para>Under the <emphasis>
<property>plug-ins</property></emphasis> node you can define a Struts plug-in. Right-click the node, select <emphasis>
<property>Create Plug-in</property></emphasis>
- and specify the plug-ib <emphasis>
+ and specify the plug-in <emphasis>
<property>Id</property></emphasis> and <emphasis>
<property>ClassName</property></emphasis> by pointing to the Java class which implements the org.apache.struts.action.PlugIn interface. </para></listitem>
14 years, 3 months
JBoss Tools SVN: r20827 - trunk/struts/docs/struts_tools_ref_guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-03-15 11:26:33 -0400 (Mon, 15 Mar 2010)
New Revision: 20827
Modified:
trunk/struts/docs/struts_tools_ref_guide/en-US/projects.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-1153 - Corrected the misspelled word.
Modified: trunk/struts/docs/struts_tools_ref_guide/en-US/projects.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/en-US/projects.xml 2010-03-15 15:17:09 UTC (rev 20826)
+++ trunk/struts/docs/struts_tools_ref_guide/en-US/projects.xml 2010-03-15 15:26:33 UTC (rev 20827)
@@ -252,7 +252,7 @@
</mediaobject>
</figure>
- <para>When done, you can open end edit the struts-config.xml file using useful Struts
+ <para>When done, you can open and edit the struts-config.xml file using useful Struts
configuration file editor provided by JBDS. (The Struts configuration is shown below in
the Tree viewer).</para>
14 years, 3 months
JBoss Tools SVN: r20826 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-03-15 11:17:09 -0400 (Mon, 15 Mar 2010)
New Revision: 20826
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6052
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-03-15 15:13:02 UTC (rev 20825)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-03-15 15:17:09 UTC (rev 20826)
@@ -592,7 +592,11 @@
sValue.setTypeName(tb.getBinaryName());
sValue.setFetchMode(FetchMode.JOIN);
RootClass associatedClass = rootClasses.get(ref.fullyQualifiedName);
- sValue.setReferencedEntityName(associatedClass.getEntityName());
+ if (associatedClass != null){
+ sValue.setReferencedEntityName(associatedClass.getEntityName());
+ } else {
+ sValue.setReferencedPropertyName(ref.fullyQualifiedName);
+ }
buildProperty(sValue);
prop.setCascade("none");//$NON-NLS-1$
} else {
14 years, 3 months
JBoss Tools SVN: r20825 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-03-15 11:13:02 -0400 (Mon, 15 Mar 2010)
New Revision: 20825
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java
Log:
JBIDE-6055: Seam EL code completion requaires JSF nature.
The EL CA availability is validated thru number of EL Resolvers defined for the project (EL CA will be shown if and only if there is at least one EL resolver defined for the project)
The "New EL Expression" proposal appearance is corrected (this proposal will not appear in case of no EL Proposals defined for project)
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2010-03-15 14:55:40 UTC (rev 20824)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2010-03-15 15:13:02 UTC (rev 20825)
@@ -82,7 +82,7 @@
*/
@Override
protected void addTextELProposals(ContentAssistRequest contentAssistRequest) {
- if (!isJsfProject())
+ if (!isELCAToBeShown())
return;
TextRegion prefix = getELPrefix(contentAssistRequest);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2010-03-15 14:55:40 UTC (rev 20824)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2010-03-15 15:13:02 UTC (rev 20825)
@@ -13,8 +13,6 @@
import java.util.List;
import java.util.Map;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
@@ -22,6 +20,7 @@
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
import org.jboss.tools.common.el.core.resolver.ELContext;
+import org.jboss.tools.common.el.core.resolver.ELResolver;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.messages.JstUIMessages;
@@ -296,6 +295,9 @@
* @param contentAssistRequest
*/
protected void addELPredicateProposals(ContentAssistRequest contentAssistRequest, int baseRelevance, boolean shiftRelevanceAgainstTagNameProposals) {
+ if (!isELCAToBeShown())
+ return;
+
// Need to check if the cursor is placed right after a word part.
// If there is no word part found then just quit
TextRegion prefix = getELPredicatePrefix(contentAssistRequest);
@@ -363,7 +365,7 @@
@Override
protected void addAttributeValueELProposals(ContentAssistRequest contentAssistRequest) {
- if (!isJsfProject())
+ if (!isELCAToBeShown())
return;
TextRegion prefix = getELPrefix(contentAssistRequest);
@@ -447,6 +449,9 @@
@Override
protected void addTextELProposals(ContentAssistRequest contentAssistRequest) {
+ if (!isELCAToBeShown())
+ return;
+
TextRegion prefix = getELPrefix(contentAssistRequest);
if (prefix == null || !prefix.isELStarted()) {
AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, "#{}", //$NON-NLS-1$
@@ -513,21 +518,12 @@
}
/**
- * A temporary fix to decide if JSF-tricks are to play
+ * Checks is we need to show EL proposals
*
* @return
*/
- protected boolean isJsfProject() {
- if (getContext() == null || getContext().getResource() == null)
- return false;
-
- IProject project = getContext().getResource().getProject();
- try {
- if (project.getNature("org.jboss.tools.jsf.jsfnature") != null) //$NON-NLS-1$
- return true;
- } catch (CoreException e) {
- JspEditorPlugin.getDefault().logError(e);
- }
- return false;
+ protected boolean isELCAToBeShown() {
+ ELResolver[] resolvers = getContext().getElResolvers();
+ return (resolvers != null && resolvers.length > 0);
}
}
\ No newline at end of file
14 years, 3 months