JBoss Tools SVN: r12710 - trunk/esb/docs/esb_ref_guide/en/images/esb_project.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-12-19 08:51:46 -0500 (Fri, 19 Dec 2008)
New Revision: 12710
Added:
trunk/esb/docs/esb_ref_guide/en/images/esb_project/13NewServerRuntimeEnv.png
Log:
https://jira.jboss.org/jira/browse/JBDS-452
Added: trunk/esb/docs/esb_ref_guide/en/images/esb_project/13NewServerRuntimeEnv.png
===================================================================
(Binary files differ)
Property changes on: trunk/esb/docs/esb_ref_guide/en/images/esb_project/13NewServerRuntimeEnv.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years
- 1
- 0
JBoss Tools SVN: r12709 - trunk/esb/docs/esb_ref_guide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-12-19 08:26:31 -0500 (Fri, 19 Dec 2008)
New Revision: 12709
Modified:
trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-452
Modified: trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml 2008-12-19 12:55:50 UTC (rev 12708)
+++ trunk/esb/docs/esb_ref_guide/en/modules/esb_support.xml 2008-12-19 13:26:31 UTC (rev 12709)
@@ -285,13 +285,17 @@
<title>Using and Configuring SOA Platform</title>
<para>In this chapter you will know what is JBoss Enterprise SOA Platform and how you can configure it to use for your ESB projects. </para>
- <literallayout> </literallayout>
+
<para>JBoss Enterprise SOA Platform delivers a flexible, standards-based platform to integrate applications, SOA services, business events and automate business processes. The SOA Platform integrates specific versions of JBoss ESB, jBPM, Drools and the JBoss Enterprise Application Platform that are certified to work together in a single supported enterprise distribution.</para>
<para>Having configured JBoss Enterprise SOA Platform for your ESB project you don't need to install and configure ESB server and runtime as they are already included.</para>
<para>Check here to find more details on the platform: <ulink url="http://www.jboss.com/products/platforms/soa">JBoss Enterprise SOA Platform</ulink> and <ulink url="http://www.jboss.com/products/platforms/soa/components">JBoss Enterprise SOA Platform Component Details</ulink>.</para>
<para>You can know what is SOA here: <ulink url="http://www.jboss.org/jbossesb/resources/SOABasics.html">Basics of SOA</ulink> and <ulink url="http://www.jboss.org/jbossesb/resources/SOAEOA.html">SOA and EOA</ulink>.</para>
+ <para>To configure the SOA platform select <emphasis>
+ <property>Window >Preferences > Server > Runtime Enironments</property>
+ </emphasis>, that will open the Server Runtime Environments Preferences page where you can add, remove and edit a Server Runtime Environment.</para>
+ <para>Select <emphasis><property>Add</property></emphasis>, choose <emphasis><property>JBoss 4.2 Runtime</property></emphasis> as a type of runtime environment, check the <emphasis><property>Create a new local server</property></emphasis> checkbox and click <emphasis><property>Next</property></emphasis>. On the next step you can specify a name of the server runtime environement and browse to its location. Click <emphasis><property>Finish</property></emphasis> to add the server runtime environment.</para>
@@ -304,7 +308,6 @@
-
</section>
17 years
- 1
- 0
JBoss Tools SVN: r12708 - documentation/trunk/movies/seam_demo.
by jbosstools-commits＠lists.jboss.org
Author: msorokin
Date: 2008-12-19 07:55:50 -0500 (Fri, 19 Dec 2008)
New Revision: 12708
Modified:
documentation/trunk/movies/seam_demo/seam_demo_part1.wnk
Log:
https://jira.jboss.org/jira/browse/JBDS-426
seam_demo_part1 - remade
Modified: documentation/trunk/movies/seam_demo/seam_demo_part1.wnk
===================================================================
(Binary files differ)
17 years
- 1
- 0
JBoss Tools SVN: r12707 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-12-19 07:23:08 -0500 (Fri, 19 Dec 2008)
New Revision: 12707
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java
Log:
Tests changed. Bugged cut and pasts has been fixed.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -339,8 +339,8 @@
IFile file = (IFile) TestUtil.getComponentPath(componentPage,
IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
+ assertNotNull("Could not open specified file. componentPage = " + componentPage//$NON-NLS-1$
+ + ";projectName = " + IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -50,8 +50,8 @@
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME//$NON-NLS-1$
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -50,8 +50,8 @@
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME//$NON-NLS-1$
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -50,8 +50,8 @@
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME //$NON-NLS-1$
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file); //$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -52,8 +52,8 @@
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME1,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(),
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME1//$NON-NLS-1$
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
@@ -127,8 +127,8 @@
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME3,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(),
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME3//$NON-NLS-1$
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
@@ -207,8 +207,8 @@
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME2,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(),
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME2//$NON-NLS-1$
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -51,8 +51,8 @@
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -44,8 +44,8 @@
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE//$NON-NLS-1$
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -52,8 +52,8 @@
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME//$NON-NLS-1$
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -76,8 +76,8 @@
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(fileName,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
+ assertNotNull("Could not open specified file. componentPage = " + fileName//$NON-NLS-1$
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
@@ -116,8 +116,8 @@
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(fileName,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
+ assertNotNull("Could not open specified file. componentPage = " + fileName//$NON-NLS-1$
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -42,7 +42,9 @@
*/
public class JBIDE2624Test extends VpeTest {
- /**
+ private static final String TEST_PAGE_NAME = "JBIDE/2624/greeting.xhtml";
+
+ /**
* @param name
*/
public JBIDE2624Test(String name) {
@@ -52,11 +54,10 @@
public void testJBide2624() throws CoreException {
// get test page path
setException(null);
- IFile file = (IFile) TestUtil.getComponentPath("JBIDE/2624/greeting.xhtml", //$NON-NLS-1$
+ IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME, //$NON-NLS-1$
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
-
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
assertNotNull("Editor input is null", input); //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -256,8 +256,8 @@
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(testPagePath,
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
+ assertNotNull("Could not open specified file. componentPage = " + testPagePath
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -35,6 +35,8 @@
*/
public class JBIDE924Test extends VpeTest{
+ private static final String TEST_PAGE_NAME = "JBIDE/924/pages/inputname.xhtml";
+
public JBIDE924Test(String name) {
super(name);
}
@@ -43,10 +45,10 @@
// get test page path
setException(null);
- IFile file = (IFile) TestUtil.getComponentPath("JBIDE/924/pages/inputname.xhtml", //$NON-NLS-1$
+ IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME, //$NON-NLS-1$
JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -44,6 +44,7 @@
*/
public class JsfJbide1467Test extends VpeTest {
+ private static final String TEST_PAGE_NAME = "JBIDE/1467/JBIDE-1467.jsp";
// type of input tag
private static final String ATTR_TYPE_VALUE = "radio";
@@ -66,10 +67,10 @@
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(
- "JBIDE/1467/JBIDE-1467.jsp", JsfAllTests.IMPORT_PROJECT_NAME);
+ TEST_PAGE_NAME, JsfAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(),
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -34,8 +34,8 @@
IFile file = (IFile) TestUtil.getComponentPath(
TEST_PAGE_NAME_2BUTTONS, RichFacesAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(),
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME_2BUTTONS//$NON-NLS-1$
+ + ";projectName = " + RichFacesAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
@@ -72,8 +72,8 @@
IFile file = (IFile) TestUtil.getComponentPath(
TEST_PAGE_NAME_4BUTTONS, RichFacesAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(),
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME_4BUTTONS//$NON-NLS-1$
+ + ";projectName = " + RichFacesAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -33,8 +33,8 @@
IFile file = (IFile) TestUtil.getComponentPath(
TEST_PAGE_NAME, RichFacesAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(),
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME//$NON-NLS-1$
+ + ";projectName = " + RichFacesAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -51,8 +51,8 @@
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(),
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME //$NON-NLS-1$
+ + ";projectName = " + IMPORT_PROJECT_NAME, file); //$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -37,6 +37,8 @@
*/
public class Jbide1548Test extends VpeTest {
+ private static final String TEST_PAGE_NAME = "JBIDE/1548/JBIDE-1548.xhtml";
+
// type of input tag
// import project name
@@ -57,10 +59,10 @@
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(
- "JBIDE/1548/JBIDE-1548.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME);
+ TEST_PAGE_NAME, RichFacesAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(),
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME
+ + ";projectName = " + RichFacesAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -41,8 +41,8 @@
IFile file = (IFile) TestUtil.getComponentPath(
TEST_PAGE_WITH_POPUP, RichFacesAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(),
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_WITH_POPUP//$NON-NLS-1$
+ + ";projectName = " + RichFacesAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
@@ -84,8 +84,8 @@
IFile file = (IFile) TestUtil.getComponentPath(
TEST_PAGE_WITHOUT_POPUP, RichFacesAllTests.IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + file.getFullPath(),
- file);
+ assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_WITHOUT_POPUP//$NON-NLS-1$
+ + ";projectName = " + RichFacesAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
IEditorInput input = new FileEditorInput(file);
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java 2008-12-19 12:01:15 UTC (rev 12706)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java 2008-12-19 12:23:08 UTC (rev 12707)
@@ -105,7 +105,7 @@
protected void check(String caName, String testPagePath, int position, int numberOfProposals) throws CoreException {
// get test page path
IFile file = project.getFile(testPagePath);
- assertNotNull("Could not open specified file " + file.getFullPath(), file);
+ assertNotNull("Could not open specified file. testPagePath = " + testPagePath, file);
IEditorInput input = new FileEditorInput(file);
17 years
- 1
- 0
JBoss Tools SVN: r12706 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-12-19 07:01:15 -0500 (Fri, 19 Dec 2008)
New Revision: 12706
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-883, code adjustment for rich:scrollableDataTable caused JUnit change.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2008-12-19 11:17:31 UTC (rev 12705)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/scrollableDataTable.xhtml.xml 2008-12-19 12:01:15 UTC (rev 12706)
@@ -1,9 +1,7 @@
-
<tests>
<test id="scrollableDataTable">
-
<DIV CLASS="dr-table-hidden" STYLE="overflow: auto; width: 500px; height: 100px;">
- <TABLE CLASS="dr-table rich-table">
+ <TABLE CLASS="dr-table rich-sdt">
<COLGROUP SPAN="6">
</COLGROUP>
<THEAD>
@@ -12,37 +10,37 @@
SCOP="col">
<SPAN CLASS="headerText">
Make
- </SPAN>
+ </SPAN>
</TD>
<TD CLASS="dr-table-subheadercell rich-table-subheadercell"
SCOP="col">
<SPAN CLASS="headerText">
Model
- </SPAN>
+ </SPAN>
</TD>
<TD CLASS="dr-table-subheadercell rich-table-subheadercell"
SCOP="col">
<SPAN CLASS="headerText">
Price
- </SPAN>
+ </SPAN>
</TD>
<TD CLASS="dr-table-subheadercell rich-table-subheadercell"
SCOP="col">
<SPAN CLASS="headerText">
Mileage
- </SPAN>
+ </SPAN>
</TD>
<TD CLASS="dr-table-subheadercell rich-table-subheadercell"
SCOP="col">
<SPAN CLASS="headerText">
VIN
- </SPAN>
+ </SPAN>
</TD>
<TD CLASS="dr-table-subheadercell rich-table-subheadercell"
SCOP="col">
<SPAN CLASS="headerText">
Stock
- </SPAN>
+ </SPAN>
</TD>
</TR>
</THEAD>
@@ -56,160 +54,160 @@
<TD ID="make" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.make}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="model" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.model}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="price" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.price}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.mileage}
- </SPAN>
+ </SPAN>
</TD>
<TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.vin}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.stock}
- </SPAN>
+ </SPAN>
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
<TD ID="make" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.make}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="model" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.model}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="price" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.price}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.mileage}
- </SPAN>
+ </SPAN>
</TD>
<TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.vin}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.stock}
- </SPAN>
+ </SPAN>
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
<TD ID="make" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.make}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="model" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.model}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="price" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.price}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.mileage}
- </SPAN>
+ </SPAN>
</TD>
<TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.vin}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.stock}
- </SPAN>
+ </SPAN>
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
<TD ID="make" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.make}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="model" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.model}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="price" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.price}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.mileage}
- </SPAN>
+ </SPAN>
</TD>
<TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.vin}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.stock}
- </SPAN>
+ </SPAN>
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
<TD ID="make" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.make}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="model" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.model}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="price" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.price}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="mileage" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.mileage}
- </SPAN>
+ </SPAN>
</TD>
<TD WIDTH="200" ID="vin" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.vin}
- </SPAN>
+ </SPAN>
</TD>
<TD ID="stock" CLASS="dr-table-cell rich-table-cell col">
<SPAN>
#{category.stock}
- </SPAN>
+ </SPAN>
</TD>
</TR>
</TABLE>
17 years
- 1
- 0
JBoss Tools SVN: r12705 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-12-19 06:17:31 -0500 (Fri, 19 Dec 2008)
New Revision: 12705
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-883, code adjustment for rich:scrollableDataTable.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-12-19 11:06:33 UTC (rev 12704)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-12-19 11:17:31 UTC (rev 12705)
@@ -41,20 +41,20 @@
private static final String COLUMN = ':' + RichFaces.TAG_COLUMN;
private static final String COLUMNS = ':' + RichFaces.TAG_COLUMNS;
- private static final String DEFAULT_HEIGHT = "500px";
- private static final String DEFAULT_WIDTH = "700px";
- private static final String CSS_STYLE_PATH = "scrollableDataTable/scrollableDataTable.css";
- private static final String COMPONENT_NAME = "richFacesDataTable";
+ private static final String DEFAULT_HEIGHT = "500px"; //$NON-NLS-1$
+ private static final String DEFAULT_WIDTH = "700px"; //$NON-NLS-1$
+ private static final String CSS_STYLE_PATH = "scrollableDataTable/scrollableDataTable.css"; //$NON-NLS-1$
+ private static final String COMPONENT_NAME = "richFacesDataTable"; //$NON-NLS-1$
- private static final String CSS_DR_TABLE = "dr-table";
- private static final String CSS_DR_TABLE_HIDDEN = "dr-table-hidden";
- private static final String CSS_RICH_SDT = "rich-sdt";
- private static final String CSS_RICH_SDT_HEADER_CELL = "rich-sdt-header-cell";
- private static final String CSS_RICH_SDT_HEADER_ROW = "rich-sdt-header-row";
- private static final String CSS_RICH_SDT_COLUMN_CELL = "rich-sdt-column-cell";
- private static final String CSS_RICH_SDT_FOOTER_CELL = "rich-sdt-footer-cell";
- private static final String CSS_RICH_SDT_FOOTER_ROW = "rich-sdt-footer-row";
- private static final String CSS_RICH_SDT_HSEP = "rich-sdt-hsep";
+ private static final String CSS_DR_TABLE = "dr-table"; //$NON-NLS-1$
+ private static final String CSS_DR_TABLE_HIDDEN = "dr-table-hidden"; //$NON-NLS-1$
+ private static final String CSS_RICH_SDT = "rich-sdt"; //$NON-NLS-1$
+ private static final String CSS_RICH_SDT_HEADER_CELL = "rich-sdt-header-cell"; //$NON-NLS-1$
+ private static final String CSS_RICH_SDT_HEADER_ROW = "rich-sdt-header-row"; //$NON-NLS-1$
+ private static final String CSS_RICH_SDT_COLUMN_CELL = "rich-sdt-column-cell"; //$NON-NLS-1$
+ private static final String CSS_RICH_SDT_FOOTER_CELL = "rich-sdt-footer-cell"; //$NON-NLS-1$
+ private static final String CSS_RICH_SDT_FOOTER_ROW = "rich-sdt-footer-row"; //$NON-NLS-1$
+ private static final String CSS_RICH_SDT_HSEP = "rich-sdt-hsep"; //$NON-NLS-1$
private static final int NUM_ROW = 5;
private static final String TAG_MAIN_TABLE_WRAPPER = "mainTable-wrapper"; //$NON-NLS-1$
@@ -156,7 +156,7 @@
nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
thead.appendChild(tr);
String styleClass = ComponentUtil.encodeStyleClass(null,
- "dr-table-subheader dr-sdt-hr", null,
+ "dr-table-subheader dr-sdt-hr", null, //$NON-NLS-1$
headerClass);
if (styleClass != null) {
tr.setAttribute(HTML.ATTR_CLASS,
@@ -164,7 +164,7 @@
}
encodeHeaderOrFooterFacets(creationData, tr, visualDocument,
columnsHeaders,
- "dr-table-subheadercell rich-table-subheadercell",
+ "dr-table-subheadercell rich-table-subheadercell", //$NON-NLS-1$
headerClass, RichFaces.NAME_FACET_HEADER, HTML.TAG_TD);
}
}
@@ -183,7 +183,7 @@
.createElement(HTML.TAG_TR);
tfoot.appendChild(tr);
String styleClass = ComponentUtil.encodeStyleClass(null,
- "dr-table-subfooter rich-table-subfooter", null,
+ "dr-table-subfooter rich-table-subfooter", null, //$NON-NLS-1$
footerClass);
if (styleClass != null) {
tr.setAttribute(HTML.ATTR_CLASS,
@@ -191,7 +191,7 @@
}
encodeHeaderOrFooterFacets(creationData, tr, visualDocument,
columnsFooters,
- "dr-table-subfootercell rich-table-subfootercell",
+ "dr-table-subfootercell rich-table-subfootercell", //$NON-NLS-1$
footerClass, RichFaces.NAME_FACET_FOOTER, HTML.TAG_TD);
}
if (footer != null) {
@@ -240,10 +240,10 @@
.createElement(HTML.TAG_CAPTION);
table.appendChild(caption);
if (captionClass != null && captionClass.length() > 0) {
- captionClass = "dr-table-caption rich-table-caption "
+ captionClass = "dr-table-caption rich-table-caption " //$NON-NLS-1$
+ captionClass;
} else {
- captionClass = "dr-table-caption rich-table-caption";
+ captionClass = "dr-table-caption rich-table-caption"; //$NON-NLS-1$
}
caption.setAttribute(HTML.ATTR_CLASS,
captionClass);
@@ -275,7 +275,7 @@
ArrayList<Element> headersOrFooters, String skinCellClass,
String headerClass, String facetName, String element) {
for (Element column : headersOrFooters) {
- String classAttribute = facetName + "Class";
+ String classAttribute = facetName + "Class"; //$NON-NLS-1$
String columnHeaderClass = column.getAttribute(classAttribute);
nsIDOMElement td = visualDocument.createElement(element);
parentTr.appendChild(td);
@@ -288,7 +288,7 @@
}
td.setAttribute(HTML.ATTR_CLASS, styleClass);
- td.setAttribute("scop", "col");
+ td.setAttribute("scop", "col"); //$NON-NLS-1$ //$NON-NLS-2$
String colspan = column
.getAttribute(HTML.ATTR_COLSPAN);
if (colspan != null && colspan.length() > 0) {
@@ -321,8 +321,8 @@
String skinFirstRowClass, String skinRowClass,
String skinCellClass, String facetBodyClass, String element) {
boolean isColumnGroup = facetBody.getNodeName()
- .endsWith(":columnGroup");
- boolean isSubTable = facetBody.getNodeName().endsWith(":subTable");
+ .endsWith(":columnGroup"); //$NON-NLS-1$
+ boolean isSubTable = facetBody.getNodeName().endsWith(":subTable"); //$NON-NLS-1$
if (isColumnGroup) {
RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData,
facetBody, visualDocument, parentTheadOrTfood);
@@ -409,7 +409,7 @@
int count = 0;
// check for exact value in component
try {
- int span = Integer.parseInt(sourceElement.getAttribute("columns"));
+ int span = Integer.parseInt(sourceElement.getAttribute("columns")); //$NON-NLS-1$
count = count > 0 ? span : calculateRowColumns(sourceElement, columns);
} catch (NumberFormatException e) {
count = calculateRowColumns(sourceElement, columns);
@@ -428,7 +428,7 @@
for (Element column : columns) {
if (ComponentUtil.isRendered(column)) {
String nodeName = column.getNodeName();
- if (nodeName.endsWith(":columnGroup")) {
+ if (nodeName.endsWith(":columnGroup")) { //$NON-NLS-1$
// Store max calculated value of previsous rows.
if (currentLength > count) {
count = currentLength;
@@ -443,7 +443,7 @@
currentLength = 0;
} else if (nodeName.equals(sourceElement.getPrefix() + COLUMN) ||
nodeName.equals(sourceElement.getPrefix() + COLUMNS)) {
- String breakBeforeStr = column.getAttribute("breakBefore");
+ String breakBeforeStr = column.getAttribute("breakBefore"); //$NON-NLS-1$
// For new row, save length of previsous.
if (Boolean.getBoolean(breakBeforeStr)) {
if (currentLength > count) {
17 years
- 1
- 0
JBoss Tools SVN: r12704 - documentation/trunk/movies/hbm_xml_editing.
by jbosstools-commits＠lists.jboss.org
Author: msorokin
Date: 2008-12-19 06:06:33 -0500 (Fri, 19 Dec 2008)
New Revision: 12704
Modified:
documentation/trunk/movies/hbm_xml_editing/hbm_xml_editing.wnk
Log:
https://jira.jboss.org/jira/browse/JBDS-352
the movie is remade
Modified: documentation/trunk/movies/hbm_xml_editing/hbm_xml_editing.wnk
===================================================================
(Binary files differ)
17 years
- 1
- 0
JBoss Tools SVN: r12703 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces: template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-12-19 05:49:32 -0500 (Fri, 19 Dec 2008)
New Revision: 12703
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-883, code adjustment for rich:scrollableDataTable and rich:orderingList.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-19 08:51:30 UTC (rev 12702)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-19 10:49:32 UTC (rev 12703)
@@ -890,4 +890,34 @@
return value;
}
+ /**
+ * Encodes style class
+ * @param parentPredefined
+ * @param predefined
+ * @param parent
+ * @param custom
+ * @return
+ */
+ public static String encodeStyleClass(Object parentPredefined,
+ Object predefined, Object parent, Object custom) {
+ StringBuffer styleClass = new StringBuffer();
+ // Construct predefined classes
+ if (null != parentPredefined) {
+ styleClass.append(parentPredefined).append(Constants.WHITE_SPACE);
+ } else if (null != predefined) {
+ styleClass.append(predefined).append(Constants.WHITE_SPACE);
+ }
+ // Append class from parent component.
+ if (null != parent) {
+ styleClass.append(parent).append(Constants.WHITE_SPACE);
+ }
+ if (null != custom) {
+ styleClass.append(custom);
+ }
+ if (styleClass.length() > 0) {
+ return styleClass.toString();
+ }
+ return null;
+ }
+
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-12-19 08:51:30 UTC (rev 12702)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-12-19 10:49:32 UTC (rev 12703)
@@ -469,7 +469,7 @@
if (!columnsHeaders.isEmpty()) {
nsIDOMElement tr = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR);
thead.appendChild(tr);
- String styleClass = encodeStyleClass(null,
+ String styleClass = ComponentUtil.encodeStyleClass(null,
CSS_HEADER_CLASS + " " + CSS_TABLE_HEADER_CLASS, null,
headerClass);
if (styleClass != null) {
@@ -495,7 +495,7 @@
nsIDOMElement tr = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TR);
tfoot.appendChild(tr);
- String styleClass = encodeStyleClass(null,
+ String styleClass = ComponentUtil.encodeStyleClass(null,
CSS_TABLE_HEADER_CLASS + " " + CSS_TABLE_HEADER_CELL_CLASS, null,
footerClass);
if (styleClass != null) {
@@ -668,7 +668,7 @@
.createElement(HtmlComponentUtil.HTML_TAG_TR);
parentTheadOrTfood.appendChild(tr);
- String styleClass = encodeStyleClass(null, skinFirstRowClass,
+ String styleClass = ComponentUtil.encodeStyleClass(null, skinFirstRowClass,
facetBodyClass, null);
if (styleClass != null) {
tr.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClass);
@@ -679,7 +679,7 @@
nsIDOMElement td = visualDocument.createElement(element);
tr.appendChild(td);
- styleClass = encodeStyleClass(null, skinCellClass, facetBodyClass,
+ styleClass = ComponentUtil.encodeStyleClass(null, skinCellClass, facetBodyClass,
null);
if (styleClass != null) {
td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClass);
@@ -723,7 +723,7 @@
td.setAttribute(HtmlComponentUtil.HTML_ATTR_BACKGROUND, "file:///"
+ ComponentUtil.getAbsoluteResourcePath(HEADER_CELL_BG).replace('\\', '/'));
- String styleClass = encodeStyleClass(null, skinCellClass,
+ String styleClass = ComponentUtil.encodeStyleClass(null, skinCellClass,
headerClass, columnHeaderClass);
td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClass);
td.setAttribute("scop", "col");
@@ -780,36 +780,6 @@
/**
*
- * @param parentPredefined
- * @param predefined
- * @param parent
- * @param custom
- * @return
- */
- private static String encodeStyleClass(Object parentPredefined,
- Object predefined, Object parent, Object custom) {
- StringBuffer styleClass = new StringBuffer();
- // Construct predefined classes
- if (null != parentPredefined) {
- styleClass.append(parentPredefined).append(SPACE);
- } else if (null != predefined) {
- styleClass.append(predefined).append(SPACE);
- }
- // Append class from parent component.
- if (null != parent) {
- styleClass.append(parent).append(SPACE);
- }
- if (null != custom) {
- styleClass.append(custom);
- }
- if (styleClass.length() > 0) {
- return styleClass.toString();
- }
- return null;
- }
-
- /**
- *
* @param sourceElement
* @param columns
* @return
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-12-19 08:51:30 UTC (rev 12702)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-12-19 10:49:32 UTC (rev 12703)
@@ -19,6 +19,7 @@
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
@@ -40,18 +41,20 @@
private static final String COLUMN = ':' + RichFaces.TAG_COLUMN;
private static final String COLUMNS = ':' + RichFaces.TAG_COLUMNS;
- final static String DEFAULT_HEIGHT = "500px";
- final static String DEFAULT_WIDTH = "700px";
- final static String HEADER = "header";
- final static String HEADER_CLASS = "headerClass";
- final static String FOOTER = "footer";
- final static String FOOTER_CLASS = "footerClass";
- final static String CAPTION_CLASS = "captionClass";
- final static String CAPTION_STYLE = "captionStyle";
- final static String SPACE = " ";
+ private static final String DEFAULT_HEIGHT = "500px";
+ private static final String DEFAULT_WIDTH = "700px";
+ private static final String CSS_STYLE_PATH = "scrollableDataTable/scrollableDataTable.css";
+ private static final String COMPONENT_NAME = "richFacesDataTable";
- private static String STYLE_FOR_LOW_SCROLL = "overflow: scroll; width: 100%; height: 17px;";
- private static String STYLE_FOR_RIGHT_SCROLL = "overflow: scroll; width: 17px; height: 100%;";
+ private static final String CSS_DR_TABLE = "dr-table";
+ private static final String CSS_DR_TABLE_HIDDEN = "dr-table-hidden";
+ private static final String CSS_RICH_SDT = "rich-sdt";
+ private static final String CSS_RICH_SDT_HEADER_CELL = "rich-sdt-header-cell";
+ private static final String CSS_RICH_SDT_HEADER_ROW = "rich-sdt-header-row";
+ private static final String CSS_RICH_SDT_COLUMN_CELL = "rich-sdt-column-cell";
+ private static final String CSS_RICH_SDT_FOOTER_CELL = "rich-sdt-footer-cell";
+ private static final String CSS_RICH_SDT_FOOTER_ROW = "rich-sdt-footer-row";
+ private static final String CSS_RICH_SDT_HSEP = "rich-sdt-hsep";
private static final int NUM_ROW = 5;
private static final String TAG_MAIN_TABLE_WRAPPER = "mainTable-wrapper"; //$NON-NLS-1$
@@ -80,7 +83,7 @@
} else {
width = VpeStyleUtil.addPxIfNecessary(width);
}
-
+
String height = sourceElement.getAttribute(HTML.ATTR_HEIGHT);
if (height == null) {
height = DEFAULT_HEIGHT;
@@ -92,11 +95,11 @@
nsIDOMElement div = visualDocument
.createElement(HTML.TAG_DIV);
- div.setAttribute(HTML.ATTR_CLASS, "dr-table-hidden");
+ div.setAttribute(HTML.ATTR_CLASS, CSS_DR_TABLE_HIDDEN);
- String divStyle = HTML.ATTR_WIDTH + " : "
- + width + ";"
- + HTML.ATTR_HEIGHT + " : "
+ String divStyle = HTML.ATTR_WIDTH + Constants.COLON
+ + width + Constants.SEMICOLON
+ + HTML.ATTR_HEIGHT + Constants.COLON
+ height + ";overflow:auto;"; //$NON-NLS-1$
VpeCreationData creationData = new VpeCreationData(div);
@@ -111,15 +114,12 @@
mainTableWrapper.appendChild(mainTable);
div.appendChild(mainTableWrapper);
- ComponentUtil.setCSSLink(pageContext,
- "scrollableDataTable/scrollableDataTable.css",
- "richFacesDataTable");
+ ComponentUtil.setCSSLink(pageContext, CSS_STYLE_PATH, COMPONENT_NAME);
String tableClass = sourceElement
.getAttribute(RichFaces.ATTR_STYLE_CLASS);
- mainTable
- .setAttribute(HTML.ATTR_CLASS,
- "dr-table rich-table "
- + (tableClass == null ? "" : tableClass));
+ mainTable.setAttribute(HTML.ATTR_CLASS, CSS_DR_TABLE
+ + Constants.WHITE_SPACE + CSS_RICH_SDT
+ + (tableClass == null ? Constants.EMPTY : tableClass));
// Encode colgroup definition.
ArrayList<Element> columns = getColumns(sourceElement);
@@ -134,24 +134,28 @@
encodeCaption(creationData, sourceElement, visualDocument, mainTable);
// Encode Header
- Element header = ComponentUtil.getFacet(sourceElement, HEADER);
- ArrayList<Element> columnsHeaders = getColumnsWithFacet(columns, HEADER);
+ Element header = ComponentUtil.getFacet(sourceElement, RichFaces.NAME_FACET_HEADER);
+ ArrayList<Element> columnsHeaders = getColumnsWithFacet(columns, RichFaces.NAME_FACET_HEADER);
if (header != null || !columnsHeaders.isEmpty()) {
nsIDOMElement thead = visualDocument
.createElement(HTML.TAG_THEAD);
mainTable.appendChild(thead);
String headerClass = (String) sourceElement
- .getAttribute(HEADER_CLASS);
+ .getAttribute(RichFaces.ATTR_HEADER_CLASS);
if (header != null) {
- encodeTableHeaderOrFooterFacet(pageContext, creationData, thead,
- columnsLength, visualDocument, header,
- "", "", "",//JBIDE-3204 #2:No one style or styleClass should be applyed for the footer and header of scrollableDataTable as default
- headerClass, HTML.TAG_TD);
+ /*
+ * JBIDE-3204 #2:No one style or styleClass should be applyed
+ * for the footer and header of scrollableDataTable as default
+ */
+ encodeTableHeaderOrFooterFacet(pageContext, creationData, thead,
+ columnsLength, visualDocument, header,
+ Constants.EMPTY, Constants.EMPTY, Constants.EMPTY,
+ headerClass, HTML.TAG_TD);
}
if (!columnsHeaders.isEmpty()) {
nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
thead.appendChild(tr);
- String styleClass = encodeStyleClass(null,
+ String styleClass = ComponentUtil.encodeStyleClass(null,
"dr-table-subheader dr-sdt-hr", null,
headerClass);
if (styleClass != null) {
@@ -161,24 +165,24 @@
encodeHeaderOrFooterFacets(creationData, tr, visualDocument,
columnsHeaders,
"dr-table-subheadercell rich-table-subheadercell",
- headerClass, HEADER, HTML.TAG_TD);
+ headerClass, RichFaces.NAME_FACET_HEADER, HTML.TAG_TD);
}
}
// Encode Footer
- Element footer = ComponentUtil.getFacet(sourceElement, FOOTER);
- ArrayList<Element> columnsFooters = getColumnsWithFacet(columns, FOOTER);
+ Element footer = ComponentUtil.getFacet(sourceElement, RichFaces.NAME_FACET_FOOTER);
+ ArrayList<Element> columnsFooters = getColumnsWithFacet(columns, RichFaces.NAME_FACET_FOOTER);
if (footer != null || !columnsFooters.isEmpty()) {
nsIDOMElement tfoot = visualDocument
.createElement(HTML.TAG_TFOOT);
mainTable.appendChild(tfoot);
String footerClass = (String) sourceElement
- .getAttribute(FOOTER_CLASS);
+ .getAttribute(RichFaces.ATTR_FOOTER_CLASS);
if (!columnsFooters.isEmpty()) {
nsIDOMElement tr = visualDocument
.createElement(HTML.TAG_TR);
tfoot.appendChild(tr);
- String styleClass = encodeStyleClass(null,
+ String styleClass = ComponentUtil.encodeStyleClass(null,
"dr-table-subfooter rich-table-subfooter", null,
footerClass);
if (styleClass != null) {
@@ -188,13 +192,17 @@
encodeHeaderOrFooterFacets(creationData, tr, visualDocument,
columnsFooters,
"dr-table-subfootercell rich-table-subfootercell",
- footerClass, FOOTER, HTML.TAG_TD);
+ footerClass, RichFaces.NAME_FACET_FOOTER, HTML.TAG_TD);
}
if (footer != null) {
- encodeTableHeaderOrFooterFacet(pageContext, creationData, tfoot,
- columnsLength, visualDocument, footer,
- "", "", "",//JBIDE-3204 #2:No one style or styleClass should be applyed for the footer and header of scrollableDataTable as default
- footerClass, HTML.TAG_TD);
+ /*
+ * JBIDE-3204 #2:No one style or styleClass should be applyed
+ * for the footer and header of scrollableDataTable as default
+ */
+ encodeTableHeaderOrFooterFacet(pageContext, creationData, tfoot,
+ columnsLength, visualDocument, footer,
+ Constants.EMPTY, Constants.EMPTY, Constants.EMPTY,
+ footerClass, HTML.TAG_TD);
}
}
@@ -225,8 +233,8 @@
Element captionFromFacet = ComponentUtil.getFacet(sourceElement,
HTML.TAG_CAPTION);
if (captionFromFacet != null) {
- String captionClass = (String) table.getAttribute(CAPTION_CLASS);
- String captionStyle = (String) table.getAttribute(CAPTION_STYLE);
+ String captionClass = (String) table.getAttribute(RichFaces.ATTR_CAPTION_CLASS);
+ String captionStyle = (String) table.getAttribute(RichFaces.ATTR_CAPTION_STYLE);
nsIDOMElement caption = visualDocument
.createElement(HTML.TAG_CAPTION);
@@ -271,7 +279,7 @@
String columnHeaderClass = column.getAttribute(classAttribute);
nsIDOMElement td = visualDocument.createElement(element);
parentTr.appendChild(td);
- String styleClass = encodeStyleClass(null, skinCellClass,
+ String styleClass = ComponentUtil.encodeStyleClass(null, skinCellClass,
headerClass, columnHeaderClass);
if (!RichFacesColumnTemplate.isVisible(column)) {
@@ -326,7 +334,7 @@
.createElement(HTML.TAG_TR);
parentTheadOrTfood.appendChild(tr);
- String styleClass = encodeStyleClass(null, skinFirstRowClass,
+ String styleClass = ComponentUtil.encodeStyleClass(null, skinFirstRowClass,
facetBodyClass, null);
if (styleClass != null) {
tr.setAttribute(HTML.ATTR_CLASS, styleClass);
@@ -335,7 +343,7 @@
nsIDOMElement td = visualDocument.createElement(element);
tr.appendChild(td);
- styleClass = encodeStyleClass(null, skinCellClass, facetBodyClass,
+ styleClass = ComponentUtil.encodeStyleClass(null, skinCellClass, facetBodyClass,
null);
if (styleClass != null) {
td.setAttribute(HTML.ATTR_CLASS, styleClass);
@@ -392,36 +400,6 @@
/**
*
- * @param parentPredefined
- * @param predefined
- * @param parent
- * @param custom
- * @return
- */
- public static String encodeStyleClass(Object parentPredefined,
- Object predefined, Object parent, Object custom) {
- StringBuffer styleClass = new StringBuffer();
- // Construct predefined classes
- if (null != parentPredefined) {
- styleClass.append(parentPredefined).append(SPACE);
- } else if (null != predefined) {
- styleClass.append(predefined).append(SPACE);
- }
- // Append class from parent component.
- if (null != parent) {
- styleClass.append(parent).append(SPACE);
- }
- if (null != custom) {
- styleClass.append(custom);
- }
- if (styleClass.length() > 0) {
- return styleClass.toString();
- }
- return null;
- }
-
- /**
- *
* @param sourceElement
* @param columns
* @return
17 years
- 1
- 0
JBoss Tools SVN: r12702 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: ui/editors and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-12-19 03:51:30 -0500 (Fri, 19 Dec 2008)
New Revision: 12702
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java
Log:
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-12-19 07:57:47 UTC (rev 12701)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-12-19 08:51:30 UTC (rev 12702)
@@ -558,7 +558,7 @@
ResourceType rt = rc.getResource();
// find the first BeanPopulator resource config , this is the root.
String resourceClazz = null;
- if(resourceConfigIsUsed(rc)){
+ if (resourceConfigIsUsed(rc)) {
continue;
}
if (rt != null) {
@@ -576,9 +576,10 @@
if (selector != null) {
selector = selector.trim();
}
- if(!sourceName.equals(selector)){
- source = findJavaBeanModelFormList(selector, sourceModelList);
- if(source != null){
+ if (!sourceName.equals(selector)) {
+ source = findJavaBeanModelFormList(selector,
+ sourceModelList);
+ if (source != null) {
sourceClazz = source.getBeanClass();
if (sourceClazz != null) {
sourceName = sourceClazz.getName();
@@ -857,6 +858,43 @@
}
}
}
+ if (current == null) {
+ // rootClassName = this.getDataSourceClass(graphInfo, TARGET_DATA);
+ // TODO if there isn't any BeanPopulater throws exception
+ // MODIFY by Dart 2008.11.17
+ try{
+ if (classLoader == null) {
+ IProject project = sourceFile.getProject();
+ classLoader = new ProjectClassLoader(JavaCore.create(project));
+ }
+ String classString = getDataSourceClass(graphInfo, TARGET_DATA);
+ if (classString != null && classLoader != null) {
+ String[] classes = classString.split(";");
+ if (classes != null) {
+ for (int i = 0; i < classes.length; i++) {
+ String clazzName = classes[i];
+ list.add(JavaBeanModelFactory
+ .getJavaBeanModelWithLazyLoad(classLoader
+ .loadClass(clazzName)));
+ }
+ return list;
+ }
+ }
+ }catch (ClassNotFoundException e) {
+ // TODO if can't find the class throws exception
+ // MODIFY by Dart 2008.11.12
+ throw new RuntimeException("Can't find the class : \""
+ + rootClassName
+ + "\" to create the JavaBean model");
+ } catch (JavaModelException e) {
+ e.printStackTrace();
+ }
+ // throw new RuntimeException(
+ // "Can't load Java bean model form the config file.");
+ }
+ // if can't load the source from GraphicalInformation , return NULL
+ if (current == null && rootClassName == null)
+ return list;
return list;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-19 07:57:47 UTC (rev 12701)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-19 08:51:30 UTC (rev 12702)
@@ -216,6 +216,8 @@
private Section mappingGUISection;
+ private Section problemSection;
+
public ISelection getSelection() {
return selection;
}
@@ -476,19 +478,18 @@
protected void createErrorMessageLinkGUI(FormToolkit toolkit,
Composite parent) {
- Section secion = this.createPageSectionHeader(parent, Section.TITLE_BAR
- | Section.DESCRIPTION, "Problems",
- "Click \"Fix\" link to fix those errors");
+ problemSection = this.createPageSectionHeader(parent, Section.TITLE_BAR
+ | Section.DESCRIPTION, "Problems", "No problems");
- designTimeAnalyzeResultRegion = toolkit.createComposite(secion);
+ designTimeAnalyzeResultRegion = toolkit.createComposite(problemSection);
GridData gd = new GridData(GridData.FILL_BOTH);
GridLayout ngl = new GridLayout();
ngl.numColumns = 2;
ngl.marginWidth = 0;
- secion.setLayout(new FillLayout());
+ problemSection.setLayout(new FillLayout());
designTimeAnalyzeResultRegion.setLayoutData(gd);
designTimeAnalyzeResultRegion.setLayout(ngl);
- secion.setClient(designTimeAnalyzeResultRegion);
+ problemSection.setClient(designTimeAnalyzeResultRegion);
}
public void refreshAllGUI() {
@@ -891,7 +892,7 @@
analyzeDesignGraph();
updateSelectionActions();
IManagedForm form = getManagedForm();
- if(form != null){
+ if (form != null) {
form.dirtyStateChanged();
}
}
@@ -1499,11 +1500,13 @@
}
protected void updateErrorMessage() {
+ boolean hasProblems = false;
for (Iterator<DesignTimeAnalyzeResult> iterator = this.analyzeResultList
.iterator(); iterator.hasNext();) {
DesignTimeAnalyzeResult result = (DesignTimeAnalyzeResult) iterator
.next();
if (result.getErrorMessage() != null) {
+ hasProblems = true;
if (canSaveFile)
canSaveFile = false;
Label imageLabel = new Label(designTimeAnalyzeResultRegion,
@@ -1583,6 +1586,12 @@
}
try {
// designTimeAnalyzeResultRegion.setLayoutData(gd);
+ if (hasProblems) {
+ problemSection
+ .setDescription("Click \"Fix\" link to fix those errors");
+ } else {
+ problemSection.setDescription("No problems");
+ }
designTimeAnalyzeResultRegion.getParent().getParent().layout();
} finally {
}
@@ -1624,7 +1633,6 @@
c = null;
}
updateErrorMessage();
- updateWarningMessage();
designTimeAnalyzeResultRegion.layout(true);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-12-19 07:57:47 UTC (rev 12701)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-12-19 08:51:30 UTC (rev 12702)
@@ -14,7 +14,6 @@
import java.util.Iterator;
import java.util.List;
-import org.eclipse.draw2d.ColorConstants;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -31,25 +30,24 @@
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.jboss.tools.smooks.analyzer.AnalyzerFactory;
import org.jboss.tools.smooks.analyzer.DataTypeID;
+import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer;
import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard;
import org.jboss.tools.smooks.ui.IViewerInitor;
import org.jboss.tools.smooks.ui.StructuredDataCreationWizardDailog;
import org.jboss.tools.smooks.ui.ViewerInitorStore;
import org.jboss.tools.smooks.ui.wizards.ISmooksDataCreationAddtionWizard;
import org.jboss.tools.smooks.ui.wizards.TransformSelectWizardNode;
+import org.jboss.tools.smooks.xml2java.analyzer.XML2JavaAnalyzer;
/**
* @author Dart Peng<br>
@@ -65,13 +63,21 @@
private Object targetTreeViewerInputContents;
protected CheckboxTableViewer source;
+
protected CheckboxTableViewer target;
+
private List sourceList;
+
private String sourceID = null;
+
private String targetID = null;
+
private String oldSourceID = null;
+
private String oldTargetID = null;
+
private IStructuredSelection selection;
+
private boolean showDataSelectPage = false;
private Hyperlink sourceDataLink;
@@ -105,8 +111,10 @@
public TypeIDSelectionWizardPage(String pageName, boolean showDataSelectPage) {
super(pageName);
this.showDataSelectPage = showDataSelectPage;
- setTitle(Messages.getString("TypeIDSelectionWizardPage.TypeIDSelectionWizardPageTitle")); //$NON-NLS-1$
- setDescription(Messages.getString("TypeIDSelectionWizardPage.TypeIDSelectionWizardPageDescription")); //$NON-NLS-1$
+ setTitle(Messages
+ .getString("TypeIDSelectionWizardPage.TypeIDSelectionWizardPageTitle")); //$NON-NLS-1$
+ setDescription(Messages
+ .getString("TypeIDSelectionWizardPage.TypeIDSelectionWizardPageDescription")); //$NON-NLS-1$
}
@Override
@@ -181,8 +189,8 @@
}
}
}
- sourceDataCreationWizard = sourceWizard;
- targetDataCreationWizard = targetWizard;
+ sourceDataCreationWizard = sourceWizard;
+ targetDataCreationWizard = targetWizard;
}
private boolean wizardIsCreated(IWizard wizard) {
@@ -193,87 +201,127 @@
}
return true;
}
+
+ private void updateWizardPageStates(){
+
+ }
/*
* (non-Javadoc)
*
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+ * @see
+ * org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets
+ * .Composite)
*/
public void createControl(Composite parent) {
Composite mainComposite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.makeColumnsEqualWidth = true;
- mainComposite.setLayout(gl);
- sourceList = AnalyzerFactory.getInstance().getRegistrySourceIDList();
- Label sl = new Label(mainComposite, SWT.NONE);
- sl.setText(Messages.getString("TypeIDSelectionWizardPage.SourceTypeIDTitle")); //$NON-NLS-1$
-
- Label tl = new Label(mainComposite, SWT.NONE);
- tl.setText(Messages.getString("TypeIDSelectionWizardPage.TargetTypeIDTitle")); //$NON-NLS-1$
- Composite sourceBorder = new Composite(mainComposite,SWT.NONE);
- sourceBorder.setBackground(ColorConstants.black);
- FillLayout sbLayout = new FillLayout();
- sbLayout.marginHeight = 1;
- sbLayout.marginWidth = 1;
- sourceBorder.setLayout(sbLayout);
- source = createTableViewer(sourceBorder);
- GridData gd = new GridData(GridData.FILL_BOTH);
- sourceBorder.setLayoutData(gd);
+ // MODIFY by Dart 2008.12.19
+ mainComposite.setLayout(new GridLayout());
-
- Composite targetBorder = new Composite(mainComposite,SWT.NONE);
- targetBorder.setBackground(ColorConstants.black);
- FillLayout tbLayout = new FillLayout();
- tbLayout.marginHeight = 1;
- tbLayout.marginWidth = 1;
- targetBorder.setLayout(tbLayout);
- target = createTableViewer(targetBorder);
- targetBorder.setLayoutData(gd);
+ Button j2jButton = new Button(mainComposite,SWT.RADIO);
+ j2jButton.setText("Java-to-Java");
+ j2jButton.addSelectionListener(new SelectionAdapter(){
- source.setInput(sourceList);
- target.setInput(sourceList);
- initViewer();
-
- sourceDataLink = new Hyperlink(mainComposite, SWT.NONE);
- sourceDataLink.setText("Source Model Select:Empty"); //$NON-NLS-1$
- sourceDataLink.addHyperlinkListener(new IHyperlinkListener() {
-
- public void linkActivated(HyperlinkEvent e) {
- openSourceWizard();
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ setPageComplete(true);
+ setSourceID("org.jboss.tools.smooks.ui.viewerInitor.javabean");
+ setTargetID("org.jboss.tools.smooks.ui.viewerInitor.javabean");
+ getContainer().updateButtons();
}
-
- public void linkEntered(HyperlinkEvent e) {
-
- }
-
- public void linkExited(HyperlinkEvent e) {
-
- }
-
+
});
- // TODO don't show this
- sourceDataLink.setVisible(false);
- targetDataLink = new Hyperlink(mainComposite, SWT.NONE);
- targetDataLink.setText("Target Model Select:Empty"); //$NON-NLS-1$
- targetDataLink.addHyperlinkListener(new IHyperlinkListener() {
+
+ Button x2jButton = new Button(mainComposite,SWT.RADIO);
+ x2jButton.setText("XML-to-Java");
+ x2jButton.addSelectionListener(new SelectionAdapter(){
- public void linkActivated(HyperlinkEvent e) {
- openTargetWizard();
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ setPageComplete(true);
+ setSourceID("org.jboss.tools.smooks.xml.viewerInitor.xml");
+ setTargetID("org.jboss.tools.smooks.ui.viewerInitor.javabean");
+ getContainer().updateButtons();
}
-
- public void linkEntered(HyperlinkEvent e) {
-
- }
-
- public void linkExited(HyperlinkEvent e) {
-
- }
-
+
});
- // TODO don't show this
- targetDataLink.setVisible(false);
+ setPageComplete(false);
+
+// GridLayout gl = new GridLayout();
+// gl.numColumns = 2;
+// gl.makeColumnsEqualWidth = true;
+// mainComposite.setLayout(gl);
+// sourceList = AnalyzerFactory.getInstance().getRegistrySourceIDList();
+// Label sl = new Label(mainComposite, SWT.NONE);
+// sl.setText(Messages
+// .getString("TypeIDSelectionWizardPage.SourceTypeIDTitle")); //$NON-NLS-1$
+//
+// Label tl = new Label(mainComposite, SWT.NONE);
+// tl.setText(Messages
+// .getString("TypeIDSelectionWizardPage.TargetTypeIDTitle")); //$NON-NLS-1$
+//
+// Composite sourceBorder = new Composite(mainComposite, SWT.NONE);
+// sourceBorder.setBackground(ColorConstants.black);
+// FillLayout sbLayout = new FillLayout();
+// sbLayout.marginHeight = 1;
+// sbLayout.marginWidth = 1;
+// sourceBorder.setLayout(sbLayout);
+// source = createTableViewer(sourceBorder);
+// GridData gd = new GridData(GridData.FILL_BOTH);
+// sourceBorder.setLayoutData(gd);
+//
+// Composite targetBorder = new Composite(mainComposite, SWT.NONE);
+// targetBorder.setBackground(ColorConstants.black);
+// FillLayout tbLayout = new FillLayout();
+// tbLayout.marginHeight = 1;
+// tbLayout.marginWidth = 1;
+// targetBorder.setLayout(tbLayout);
+// target = createTableViewer(targetBorder);
+// targetBorder.setLayoutData(gd);
+//
+// source.setInput(sourceList);
+// target.setInput(sourceList);
+// initViewer();
+//
+// sourceDataLink = new Hyperlink(mainComposite, SWT.NONE);
+// sourceDataLink.setText("Source Model Select:Empty"); //$NON-NLS-1$
+// sourceDataLink.addHyperlinkListener(new IHyperlinkListener() {
+//
+// public void linkActivated(HyperlinkEvent e) {
+// openSourceWizard();
+// }
+//
+// public void linkEntered(HyperlinkEvent e) {
+//
+// }
+//
+// public void linkExited(HyperlinkEvent e) {
+//
+// }
+//
+// });
+// // TODO don't show this
+// sourceDataLink.setVisible(false);
+// targetDataLink = new Hyperlink(mainComposite, SWT.NONE);
+// targetDataLink.setText("Target Model Select:Empty"); //$NON-NLS-1$
+// targetDataLink.addHyperlinkListener(new IHyperlinkListener() {
+//
+// public void linkActivated(HyperlinkEvent e) {
+// openTargetWizard();
+// }
+//
+// public void linkEntered(HyperlinkEvent e) {
+//
+// }
+//
+// public void linkExited(HyperlinkEvent e) {
+//
+// }
+//
+// });
+// // TODO don't show this
+// targetDataLink.setVisible(false);
this.setControl(mainComposite);
}
@@ -308,8 +356,11 @@
.getTreeViewerInputContents();
}
} else {
- MessageDialog.openInformation(getShell(), "Info", //$NON-NLS-1$
- Messages.getString("TypeIDSelectionWizardPage.WarningMessage")); //$NON-NLS-1$
+ MessageDialog
+ .openInformation(getShell(),
+ "Info", //$NON-NLS-1$
+ Messages
+ .getString("TypeIDSelectionWizardPage.WarningMessage")); //$NON-NLS-1$
}
return null;
@@ -317,11 +368,12 @@
protected void openSourceWizard() {
sourceTreeViewerInputContents = getReturnObjectFromWizard(getSourceID());
-// resetLinkText();
+ // resetLinkText();
}
-/**
- * @deprecated
- */
+
+ /**
+ * @deprecated
+ */
private void resetLinkText() {
// if (sourceTreeViewerInputContents != null) {
// sourceDataLink.setText("Source Model Select");
@@ -428,7 +480,8 @@
});
TableColumn nameColumn = new TableColumn(viewer.getTable(), SWT.NONE);
nameColumn.setWidth(250);
- nameColumn.setText(Messages.getString("TypeIDSelectionWizardPage.NameColumn")); //$NON-NLS-1$
+ nameColumn.setText(Messages
+ .getString("TypeIDSelectionWizardPage.NameColumn")); //$NON-NLS-1$
viewer.setContentProvider(new TypeIDContentProvider());
viewer.setLabelProvider(new TypeIDLabelProvider());
return viewer;
@@ -474,7 +527,6 @@
}
-
public Object getSourceTreeViewerInputContents() {
return sourceTreeViewerInputContents;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-12-19 07:57:47 UTC (rev 12701)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-12-19 08:51:30 UTC (rev 12702)
@@ -33,14 +33,10 @@
import org.jboss.tools.smooks.ui.editors.TypeIDSelectionWizardPage;
/**
- * This is a sample new wizard. Its role is to create a new file resource in the
- * provided container. If the container resource (a folder or a project) is
- * selected in the workspace when the wizard is opened, it will accept it as the
- * target container. The wizard creates one file with the extension "smooks". If
- * a sample multi-page editor (also available as a template) is registered for
- * the same extension, it will be able to open it.
+ *
+ * @author Dart
+ *
*/
-
public class SmooksConfigFileNewWizard extends Wizard implements INewWizard,
ISmooksDataCreationAddtionWizard {
public static final String PRO_SOURCE_DATA_PATH = "sourceDataPath"; //$NON-NLS-1$
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java 2008-12-19 07:57:47 UTC (rev 12701)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java 2008-12-19 08:51:30 UTC (rev 12702)
@@ -1,5 +1,10 @@
package org.jboss.tools.smooks.ui.wizards;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
@@ -32,9 +37,23 @@
} else {
error = Messages.getString("SmooksConfigFileNewWizardPage.NewConfigFileWizardPageErrorMessage1"); //$NON-NLS-1$
}
- if (error != null) {
- this.setErrorMessage(error);
+ IPath containerPath = this.getContainerFullPath();
+ IResource container = ResourcesPlugin.getWorkspace().getRoot().findMember(containerPath);
+ IProject project = container.getProject();
+ boolean isJavaProject = false;
+ if(project != null){
+ try{
+ if(project.hasNature(JavaCore.NATURE_ID)){
+ isJavaProject = true;
+ }
+ }catch(Exception e){
+
+ }
}
+ if(!isJavaProject){
+ error = "Please select a folder of Java projects.";
+ }
+ this.setErrorMessage(error);
return (error == null);
}
}
\ No newline at end of file
17 years
- 1
- 0
JBoss Tools SVN: r12701 - in trunk/jbpm/plugins/org.jboss.tools.jbpm.convert: src/org/jboss/tools/jbpm/convert/b2j/messages and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-12-19 02:57:47 -0500 (Fri, 19 Dec 2008)
New Revision: 12701
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/.project
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2JMessages.java
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java
Log:
JBIDE-3364: BPMN -> jPDL wizard hangs on certain input
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/.project
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/.project 2008-12-19 05:50:08 UTC (rev 12700)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/.project 2008-12-19 07:57:47 UTC (rev 12701)
@@ -1,28 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.jbpm.convert</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>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.jbpm.convert</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>
+ <buildCommand>
+ <name>org.eclipse.stp.bpmn.validation.BatchValidationBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.stp.bpmn.validation.BatchValidationBuildAbleNature</nature>
+ </natures>
+</projectDescription>
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties 2008-12-19 05:50:08 UTC (rev 12700)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2J.properties 2008-12-19 07:57:47 UTC (rev 12701)
@@ -24,6 +24,8 @@
Bpmn_FlowSource_Attribute_Name=source
Bpmn_FlowTarget_Attribute_Name=target
Bpmn_FlowDefault_Attribute_Name=isDefault
+Bpmn_FlowOutgoings_Attribute_Name=outgoingEdges
+Bpmn_FlowIncomings_Attribute_Name=incomingEdges
Bpmn_Element_ID=iD
Bpmn_Wizard_Title=BPMN to jPDL Conversion
Bpmn_File_Choose_WizardPage_Name=FileChoosePage
@@ -70,10 +72,10 @@
Gpd_Process_Diagram_Name=process-diagram
Gpd_Label_Element_Name=label
Translate_Error_GpdFile_CanNotGenerate=Errror: Couldn't write gpd.xml:
-Translate_Error_GpdFile_CanNotWrite=Errror: Couldn't write gpd definition to a gpd.xml:
+Translate_Error_GpdFile_CanNotWrite=Errror\: Couldn't write gpd definition to a gpd.xml\:
Translate_Error_JpdlProcess_Definition_Null=Errror: The JPDL process definition is null.
-Translate_Error_JpdlFile_CanNotGenerate=Errror: Couldn't write process definition xml:
-Translate_Error_JpdlFile_CanNotWrite=Errror: Couldn't write process definition to a jpdl file:
-Translate_Error_File_CanNotRead=Error: Couldn't read or parse {0} file to a DOM document:
+Translate_Error_JpdlFile_CanNotGenerate=Errror\: Couldn't write process definition xml\:
+Translate_Error_JpdlFile_CanNotWrite=Errror\: Couldn't write process definition to a jpdl file\:
+Translate_Error_File_CanNotRead=Error\: Couldn't read or parse {0} file to a DOM document\:
Translate_Warning_Bpmn_Element_Name=Warning: The bpmn element's name is null or same to another element's name:
-Translate_Warning_Bpmn_Element_Type=Warning: The type of this bpmn element is not translated to corresponding jpdl element:
\ No newline at end of file
+Translate_Warning_Bpmn_Element_Type=Warning\: The type of this bpmn element is not translated to corresponding jpdl element\:
\ No newline at end of file
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2JMessages.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2JMessages.java 2008-12-19 05:50:08 UTC (rev 12700)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/messages/B2JMessages.java 2008-12-19 07:57:47 UTC (rev 12701)
@@ -50,6 +50,8 @@
public static String Bpmn_FlowSource_Attribute_Name;
public static String Bpmn_FlowTarget_Attribute_Name;
public static String Bpmn_FlowDefault_Attribute_Name;
+ public static String Bpmn_FlowOutgoings_Attribute_Name;
+ public static String Bpmn_FlowIncomings_Attribute_Name;
public static String Bpmn_Wizard_Title;
public static String Bpmn_File_Choose_WizardPage_Name;
public static String Bpmn_File_Choose_WizardPage_Title;
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java 2008-12-19 05:50:08 UTC (rev 12700)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/src/org/jboss/tools/jbpm/convert/b2j/translate/BPMN2JPDL.java 2008-12-19 07:57:47 UTC (rev 12701)
@@ -28,13 +28,19 @@
/**
* @author Grid Qian
*
- * this is a translator for bpmn ->jpdl
+ * this is a translator for bpmn -> jpdl
*/
public class BPMN2JPDL extends BPMNTranslator {
private Document bpmnDocument;
private List<Document> processDefs = new ArrayList<Document>();
+
+ // map: bpmn element's(activity) id to jpdl element
private Map<String, Element> map = new HashMap<String, Element>();
+ // map: bpmn outgoingEdges element's(sequenceEdges) id to bpmn element's(activity) id
+ private Map<String, String> sourceMap = new HashMap<String, String>();
+ // map: bpmn incomingEdges element's(sequenceEdges) id to bpmn element's(activity) id
+ private Map<String, String> targetMap = new HashMap<String, String>();
public BPMN2JPDL() {
}
@@ -150,7 +156,8 @@
for (Object activity : graph.elements()) {
if (B2JMessages.Bpmn_Vertice_Element_Name
.equals(((Element) activity).getName())) {
- translateActivity(((Element) activity), processRoot);
+ translateActivity((Element) activity, processRoot);
+ getSequenceFlowInfo((Element)activity);
}
}
translateSequenceFlows(graph, processRoot);
@@ -160,6 +167,29 @@
}
/*
+ * get Incomingedges and Outgoingedges Map from the activity element
+ */
+ private void getSequenceFlowInfo(Element activity) {
+ String id = activity.attributeValue(B2JMessages.Dom_Element_ID);
+ String ins = activity.attributeValue(B2JMessages.Bpmn_FlowIncomings_Attribute_Name);
+ String outs = activity.attributeValue(B2JMessages.Bpmn_FlowOutgoings_Attribute_Name);
+ String[] inArray = null;
+ String[] outArray = null;
+ if(ins != null){
+ inArray = ins.split(" ");
+ for(String in : inArray){
+ targetMap.put(in, id);
+ }
+ }
+ if(outs != null){
+ outArray = outs.split(" ");
+ for(String out : outArray){
+ sourceMap.put(out, id);
+ }
+ }
+ }
+
+ /*
* Translate a bpmn activity to a jpdl node according to activity type
*/
private void translateActivity(Element activity, Element processRoot) {
@@ -380,8 +410,7 @@
*/
private void translateSequenceFlow(Element edge, Element processRoot) {
- Element source = map.get(edge
- .attributeValue(B2JMessages.Bpmn_FlowSource_Attribute_Name));
+ Element source = map.get(sourceMap.get(edge.attributeValue(B2JMessages.Dom_Element_ID)));
Element transition = null;
if ("true".equals(edge
@@ -399,7 +428,7 @@
warnings.add(B2JMessages.Translate_Warning_Bpmn_Element_Name
+ edge.attributeValue(B2JMessages.Bpmn_Element_ID));
}
- transition.addAttribute(B2JMessages.To,map.get(edge.attributeValue(B2JMessages.Bpmn_FlowTarget_Attribute_Name)).attributeValue(B2JMessages.Dom_Element_Name));
+ transition.addAttribute(B2JMessages.To,map.get(targetMap.get(edge.attributeValue(B2JMessages.Dom_Element_ID))).attributeValue(B2JMessages.Dom_Element_Name));
}
/*
17 years
- 1
- 0