JBoss Tools SVN: r15901 - in trunk/jbpm/docs: reference/en and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-06-11 16:46:24 -0400 (Thu, 11 Jun 2009)
New Revision: 15901
Modified:
trunk/jbpm/docs/converter_ref/en/master.xml
trunk/jbpm/docs/converter_ref/en/master_output.xml
trunk/jbpm/docs/reference/en/master.xml
trunk/jbpm/docs/reference/en/master_output.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4319 fix provider names
Modified: trunk/jbpm/docs/converter_ref/en/master.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en/master.xml 2009-06-11 20:46:03 UTC (rev 15900)
+++ trunk/jbpm/docs/converter_ref/en/master.xml 2009-06-11 20:46:24 UTC (rev 15901)
@@ -26,7 +26,7 @@
<copyright>
<year>2008</year>
<year>2009</year>
- <holder>JBoss, a division of Red Hat</holder>
+ <holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
Version: 1.1.0.M1
Modified: trunk/jbpm/docs/converter_ref/en/master_output.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en/master_output.xml 2009-06-11 20:46:03 UTC (rev 15900)
+++ trunk/jbpm/docs/converter_ref/en/master_output.xml 2009-06-11 20:46:24 UTC (rev 15901)
@@ -24,7 +24,7 @@
<copyright>
<year>2008</year>
<year>2009</year>
- <holder>JBoss, a division of Red Hat</holder>
+ <holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo><diffmk:wrapper diffmk:change="changed">
Version: 1.1.0.M1
Modified: trunk/jbpm/docs/reference/en/master.xml
===================================================================
--- trunk/jbpm/docs/reference/en/master.xml 2009-06-11 20:46:03 UTC (rev 15900)
+++ trunk/jbpm/docs/reference/en/master.xml 2009-06-11 20:46:24 UTC (rev 15901)
@@ -67,7 +67,7 @@
<copyright>
<year>2007</year>
<year>2009</year>
- <holder>JBoss, a division of Red Hat</holder>
+ <holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo> Version: 3.1.7.GA</releaseinfo>
Modified: trunk/jbpm/docs/reference/en/master_output.xml
===================================================================
--- trunk/jbpm/docs/reference/en/master_output.xml 2009-06-11 20:46:03 UTC (rev 15900)
+++ trunk/jbpm/docs/reference/en/master_output.xml 2009-06-11 20:46:24 UTC (rev 15901)
@@ -66,7 +66,7 @@
<copyright>
<year>2007</year>
<year>2009</year>
- <holder>JBoss, a division of Red Hat</holder>
+ <holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo> Version: 3.1.7.GA</releaseinfo>
15 years, 6 months
- 1
- 0
JBoss Tools SVN: r15900 - in trunk/jbpm/features: org.jboss.tools.jbpm3.sdk.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-06-11 16:46:03 -0400 (Thu, 11 Jun 2009)
New Revision: 15900
Added:
trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/
trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/
Removed:
trunk/jbpm/features/org.jboss.tools.jbpm3.all/
trunk/jbpm/features/org.jboss.tools.jbpm4.all/
Modified:
trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.xml
trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4319 rename .all to .sdk.feature for consistency; add source features/plugins; fix provider names, add missing properties files
Copied: trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature (from rev 15889, trunk/jbpm/features/org.jboss.tools.jbpm3.all)
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.all/feature.properties 2009-06-11 17:46:35 UTC (rev 15889)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.properties 2009-06-11 20:46:03 UTC (rev 15900)
@@ -1,6 +1,6 @@
featureName=All jBPM 3 Tools Features
featureProvider=JBoss by Red Hat
-description=This feature includes all end-user tools for jBPM 3 .
+description=This feature includes all end-user tools for jBPM 3, including runtime and sources.
copyright=Copyright 2009 Red Hat, Inc.
licenseURL=http://www.eclipse.org/legal/epl-v10.html
license= Eclipse Public License - v 1.0\n\
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.all/feature.xml 2009-06-11 17:46:35 UTC (rev 15889)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.xml 2009-06-11 20:46:03 UTC (rev 15900)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.jboss.tools.jbpm3.all"
+ id="org.jboss.tools.jbpm3.sdk.feature"
label="%featureName"
version="3.2.0"
provider-name="%featureProvider">
Copied: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature (from rev 15889, trunk/jbpm/features/org.jboss.tools.jbpm4.all)
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.all/feature.properties 2009-06-11 17:46:35 UTC (rev 15889)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.properties 2009-06-11 20:46:03 UTC (rev 15900)
@@ -1,6 +1,6 @@
featureName=All jBPM 4 Tools Features
featureProvider=JBoss by Red Hat
-description=This feature includes all end-user tools for jBPM 4 .
+description=This feature includes all end-user tools for jBPM 4, including runtime and sources.
copyright=Copyright 2009 Red Hat, Inc.
licenseURL=http://www.eclipse.org/legal/epl-v10.html
license= Eclipse Public License - v 1.0\n\
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.all/feature.xml 2009-06-11 17:46:35 UTC (rev 15889)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml 2009-06-11 20:46:03 UTC (rev 15900)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.jboss.tools.jbpm4.all"
+ id="org.jboss.tools.jbpm4.sdk.feature"
label="%"
version="4.0.0">
@@ -17,15 +17,35 @@
</license>
<includes
- id="org.jboss.tools.flow.common.feature"
+ id="org.jboss.tools.flow.jpdl4.feature"
version="0.0.0"/>
<includes
- id="org.jboss.tools.flow.jpdl4.feature"
+ id="org.jboss.tools.flow.jpdl4.source.feature"
version="0.0.0"/>
<includes
id="org.jboss.tools.jbpm.common.feature"
version="0.0.0"/>
+ <includes
+ id="org.jboss.tools.jbpm.common.source.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.tools.jbpm.convert.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jboss.tools.jbpm.convert.source.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jbpm.gd.jpdl.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.jbpm.gd.jpdl.source.feature"
+ version="0.0.0"/>
+
</feature>
15 years, 6 months
- 1
- 0
JBoss Tools SVN: r15899 - trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-06-11 16:19:09 -0400 (Thu, 11 Jun 2009)
New Revision: 15899
Added:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/jbpm4.map
Modified:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map
Log:
https://jira.jboss.org/jira/browse/JBIDE-4319 add missing features/plugins/tests; fix invalid paths
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map 2009-06-11 19:01:04 UTC (rev 15898)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map 2009-06-11 20:19:09 UTC (rev 15899)
@@ -1,5 +1,9 @@
+!*** Contains features, plugins, and tests common to both jbpm3 and jbpm4.
+
+!*** features
feature@org.jboss.tools.jbpm.common.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm.common.feature
+!*** plugins
plugin@org.jboss.tools.jbpm.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common
plugin@org.jboss.tools.jbpm.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common.test
Copied: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/jbpm4.map (from rev 15898, trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map)
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/jbpm4.map (rev 0)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/jbpm4.map 2009-06-11 20:19:09 UTC (rev 15899)
@@ -0,0 +1,23 @@
+!*** Contains features, plugins, and tests for jbpm4.
+!*** See common.map for features, plugins, and tests common to both jbpm3 and jbpm4.
+
+!*** features
+feature@org.jboss.tools.jbpm4.all=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm4.all
+feature@org.jboss.tools.flow.jpdl4.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature
+feature@org.jboss.tools.jbpm.convert.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature
+feature@org.jbpm.gd.jpdl.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jbpm.gd.jpdl.feature
+
+!*** plugins
+plugin@org.jboss.tools.flow.jpdl4=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4
+plugin@org.jboss.tools.flow.jpdl4.multipage=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage
+plugin@org.jboss.tools.flow.convert=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.convert
+plugin@org.jbpm.gd.jpdl=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jbpm.gd.jpdl
+
+!*** test feature
+feature@org.jboss.tools.jbpm4.tests.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature
+
+!*** test plugins
+plugin@org.jboss.tools.jbpm.convert.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jboss.tools.flow.convert.test
+plugin@org.jboss.tools.flow.jpdl4.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test
+plugin@org.jboss.tools.flow.jpdl4.multipage.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test
+plugin@org.jbpm.gd.jpdl.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jbpm.gd.jpdl.test
Property changes on: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/jbpm4.map
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 6 months
- 1
- 0
JBoss Tools SVN: r15898 - trunk/documentation/qa/reports/Tests_06.10.2009.
by jbosstools-commits＠lists.jboss.org
Author: anis
Date: 2009-06-11 15:01:04 -0400 (Thu, 11 Jun 2009)
New Revision: 15898
Added:
trunk/documentation/qa/reports/Tests_06.10.2009/Smoke.htm
Log:
Smoke test added
Added: trunk/documentation/qa/reports/Tests_06.10.2009/Smoke.htm
===================================================================
--- trunk/documentation/qa/reports/Tests_06.10.2009/Smoke.htm (rev 0)
+++ trunk/documentation/qa/reports/Tests_06.10.2009/Smoke.htm 2009-06-11 19:01:04 UTC (rev 15898)
@@ -0,0 +1,396 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD><TITLE>Smoke tests</TITLE>
+<STYLE>H1 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+H2 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+TR {
+ BACKGROUND-COLOR: #f5f5f5
+}
+TD {
+ BORDER-RIGHT: dimgray 1px solid; PADDING-RIGHT: 0.5em; BORDER-TOP: dimgray 1px solid; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.15em; BORDER-LEFT: dimgray 1px solid; PADDING-TOP: 0.15em; BORDER-BOTTOM: dimgray 1px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+HR {
+ COLOR: #999; BORDER-COLLAPSE: collapse
+}
+BODY {
+ PADDING-RIGHT: 2em; PADDING-LEFT: 2em; FONT-SIZE: 12px; PADDING-BOTTOM: 0em; COLOR: #333; LINE-HEIGHT: 100%; PADDING-TOP: 0em; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; max-width: 55em
+}
+TABLE {
+ BORDER-RIGHT: dimgray 0px solid; BORDER-TOP: dimgray 0px solid; BORDER-LEFT: dimgray 0px solid; COLOR: #4a5d75; BORDER-BOTTOM: dimgray 0px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif
+}
+</STYLE>
+
+<META http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<META content="MSHTML 6.00.2900.3059" name=GENERATOR></HEAD>
+<BODY bgColor=#f5f5f5>
+<CENTER>
+<H1>Smoke tests</H1>
+<TABLE
+style="BORDER-TOP-WIDTH: 1pt; BORDER-LEFT-WIDTH: 1pt; BORDER-BOTTOM-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"
+cellSpacing=0 cellPadding=4 width="100%" align=center>
+ <TBODY>
+ <TR bgColor=gray>
+ <TD><B>Test Name</B></TD>
+ <TD><B>Status</B></TD>
+ <TD><B>Bug Number</B></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ action in test Seam 1.2 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ action in test Seam 1.2 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ action in test Seam 2.0 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ action in test Seam 2.0 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ action in test Seam 2.1 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ action in test Seam 2.1 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ entity in test Seam 1.2 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ entity in test Seam 1.2 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ entity in test Seam 2.0 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ entity in test Seam 2.0 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ entity in test Seam 2.1 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Adding new
+ entity in test Seam 2.1 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Checking
+ generated TestNG report runtime 1.2</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Checking
+ generated TestNG report runtime 2.0</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Checking
+ generated TestNG report runtime 2.1</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating JSF
+ JSP page</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating new
+ JSF Project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating new
+ Struts Project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ test Seam 1.2 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ test Seam 1.2 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ test Seam 2.0 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ test Seam 2.0 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ test Seam 2.1 ear project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ test Seam 2.1 war project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ XHTML page</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Deleting
+ test Seam 1.2 projects</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: red; BORDER-RIGHT-WIDTH: 1pt">Failed</TD>
+ <TD
+style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JBIDE-3337</TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Deleting
+ test Seam 2.0 projects</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: red; BORDER-RIGHT-WIDTH: 1pt">Failed</TD>
+ <TD
+style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JBIDE-3337</TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Deleting
+ test Seam 2.1 projects</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: red; BORDER-RIGHT-WIDTH: 1pt">Failed</TD>
+ <TD
+style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JBIDE-3337</TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Importing
+ existing JSF Project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Importing
+ existing Struts Project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> JSF
+ capabilities after closing,opening a JSF project.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Outline view
+ and Properties Editor</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Removeadd
+ JSF Capabilities</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Removeadd
+ Struts Capabilities</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Rename
+ faces-config file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Rename JSP
+ file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Rename
+ struts-config.xml</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Rename TLD
+ file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Rename XHTML
+ file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running JSF
+ project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running
+ Struts project</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running Test
+ NG suite runtime 1.2</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running Test
+ NG suite runtime 2.0</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running Test
+ NG suite runtime 2.1</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running test
+ Seam 1.2 ear project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running test
+ Seam 1.2 war project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running test
+ Seam 2.0 ear project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running test
+ Seam 2.0 war project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running test
+ Seam 2.1 ear project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running test
+ Seam 2.1 war project on server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Server
+ jboss-seam.jar test</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white
+size=1> </FONT></TD></TR></TBODY></TABLE></CENTER></BODY></HTML>
15 years, 6 months
- 1
- 0
JBoss Tools SVN: r15897 - trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-06-11 14:50:41 -0400 (Thu, 11 Jun 2009)
New Revision: 15897
Modified:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map
Log:
including missing features
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map 2009-06-11 18:46:23 UTC (rev 15896)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map 2009-06-11 18:50:41 UTC (rev 15897)
@@ -1,4 +1,6 @@
feature@org.jboss.tools.jbpm4.all=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm4.all
+feature@org.jboss.tools.flow.common.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.flow.common.feature
+feature@org.jboss.tools.flow.jpdl4.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature
feature@org.jboss.tools.jbpm4.tests.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jboss.tools.jbpm4.tests
plugin@org.jboss.tools.flow.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.common
15 years, 6 months
- 1
- 0
JBoss Tools SVN: r15896 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-06-11 14:46:23 -0400 (Thu, 11 Jun 2009)
New Revision: 15896
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
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/JspContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java
Log:
JBIDE-2808: Improve/refactor org.jboss.tools.common.kb plugin.
The skeleton to prompt for the EL is added
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-11 18:44:23 UTC (rev 15895)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-11 18:46:23 UTC (rev 15896)
@@ -36,9 +36,15 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
import org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor;
import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
+import org.jboss.tools.common.el.core.model.ELInstance;
+import org.jboss.tools.common.el.core.model.ELModel;
+import org.jboss.tools.common.el.core.model.ELUtil;
+import org.jboss.tools.common.el.core.parser.ELParser;
+import org.jboss.tools.common.el.core.parser.ELParserUtil;
import org.jboss.tools.common.el.core.resolver.ELContext;
import org.jboss.tools.common.el.core.resolver.ELResolver;
import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager;
@@ -247,6 +253,7 @@
*/
protected void addEntityProposals(ContentAssistRequest contentAssistRequest, int documentPosition, ITextRegion completionRegion, IDOMNode treeNode) {
System.out.println("AbstractXMLContentAssistProcessor: addEntityProposals() invoked");
+ super.addEntityProposals(contentAssistRequest, documentPosition, completionRegion, treeNode);
}
/*
@@ -285,6 +292,21 @@
*/
abstract protected void addTagNameProposals(ContentAssistRequest contentAssistRequest, int childPosition);
+
+ /**
+ * Calculates and adds the EL proposals in attribute value to the Content Assist Request object
+ *
+ * @param contentAssistRequest
+ */
+ abstract protected void addAttributeValueELProposals(ContentAssistRequest contentAssistRequest);
+
+ /**
+ * Calculates and adds the EL proposals in text to the Content Assist Request object
+ *
+ * @param contentAssistRequest
+ */
+ abstract protected void addTextELProposals(ContentAssistRequest contentAssistRequest);
+
/*
* (non-Javadoc)
* @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#computeCompletionProposals(int, java.lang.String, org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion, org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode, org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode)
@@ -301,11 +323,29 @@
if ((xmlnode.getNodeType() == Node.ELEMENT_NODE) || (xmlnode.getNodeType() == Node.DOCUMENT_NODE)) {
if (regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
addAttributeNameProposals(contentAssistRequest);
+ } else if ((regionType == DOMRegionContext.XML_CONTENT) || (regionType == DOMRegionContext.XML_CHAR_REFERENCE) || (regionType == DOMRegionContext.XML_ENTITY_REFERENCE) || (regionType == DOMRegionContext.XML_PE_REFERENCE)) {
+ addTextELProposals(contentAssistRequest);
}
}
+
return contentAssistRequest;
}
+
+ protected ContentAssistRequest computeAttributeValueProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) {
+ ContentAssistRequest contentAssistRequest = super.computeAttributeValueProposals(documentPosition, matchString, completionRegion, nodeAtOffset, node);
+
+ IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition);
+ if ((documentPosition <= sdRegion.getStartOffset(completionRegion) + completionRegion.getTextLength()) ||
+ (sdRegion.getStartOffset(completionRegion) + completionRegion.getTextLength() == sdRegion.getStartOffset(completionRegion) + completionRegion.getLength())) {
+ // setup to replace the existing value
+ if (nodeAtOffset.getFirstStructuredDocumentRegion().isEnded() || (documentPosition >= sdRegion.getStartOffset(completionRegion))) {
+ addAttributeValueELProposals(contentAssistRequest);
+ }
+ }
+ return contentAssistRequest;
+ }
+
/**
* Creates and fulfills the <code>org.jboss.tools.common.el.core.resolver.ELContext</code>
* instance
@@ -613,4 +653,95 @@
return cursorAdjustment;
}
+
+ /**
+ * Returns URI for the current/parent tag
+ * @return
+ */
+ protected String getELPrefix() {
+ IStructuredModel sModel = StructuredModelManager
+ .getModelManager()
+ .getExistingModelForRead(getDocument());
+ try {
+ if (sModel == null)
+ return null;
+
+ Document xmlDocument = (sModel instanceof IDOMModel)
+ ? ((IDOMModel) sModel).getDocument()
+ : null;
+
+ if (xmlDocument == null)
+ return null;
+
+ Node n = findNodeForOffset(xmlDocument, getOffset());
+ if (n == null)
+ return null;
+
+ String text = null;
+ ITextRegion region = null;
+ int startOffset = -1;
+ if (n instanceof IDOMAttr) {
+ text = ((IDOMAttr)n).getValueRegionText();
+ region = ((IDOMAttr)n).getValueRegion();
+ startOffset = ((IndexedRegion)((IDOMAttr)n).getOwnerElement()).getStartOffset();
+ startOffset += region.getStart();
+ } else if (n instanceof IDOMText) {
+ text = ((IDOMText)n).getNodeValue();
+ region = ((IDOMText)n).getFirstStructuredDocumentRegion();
+ startOffset = ((IndexedRegion)((IDOMAttr)n).getOwnerElement()).getStartOffset();
+ } else {
+ // The EL may appear only in TEXT and ATTRIBUTE VALUE types of node
+ return null;
+ }
+
+ int inValueOffset = getOffset() - startOffset;
+ if (text.length() < inValueOffset) // probably, the attribute value ends before the document position
+ return null;
+
+ String matchString = text.substring(0, inValueOffset);
+
+ ELParser p = ELParserUtil.getJbossFactory().createParser();
+ ELModel model = p.parse(matchString);
+ ELInstance is = ELUtil.findInstance(model, inValueOffset);
+
+ String elPrefix = is.getText();
+
+
+ return elPrefix;
+ } finally {
+ if (sModel != null) {
+ sModel.releaseFromRead();
+ }
+ }
+ }
+
+ /*
+ * Checks if the EL operand starting characters are present
+ * @return
+ */
+ private int getELStartPosition(String matchString) {
+ ELParser p = ELParserUtil.getJbossFactory().createParser();
+ ELModel model = p.parse(matchString);
+ ELInstance is = ELUtil.findInstance(model, matchString.length());
+ return is == null ? -1 : is.getStartPosition();
+ }
+
+ /*
+ * Checks if the EL operand ending character is present
+ * @return
+ */
+ private int getELEndPosition(String matchString, String currentValue) {
+ if (matchString == null || matchString.length() == 0 ||
+ currentValue == null || currentValue.length() == 0 ||
+ currentValue.length() < matchString.length())
+ return -1;
+
+ ELParser p = ELParserUtil.getJbossFactory().createParser();
+ ELModel model = p.parse(currentValue);
+ ELInstance is = ELUtil.findInstance(model, matchString.length());
+ if(is == null || is.getCloseInstanceToken() == null) return -1;
+
+ return is.getEndPosition();
+ }
+
}
\ No newline at end of file
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 2009-06-11 18:44:23 UTC (rev 15895)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2009-06-11 18:46:23 UTC (rev 15896)
@@ -14,14 +14,22 @@
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
+import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
+import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.IFaceletPageContext;
import org.jboss.tools.jst.web.kb.IPageContext;
+import org.jboss.tools.jst.web.kb.KbQuery;
+import org.jboss.tools.jst.web.kb.PageProcessor;
+import org.jboss.tools.jst.web.kb.KbQuery.Type;
import org.jboss.tools.jst.web.kb.internal.FaceletPageContextImpl;
import org.jboss.tools.jst.web.kb.taglib.INameSpace;
import org.w3c.dom.Attr;
@@ -144,4 +152,48 @@
protected IFaceletPageContext getContext() {
return (IFaceletPageContext)super.getContext();
}
+
+
+
+ /**
+ * Calculates and adds the EL proposals to the Content Assist Request object
+ */
+ @Override
+ protected void addTextELProposals(ContentAssistRequest contentAssistRequest) {
+ // TODO Auto-generated method stub
+ System.out.println("FaceletPageContectAssistProcessor: addTextELProposals() invoked");
+ try {
+ String matchString = getELPrefix();
+ String query = matchString;
+ if (query == null)
+ query = "";
+ String stringQuery = matchString;
+
+ KbQuery kbQuery = createKbQuery(Type.TEXT, query, stringQuery);
+ TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext());
+
+ for (int i = 0; proposals != null && i < proposals.length; i++) {
+ TextProposal textProposal = proposals[i];
+
+ System.out.println("Tag Text EL proposal [" + (i + 1) + "/" + proposals.length + "]: " + textProposal.getReplacementString());
+
+ String replacementString = textProposal.getReplacementString();
+
+ int replacementOffset = contentAssistRequest.getReplacementBeginPosition();
+ int replacementLength = contentAssistRequest.getReplacementLength();
+ int cursorPosition = getCursorPositionForProposedText(replacementString);
+ Image image = textProposal.getImage();
+ String displayString = (textProposal.getLabel() == null ? replacementString : textProposal.getLabel());
+ IContextInformation contextInformation = null;
+ String additionalProposalInfo = textProposal.getContextInfo();
+ int relevance = textProposal.getRelevance() + 10000;
+
+ CustomCompletionProposal proposal = new CustomCompletionProposal(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString, contextInformation, additionalProposalInfo, relevance);
+ contentAssistRequest.addProposal(proposal);
+ }
+ } finally {
+ System.out.println("FaceletPageContectAssistProcessor: addTextELProposals() exited");
+ }
+ }
+
}
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-06-11 18:44:23 UTC (rev 15895)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-06-11 18:46:23 UTC (rev 15896)
@@ -198,7 +198,7 @@
*
* @param attrName Name of attribute to check
*/
- private boolean isExistingAttribute(String attrName) {
+ protected boolean isExistingAttribute(String attrName) {
IStructuredModel sModel = StructuredModelManager.getModelManager()
.getExistingModelForRead(getDocument());
try {
@@ -368,7 +368,6 @@
String additionalProposalInfo = textProposal.getContextInfo();
int relevance = textProposal.getRelevance() + 10000;
-
CustomCompletionProposal proposal = new CustomCompletionProposal(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString, contextInformation, additionalProposalInfo, relevance);
contentAssistRequest.addProposal(proposal);
}
@@ -377,4 +376,59 @@
}
}
+ /**
+ * Calculates and adds the EL proposals to the Content Assist Request object
+ */
+ @Override
+ protected void addTextELProposals(ContentAssistRequest contentAssistRequest) {
+ // TODO Auto-generated method stub
+ System.out.println("JspContentAssistProcessor: addTextELProposals() invoked");
+ try {
+ System.out.println("JspContentAssistProcessor: No EL allowed in TEXT");
+ } finally {
+ System.out.println("JspContentAssistProcessor: addTextELProposals() exited");
+ }
+ }
+
+ /**
+ * Calculates and adds the EL proposals to the Content Assist Request object
+ */
+ @Override
+ protected void addAttributeValueELProposals(ContentAssistRequest contentAssistRequest) {
+ // TODO Auto-generated method stub
+ System.out.println("JspContentAssistProcessor: addAttributeValueELProposals() invoked");
+ try {
+ String matchString = getELPrefix();
+ String query = matchString;
+ if (query == null)
+ query = "";
+ String stringQuery = matchString;
+
+ KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, query, stringQuery);
+ TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext());
+
+ for (int i = 0; proposals != null && i < proposals.length; i++) {
+ TextProposal textProposal = proposals[i];
+
+ System.out.println("Tag Attribute Value EL proposal [" + (i + 1) + "/" + proposals.length + "]: " + textProposal.getReplacementString());
+
+ String replacementString = textProposal.getReplacementString();
+
+ int replacementOffset = contentAssistRequest.getReplacementBeginPosition();
+ int replacementLength = contentAssistRequest.getReplacementLength();
+ int cursorPosition = getCursorPositionForProposedText(replacementString);
+ Image image = textProposal.getImage();
+ String displayString = (textProposal.getLabel() == null ? replacementString : textProposal.getLabel());
+ IContextInformation contextInformation = null;
+ String additionalProposalInfo = (textProposal.getContextInfo() == null ? "" : textProposal.getContextInfo());
+ int relevance = textProposal.getRelevance() + 10000;
+
+ CustomCompletionProposal proposal = new CustomCompletionProposal(replacementString, replacementOffset, replacementLength, cursorPosition, image, displayString, contextInformation, additionalProposalInfo, relevance);
+ contentAssistRequest.addProposal(proposal);
+ }
+ } finally {
+ System.out.println("JspContentAssistProcessor: addAttributeELProposals() exited");
+ }
+ }
+
}
\ No newline at end of file
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 2009-06-11 18:44:23 UTC (rev 15895)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2009-06-11 18:46:23 UTC (rev 15896)
@@ -85,4 +85,18 @@
// TODO Auto-generated method stub
}
+
+ @Override
+ protected void addAttributeValueELProposals(ContentAssistRequest contentAssistRequest) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected void addTextELProposals(ContentAssistRequest contentAssistRequest) {
+ // TODO Auto-generated method stub
+
+ }
+
+
}
\ No newline at end of file
15 years, 6 months
- 1
- 0
JBoss Tools SVN: r15895 - in trunk/seam/plugins: org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-06-11 14:44:23 -0400 (Thu, 11 Jun 2009)
New Revision: 15895
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamELAttributeContentProposalProvider.java
Log:
JBIDE-2808: Improve/refactor org.jboss.tools.common.kb plugin.
SeamELCompletionEngine is re-developed to use the only default constructor in order to allow to create its instance by ELResolver factory
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2009-06-11 18:44:23 UTC (rev 15895)
@@ -496,7 +496,8 @@
<extension
point="org.jboss.tools.common.el.core.elResolver">
<el-resolver id="seamELResolver">
- <project-nature id="org.jboss.tools.seam.core.seamnature"/>
+ <project-nature id="org.jboss.tools.seam.core.seamnature"
+ resolver-class="org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine"/>
</el-resolver>
</extension>
</plugin>
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2009-06-11 18:44:23 UTC (rev 15895)
@@ -28,6 +28,7 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.launching.ExecutionArguments;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
@@ -85,14 +86,13 @@
private static final Image SEAM_MESSAGES_PROPOSAL_IMAGE =
SeamCorePlugin.getDefault().getImage(SeamCorePlugin.CA_SEAM_MESSAGES_IMAGE_PATH);
- ISeamProject project;
private static ELParserFactory factory = ELParserUtil.getJbossFactory();
/**
* Constructs SeamELCompletionEngine object
*/
- public SeamELCompletionEngine(ISeamProject project) {
- this.project = project;
+ public SeamELCompletionEngine() {
+
}
/*
@@ -288,7 +288,7 @@
public ELExpression parseOperand(String operand) {
if(operand == null) return null;
- String el = (operand.indexOf("#{") < 0) ? "#{" + operand + "}" : operand;
+ String el = (operand.indexOf("#{") < 0 && operand.indexOf("${") < 0) ? "#{" + operand + "}" : operand;
ELParser p = factory.createParser();
ELModel model = p.parse(el);
List<ELInstance> is = model.getInstances();
@@ -345,11 +345,11 @@
ScopeType scope = getScope(project, file);
if (expr.getLeft() == null && isIncomplete) {
- resolvedVariables = resolveVariables(scope, expr, true, true);
+ resolvedVariables = resolveVariables(project, scope, expr, true, true);
} else {
while (left != null) {
List<ISeamContextVariable> resolvedVars = new ArrayList<ISeamContextVariable>();
- resolvedVars = resolveVariables(scope, left,
+ resolvedVars = resolveVariables(project, scope, left,
left == expr, true);
if (resolvedVars != null && !resolvedVars.isEmpty()) {
resolvedVariables = resolvedVars;
@@ -369,27 +369,36 @@
public SeamELOperandResolveStatus resolveELOperand(IFile file, ELExpression operand,
boolean returnEqualedVariablesOnly, boolean varIsUsed) throws BadLocationException, StringIndexOutOfBoundsException {
- if(!(operand instanceof ELInvocationExpression)) {
+ if(!(operand instanceof ELInvocationExpression) || file == null) {
return new SeamELOperandResolveStatus(null);
}
+
ELInvocationExpression expr = (ELInvocationExpression)operand;
boolean isIncomplete = expr.getType() == ELObjectType.EL_PROPERTY_INVOCATION
&& ((ELPropertyInvocation)expr).getName() == null;
-
+ boolean isArgument = expr.getType() == ELObjectType.EL_ARGUMENT_INVOCATION;
+
SeamELOperandResolveStatus status = new SeamELOperandResolveStatus(expr);
ELInvocationExpression left = expr;
List<ISeamContextVariable> resolvedVariables = new ArrayList<ISeamContextVariable>();
+ ISeamProject project = SeamCorePlugin.getSeamProject(file.getProject(), false);
ScopeType scope = getScope(project, file);
- if (expr.getLeft() == null && isIncomplete) {
- resolvedVariables = resolveVariables(scope, expr, true,
+ if (expr.getLeft() != null && isArgument) {
+ left = expr.getLeft();
+ resolvedVariables = resolveVariables(project, scope, left, false,
+ true); // is Final and equal names are because of
+ // we have no more to resolve the parts of expression,
+ // but we have to resolve arguments of probably a message component
+ } else if (expr.getLeft() == null && isIncomplete) {
+ resolvedVariables = resolveVariables(project, scope, expr, true,
returnEqualedVariablesOnly);
} else {
while(left != null) {
List<ISeamContextVariable>resolvedVars = new ArrayList<ISeamContextVariable>();
- resolvedVars = resolveVariables(scope,
+ resolvedVars = resolveVariables(project, scope,
left, left == expr,
returnEqualedVariablesOnly);
if (resolvedVars != null && !resolvedVars.isEmpty()) {
@@ -412,7 +421,7 @@
isIncomplete) {
// no vars are resolved
// the tokens are the part of var name ended with a separator (.)
- resolvedVariables = resolveVariables(scope, expr, true, returnEqualedVariablesOnly);
+ resolvedVariables = resolveVariables(project, scope, expr, true, returnEqualedVariablesOnly);
Set<TextProposal> proposals = new TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER);
for (ISeamContextVariable var : resolvedVariables) {
String varName = var.getName();
@@ -722,14 +731,19 @@
}
String filter = expr.getMemberName();
- if(filter == null) filter = "";
- if((filter.startsWith("'") || filter.startsWith("\""))
- && (filter.endsWith("'") || filter.endsWith("\""))) {
- filter = filter.substring(1, filter.length() - 1);
+ boolean bSurroundWithQuotes = false;
+ if(filter == null) {
+ filter = "";
+ bSurroundWithQuotes = true;
} else {
- //Value is set as expression itself, we cannot compute it
- if(isMessages) status.setMapOrCollectionOrBundleAmoungTheTokens();
- return;
+ if((filter.startsWith("'") || filter.startsWith("\""))
+ && (filter.endsWith("'") || filter.endsWith("\""))) {
+ filter = filter.substring(1, filter.length() - 1);
+ } else {
+ //Value is set as expression itself, we cannot compute it
+ if(isMessages) status.setMapOrCollectionOrBundleAmoungTheTokens();
+ return;
+ }
}
for (TypeInfoCollector.MemberPresentation proposal : proposalsToFilter) {
@@ -760,7 +774,13 @@
} else if (proposal.getPresentation().startsWith(filter)) {
// This is used for CA.
TextProposal kbProposal = new TextProposal();
- kbProposal.setReplacementString(proposal.getPresentation().substring(filter.length()));
+
+ String replacementString = proposal.getPresentation().substring(filter.length());
+ if (bSurroundWithQuotes) {
+ replacementString = "'" + replacementString + "']";
+ }
+
+ kbProposal.setReplacementString(replacementString);
kbProposal.setImage(SEAM_EL_PROPOSAL_IMAGE);
kbProposals.add(kbProposal);
@@ -828,9 +848,17 @@
return null;
}
- public List<ISeamContextVariable> resolveVariables(ScopeType scope, ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames) {
+
+
+
+ public List<ISeamContextVariable> resolveVariables(ISeamProject project, ScopeType scope, ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames) {
List<ISeamContextVariable>resolvedVars = new ArrayList<ISeamContextVariable>();
+
+ if (project == null)
+ return new ArrayList<ISeamContextVariable>();
+
String varName = expr.toString();
+
if (varName != null) {
resolvedVars = SeamExpressionResolver.resolveVariables(project, scope, varName, onlyEqualNames);
}
@@ -851,7 +879,7 @@
}
else if(varName != null && (varName.startsWith("\"") || varName.startsWith("'"))
&& (varName.endsWith("\"") || varName.endsWith("'"))) {
- IJavaProject jp = EclipseResourceUtil.getJavaProject(this.project.getProject());
+ IJavaProject jp = EclipseResourceUtil.getJavaProject(project.getProject());
try {
IType type = jp.findType("java.lang.String");
if(type != null) {
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-06-11 18:44:23 UTC (rev 15895)
@@ -97,7 +97,7 @@
SeamContextValidationHelper coreHelper, IReporter reporter,
SeamValidationContext validationContext, ISeamProject project) {
super(validatorManager, coreHelper, reporter, validationContext, project);
- engine = new SeamELCompletionEngine(project);
+ engine = new SeamELCompletionEngine();
elVarSearcher = new ElVarSearcher(engine);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2009-06-11 18:44:23 UTC (rev 15895)
@@ -238,7 +238,7 @@
}
//TODO do we have and need seam project here?
- SeamELCompletionEngine engine = new SeamELCompletionEngine(null);
+ SeamELCompletionEngine engine = new SeamELCompletionEngine();
ELInvocationExpression tokens = engine.findExpressionAtOffset(document, offset, start, end);
if (tokens == null /*|| tokens.size() == 0*/)
return null; // No EL Operand found
@@ -304,7 +304,7 @@
if (seamProject == null)
return null;
- SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine engine = new SeamELCompletionEngine();
String prefix = propText;
ELExpression expr = engine.parseOperand(prefix);
@@ -391,7 +391,7 @@
if (seamProject == null)
return null;
- SeamELCompletionEngine engine= new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine engine= new SeamELCompletionEngine();
String prefix = propText;
ELExpression exp = engine.parseOperand(prefix);
@@ -427,7 +427,7 @@
if (expr.getLeft() != null) {
while (left != null) {
List<ISeamContextVariable> resolvedVars = new ArrayList<ISeamContextVariable>();
- resolvedVars = engine.resolveVariables(scope, left,
+ resolvedVars = engine.resolveVariables(seamProject, scope, left,
left == expr, true);
if (resolvedVars != null && !resolvedVars.isEmpty()) {
map.put(left, resolvedVars);
@@ -482,7 +482,7 @@
if (seamProject == null)
return null;
- SeamELCompletionEngine engine= new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine engine= new SeamELCompletionEngine();
String prefix = propText;
ELExpression exp = engine.parseOperand(prefix);
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2009-06-11 18:44:23 UTC (rev 15895)
@@ -86,7 +86,7 @@
return null;
ISeamProject seamProject = SeamCorePlugin.getSeamProject(input.getResource().getProject(), true);
- SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine engine = new SeamELCompletionEngine();
IDocument document= textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
IRegion wordRegion= JavaWordFinder.findWord(document, offset);
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java 2009-06-11 18:44:23 UTC (rev 15895)
@@ -116,7 +116,7 @@
if (seamProject == null)
return null;
- SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine engine = new SeamELCompletionEngine();
String prefix= engine.getJavaElementExpression(document, region.getOffset(), region, start, end);
prefix = (prefix == null ? "" : prefix);
@@ -142,7 +142,7 @@
if (seamProject == null)
return null;
- SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine engine = new SeamELCompletionEngine();
String prefix= engine.getJavaElementExpression(document, region.getOffset(), region, start, end);
prefix = (prefix == null ? "" : prefix);
@@ -181,7 +181,7 @@
if (expr.getLeft() != null) {
while (left != null) {
List<ISeamContextVariable> resolvedVars = new ArrayList<ISeamContextVariable>();
- resolvedVars = engine.resolveVariables(scope, left,
+ resolvedVars = engine.resolveVariables(seamProject, scope, left,
left == expr, true);
if (resolvedVars != null && !resolvedVars.isEmpty()) {
map.put(left, resolvedVars);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java 2009-06-11 18:44:23 UTC (rev 15895)
@@ -92,7 +92,7 @@
private String[] getVariableNames(ISeamProject seamProject, IDocument document, int offset,
int start, int end) {
- SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine engine = new SeamELCompletionEngine();
ELInvocationExpression tokens = engine.findExpressionAtOffset(
document, offset, start, end);
@@ -121,9 +121,7 @@
if (seamProject == null)
return result;
- SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject);
-
- ELInvocationExpression tokens = engine.findExpressionAtOffset(
+ ELInvocationExpression tokens = SeamELCompletionEngine.findExpressionAtOffset(
document,
context.getSelectionOffset(),
0, //TODO compute region start
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java 2009-06-11 18:44:23 UTC (rev 15895)
@@ -96,7 +96,7 @@
if (seamProject == null)
return Status.OK_STATUS;
- SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine engine = new SeamELCompletionEngine();
//Find Seam variable names
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2009-06-11 18:44:23 UTC (rev 15895)
@@ -269,7 +269,7 @@
if (seamProject == null)
return Status.OK_STATUS;
- SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine engine = new SeamELCompletionEngine();
// List<IJavaElement> elements = engine.getJavaElementsForELOperandTokens(seamProject, fSourceFile, fTokens)
SeamSearchResultCollector collector= new SeamSearchResultCollector(textResult, getParentRequestor());
@@ -285,7 +285,7 @@
if (seamProject == null)
return Status.OK_STATUS;
- SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine engine = new SeamELCompletionEngine();
SeamSearchResultCollector collector= new SeamSearchResultCollector(textResult, getParentRequestor());
return SeamSearchEngine.getInstance().search(fScope, collector, fSourceFile, fJavaElements, monitor);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2009-06-11 18:44:23 UTC (rev 15895)
@@ -476,7 +476,7 @@
}
- SeamELCompletionEngine fCompletionEngine = new SeamELCompletionEngine(project);
+ SeamELCompletionEngine fCompletionEngine = new SeamELCompletionEngine();
fELVarSearcher = new ElVarSearcher(fCompletionEngine);
fDocumentsInEditors= evalNonFileBufferDocuments();
boolean res= true;
@@ -716,7 +716,7 @@
ELInvocationExpression expr = token;
while(expr != null) {
List<IJavaElement> elements = null;
- SeamELCompletionEngine fCompletionEngine = new SeamELCompletionEngine(fCurrentSeamProject);
+ SeamELCompletionEngine fCompletionEngine = new SeamELCompletionEngine();
try {
elements = fCompletionEngine.getJavaElementsForELOperandTokens(fCurrentSeamProject, file, expr);
} catch (StringIndexOutOfBoundsException e) {
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2009-06-11 18:44:23 UTC (rev 15895)
@@ -374,7 +374,7 @@
//TODO Now this will work only for EL.
// If we need CA for expressions/variables without #{}, it should be handled separately.
- SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine engine = new SeamELCompletionEngine();
//TODO refactor method checkStartPositionInEL
boolean isInEl = checkStartPositionInEL(viewer, offset);
@@ -435,7 +435,7 @@
ElVarSearcher varSearcher = new ElVarSearcher(engine);
List<Var> vars = varSearcher.findAllVars(viewer, offset);
- SeamELCompletionEngine fEngine= new SeamELCompletionEngine(seamProject);
+ SeamELCompletionEngine fEngine= new SeamELCompletionEngine();
List<TextProposal> suggestions = fEngine.getCompletions(file, document, prefix, offset + proposalPrefix.length() - prefix.length(), false, vars);
List<TextProposal> uniqueSuggestions = fEngine.makeKbUnique(suggestions);
@@ -525,6 +525,10 @@
if(superDefaultChars.indexOf(".")<0) { //$NON-NLS-1$
redhatDefaultChars.append('.');
}
+ if(superDefaultChars.indexOf("[")<0) { //$NON-NLS-1$
+ redhatDefaultChars.append('[');
+ }
+
autoActivChars = new char[redhatDefaultChars.length()];
redhatDefaultChars.getChars(0, redhatDefaultChars.length(), autoActivChars, 0);
store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, redhatDefaultChars.toString());
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamELAttributeContentProposalProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamELAttributeContentProposalProvider.java 2009-06-11 18:39:49 UTC (rev 15894)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamELAttributeContentProposalProvider.java 2009-06-11 18:44:23 UTC (rev 15895)
@@ -82,7 +82,7 @@
IProject project = file.getProject();
ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
if(seamProject != null) {
- engine = new SeamELCompletionEngine(seamProject);
+ engine = new SeamELCompletionEngine();
}
}
15 years, 6 months
- 1
- 0
JBoss Tools SVN: r15894 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: internal/taglib and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-06-11 14:39:49 -0400 (Thu, 11 Jun 2009)
New Revision: 15894
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
Log:
JBIDE-2808: Improve/refactor org.jboss.tools.common.kb plugin.
PageProcessor.getProposals() method is updated to separate EL and ordinar proposal requests
A number of methods are fixed: a number of NullPointerException-s are fixed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-06-11 18:36:44 UTC (rev 15893)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-06-11 18:39:49 UTC (rev 15894)
@@ -48,30 +48,43 @@
*/
public TextProposal[] getProposals(KbQuery query, IPageContext context) {
ArrayList<TextProposal> proposals = new ArrayList<TextProposal>();
- ITagLibrary[] libs = context.getLibraries();
- for (int i = 0; libs != null && i < libs.length; i++) {
- TextProposal[] libProposals = libs[i].getProposals(query, context);
- for (int j = 0; libProposals != null && j < libProposals.length; j++) {
- proposals.add(libProposals[j]);
+
+ if (!isQueryForELProposals(query)) {
+ ITagLibrary[] libs = context.getLibraries();
+ for (int i = 0; libs != null && i < libs.length; i++) {
+ TextProposal[] libProposals = libs[i].getProposals(query, context);
+ for (int j = 0; libProposals != null && j < libProposals.length; j++) {
+ proposals.add(libProposals[j]);
+ }
}
- }
- for (int i = 0; customTagLibs != null && i < customTagLibs.length; i++) {
- // TODO
- }
- if(query.getType() == KbQuery.Type.ATTRIBUTE_VALUE || ((query.getType() == KbQuery.Type.TEXT )&& context instanceof IFaceletPageContext)) {
- String value = query.getValue();
- //TODO convert value to EL string.
- String elString = value;
- ELResolver[] resolvers = context.getElResolvers();
- for (int i = 0; resolvers != null && i < resolvers.length; i++) {
- proposals.addAll(resolvers[i].getCompletions(elString, !query.isMask(), query.getOffset(), context));
+ for (int i = 0; customTagLibs != null && i < customTagLibs.length; i++) {
+ // TODO
}
+ } else {
+ if(query.getType() == KbQuery.Type.ATTRIBUTE_VALUE || ((query.getType() == KbQuery.Type.TEXT )&& context instanceof IFaceletPageContext)) {
+ String value = query.getValue();
+ //TODO convert value to EL string.
+ String elString = value;
+ ELResolver[] resolvers = context.getElResolvers();
+ for (int i = 0; resolvers != null && i < resolvers.length; i++) {
+ proposals.addAll(resolvers[i].getCompletions(elString, !query.isMask(), query.getOffset(), context));
+ }
+ }
}
-
return proposals.toArray(new TextProposal[proposals.size()]);
}
- /**
+ private boolean isQueryForELProposals(KbQuery query) {
+ if (query.getType() != KbQuery.Type.ATTRIBUTE_VALUE &&
+ query.getType() != KbQuery.Type.TEXT)
+ return false;
+
+ return (query.getValue() != null &&
+ ( query.getValue().startsWith("#{") ||
+ query.getValue().startsWith("${") ) );
+ }
+
+ /**
* Returns components
* @param query
* @param context
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2009-06-11 18:36:44 UTC (rev 15893)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2009-06-11 18:39:49 UTC (rev 15894)
@@ -326,7 +326,7 @@
*/
public TextProposal[] getProposals(KbQuery query, IPageContext context) {
IAttribute[] attributes = getAttributes(query, context);
- if(attributes.length == 0) {
+ if(attributes == null || attributes.length == 0) {
return EMPTY_PROPOSAL_LIST;
}
List<TextProposal> proposals = null;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-06-11 18:36:44 UTC (rev 15893)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-06-11 18:39:49 UTC (rev 15894)
@@ -158,7 +158,7 @@
return EMPTY_ARRAY;
}
IComponent comp = getComponent(tagName);
- if(checkExtended(comp, context)) {
+ if(comp != null && checkExtended(comp, context)) {
return new IComponent[]{comp};
}
return EMPTY_ARRAY;
15 years, 6 months
- 1
- 0
JBoss Tools SVN: r15893 - 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-06-11 14:36:44 -0400 (Thu, 11 Jun 2009)
New Revision: 15893
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
Log:
JBIDE-2808: Improve/refactor org.jboss.tools.common.kb plugin.
A number of methods are fixed: a number of NullPointerException-s are 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-06-11 18:24:05 UTC (rev 15892)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-06-11 18:36:44 UTC (rev 15893)
@@ -125,7 +125,13 @@
return false;
String objClassName = obj.getClass().getName();
+ if (objClassName == null)
+ return false;
+
for (Object o : collection) {
+ if (o == null || o.getClass() == null)
+ continue;
+
if (objClassName.equals(o.getClass().getName()))
return true;
}
@@ -234,12 +240,13 @@
protected Sorter createSorter() {
return new Sorter() {
public boolean compare(Object proposal1, Object proposal2) {
- ICompletionProposal p1 = (ICompletionProposal)proposal1;
- ICompletionProposal p2 = (ICompletionProposal)proposal2;
int pr1 = Integer.MIN_VALUE;
int pr2 = Integer.MIN_VALUE;
+ ICompletionProposal p1 = (ICompletionProposal)proposal1;
+ ICompletionProposal p2 = (ICompletionProposal)proposal2;
+
if (p1 instanceof IRelevanceCompletionProposal)
pr1 = ((IRelevanceCompletionProposal)p1).getRelevance();
@@ -248,8 +255,8 @@
if (pr1 == pr2) {
- String str1 = p1.getDisplayString(); //$NON-NLS-1$
- String str2 = p2.getDisplayString(); //$NON-NLS-1$
+ String str1 = (p1.getDisplayString() == null ? "" : p1.getDisplayString()); //$NON-NLS-1$
+ String str2 = (p2.getDisplayString() == null ? "" : p2.getDisplayString()); //$NON-NLS-1$
return str2.compareTo(str1) > 0;
}
15 years, 6 months
- 1
- 0
JBoss Tools SVN: r15892 - trunk/jbpm/releng/org.jboss.tools.jbpm4.releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-06-11 14:24:05 -0400 (Thu, 11 Jun 2009)
New Revision: 15892
Modified:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/jbosstools-trunk jbpm4 releng build.xml.launch
Log:
path error
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/jbosstools-trunk jbpm4 releng build.xml.launch
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/jbosstools-trunk jbpm4 releng build.xml.launch 2009-06-11 18:00:02 UTC (rev 15891)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/jbosstools-trunk jbpm4 releng build.xml.launch 2009-06-11 18:24:05 UTC (rev 15892)
@@ -2,23 +2,18 @@
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${container}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jbosstools-trunk/jbpm4/releng/org.jboss.tools.jbpm4.releng/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/jbosstools-trunk/jbpm4/releng/org.jboss.tools.jbpm4.releng}/buildlog.latest.txt"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/>
+<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/jbosstools-trunk/jbpm/releng/org.jboss.tools.jbpm4.releng}/buildlog.latest.txt"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.6.0-openjdk-1.6.0.0"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jbosstools-trunk"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="java-1.6.0-openjdk-1.6.0.0"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jbosstools-trunk/jbpm4/releng/org.jboss.tools.jbpm4.releng/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jbosstools-trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/build.xml}"/>
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
</launchConfiguration>
15 years, 6 months
- 1
- 0