JBoss Tools SVN: r16990 - workspace/yzhishko.
by jbosstools-commits＠lists.jboss.org
Author: anis
Date: 2009-08-06 11:39:13 -0400 (Thu, 06 Aug 2009)
New Revision: 16990
Removed:
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/
workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/
Log:
Removed file/folder
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r16989 - trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-08-06 11:15:45 -0400 (Thu, 06 Aug 2009)
New Revision: 16989
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
Log:
JBIDE-4660: Update and correct the CA-related JUnit tests after the new-style CA is applied.
Test project data for SeamUiAllTests JUnit Test suite is updated to suite the new-style CA requirements:
SeamELContentAssistTestCase.testSeamELContentAssist test case is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-08-06 15:11:10 UTC (rev 16988)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-08-06 15:15:45 UTC (rev 16989)
@@ -280,7 +280,7 @@
displayStringUnquoted = displayStringUnquoted.substring(0, displayStringUnquoted.length() - 1);
displayStringUnquoted = displayStringUnquoted.trim().toLowerCase();
- if (!present.contains(displayStringUnquoted)) {
+ if (displayStringUnquoted != null && displayStringUnquoted.length() > 0 && !present.contains(displayStringUnquoted)) {
present.add(displayStringUnquoted);
if (infoUnquoted != null && infoUnquoted.length() > 0) {
if (!info.contains(infoUnquoted)) {
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r16988 - in workspace/yzhishko: org.jboss.tools.smoke.ui.bot.test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: anis
Date: 2009-08-06 11:11:10 -0400 (Thu, 06 Aug 2009)
New Revision: 16988
Added:
workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/
workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.classpath
workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.project
workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/build.properties
Log:
Added a folder remotely
Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.classpath
===================================================================
--- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.classpath (rev 0)
+++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.classpath 2009-08-06 15:11:10 UTC (rev 16988)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="resources"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.project
===================================================================
--- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.project (rev 0)
+++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.project 2009-08-06 15:11:10 UTC (rev 16988)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.smoke.ui.bot.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/build.properties
===================================================================
--- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/build.properties (rev 0)
+++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/build.properties 2009-08-06 15:11:10 UTC (rev 16988)
@@ -0,0 +1,4 @@
+source.. = src/,resources/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r16987 - in workspace/yzhishko: org.jboss.tools.seam.ui.bot.test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: anis
Date: 2009-08-06 11:10:27 -0400 (Thu, 06 Aug 2009)
New Revision: 16987
Added:
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.classpath
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/build.properties
Log:
Added a folder remotely
Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.classpath
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.classpath (rev 0)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.classpath 2009-08-06 15:10:27 UTC (rev 16987)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="resources"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project (rev 0)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project 2009-08-06 15:10:27 UTC (rev 16987)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.seam.ui.bot.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/build.properties
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/build.properties (rev 0)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/build.properties 2009-08-06 15:10:27 UTC (rev 16987)
@@ -0,0 +1,4 @@
+source.. = src/,resources/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r16986 - workspace/yzhishko.
by jbosstools-commits＠lists.jboss.org
Author: anis
Date: 2009-08-06 11:09:14 -0400 (Thu, 06 Aug 2009)
New Revision: 16986
Removed:
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/
Log:
Removed file/folder
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r16985 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-08-06 11:04:40 -0400 (Thu, 06 Aug 2009)
New Revision: 16985
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java
Log:
JBIDE-4660: Update and correct the CA-related JUnit tests after the new-style CA is applied.
Test project data for SeamUiAllTests JUnit Test suite is updated to suite the new-style CA requirements:
SeamELContentAssistTestCase.testSeamELContentAssist test case is fixed
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java 2009-08-06 14:36:42 UTC (rev 16984)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java 2009-08-06 15:04:40 UTC (rev 16985)
@@ -32,9 +32,9 @@
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
+import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.test.TestUtil;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
-import org.jboss.tools.seam.ui.text.java.SeamELProposalProcessor;
import org.jboss.tools.test.util.JUnitUtils;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
@@ -257,7 +257,6 @@
if (projectResource == null)
return;
prj = projectResource.getProject();
-
this.project = prj;
}
@@ -295,7 +294,7 @@
}catch(Exception e){
JUnitUtils.fail("Error during changing 'TestComponentForVarAttributes.java' content to 'TestComponentForVarAttributes.1'", e);
}
- JobUtils.waitForIdle();
+ JobUtils.waitForIdle(3000);
checkProposals("/WebContent/varAttributes.xhtml", 458, new String[]{"test.name"}, false);
checkProposals("/WebContent/varAttributes.xhtml", 640, new String[]{"item.name"}, false);
@@ -485,15 +484,17 @@
// compare SeamELCompletionProposals in the result to the filtered valid proposals
Set<String> existingProposals = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
- Set<String> nonExistingProposals = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
if (result != null && result.length > 0) {
for (int j = 0; j < result.length; j++) {
// System.out.println("Result#" + i + "-" + j + " ==> " + result[j].getClass().getName());
- // Look only for SeamELProposalProcessor proposals
- if (result[j] instanceof SeamELProposalProcessor.Proposal) {
- SeamELProposalProcessor.Proposal proposal = (SeamELProposalProcessor.Proposal)result[j];
- String proposalString = proposal.getPrefixCompletionText(document, offset).toString();
+ // Cannot separate Seam EL proposals from all the others,
+ // so check only the required proposals existance
+ //
+ if (result[j] instanceof AutoContentAssistantProposal) {
+ AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)result[j];
+
+ String proposalString = proposal.getReplacementString();
if (filteredValidProposals.contains(proposalString)) {
existingProposals.add(proposalString);
filteredValidProposals.remove(proposalString);
@@ -516,8 +517,6 @@
if (validProposal != null) {
existingProposals.add(validProposal);
filteredValidProposals.remove(validProposal);
- } else {
- nonExistingProposals.add(proposalString);
}
}
@@ -525,10 +524,8 @@
}
}
assertTrue("Some Seam EL proposals werent\'t shown in the Content Assistant", filteredValidProposals.isEmpty());
- assertTrue("Some Seam EL proposals were shown in the Content Assistant but they shouldn\'t", nonExistingProposals.isEmpty());
}
-
} catch (BadLocationException e) {
assertNull("An exception caught: " + (e != null? e.getMessage() : ""), e);
}
@@ -593,15 +590,16 @@
// compare SeamELCompletionProposals in the result to the filtered valid proposals
Set<String> existingProposals = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
- Set<String> nonExistingProposals = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
-
+
if (result != null && result.length > 0) {
for (int j = 0; j < result.length; j++) {
// System.out.println("Result#" + i + "/" + j + " ==> " + result[j].getClass().getName());
- // Look only for SeamELProposalProcessor proposals
- if (result[j] instanceof SeamELProposalProcessor.Proposal) {
- SeamELProposalProcessor.Proposal proposal = (SeamELProposalProcessor.Proposal)result[j];
- String proposalString = proposal.getPrefixCompletionText(document, offset).toString();
+ // Cannot separate Seam EL proposals from all the others,
+ // so check only the required proposals existance
+ //
+ if (result[j] instanceof AutoContentAssistantProposal) {
+ AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)result[j];
+ String proposalString = proposal.getReplacementString();
if (filteredValidProposals.contains(proposalString)) {
existingProposals.add(proposalString);
@@ -625,15 +623,12 @@
if (validProposal != null) {
existingProposals.add(validProposal);
filteredValidProposals.remove(validProposal);
- } else {
- nonExistingProposals.add(proposalString);
}
}
}
}
}
assertTrue("Some in-attribute Seam EL proposals werent\'t shown in the Content Assistant", filteredValidProposals.isEmpty());
- assertTrue("Some in-attribute Seam EL proposals were shown in the Content Assistant but they shouldn\'t", nonExistingProposals.isEmpty());
}
}
} catch (BadLocationException e) {
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r16984 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: taglibs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-08-06 10:36:42 -0400 (Thu, 06 Aug 2009)
New Revision: 16984
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3571
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java 2009-08-06 13:47:49 UTC (rev 16983)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java 2009-08-06 14:36:42 UTC (rev 16984)
@@ -3,16 +3,11 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import java.util.StringTokenizer;
import java.util.TreeSet;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
import org.eclipse.jface.text.IDocument;
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.IPageContext;
@@ -23,6 +18,9 @@
import org.w3c.dom.NodeList;
public class IDProposalType extends CustomProposalType {
+ static String ID = "id"; //$NON-NLS-1$
+ static String QUOTE_1 = "'"; //$NON-NLS-1$
+ static String QUOTE_2 = "\""; //$NON-NLS-1$
Set<String> idList = new TreeSet<String>();
@Override
@@ -49,7 +47,7 @@
}
private void collectIDs(Element element) {
- String id = element.getAttribute("id");
+ String id = element.getAttribute(ID);
if(id != null && id.length() > 0) idList.add(id);
NodeList cs = element.getChildNodes();
for (int i = 0; i < cs.getLength(); i++) {
@@ -64,8 +62,8 @@
public TextProposal[] getProposals(KbQuery query) {
String v = query.getValue();
String txt = query.getText();
- if(txt.startsWith("\"")) txt = txt.substring(1);
- if(txt.endsWith("\"")) txt = txt.substring(0, txt.length() - 1);
+ if(txt.startsWith(QUOTE_1) || txt.startsWith(QUOTE_2)) txt = txt.substring(1);
+ if(txt.endsWith(QUOTE_1) || txt.endsWith(QUOTE_2)) txt = txt.substring(0, txt.length() - 1);
int offset = v.length();
int b = v.lastIndexOf(',');
if(b < 0) b = 0; else b += 1;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-08-06 13:47:49 UTC (rev 16983)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-08-06 14:36:42 UTC (rev 16984)
@@ -88,7 +88,7 @@
<proposal type="jsfVariables"/>
</attribute>
</component>
- <component closeTag="true" name="commandButton" extended="false">
+ <component closeTag="true" name="commandButton">
<description>Renders an HTML "input" element.
&lt;br /&gt;
During Decoding: Obtains the Map from the
@@ -113,6 +113,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="accesskey" required="false">
<description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note: Authors should consider the input method of the expected reader when specifying an accesskey</description>
@@ -368,12 +369,14 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>Id['s] (in format of call UIComponent.findComponent()) of components, rendered in case of AjaxRequest caused by this component. Can be single id, comma-separated list of Id's, or EL Expression with array or Collection</description>
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>If "false", this component is not rendered</description>
@@ -403,6 +406,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>CSS style(s) is/are to be applied when this component is rendered</description>
@@ -473,6 +477,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="accesskey" required="false">
<description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note: Authors should consider the input method of the expected reader when specifying an accesskey</description>
@@ -587,6 +592,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="hreflang" required="false">
<description>Base language of a resource specified with the href attribute; hreflang may only be used with href</description>
@@ -727,12 +733,14 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>Id['s] (in format of call UIComponent.findComponent()) of components, rendered in case of AjaxRequest caused by this component. Can be single id, comma-separated list of Id's, or EL Expression with array or Collection</description>
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rel" required="false">
<description>The relationship from the current document to the anchor specified by this hyperlink. The value of this attribute is a space-separated list of link types</description>
@@ -786,6 +794,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>CSS style(s) is/are to be applied when this component is rendered</description>
@@ -858,6 +867,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="accept" required="false">
<description>This attribute specifies a comma-separated list of content types that a server processing this form will handle correctly. User agents may use this information to filter out non-conforming files when prompting you to select files to be sent to the server (cf. the INPUT element when type="file")</description>
@@ -935,6 +945,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>Every component may have a unique id that is automatically created if omitted</description>
@@ -996,12 +1007,14 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>Id['s] (in format of call UIComponent.findComponent()) of components, rendered in case of AjaxRequest caused by this component. Can be single id, comma-separated list of Id's, or EL Expression with array or Collection</description>
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>If "false", this component is not rendered</description>
@@ -1025,6 +1038,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="target" required="false">
<description>This attribute specifies the name of a frame where a document is to be opened.
@@ -1431,6 +1445,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="action" required="false">
<description>MethodBinding pointing at the application action to be invoked,
@@ -1499,6 +1514,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>Every component may have a unique id that is automatically created if omitted</description>
@@ -1561,12 +1577,14 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>Id['s] (in format of call UIComponent.findComponent()) of components, rendered in case of AjaxRequest caused by this component. Can be single id, comma-separated list of Id's, or EL Expression with array or Collection</description>
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>If "false", this component is not rendered</description>
@@ -1590,6 +1608,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="timeout" required="false">
<description>Response waiting time on a particular request. If a response is not received during this time, the request is aborted</description>
@@ -2567,6 +2586,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="timeout" required="false">
<description>Waiting time for response on a particular request. If no response is received during this time, the request is aborted</description>
@@ -2724,6 +2744,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="action" required="false">
<description>MethodBinding pointing at the application action to be invoked,
@@ -2802,6 +2823,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>Every component may have a unique id that is automatically created if omitted</description>
@@ -2871,12 +2893,14 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>Id['s] (in format of call UIComponent.findComponent()) of components, rendered in case of AjaxRequest caused by this component. Can be single id, comma-separated list of Id's, or EL Expression with array or Collection</description>
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>If "false", this component is not rendered</description>
@@ -2893,6 +2917,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="timeout" required="false">
<description>Timeout (in ms) for request</description>
@@ -2933,6 +2958,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="action" required="false">
<description>MethodBinding pointing at the application action to be invoked,
@@ -3021,6 +3047,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>Every component may have a unique id that is automatically created if omitted</description>
@@ -3083,12 +3110,14 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>Id['s] (in format of call UIComponent.findComponent()) of components, rendered in case of AjaxRequest caused by this component. Can be single id, comma-separated list of Id's, or EL Expression with array or Collection</description>
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>If "false", this component is not rendered</description>
@@ -3105,6 +3134,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="timeout" required="false">
<description>Timeout (in ms) for request</description>
@@ -3325,6 +3355,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="forceId" required="false">
<description>If true, render the ID of the component in HTML code
@@ -3529,6 +3560,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="action" required="false">
<description>MethodBinding pointing at the application action to be invoked,
@@ -3621,6 +3653,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>Every component may have a unique id that is automatically created if omitted</description>
@@ -3684,12 +3717,14 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>Id['s] (in format of call UIComponent.findComponent()) of components, rendered in case of AjaxRequest caused by this component. Can be single id, comma-separated list of Id's, or EL Expression with array or Collection</description>
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>If "false", this component is not rendered</description>
@@ -3713,6 +3748,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="timeout" required="false">
<description>Timeout (in ms) for request</description>
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml 2009-08-06 13:47:49 UTC (rev 16983)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml 2009-08-06 14:36:42 UTC (rev 16984)
@@ -112,6 +112,7 @@
<proposal type="beanProperty"/>
<proposal type="jsfVariables"/>
<proposal type="bundleProperty"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>
@@ -205,6 +206,7 @@
</description>
<proposal type="beanProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="requestDelay" required="false">
<description>
@@ -226,6 +228,7 @@
<proposal type="beanProperty"/>
<proposal type="jsfVariables"/>
<proposal type="bundleProperty"/>
+ <proposal type="id"/>
</attribute>
<attribute name="status" required="false">
<description>
@@ -235,6 +238,7 @@
<proposal type="beanProperty"/>
<proposal type="jsfVariables"/>
<proposal type="bundleProperty"/>
+ <proposal type="id"/>
</attribute>
<attribute name="summary" required="false">
<description>
@@ -1373,6 +1377,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="horizontalOffset" required="false">
<description>
@@ -1712,6 +1717,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -1723,6 +1729,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>
@@ -1867,6 +1874,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>
@@ -2026,6 +2034,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="changeExpandListener">
@@ -3383,6 +3392,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="binding" required="false">
<description>
@@ -3423,6 +3433,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>
@@ -3503,6 +3514,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="attached" required="false">
<description>
@@ -3518,6 +3530,7 @@
<param value="true"/>
<param value="false"/>
</proposal>
+ <proposal type="id"/>
</attribute>
<attribute name="binding" required="false">
<description>
@@ -4048,6 +4061,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="for" required="false">
<description>
@@ -4056,6 +4070,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="forValRef" required="false">
<description>
@@ -4287,6 +4302,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rangeStyleClass" required="false">
<description>
@@ -4307,6 +4323,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>
@@ -4359,6 +4376,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="storeResults" required="false">
<description>
@@ -4469,6 +4487,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="dataGrid">
@@ -6012,6 +6031,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component closeTag="true" name="datascroller">
@@ -6162,6 +6182,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="for" required="false">
<description>
@@ -6170,6 +6191,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="handleValue" required="false">
<description>Current handle value</description>
@@ -6397,6 +6419,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -6408,6 +6431,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="renderIfSinglePage" required="false">
<description>
@@ -6481,6 +6505,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="stepControls" required="false">
<description>
@@ -6551,6 +6576,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component closeTag="true" name="dndParam">
@@ -6618,6 +6644,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="binding" required="false">
<description>
@@ -6785,6 +6812,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="dragListener" required="false">
<description>
@@ -6834,6 +6862,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="grabCursors" required="false">
<description>
@@ -6962,6 +6991,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -6973,6 +7003,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>
@@ -7006,6 +7037,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="timeout" required="false">
<description>
@@ -7030,6 +7062,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="dropDownMenu">
@@ -7498,6 +7531,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>
@@ -7612,6 +7646,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -7623,6 +7658,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rejectCursors" required="false">
<description>
@@ -7665,6 +7701,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="timeout" required="false">
<description>
@@ -7699,6 +7736,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="editor">
@@ -8058,6 +8096,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>
@@ -8102,6 +8141,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="type" required="false">
<description>
@@ -8660,6 +8700,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="stopControlLabel" required="false">
<description>Defines a label for a stop button</description>
@@ -12503,6 +12544,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="icon" required="false">
<description>
@@ -12681,6 +12723,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -12692,6 +12735,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>
@@ -12741,6 +12785,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>
@@ -12805,6 +12850,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component closeTag="true" name="menuSeparator">
@@ -12924,6 +12970,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>
@@ -13406,6 +13453,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="modalPanel">
@@ -15862,6 +15910,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="hoverClass" required="false">
<description>
@@ -16165,6 +16214,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -16176,6 +16226,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>
@@ -16244,6 +16295,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>
@@ -16339,6 +16391,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="panelMenuItem">
@@ -16466,6 +16519,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="hoverClass" required="false">
<description>
@@ -16716,6 +16770,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -16727,6 +16782,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>
@@ -16760,6 +16816,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>
@@ -16809,6 +16866,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="pickList">
@@ -17328,6 +17386,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>
@@ -17563,6 +17622,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="progressVar" required="false">
<description>
@@ -17582,6 +17642,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRenderAfterComplete" required="false">
<description>
@@ -17590,6 +17651,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="remainClass" required="false">
<description>
@@ -17620,6 +17682,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>
@@ -17670,6 +17733,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="recursiveTreeNodesAdaptor">
@@ -18004,6 +18068,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -18015,6 +18080,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>
@@ -18144,6 +18210,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>
@@ -18203,6 +18270,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component closeTag="true" name="separator">
@@ -18499,6 +18567,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="headerClass" required="false">
<description>
@@ -18714,6 +18783,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -18725,6 +18795,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>
@@ -18758,6 +18829,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>
@@ -18822,6 +18894,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component closeTag="true" name="spacer">
@@ -19553,6 +19626,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="for" required="false">
<description>
@@ -19570,6 +19644,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="frame" required="false">
<description>
@@ -19780,6 +19855,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -19791,6 +19867,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>
@@ -19911,6 +19988,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>
@@ -20036,6 +20114,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="tab">
@@ -20144,6 +20223,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>
@@ -20418,6 +20498,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -20429,6 +20510,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>
@@ -20462,6 +20544,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>
@@ -20519,6 +20602,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="tabPanel">
@@ -21041,6 +21125,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="for" required="false">
<description>
@@ -21051,6 +21136,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>
@@ -21241,6 +21327,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="process" required="false">
<description>
@@ -21253,6 +21340,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rendered" required="false">
<description>
@@ -21286,6 +21374,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>
@@ -21358,6 +21447,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="togglePanel">
@@ -22226,6 +22316,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="hideDelay" required="false">
<description>
@@ -22645,6 +22736,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="dragListener" required="false">
<description>
@@ -22713,6 +22805,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="grabCursors" required="false">
<description>
@@ -23061,6 +23154,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -23072,6 +23166,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rejectCursors" required="false">
<description>
@@ -23163,6 +23258,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="style" required="false">
<description>
@@ -23296,6 +23392,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="treeNode">
@@ -23406,6 +23503,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="dragListener" required="false">
<description>
@@ -23477,6 +23575,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="grabCursors" required="false">
<description>
@@ -23797,6 +23896,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="reRender" required="false">
<description>
@@ -23809,6 +23909,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="rejectCursors" required="false">
<description>
@@ -23860,6 +23961,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="timeout" required="false">
<description>
@@ -23891,6 +23993,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
</component>
<component name="treeNodesAdaptor">
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r16983 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: src/org/jboss/tools/jst/web/kb and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-08-06 09:47:49 -0400 (Thu, 06 Aug 2009)
New Revision: 16983
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbQuery.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomProposalTypeFactory.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3571
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2009-08-06 13:46:38 UTC (rev 16982)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2009-08-06 13:47:49 UTC (rev 16983)
@@ -10,7 +10,8 @@
org.eclipse.core.runtime,
org.jboss.tools.jst.web,
org.jboss.tools.common.el.core,
- org.eclipse.jface.text
+ org.eclipse.jface.text,
+ org.eclipse.wst.sse.core
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbQuery.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbQuery.java 2009-08-06 13:46:38 UTC (rev 16982)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbQuery.java 2009-08-06 13:47:49 UTC (rev 16983)
@@ -28,6 +28,9 @@
private Type type;
private String parent;
+ //includes text after offset
+ private String text;
+
/**
* Type of object for which we want to get info
* @author Alexey Kazakov
@@ -173,4 +176,12 @@
public void setPrefix(String prefix) {
this.prefix = prefix;
}
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public String getText() {
+ return text;
+ }
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomProposalTypeFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomProposalTypeFactory.java 2009-08-06 13:46:38 UTC (rev 16982)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomProposalTypeFactory.java 2009-08-06 13:47:49 UTC (rev 16983)
@@ -25,6 +25,7 @@
public static final String ENUMERATION_TYPE = "enumeration"; //$NON-NLS-1$
public static final String FACELETS_JSFC_TYPE = "faceletsJsfCTags"; //$NON-NLS-1$
public static final String NAME_SPACE_TYPE = "taglib"; //$NON-NLS-1$
+ public static final String ID_TYPE = "id"; //$NON-NLS-1$
private CustomProposalTypeFactory() {
}
@@ -60,6 +61,9 @@
if(NAME_SPACE_TYPE.equals(type)) {
return new NameSpaceProposalType();
}
+ if(ID_TYPE.equals(type)) {
+ return new IDProposalType();
+ }
//WebKbPlugin.getDefault().logError("Unknown proposal type: " + type); //$NON-NLS-1$
//ExtendedProposalType will report if necessary
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java 2009-08-06 13:47:49 UTC (rev 16983)
@@ -0,0 +1,95 @@
+package org.jboss.tools.jst.web.kb.internal.taglib;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.wst.sse.core.StructuredModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.jboss.tools.common.text.TextProposal;
+import org.jboss.tools.jst.web.kb.IPageContext;
+import org.jboss.tools.jst.web.kb.KbQuery;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class IDProposalType extends CustomProposalType {
+ Set<String> idList = new TreeSet<String>();
+
+ @Override
+ protected void init(IPageContext context) {
+ idList.clear();
+ IDocument document = context.getDocument();
+ IStructuredModel sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
+ try {
+ if (sModel != null) {
+ Document sd = (sModel instanceof IDOMModel) ? ((IDOMModel) sModel).getDocument() : null;
+ if(sd != null) {
+ Element root = sd.getDocumentElement();
+ collectIDs(root);
+ }
+ }
+ }
+ finally {
+ if (sModel != null) {
+ sModel.releaseFromRead();
+ }
+ }
+
+
+ }
+
+ private void collectIDs(Element element) {
+ String id = element.getAttribute("id");
+ if(id != null && id.length() > 0) idList.add(id);
+ NodeList cs = element.getChildNodes();
+ for (int i = 0; i < cs.getLength(); i++) {
+ Node n = cs.item(i);
+ if(n.getNodeType() == Node.ELEMENT_NODE) {
+ collectIDs((Element)n);
+ }
+ }
+ }
+
+ @Override
+ public TextProposal[] getProposals(KbQuery query) {
+ String v = query.getValue();
+ String txt = query.getText();
+ if(txt.startsWith("\"")) txt = txt.substring(1);
+ if(txt.endsWith("\"")) txt = txt.substring(0, txt.length() - 1);
+ int offset = v.length();
+ int b = v.lastIndexOf(',');
+ if(b < 0) b = 0; else b += 1;
+ String tail = txt.substring(offset);
+ int e = tail.indexOf(',');
+ if(e < 0) e = txt.length(); else e += offset;
+ String prefix = v.substring(b);
+
+ List<TextProposal> proposals = new ArrayList<TextProposal>();
+ for (String text: idList) {
+ if(text.startsWith(prefix)) {
+ TextProposal proposal = new TextProposal();
+ proposal.setLabel(text);
+ proposal.setReplacementString(text);
+ proposal.setPosition(b + text.length());
+
+ proposal.setStart(b);
+ proposal.setEnd(e);
+
+ proposals.add(proposal);
+ }
+ }
+
+ return proposals.toArray(new TextProposal[0]);
+ }
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-08-06 13:46:38 UTC (rev 16982)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-08-06 13:47:49 UTC (rev 16983)
@@ -88,7 +88,7 @@
<proposal type="jsfVariables"/>
</attribute>
</component>
- <component closeTag="true" name="commandButton">
+ <component closeTag="true" name="commandButton" extended="false">
<description>Renders an HTML "input" element.
&lt;br /&gt;
During Decoding: Obtains the Map from the
@@ -216,6 +216,7 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="id"/>
</attribute>
<attribute name="id" required="false">
<description>Every component may have a unique id that is automatically created if omitted</description>
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r16982 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: outline and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-08-06 09:46:38 -0400 (Thu, 06 Aug 2009)
New Revision: 16982
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPDialogCellEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3571
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-08-06 13:04:51 UTC (rev 16981)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-08-06 13:46:38 UTC (rev 16982)
@@ -53,6 +53,10 @@
*
*/
public class JSPDialogContentProposalProvider implements IContentProposalProvider {
+ static int EL_MODE = 0;
+ static int ATTR_MODE = 1;
+ int mode = EL_MODE;
+
Properties context;
String attributeName;
String nodeName;
@@ -60,7 +64,12 @@
JspContentAssistProcessor processor;
IPageContext pageContext = null;
- public JSPDialogContentProposalProvider() {}
+ public JSPDialogContentProposalProvider() {
+ }
+
+ public void setAttrMode() {
+ mode = ATTR_MODE;
+ }
public void setContext(Properties context) {
this.context = context;
@@ -90,25 +99,48 @@
}
public IContentProposal[] getProposals(String contents, int position) {
+ if(mode == ATTR_MODE) {
+ return getAttrProposals(contents, position);
+ } else {
+ return getELProposals(contents, position);
+ }
+ }
+
+ public IContentProposal[] getAttrProposals(String contents, int position) {
List<IContentProposal> result = new ArrayList<IContentProposal>();
- if(contents.indexOf('{') < 0) {
- KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, contents, contents, position, false);
+ TextRegion p = getELPrefix(contents, position);
+ if (p == null || !p.isELStarted()) {
+ KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, contents.substring(0, position), contents, position, false);
TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, pageContext);
if(proposals != null) for (TextProposal textProposal: proposals) {
String displayString = textProposal.getReplacementString();
int cursorPosition = /*replacementOffset + */ textProposal.getReplacementString().length();
Image image = textProposal.getImage();
-
+ String relacementString = textProposal.getReplacementString();
+ if(textProposal.getStart() >= 0 && textProposal.getEnd() >= 0) {
+ int b = textProposal.getStart();
+ int e = textProposal.getEnd();
+ String prefix = contents.substring(0, b);
+ String tail = contents.substring(e);
+ relacementString = prefix + relacementString + tail;
+ }
IContentProposal proposal = //new ContentProposal(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString, contextInformation, additionalProposalInfo, relevance);
- new ContentProposal(textProposal.getReplacementString(), cursorPosition, displayString, displayString);
+ new ContentProposal(relacementString, cursorPosition, displayString, displayString);
result.add(proposal);
}
+ IContentProposal proposal = new ContentProposal(contents.substring(0, position) + "#{}" + contents.substring(position), position, "#{}", JstUIMessages.JSPDialogContentProposalProvider_NewELExpression); //$NON-NLS-1$ //$NON-NLS-2$
+ result.add(proposal);
}
+ return toSortedUniqueArray(result);
+ }
+
+ public IContentProposal[] getELProposals(String contents, int position) {
+ List<IContentProposal> result = new ArrayList<IContentProposal>();
TextRegion prefix = getELPrefix(contents, position);
if (prefix == null || !prefix.isELStarted()) {
- IContentProposal proposal = new ContentProposal("#{}", 0, "#{}", JstUIMessages.JSPDialogContentProposalProvider_NewELExpression); //$NON-NLS-1$ //$NON-NLS-2$
- result.add(proposal);
+// IContentProposal proposal = new ContentProposal("#{}", 0, "#{}", JstUIMessages.JSPDialogContentProposalProvider_NewELExpression); //$NON-NLS-1$ //$NON-NLS-2$
+// result.add(proposal);
return toSortedUniqueArray(result);
}
String matchString = "#{" + prefix.getText(); //$NON-NLS-1$
@@ -276,7 +308,7 @@
return elrfm.getResolvers(resource);
}
- protected KbQuery createKbQuery(Type type, String query, String stringQuery, int pos, boolean addAttr) {
+ protected KbQuery createKbQuery(Type type, String query, String text, int pos, boolean addAttr) {
KbQuery kbQuery = new KbQuery();
String[] parentTags = processor.getParentTags(false);
@@ -293,7 +325,8 @@
// kbQuery.setOffset(pos);
kbQuery.setOffset(offset);
kbQuery.setValue(query);
- kbQuery.setStringQuery(stringQuery);
+ kbQuery.setStringQuery(query);
+ kbQuery.setText(text);
return kbQuery;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-08-06 13:04:51 UTC (rev 16981)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-08-06 13:46:38 UTC (rev 16982)
@@ -514,13 +514,21 @@
String stringQuery = matchString;
KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, query, stringQuery);
+ kbQuery.setText(contentAssistRequest.getText());
TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext());
for (int i = 0; proposals != null && i < proposals.length; i++) {
TextProposal textProposal = proposals[i];
int replacementOffset = contentAssistRequest.getReplacementBeginPosition();
int replacementLength = contentAssistRequest.getReplacementLength();
+ if(textProposal.getStart() >= 0 && textProposal.getEnd() >= 0) {
+ replacementOffset += textProposal.getStart() + 1;
+ replacementLength = textProposal.getEnd() - textProposal.getStart();
+ }
String replacementString = "\"" + textProposal.getReplacementString() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
+ if(textProposal.getStart() >= 0 && textProposal.getEnd() >= 0) {
+ replacementString = textProposal.getReplacementString();
+ }
int cursorPosition = getCursorPositionForProposedText(replacementString);
Image image = textProposal.getImage();
String displayString = textProposal.getLabel();
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPDialogCellEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPDialogCellEditor.java 2009-08-06 13:04:51 UTC (rev 16981)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPDialogCellEditor.java 2009-08-06 13:46:38 UTC (rev 16982)
@@ -45,7 +45,8 @@
public class JSPDialogCellEditor extends DialogCellEditorEx implements ExtendedCellEditorProvider.StoppableCellEditor {
Properties context;
- JSPDialogContentProposalProvider cpp;
+ JSPDialogContentProposalProvider cppEL;
+ JSPDialogContentProposalProvider cppAttr;
boolean hasProposals = false;
/**
@@ -80,11 +81,16 @@
return;
}
- if(cpp == null) {
- cpp = new JSPDialogContentProposalProvider();
+ if(cppEL == null) {
+ cppEL = new JSPDialogContentProposalProvider();
}
- cpp.setContext(context);
- IContentProposal[] ps = cpp.getProposals("#{}", 2); //$NON-NLS-1$
+ cppEL.setContext(context);
+ if(cppAttr == null) {
+ cppAttr = new JSPDialogContentProposalProvider();
+ cppAttr.setAttrMode();
+ }
+ cppAttr.setContext(context);
+ IContentProposal[] ps = cppEL.getProposals("#{}", 2); //$NON-NLS-1$
hasProposals = ((ps != null) && (ps.length > 0));
}
@@ -180,13 +186,13 @@
protected void addContentAssist(Text text) {
IControlContentAdapter controlAdapter = new TextContentAdapter();
- cpp = new JSPDialogContentProposalProvider();
- cpp.setContext(context);
+ cppEL = new JSPDialogContentProposalProvider();
+ cppEL.setContext(context);
ContentProposalAdapter adapter = new ContentProposalAdapter(
text,
controlAdapter,
- cpp,
+ cppEL,
AttributeContentProposalProviderFactory.getCtrlSpaceKeyStroke(),
null);
adapter.setPropagateKeys(true);
@@ -195,6 +201,22 @@
adapter.addContentProposalListener(popup);
}
+ cppAttr = new JSPDialogContentProposalProvider();
+ cppAttr.setAttrMode();
+ cppAttr.setContext(context);
+
+ adapter = new ContentProposalAdapter(
+ text,
+ controlAdapter,
+ cppAttr,
+ AttributeContentProposalProviderFactory.getCtrlSpaceKeyStroke(),
+ null);
+ adapter.setPropagateKeys(true);
+ adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
+ if(popup != null) {
+ adapter.addContentProposalListener(popup);
+ }
+
int bits = SWT.TOP | SWT.LEFT;
ControlDecoration controlDecoration = new ControlDecoration(getTextControl(), bits) {
public Image getImage() {
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r16981 - in trunk/common/plugins/org.jboss.tools.common.text.ext: src/org/jboss/tools/common/text/ext/hyperlink and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-08-06 09:04:51 -0400 (Thu, 06 Aug 2009)
New Revision: 16981
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2806
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF 2009-08-06 12:26:44 UTC (rev 16980)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/META-INF/MANIFEST.MF 2009-08-06 13:04:51 UTC (rev 16981)
@@ -38,5 +38,6 @@
org.eclipse.jst.j2ee.web;visibility:=reexport,
org.eclipse.wst.common.modulecore;visibility:=reexport,
org.eclipse.emf.ecore,
- org.eclipse.pde.ui
+ org.eclipse.pde.ui,
+ org.jboss.tools.common.el.core;bundle-version="2.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2009-08-06 12:26:44 UTC (rev 16980)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2009-08-06 13:04:51 UTC (rev 16981)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink;
+import java.util.Arrays;
+import java.util.Comparator;
+
import org.eclipse.core.internal.resources.ICoreConstants;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -29,12 +32,13 @@
import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.jboss.tools.common.el.core.GlobalELReferenceList;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.text.ext.ExtensionsPlugin;
+import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.common.text.ext.hyperlink.xpl.AbstractBaseHyperlink;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
@@ -43,7 +47,12 @@
*
*/
abstract public class AbstractHyperlink extends AbstractBaseHyperlink implements IHyperlink {
+ public static final String DOLLAR_PREFIX = "${"; //$NON-NLS-1$
+ private static final String SUFFIX = "}"; //$NON-NLS-1$
+
+ public static final String SHARP_PREFIX = "#{"; //$NON-NLS-1$
+
public static XModel getXModel(IFile file) {
if (file == null)
return null;
@@ -149,7 +158,9 @@
protected IFile getFileFromProject(String fileName) {
IFile documentFile = getFile();
if(documentFile == null || !documentFile.isAccessible()) return null;
-
+
+ fileName = findAndReplaceElVariable(fileName);
+
IProject project = documentFile.getProject();
String name = Utils.trimFilePath(fileName);
IPath currentPath = documentFile.getLocation()
@@ -180,13 +191,51 @@
}
return null;
}
+
+ // partly copied from org.jboss.tools.vpe.editor.util.ElService
+ protected String findAndReplaceElVariable(String fileName){
+ final IPath workspacePath = Platform.getLocation();
+ final ResourceReference[] gResources = GlobalELReferenceList.getInstance().getAllResources(workspacePath);
+ String result = fileName;
+
+ ResourceReference[] sortedReferences = sortReferencesByScope(gResources);
+
+ for (ResourceReference rf : sortedReferences) {
+ final String dollarEl = DOLLAR_PREFIX + rf.getLocation() + SUFFIX;
+ final String sharpEl = SHARP_PREFIX + rf.getLocation() + SUFFIX;
+
+ if (fileName.contains(dollarEl)) {
+ result = result.replace(dollarEl, rf.getProperties());
+ }
+ if (fileName.contains(sharpEl)) {
+ result = result.replace(sharpEl, rf.getProperties());
+ }
+ }
+ return result;
+ }
+
+ // copied from org.jboss.tools.vpe.editor.util.ElService
+ private ResourceReference[] sortReferencesByScope(ResourceReference[] references) {
+ ResourceReference[] sortedReferences = references.clone();
+
+ Arrays.sort(sortedReferences, new Comparator<ResourceReference>() {
+ public int compare(ResourceReference r1, ResourceReference r2) {
+ return r1.getScope() - r2.getScope();
+ }
+ });
+
+ return sortedReferences;
+ }
+
private IFile findFileByRelativePath(IProject project,
WorkbenchComponent module, IPath basePath, String path) {
if (path == null || path.trim().length() == 0)
return null;
+ path = findAndReplaceElVariable(path);
+
ComponentResource[] resources = module.findResourcesBySourcePath(
new Path("/"), 0); //$NON-NLS-1$
IPath projectPath = project.getLocation();
@@ -224,6 +273,8 @@
WorkbenchComponent module, String path) {
ComponentResource[] resources = module.findResourcesBySourcePath(
new Path("/"), 0); //$NON-NLS-1$
+
+ path = findAndReplaceElVariable(path);
IFile member = null;
16 years, 4 months
- 1
- 0