August 2008 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r9801 - tags/jbosstools-3.0.0.Alpha1.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-08-19 15:57:00 -0400 (Tue, 19 Aug 2008) New Revision: 9801 Added: tags/jbosstools-3.0.0.Alpha1/struts/ Log: reatg for struts component Copied: tags/jbosstools-3.0.0.Alpha1/struts (from rev 9800, trunk/struts)

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9800 - tags/jbosstools-3.0.0.Alpha1.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-08-19 15:55:50 -0400 (Tue, 19 Aug 2008) New Revision: 9800 Removed: tags/jbosstools-3.0.0.Alpha1/struts/ Log: deleted due to reatg

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9799 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2008-08-19 12:06:01 -0400 (Tue, 19 Aug 2008) New Revision: 9799 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java Log: https://jira.jboss.org/jira/browse/JBIDE-2525 Fixed Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-08-19 14:01:07 UTC (rev 9798) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-08-19 16:06:01 UTC (rev 9799) @@ -28,8 +28,10 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Shell; +import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -99,6 +101,17 @@ synchSeamActionModels(); } }, IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED); + getFacetedProjectWorkingCopy().addListener(new IFacetedProjectListener() { + public void handleEvent(IFacetedProjectEvent event) { + Set<Action> actions = getFacetedProjectWorkingCopy().getProjectFacetActions(); + for (Action action : actions) { + if(ISeamFacetDataModelProperties.SEAM_FACET_ID.equals(action.getProjectFacetVersion().getProjectFacet().getId())) { + IDataModel seamFacetModel = (IDataModel)action.getConfig(); + seamFacetModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)); + } + } + } + }, IFacetedProjectEvent.Type.PROJECT_NAME_CHANGED); Control control = findGroupByText(getShell(), SeamUIMessages.SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP); if (control != null) control.setVisible(false); @@ -121,9 +134,13 @@ } model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME, targetRuntimeName); } - DataModelSynchHelper synchHelper = firstPage.initializeSynchHelper(model); - synchHelper.synchCombo(matchedServerTargetCombo, ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, dependentServerControls); - synchHelper.synchCombo(serverRuntimeTargetCombo, ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME, null); + final DataModelSynchHelper synchHelper = firstPage.initializeSynchHelper(model); + Display.getDefault().syncExec(new Runnable() { + public void run() { + synchHelper.synchCombo(matchedServerTargetCombo, ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, dependentServerControls); + synchHelper.synchCombo(serverRuntimeTargetCombo, ISeamFacetDataModelProperties.JBOSS_AS_TARGET_RUNTIME, null); + } + }); } } }

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9798 - in trunk/documentation/whatsnew: as and 11 other directories.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2008-08-19 10:01:07 -0400 (Tue, 19 Aug 2008) New Revision: 9798 Added: trunk/documentation/whatsnew/as/as-news-1.1.0.Alpha1.html trunk/documentation/whatsnew/as/as-news-2.0.0.Alpha1.html trunk/documentation/whatsnew/birt/ trunk/documentation/whatsnew/birt/birt-news-1.0.0.alpha1.html trunk/documentation/whatsnew/birt/images/ trunk/documentation/whatsnew/birt/images/HbDataSet.png trunk/documentation/whatsnew/birt/images/HbDataSource1.png trunk/documentation/whatsnew/birt/images/HbDataSource2.png trunk/documentation/whatsnew/birt/images/birttag1.png trunk/documentation/whatsnew/core/ trunk/documentation/whatsnew/core/core-news-3.0.0.Alpha1.html trunk/documentation/whatsnew/hibernate/hibernate-news-3.2.4.Alpha1.html trunk/documentation/whatsnew/images/daligenentities.png trunk/documentation/whatsnew/images/dalihibernateplatform.png trunk/documentation/whatsnew/images/jbossws_facet.png trunk/documentation/whatsnew/images/jpatoolsmenu.png trunk/documentation/whatsnew/images/pagesxml_graphicaloutline.png trunk/documentation/whatsnew/images/pagesxml_structuraloutline.png trunk/documentation/whatsnew/images/pagesxmleditor.png trunk/documentation/whatsnew/images/serverpreferences.png trunk/documentation/whatsnew/images/structured_pagesxmleditor.png trunk/documentation/whatsnew/images/webservice_client_wizard.png trunk/documentation/whatsnew/portlet/ trunk/documentation/whatsnew/portlet/images/ trunk/documentation/whatsnew/portlet/images/portletnews1.png trunk/documentation/whatsnew/portlet/images/portletnews2.png trunk/documentation/whatsnew/portlet/images/portletnews3.png trunk/documentation/whatsnew/portlet/images/portletnews4.png trunk/documentation/whatsnew/portlet/images/portletnews5.png trunk/documentation/whatsnew/portlet/images/portletnews6.png trunk/documentation/whatsnew/portlet/images/portletnews7.png trunk/documentation/whatsnew/portlet/images/portletnews8.png trunk/documentation/whatsnew/portlet/images/portletnews9.png trunk/documentation/whatsnew/portlet/portlet-news-1.0.0.alpha1.html trunk/documentation/whatsnew/seam/seam-news-2.0.0.Alpha1.html trunk/documentation/whatsnew/vpe/images/css-dialog-calling.png trunk/documentation/whatsnew/vpe/images/css-editor-dialog.png trunk/documentation/whatsnew/vpe/images/el-configuration.png trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.Alpha1.html trunk/documentation/whatsnew/ws/ trunk/documentation/whatsnew/ws/ws-news-1.0.0.alpha1.html Modified: trunk/documentation/whatsnew/index.html Log: new and noteworthy for 3.alpha Added: trunk/documentation/whatsnew/as/as-news-1.1.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/as/as-news-1.1.0.Alpha1.html (rev 0) +++ trunk/documentation/whatsnew/as/as-news-1.1.0.Alpha1.html 2008-08-19 14:01:07 UTC (rev 9798) @@ -0,0 +1,56 @@ +<html> + +<head> +<link rel="stylesheet" href="../whatsnew.css"> +<title>JBoss AS Tools 2.1.0.Alpha1 News</title> +</head> + +<body> + +<h1>JBoss AS Tools 2.1.0.Alpha1 - New and Noteworthy</h1> + +<p align="right"><a href="../index.html">< Main Index</a> <a href="../seam/seam-news-1.1.0.beta1.html">Seam Tools News ></a></p> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr> + <h3>General</h3> + <hr> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p align="right"><b>XML Catalog</b></td> + <td valign="top"> + <p>We added in a range of JBoss related DTD's and Schema's into Eclipse's XML Catalog.</p> +<p>For example: JBoss JCA Config, MBean service, JBoss Web Service reference and jaxws-config.</p> +<p>This makes the xml validation and code completion available without extra setup or need for being online.</p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr> + <h3>Servers</h3> + <hr> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p align="right"><b>Port preferences</b></td> + <td valign="top"> + <p>Our server adapter by default tries to automatically detect the ports it needs for integrating with a JBoss server.</p> + <p>Sometimes it can though be relevant to override this automatic detection if a user is using some custom configuration. These port settings are now configurable on the Server in the Server Editor.</p> + <p><img src="../images/serverpreferences.png"/></p> + + <p>Other server settings like Timeouts and Server polling have also been moved to the server editor from the seperate preference page in Eclipse preferences.</p> + </td> + </tr> + +</table> + +</body> + +</html> + + Added: trunk/documentation/whatsnew/as/as-news-2.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/as/as-news-2.0.0.Alpha1.html (rev 0) +++ trunk/documentation/whatsnew/as/as-news-2.0.0.Alpha1.html 2008-08-19 14:01:07 UTC (rev 9798) @@ -0,0 +1,56 @@ +<html> + +<head> +<link rel="stylesheet" href="../whatsnew.css"> +<title>JBoss AS Tools 2.0.0.Alpha1 News</title> +</head> + +<body> + +<h1>JBoss AS Tools 2.0.0.Alpha1 - New and Noteworthy</h1> + +<p align="right"><a href="../index.html">< Main Index</a> <a href="../seam/seam-news-1.1.0.beta1.html">Seam Tools News ></a></p> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr> + <h3>General</h3> + <hr> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p align="right"><b>XML Catalog</b></td> + <td valign="top"> + <p>We added in a range of JBoss related DTD's and Schema's into Eclipse's XML Catalog.</p> +<p>For example: JBoss JCA Config, MBean service, JBoss Web Service reference and jaxws-config.</p> +<p>This makes the xml validation and code completion available without extra setup or need for being online.</p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr> + <h3>Servers</h3> + <hr> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p align="right"><b>Port preferences</b></td> + <td valign="top"> + <p>Our server adapter by default tries to automatically detect the ports it needs for integrating with a JBoss server.</p> + <p>Sometimes it can though be relevant to override this automatic detection if a user is using some custom configuration. These port settings are now configurable on the Server in the Server Editor.</p> + <p><img src="../images/serverpreferences.png"/></p> + + <p>Other server settings like Timeouts and Server polling have also been moved to the server editor from the seperate preference page in Eclipse preferences.</p> + </td> + </tr> + +</table> + +</body> + +</html> + + Added: trunk/documentation/whatsnew/birt/birt-news-1.0.0.alpha1.html =================================================================== --- trunk/documentation/whatsnew/birt/birt-news-1.0.0.alpha1.html (rev 0) +++ trunk/documentation/whatsnew/birt/birt-news-1.0.0.alpha1.html 2008-08-19 14:01:07 UTC (rev 9798) @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>JBoss BIRT Integration</title> +</head> +<body> +<h1>JBoss BIRT Integration 3.0.0.alpha1 - New and Noteworthy</h1> +<p>Last revised August 8, 2008</p> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr/> + <h3>JBoss BIRT Integration</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p><b>Hibernate Data Source</b></p> + </td> + <td valign="top"> + <p> + The Hibernate Data Source enables a user to specify a Hibernate Configuration or JNDI URL. + </p> + <p> + <img src="images/HbDataSource1.png" alt="The Hibernate Data Source" /> + </p> + <p> + <img src="images/HbDataSource2.png" alt="The Hibernate Data Source" /> + </p> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p><b>Hibernate Data Set</b></p> + </td> + <td valign="top"> + <p> + When the Hibernate Data Source is set up, the user can create a Hibernate Data Set + using a HQL query in the way in which the JDBC driver creates a SQL query. + </p> + <p><img src="images/HbDataSet.png" alt="The Hibernate Data Set" /></p> + + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p><b>Integration with Seam</b></p> + </td> + <td width="70%" valign="top"> + <p> + The JBoss BIRT Integration feature contains the "birt" tag that allows the user to add a BIRT report to an .xhtml file. + </p> + + <p><img src="images/birttag1.png" alt="JBoss Test Report" /> </p> + + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p><b>Deployment</b></p> + </td> + <td valign="top"> + <p> + A Seam project that includes the BIRT facet can be deployed as any project. + If you define the Hibernate ODA driver, the JBoss BIRT engine will use JNDI URL + that has to be bind to either Hibernate Session Factory or Hibernate Entity Manager Factory. + </p> + +<p>Any Seam project with the BIRT facet that +uses the Hibernate ODA driver has to bind a Hibernate session factory +or an Hibernate entity manager factory. It doesn't matter which of +these two factories the user binds because the Hibernate ODA driver +will recognize the type of the object.</p> + +<p> +When creating a Seam EAR project, Hibernate Entity Manager Factory is +bound to java:/{projectName}EntityManagerFactory. All the user needs +to do is using the Hibernate Configuration created automatically. The +user can use default values for the Hibernate Configuration and JNDI +URL within the BIRT Hibernate Data Source.</p> + +<p> +When using a Seam WAR project, neither HSF nor HEMF aren't binded to JNDI by default. +The user has to do this manually. +For instance, +HSF can be bound to JNDI adding the following property to the persistence.xml file:</p> + +<code><property name="hibernate.session_factory_name" value="java:/projectname"/></code> + +<p>the user can use 'java:/projectname' as the JNDI URL property when creating a BIRT Hibernate Data Source.</p> + + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + +<tr> + <td valign="top" align="left"> + </td> + <td valign="top"> <p> + For more details, see <a href="https://jira.jboss.org/jira/browse/JBIDE-2220">JBIDE-2220</a>. + </p> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + + +</table> + +</body> + +</html> + + Added: trunk/documentation/whatsnew/birt/images/HbDataSet.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/birt/images/HbDataSet.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/birt/images/HbDataSource1.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/birt/images/HbDataSource1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/birt/images/HbDataSource2.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/birt/images/HbDataSource2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/birt/images/birttag1.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/birt/images/birttag1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/core/core-news-3.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/core/core-news-3.0.0.Alpha1.html (rev 0) +++ trunk/documentation/whatsnew/core/core-news-3.0.0.Alpha1.html 2008-08-19 14:01:07 UTC (rev 9798) @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>Core 3.0.0.Alpha1 What's New</title> +</head> +<body> +<h1>Core 3.0.0.Alpha1 What's New</h1> + +<p align="right"><a href="../index.html">< Main Index</a> <a href="../vpe/vpe-news-2.1.0.CR1.html">Visual Page Editor News ></a></p> + + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr/> + <h3>General</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="right"> + <a name="itemnam2e" id="itemname2"></a><b>Ganymede Support</b> + </td> + <td width="70%" valign="top"> + <p>All plugins were migrated to Eclipse 3.4/WebTools 3.0 and their dependencies, making 3.0.0.alpha runnable on Ganymede.</p> + <p>This also means that 3.0.0.alpha is not supported on Eclipse 3.3.x/WebTools 2.x aka Europa becuase of API changes in Eclipse API's.</p> + </tr> + <tr> + <td colspan="2"> + <hr/> + <h3>Project Archives</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="right"> + <a name="itemname3" id="itemname3"></a><b>Relative paths</b> + </td> + <td valign="top"> + +<p>The Project Archives view is now implemented with the + "Common Navigator" API which allow us to have a more customizable + archive view, but also makes "Project Archives" node available in + Project Explorer for even easier access.</p> + + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="right"> + <a name="itemname3" id="itemname3"></a><b>Variable support</b> + </td> + <td valign="top"> + +<p>Archives can now use Eclipse variables to specify destination paths.</p> + + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="right"> + <a name="itemname3" id="itemname3"></a><b>Common Navigator Views</b> + </td> + <td valign="top"> + +<p>The Archives view is now implemented with the + "Common Navigator" API which allow us to have a more customizable + archive view, but also makes "Project Archives" node available in + Project Explorer for even easier access.</p> + + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + + +</table> + +</body> + +</html> + + Added: trunk/documentation/whatsnew/hibernate/hibernate-news-3.2.4.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/hibernate/hibernate-news-3.2.4.Alpha1.html (rev 0) +++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.2.4.Alpha1.html 2008-08-19 14:01:07 UTC (rev 9798) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>Hibernate tools 3.2.4.Alpha1 What's New</title> +</head> +<body> +<h1>Hibernate tools 3.2.4.Beta1 What's New</h1> + +<p align="right"><a href="../index.html">< Main Index</a> <a href="../vpe/vpe-news-2.1.0.beta1.html">Visual Page Editor News ></a></p> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr/> + <h3>Dali integration</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Dali support</b></td> + <td valign="top"> + <p>We added support for Hibernate to the Dali plugins provided by Eclipse WTP.</p> + <p>This makes Hibernate available as a target platform for JPA projects.</p> + + <p><img src="../images/dalihibernateplatform.png"/></p> + + <p>Currently the Dali support just entails enabling "Generate DDL" + and "Generate entities" from the JPA menu.</p> + + <p><img src="../images/jpatoolsmenu.png"/></p> + <p>Going forward more features will be added to support Hibernate + specific JPA features in Dali.</p> + + <p><img src="../images/daligenentities.png"/></p> + + <p>Note: Currently the JPA wizards requires you to have a Hibernate Console configuration already configured. That will not be required in an upcoming release.</p> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + +</table> + +</body> + +</html> + + Added: trunk/documentation/whatsnew/images/daligenentities.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/daligenentities.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/dalihibernateplatform.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/dalihibernateplatform.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/jbossws_facet.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/jbossws_facet.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/jpatoolsmenu.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/jpatoolsmenu.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/pagesxml_graphicaloutline.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/pagesxml_graphicaloutline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/pagesxml_structuraloutline.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/pagesxml_structuraloutline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/pagesxmleditor.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/pagesxmleditor.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/serverpreferences.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/serverpreferences.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/structured_pagesxmleditor.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/structured_pagesxmleditor.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/webservice_client_wizard.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/webservice_client_wizard.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/documentation/whatsnew/index.html =================================================================== --- trunk/documentation/whatsnew/index.html 2008-08-19 14:00:46 UTC (rev 9797) +++ trunk/documentation/whatsnew/index.html 2008-08-19 14:01:07 UTC (rev 9798) @@ -21,6 +21,23 @@ </tr> <tr> <td valign="top" align="left"> + <p align="right"><b>3.0.0.Alpha1</b> + <td valign="top"> + <p><a href="core/core-news-3.0.0.alpha1.html">Core/General</a></p> + <p><a href="seam/seam-news-2.0.0.Alpha1.html">Seam Tools</a></p> + <p><a href="hibernate/hibernate-news-3.2.4.Alpha1.html">Hibernate Tools</a></p> + <p><a href="as/as-news-2.0.0.Alpha1.html">JBoss AS Tools</a></p> + <p><a href="portlet/portlet-news-1.0.0.alpha1.html">Portal Tools</a></p> + + <p><a href="ws/ws-news-1.0.0.alpha1.html">Web Services</a></p> + <p><a href="birt/birt-news-1.0.0.alpha1.html">Birt Tools</a></p> + + <p><a href="vpe/vpe-news-3.0.0.Alpha1.html">Visual Page Editor</a></p> + + </td> + </tr> + <tr> + <td valign="top" align="left"> <p align="right"><b>2.1.0.GA</b> <td valign="top"><p>Bugfixes, no new major features</p></td> </td> Added: trunk/documentation/whatsnew/portlet/images/portletnews1.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/portlet/images/portletnews1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/portlet/images/portletnews2.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/portlet/images/portletnews2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/portlet/images/portletnews3.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/portlet/images/portletnews3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/portlet/images/portletnews4.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/portlet/images/portletnews4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/portlet/images/portletnews5.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/portlet/images/portletnews5.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/portlet/images/portletnews6.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/portlet/images/portletnews6.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/portlet/images/portletnews7.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/portlet/images/portletnews7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/portlet/images/portletnews8.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/portlet/images/portletnews8.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/portlet/images/portletnews9.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/portlet/images/portletnews9.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/portlet/portlet-news-1.0.0.alpha1.html =================================================================== --- trunk/documentation/whatsnew/portlet/portlet-news-1.0.0.alpha1.html (rev 0) +++ trunk/documentation/whatsnew/portlet/portlet-news-1.0.0.alpha1.html 2008-08-19 14:01:07 UTC (rev 9798) @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>JBoss Tools Portlet</title> +</head> +<body> +<h1>JBoss Tools Portlet 3.0.0.alpha1 - New and Noteworthy</h1> +<p>Last revised August 10, 2008</p> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr/> + <h3>JBoss Tools Portlet</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p><b>JBoss Portlet Support</b></p> + </td> + <td valign="top"> + <p> + The JBoss Portlet feature is available as part of JBoss Tools 3.0.0. + JBoss Tools supports the <a href="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification (Portlet 1.0)</a>, + <a href="http://www.jcp.org/en/jsr/detail?id=286">JSR-286 + Portlet Specification (Portlet 2.0)</a> and works + with <a href="http://www.jboss.org/portletbridge/">PortletBridge</a> + for supporting Portlets in JSF/Seam applications. To + enable these features, you need to add the JBoss Portlet + facet to a new or an existing web project. + </p> + + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p><b>JBoss Portlet facet</b></p> + </td> + <td valign="top"> + <p> + The JBoss Portlet feature provides the Java, JSF and Seam Portlet facets.</p> + <p><img src="images/portletnews1.png" alt="The JBoss Portlet Facet" /></p> + + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p><b>Java Portlet</b></p> + </td> + <td width="70%" valign="top"> + <p> + This wizard enables creating a JSR-186/JSR-286 compliant portlet. </p> + <p><img src="images/portletnews2.png" alt="The JBoss Portlet Wizard" /></p> + <p><img src="images/portletnews3.png" alt="The JBoss Portlet Wizard" /></p> + <p><img src="images/portletnews4.png" alt="The JBoss Portlet Wizard" /></p> + <p><img src="images/portletnews5.png" alt="The JBoss Portlet Wizard" /></p> + <p> + You can optionally configure JBoss portal specific deployment descriptors.</p> + <p><img src="images/portletnews6.png" alt="The JBoss Portlet Wizard" /></p> + + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p><b>JSF/Seam Portlet</b></p> + </td> + <td width="70%" valign="top"> + <p> + The JSF and Seam Portlet wizards create a JSF/Seam portlet that uses <a href="http://www.jboss.org/portletbridge/">JBoss Portlet Bridge</a> + </p> + <p><img src="images/portletnews7.png" alt="The JBoss Portlet Wizard" /></p> + <p><img src="images/portletnews8.png" alt="The JBoss Portlet Wizard" /></p> + <p><img src="images/portletnews9.png" alt="The JBoss Portlet Wizard" /></p> + + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Deployment</b></td> + <td valign="top"> + <p> + You can deploy portlet projects to <a href="http://www.jboss.org/jbossportal/">JBoss Portal</a> as any other web project. + + </p> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + +<tr> + <td valign="top" align="left"><a name="itemname4" id="itemname4"></a><b></b></td> + <td valign="top"> + <p> + More detail is available at + <a href="https://jira.jboss.org/jira/browse/JBIDE-2233">JBIDE-2233</a>, + <a href="https://jira.jboss.org/jira/browse/JBIDE-2234">JBIDE-2234</a> and + <a href="https://jira.jboss.org/jira/browse/JBIDE-2574">JBIDE-2574</a>. + </p> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + + +</table> + +</body> + +</html> + + Added: trunk/documentation/whatsnew/seam/seam-news-2.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/seam/seam-news-2.0.0.Alpha1.html (rev 0) +++ trunk/documentation/whatsnew/seam/seam-news-2.0.0.Alpha1.html 2008-08-19 14:01:07 UTC (rev 9798) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>Seam tools 2.0.0.Alpha1 What's New</title> +</head> +<body> +<h1>Seam tools 2.0.0.Alpha1 What's New</h1> + +<p align="right"><a href="../index.html">< Main Index</a> <a href="../vpe/vpe-news-2.1.0.CR1.html">Visual Page Editor News ></a></p> + + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr/> + <h3>Editors</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="right"> + <a name="itemnam2e" id="itemname2"></a><b>pages.xml editor</b> + </td> + <td width="70%" valign="top"> + <p>An editor for pages.xml have been added for visualizing and edit the flow defined in pages.xml (single page.xml will be added later)</p> + <p>There are three modes: Graphical, Tree and plain source.</p> + +<b>Graphical</b> + <p><img src="../images/pagesxmleditor.png"/></p> + + <p>Yellow, full line: Represent a <code><page></code> element.</p> + <p>Yellow, dashed line: Represent a page that is being navigated to but does not exist in pages.xml </p> + <p>Red box: <code><exception></code> element</p> + <p>Red cross on page icon: the view-id is not found in the project.</p> + +<br/> + +<p>Edit tips: Double click on a page with a concrete view-id will open up that page, selecting and single clicking on the page name allows for quick rename. The context menu also has operations that is worth trying out.</p> +<b>Tree</b> + + <p> + <img src="../images/structured_pagesxmleditor.png"/> + </p> + + </td> + </tr> + + + <tr> + <td colspan="2"><hr /> + </td> + </tr> + + <tr> + <td valign="top" align="right"> + <a name="itemnam2e" id="itemname2"></a><b>pages.xml outline</b> + </td> + <td width="70%" valign="top"> + <p>pages.xml editor has outline support for both the graphical and structural mode.</p> + + <p>The graphical outline gives a birds-view of the layout to allow quick navigation for even big sites</p> + + <img src="../images/pagesxml_graphicaloutline.png"/></p> + +<p>The structural outline shows a tree for every element in pages.xml. You can get a quick overview plus by selecting an element the related element will be highlighted in the graphical, structural or source page.</p> + <p> + <img src="../images/pagesxml_structuraloutline.png"/> + </p> + + + </td> + </tr> + + +</table> + +</body> + +</html> + + Added: trunk/documentation/whatsnew/vpe/images/css-dialog-calling.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/vpe/images/css-dialog-calling.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/vpe/images/css-editor-dialog.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/vpe/images/css-editor-dialog.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/vpe/images/el-configuration.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/vpe/images/el-configuration.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.Alpha1.html =================================================================== --- trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.Alpha1.html (rev 0) +++ trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.Alpha1.html 2008-08-19 14:01:07 UTC (rev 9798) @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>What's New Visual Page Editor</title> +</head> +<body> +<h1>What's New Visual Page Editor</h1> +<p>Last revised August 8, 2008</p> +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr/> + <h3>Visual Page Editor</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="left"><a name="itemnam2e" id="itemname2"></a><b>Custom EL substitution</b></td> + <td width="70%" valign="top"><p>There are now an a section in "Page Design Options" for Visual Page Editor that allows user to configure values to substitute with when the editor encounter an EL expression. + </p> + +<p>This is very usefull if you have custom skins or image resources that you refer to by EL which value are normally only known at runtime. By setting up the values in the Page Design Options the visual editor will "resolve" the EL and be able to locate the resources and provide a closer to real life visualization.</p> + + <p><img src="images/el-configuration.png" alt="El Configuration Example"/></p> + + <p>The variables can be set at Project, folder and page level allowing for flexible overrides in custom project layouts.</p> + </td> + </tr> + <tr> + <td colspan="2"><hr/> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p><b>CSS Editor</b></p></td> + <td valign="top"><p>An CSS Editor was added for editing inline styles for elements that has a style attribute. + It is started by selecting an element in VPE and then via the properties view find the style attribute and click ... to start the dialog. </p> + + <p><img src="images/css-dialog-calling.png" alt="Call Place Of CSS Dialog"/></p> + + <p>The editor dialog has four tabs where CSS properties for text, color, position and others can be specified and adjusted. + The quick edit tab shows just the edited properties, removing the need to browse multiple tabs to adjust an existing styling.</p> + + <p>The bottom of dialog a preview is continously updated while the styling are adjusted.</p> + + + <p><img src="images/css-editor-dialog.png" alt="CSS Editor Dialog"/></p> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Update Visual Editor Preview Improvements</b></td> + <td valign="top"><p> + Update of visual editor preview on change source code was made in separate thread, and now it does not cause eclipse to + 'sleep' when we edit something in source part of visual editor for large files. + </p> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"><a name="itemname4" id="itemname4"></a><b>Visual Editor Caret and Speed improvements</b></td> + <td valign="top"><p> The visual editor now has a visible caret for + editing and we also made the update mechanism run in the background so Eclipse + should no longer 'pause' when updating the visual preview plus we started waiting for the user to stop typing before actually doing the update. + </p> + + <p>The preview also now obeys the used doctype in the HTML source to provide better and more consistent preview via Mozilla.</p> + + <p>All-in-all improvements that should make the editing process faster and give a better editing flow.</p> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> +</table> + +</body> + +</html> + + Added: trunk/documentation/whatsnew/ws/ws-news-1.0.0.alpha1.html =================================================================== --- trunk/documentation/whatsnew/ws/ws-news-1.0.0.alpha1.html (rev 0) +++ trunk/documentation/whatsnew/ws/ws-news-1.0.0.alpha1.html 2008-08-19 14:01:07 UTC (rev 9798) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>Web Services 1.0.0.Alpha What's New</title> +</head> +<body> +<h1>Web Services 1.0.0.Alpha What's New</h1> + +<p align="right"><a href="../index.html">< Main Index</a> <a href="../vpe/vpe-news-2.0.0.cr1.html">Visual Page Editor News ></a></p> +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr/> + <h3>General</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="right"> + <a name="itemname3" id="itemname3"></a><b>JBossWS WTP Support</b> + </td> + <td valign="top">JBossWS support have been added, meaning you can now use WTP WebServices support with JBossWS. + <p><img src="../images/jbossws_facet.png"/></p> + </td> + + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="right"> + <a name="itemname3" id="itemname3"></a><b>Wizards</b> + </td> + <td valign="top">JBossWS WTP support integrates into the existing WebServices wizards (Web Service and Web Service Client) in Eclipse. See the JBossWS tools documentation for details + <p><img src="../images/webservice_client_wizard.png"/></p> + </td> + + </tr> + +</table> + +</body> + +</html> + +

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9797 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-08-19 10:00:46 -0400 (Tue, 19 Aug 2008) New Revision: 9797 Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionException.java Removed: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAttributeCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeElementCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlPseudoContentCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLabeledFormCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateConditionSet.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAndOperation.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeEqualOperation.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpression.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunction.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionAttrPresent.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasInParents.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionIif.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsfValue.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionNot.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentAttrValue.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeOrOperation.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpePlusOperation.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeValue.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml Log: JBIDE-1280 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -68,9 +68,8 @@ public static void reportProblem(Exception throwable) { if (VpeDebug.USE_PRINT_STACK_TRACE) { throwable.printStackTrace(); - } else { - ProblemReportingHelper.reportProblem(PLUGIN_ID, throwable); - } + } + ProblemReportingHelper.reportProblem(PLUGIN_ID, throwable); } public String getResourcePath(String resourceName) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -67,6 +67,7 @@ import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.jboss.tools.vpe.editor.template.VpeToggableTemplate; import org.jboss.tools.vpe.editor.template.dnd.VpeDnd; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.util.ElService; import org.jboss.tools.vpe.editor.util.FaceletUtil; import org.jboss.tools.vpe.editor.util.HTML; @@ -440,7 +441,7 @@ VpeTemplate defTemplate = templateManager.getDefTemplate(); creationData = defTemplate.create(getPageContext(), sourceNode, getVisualDocument()); - } + } getPageContext().setCurrentVisualNode(null); @@ -770,9 +771,14 @@ containerTemplate.setPseudoContent(pageContext, sourceContainer, visualContainer, visualDocument); } else { - VpeDefaultPseudoContentCreator.getInstance().setPseudoContent( - pageContext, sourceContainer, visualContainer, - visualDocument); + try { + VpeDefaultPseudoContentCreator.getInstance().setPseudoContent( + pageContext, sourceContainer, visualContainer, + visualDocument); + } catch (VpeExpressionException ex) { + VpeExpressionException exception = new VpeExpressionException("Error for source node"+sourceContainer.toString(),ex); //$NON-NLS-1$ + VpePlugin.reportProblem(exception); + } } // if (isEmptyElement(visualContainer)) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -15,6 +15,7 @@ import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -35,7 +36,7 @@ * @param visualNodeMap Is used for a storage padding information. * @return The information on the created node of the visual tree. */ - public abstract VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap); + public abstract VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap)throws VpeExpressionException ; /** * Is invoked after construction of all child nodes of the current visual node. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -33,6 +33,7 @@ import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; import org.jboss.tools.vpe.editor.template.dnd.VpeDnd; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.resize.VpeResizer; import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData; import org.jboss.tools.vpe.editor.util.ElService; @@ -1245,6 +1246,7 @@ public void setPseudoContent(VpePageContext pageContext, Node sourceContainer, nsIDOMNode visualContainer, nsIDOMDocument visualDocument) { + try{ if (pseudoContentCreator != null) { pseudoContentCreator.setPseudoContent(pageContext, sourceContainer, visualContainer, visualDocument); @@ -1253,6 +1255,11 @@ pageContext, sourceContainer, visualContainer, visualDocument); } + } catch (VpeExpressionException ex) { + + VpeExpressionException exception = new VpeExpressionException(sourceContainer+" ",ex); + VpePlugin.reportProblem(exception); + } } /** Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -21,6 +21,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.HTML; @@ -185,7 +186,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); VpeCreatorInfo creatorInfo = new VpeCreatorInfo(div); @@ -224,7 +225,7 @@ return creatorInfo; } - private void setStyles(VpePageContext pageContext, Node sourceNode, nsIDOMElement div, nsIDOMElement span) { + private void setStyles(VpePageContext pageContext, Node sourceNode, nsIDOMElement div, nsIDOMElement span) throws VpeExpressionException { boolean display = true; boolean displayBlock = true; @@ -289,9 +290,16 @@ private String getExprValue(VpePageContext pageContext, VpeExpression expr, Node sourceNode) { String value; if (expr != null) { - value = expr.exec(pageContext, sourceNode).stringValue(); + try { + value = expr.exec(pageContext, sourceNode).stringValue(); + } catch (VpeExpressionException e) { + + VpeExpressionException exception = new VpeExpressionException(sourceNode.toString()+" "+expr.toString(),e); //$NON-NLS-1$ + VpePlugin.reportProblem(exception); + value=""; //$NON-NLS-1$ + } } else { - value = ""; + value = ""; //$NON-NLS-1$ } return value; } @@ -300,7 +308,12 @@ Object elements = visualNodeMap.get(this); if (elements != null && elements instanceof VisualElements) { VisualElements o = (VisualElements)elements; - setStyles(pageContext, sourceElement, o.div, o.span); + try { + setStyles(pageContext, sourceElement, o.div, o.span); + } catch (VpeExpressionException e) { + VpeExpressionException exception = new VpeExpressionException(sourceElement.toString()+" "+name+" "+value,e); //$NON-NLS-1$ //$NON-NLS-2$ + VpePlugin.reportProblem(exception) ; + } } } @@ -308,7 +321,12 @@ Object elements = visualNodeMap.get(this); if (elements != null && elements instanceof VisualElements) { VisualElements o = (VisualElements)elements; - setStyles(pageContext, sourceElement, o.div, o.span); + try { + setStyles(pageContext, sourceElement, o.div, o.span); + } catch (VpeExpressionException e) { + VpeExpressionException exception = new VpeExpressionException(sourceElement.toString()+" "+name,e); //$NON-NLS-1$ + VpePlugin.reportProblem(exception); + } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAttributeCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAttributeCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAttributeCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -17,6 +17,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.mozilla.interfaces.nsIDOMAttr; @@ -46,7 +47,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { if (expression != null) { if (visualNodeMap != null) { @@ -71,6 +72,7 @@ } private void setValue(VpePageContext pageContext, Element sourceElement, Map visualNodeMap) { + try{ if (expression != null) { nsIDOMElement visualElement = (nsIDOMElement) visualNodeMap.get(this); VpeValue vpeValue = expression.exec(pageContext, sourceElement); @@ -80,5 +82,9 @@ visualElement.removeAttribute(this.name); } } + } catch(VpeExpressionException ex) { + VpeExpressionException exception = new VpeExpressionException(sourceElement.toString()+" "+expression.toString(),ex); //$NON-NLS-1$ + VpePlugin.reportProblem(exception); + } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -17,6 +17,7 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMAttr; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -88,7 +89,7 @@ public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, - Map visualNodeMap) { + Map visualNodeMap) throws VpeExpressionException { nsIDOMElement visualNewElement = visualDocument .createElement(sourceNode.getNodeName()); visualNodeMap.put(this, visualNewElement); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -15,6 +15,7 @@ import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -35,7 +36,7 @@ * @param visualNodeMap Is used for a storage padding information. * @return The information on the created node of the visual tree. */ - VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map<VpeTemplate,?> visualNodeMap); + VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map<VpeTemplate,?> visualNodeMap) throws VpeExpressionException ; /** * Is invoked after construction of all child nodes of the current visual node. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -22,6 +22,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMAttr; @@ -145,9 +146,10 @@ } + @Override public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, - Map visualNodeMap) { + Map visualNodeMap) throws VpeExpressionException { SourceDataTableElements sourceElements = new SourceDataTableElements( sourceNode); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeElementCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeElementCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeElementCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -22,6 +22,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.mozilla.interfaces.nsIDOMDocument; @@ -49,7 +50,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { if (expression != null) { visualNodeMap.put(this, visualElement); VpeValue vpeValue = expression.exec(pageContext, sourceNode); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -20,6 +20,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.HTML; @@ -83,7 +84,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { boolean layoutHorizontal = true; if (layoutExpr != null) { VpeValue vpeValue = layoutExpr.exec(pageContext, sourceNode); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -15,6 +15,7 @@ import java.util.Map; import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMAttr; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -78,7 +79,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { nsIDOMElement visualNewElement = visualDocument.createElement(name); if (attrs != null) { for (int i = 0; i < attrs.length; i++) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlPseudoContentCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlPseudoContentCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlPseudoContentCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -14,6 +14,7 @@ import java.util.List; import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMAttr; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -65,7 +66,8 @@ } } - public void setPseudoContent(VpePageContext pageContext, Node sourceContainer, nsIDOMNode visualContainer, nsIDOMDocument visualDocument) { + @Override + public void setPseudoContent(VpePageContext pageContext, Node sourceContainer, nsIDOMNode visualContainer, nsIDOMDocument visualDocument) throws VpeExpressionException { nsIDOMElement visualNewElement = visualDocument.createElement(name); setPseudoAttribute(visualNewElement); if (attrs != null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -22,6 +22,7 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -189,8 +190,14 @@ if (creator == null) { return null; } - - VpeCreatorInfo elementInfo = creator.create(pageContext, sourceElement, visualDocument, visualParent, visualNodeMap); + VpeCreatorInfo elementInfo =null; + try { + elementInfo = creator.create(pageContext, sourceElement, visualDocument, visualParent, visualNodeMap); + } catch(VpeExpressionException ex) { + + VpeExpressionException exception = new VpeExpressionException("Exception on processing node "+sourceElement.toString(), ex); //$NON-NLS-1$ + VpePlugin.reportProblem(exception); + } if (elementInfo != null) { nsIDOMElement visualElement = (nsIDOMElement)elementInfo.getVisualNode(); if (visualElement != null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -18,6 +18,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.FileUtil; import org.jboss.tools.vpe.editor.util.HTML; @@ -31,9 +32,10 @@ import org.w3c.dom.NodeList; public class VpeIncludeTemplate extends VpeAbstractTemplate { - private static final String ATTR_FILE = "file"; + private static final String ATTR_FILE = "file"; //$NON-NLS-1$ private VpeExpression fileNameExpression; + @Override protected void init(Element templateElement) { modify = false; Attr fileAttr = ((Element)templateElement).getAttributeNode(ATTR_FILE); @@ -50,7 +52,9 @@ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { String fileName = null; if (fileNameExpression != null) { - VpeValue vpeValue = fileNameExpression.exec(pageContext, sourceNode); + VpeValue vpeValue; + try { + vpeValue = fileNameExpression.exec(pageContext, sourceNode); if (vpeValue != null && vpeValue.stringValue().length() > 0) { fileName = vpeValue.stringValue(); VpeIncludeInfo info = pageContext.getVisualBuilder().getCurrentIncludeInfo(); @@ -76,6 +80,11 @@ } } } + } catch (VpeExpressionException e) { + VpeExpressionException exception = new VpeExpressionException( + sourceNode.toString(),e); + VpePlugin.reportProblem(exception); + } } VpeCreationData creationData = createStub(fileName, visualDocument); @@ -131,9 +140,15 @@ public void openIncludeEditor(VpePageContext pageContext, Element sourceElement, Object data) { if (sourceElement != null && fileNameExpression != null) { - VpeValue vpeValue = fileNameExpression.exec(pageContext, sourceElement); - if (vpeValue != null && vpeValue.stringValue().length() > 0) { - pageContext.openIncludeFile(vpeValue.stringValue()); + VpeValue vpeValue; + try { + vpeValue = fileNameExpression.exec(pageContext, sourceElement); + if (vpeValue != null && vpeValue.stringValue().length() > 0) { + pageContext.openIncludeFile(vpeValue.stringValue()); + } + } catch (VpeExpressionException e) { + + VpePlugin.reportProblem(e); } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLabeledFormCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLabeledFormCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLabeledFormCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -20,6 +20,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.HTML; @@ -78,7 +79,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { String labelAttrName = VpeTemplateManager.ATTR_LABELED_FORM_DEFAULT_LABEL; if (labelNameExpr != null) { VpeValue vpeValue = labelNameExpr.exec(pageContext, sourceNode); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -18,6 +18,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -112,9 +113,14 @@ private String getExprValue(VpePageContext pageContext, VpeExpression expr, Node sourceNode) { String value; if (expr != null) { - value = expr.exec(pageContext, sourceNode).stringValue(); + try { + value = expr.exec(pageContext, sourceNode).stringValue(); + } catch (VpeExpressionException ex) { + VpePlugin.reportProblem(ex); + value=""; //$NON-NLS-1$ + } } else { - value = ""; + value = ""; //$NON-NLS-1$ } return value; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -26,6 +26,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.HTML; @@ -78,7 +79,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { String strValue=null; int listSize = 0; if (layoutExpr != null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -19,6 +19,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.HTML; @@ -188,7 +189,7 @@ public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, - Map visualNodeMap) { + Map visualNodeMap) throws VpeExpressionException { int tableSize = 1; if (tableSizeExpr != null) { VpeValue vpeValue = tableSizeExpr.exec(pageContext, sourceNode); @@ -417,7 +418,7 @@ } private List getClasses(VpeExpression expression, Node sourceNode, - VpePageContext pageContext) { + VpePageContext pageContext) throws VpeExpressionException { List b = new ArrayList(); if (expression != null && sourceNode != null) { String classes = expression.exec(pageContext, sourceNode) @@ -435,7 +436,7 @@ private void makeSpecial(Node header, nsIDOMElement visualHead, nsIDOMDocument visualDocument, int tableSize, VpeCreatorInfo creatorInfo, String cellTag, - VpeExpression headerClassExpr, VpePageContext pageContext) { + VpeExpression headerClassExpr, VpePageContext pageContext) throws VpeExpressionException { if (header != null && visualHead != null) { nsIDOMElement visualRow = visualDocument.createElement(HTML.TAG_TR); visualHead.appendChild(visualRow); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -11,6 +11,7 @@ package org.jboss.tools.vpe.editor.template; import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -20,7 +21,7 @@ public abstract class VpePseudoContentCreator { private static final String PSEUDO_CONTENT_ATTR = "vpe:pseudo-element"; - public abstract void setPseudoContent(VpePageContext pageContext, Node sourceContainer, nsIDOMNode visualContainer, nsIDOMDocument visualDocument); + public abstract void setPseudoContent(VpePageContext pageContext, Node sourceContainer, nsIDOMNode visualContainer, nsIDOMDocument visualDocument) throws VpeExpressionException; public static void setPseudoAttribute(nsIDOMElement visualPseudoElement) { visualPseudoElement.setAttribute(PSEUDO_CONTENT_ATTR, "yes"); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateConditionSet.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateConditionSet.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateConditionSet.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -19,6 +19,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; @@ -54,10 +55,17 @@ if (expression == null) { return false; } - VpeValue value = expression.exec(pageContext, sourceNode); - if (value == null) { + try { + VpeValue value = expression.exec(pageContext, sourceNode); + + if (value == null) { + return false; + } + return value.booleanValue(); + } catch (VpeExpressionException e) { + + VpePlugin.reportProblem(e); return false; } - return value.booleanValue(); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -18,6 +18,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -28,7 +29,7 @@ import org.w3c.dom.Node; public class VpeValueCreator extends VpeAbstractCreator implements VpeOutputAttributes { - public static final String SIGNATURE_VPE_VALUE = ":vpe:value"; + public static final String SIGNATURE_VPE_VALUE = ":vpe:value"; //$NON-NLS-1$ private VpeExpression expression; private String outputAttrName; @@ -51,7 +52,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { String value; if (expression != null) { value = expression.exec(pageContext, sourceNode).stringValue(); @@ -78,9 +79,14 @@ private void setValue(VpePageContext pageContext, Element sourceElement, Map<?,?> visualNodeMap) { String value; if (expression != null) { - value = expression.exec(pageContext, sourceElement).stringValue(); + try { + value = expression.exec(pageContext, sourceElement).stringValue(); + } catch (VpeExpressionException ex) { + VpePlugin.reportProblem(ex); + value=""; //$NON-NLS-1$ + } } else { - value = ""; + value = ""; //$NON-NLS-1$ } nsIDOMNode valueNode = (nsIDOMNode) visualNodeMap.get(this); valueNode.setNodeValue(value); @@ -110,8 +116,14 @@ public boolean isEditabledAtribute(VpePageContext pageContext, Element sourceElement, Map visualNodeMap) { if (outputAttrName != null && expression != null) { String attrValue = sourceElement.getAttribute(outputAttrName); - String exprValue = expression.exec(pageContext, sourceElement).stringValue(); - return exprValue.equals(attrValue); + String exprValue; + try { + exprValue = expression.exec(pageContext, sourceElement).stringValue(); + return exprValue.equals(attrValue); + } catch (VpeExpressionException ex) { + VpePlugin.reportProblem(ex); + } + } return false; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -17,6 +17,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; @@ -113,7 +114,7 @@ } public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, - Map visualNodeMap) { + Map visualNodeMap) throws VpeExpressionException { nsIDOMElement a = visualDocument.createElement(HTML.TAG_A); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAndOperation.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAndOperation.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAndOperation.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,11 +16,12 @@ public class VpeAndOperation extends VpeOperation { + @Override int getPriority() { return PRIORITY_OPERATION_AND; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { VpeValue leftValue = getLeftOperand().exec(pageContext, sourceNode); VpeValue rightValue = getRightOperand().exec(pageContext, sourceNode); return leftValue.and(rightValue); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -21,9 +21,9 @@ this.expressions = expressions; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { if (expressions == null) { - return new VpeValue(""); + return new VpeValue(""); //$NON-NLS-1$ } StringBuffer result = new StringBuffer(); for (int i = 0; i < expressions.length; i++) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeEqualOperation.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeEqualOperation.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeEqualOperation.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,11 +16,12 @@ public class VpeEqualOperation extends VpeOperation { + @Override int getPriority() { return PRIORITY_OPERATION_EQUAL; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { VpeValue leftValue = getLeftOperand().exec(pageContext, sourceNode); VpeValue rightValue = getRightOperand().exec(pageContext, sourceNode); return leftValue.equal(rightValue); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpression.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpression.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpression.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -15,5 +15,5 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; public interface VpeExpression { - VpeValue exec(VpePageContext pageContext, Node sourceNode); + VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException; } Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.vpe.editor.template.expression; - -public class VpeExpressionError extends Error { - - VpeExpressionError(String message) { - super(message); - } -} Copied: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionException.java (from rev 9737, trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionException.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionException.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.editor.template.expression; +/** + * + * Expression parsing Exception + * + */ +public class VpeExpressionException extends Exception { + + private static final long serialVersionUID = 3620963302559253556L; + + public VpeExpressionException(String message) { + super(message); + } + + public VpeExpressionException(String message, Throwable throwable) { + super(message, throwable); + } +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunction.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunction.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunction.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -24,13 +24,14 @@ this.paramertes = paramertes; } + @Override int getPriority() { return PRIORITY_OPERAND; } - VpeOperand getParameter(int index) { + VpeOperand getParameter(int index) throws VpeExpressionException { if (paramertes == null || paramertes.length < index) { - throw new VpeExpressionError(ERROR_PARAMETER_INCORRECT); + throw new VpeExpressionException(ERROR_PARAMETER_INCORRECT); } return paramertes[index]; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionAttrPresent.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionAttrPresent.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionAttrPresent.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -17,7 +17,7 @@ public class VpeFunctionAttrPresent extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { boolean present = false; NamedNodeMap attrs = sourceNode.getAttributes(); if (attrs != null) { @@ -30,6 +30,7 @@ return new VpeValue(present); } + @Override String[] getSignatures() { return new String[] {VpeExpressionBuilder.SIGNATURE_ANY_ATTR}; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasInParents.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasInParents.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasInParents.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -20,7 +20,7 @@ public class VpeFunctionHasInParents extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { String prm = getParameter(0).exec(pageContext, sourceNode) .stringValue(); Node parentNode = sourceNode.getParentNode(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -21,15 +21,18 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; public class VpeFunctionHref extends VpeFunctionSrc { - protected String getUnresolved() { + @Override + protected String getUnresolved() { return ""; //$NON-NLS-1$ } - String[] getSignatures() { + @Override + String[] getSignatures() { return new String[] {VpeExpressionBuilder.SIGNATURE_ANY_ATTR}; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + @Override + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { String tagValue = getParameter(0).exec(pageContext, sourceNode).stringValue(); tagValue = resolveEL(pageContext,tagValue); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionIif.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionIif.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionIif.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,7 +16,7 @@ public class VpeFunctionIif extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { if (getParameter(0).exec(pageContext, sourceNode).booleanValue()) { return getParameter(1).exec(pageContext, sourceNode); } else { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsfValue.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsfValue.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsfValue.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -18,7 +18,7 @@ public class VpeFunctionJsfValue extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { String value = getParameter(0).exec(pageContext, sourceNode).stringValue(); BundleMap bundle = pageContext.getBundle(); int offset = pageContext.getVisualBuilder().getCurrentMainIncludeOffset(); @@ -27,6 +27,7 @@ return new VpeValue(jsfValue != null ? jsfValue : value); } + @Override String[] getSignatures() { return new String[] {VpeExpressionBuilder.SIGNATURE_JSF_VALUE}; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionNot.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionNot.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionNot.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,7 +16,7 @@ public class VpeFunctionNot extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { return getParameter(0).exec(pageContext, sourceNode).not(); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentAttrValue.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentAttrValue.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentAttrValue.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,8 +16,8 @@ public class VpeFunctionParentAttrValue extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { - String prm = getParameter(0).exec(pageContext, sourceNode).stringValue(); + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { + Node parentNode = sourceNode.getParentNode(); if (parentNode != null) { String a = getParameter(0).exec(pageContext, parentNode).stringValue(); @@ -26,6 +26,6 @@ return new VpeValue(attr.getNodeValue()); } } - return new VpeValue(""); + return new VpeValue(""); //$NON-NLS-1$ } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -43,7 +43,7 @@ static final String IMG_UNRESOLVED = "unresolved.gif"; //$NON-NLS-1$ static final String IMG_PREFIX = "file:///"; //$NON-NLS-1$ - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { String tagValue = getParameter(0).exec(pageContext, sourceNode) .stringValue(); tagValue = resolveEL(pageContext,tagValue); @@ -186,8 +186,8 @@ return IMG_PREFIX; } - String processValue(VpePageContext pageContext, Node sourceNode, - String tagValue) { + private String processValue(VpePageContext pageContext, Node sourceNode, + String tagValue) throws VpeExpressionException { String attrName = null; if (getParameter(0) instanceof VpeAttributeOperand) { attrName = ((VpeAttributeOperand) getParameter(0)).getAttributeName(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -69,7 +69,7 @@ private static final String MAX_VERSION_KEYWORD="max";//$NON-NLS-1$ - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { //gets function parameter String tagValue = getParameter(0).exec(pageContext, sourceNode) Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeOrOperation.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeOrOperation.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeOrOperation.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,11 +16,12 @@ public class VpeOrOperation extends VpeOperation { + @Override int getPriority() { return PRIORITY_OPERATION_OR; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { VpeValue leftValue = getLeftOperand().exec(pageContext, sourceNode); VpeValue rightValue = getRightOperand().exec(pageContext, sourceNode); return leftValue.or(rightValue); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpePlusOperation.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpePlusOperation.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpePlusOperation.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,11 +16,12 @@ public class VpePlusOperation extends VpeOperation { + @Override int getPriority() { return PRIORITY_OPERATION_PLUS; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { VpeValue leftValue = getLeftOperand().exec(pageContext, sourceNode); VpeValue rightValue = getRightOperand().exec(pageContext, sourceNode); return leftValue.plus(rightValue); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeValue.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeValue.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeValue.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -37,11 +37,11 @@ return type; } - public boolean booleanValue() { + public boolean booleanValue() throws VpeExpressionException { if (type == BOOLEAN_VALUE) { return booleanValue; } else { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -56,9 +56,9 @@ } } - VpeValue equal(VpeValue other) { + VpeValue equal(VpeValue other) throws VpeExpressionException { if (type != other.type()) { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$//$NON-NLS-2$ } boolean value; switch (type) { @@ -75,31 +75,31 @@ return new VpeValue(value); } - VpeValue not() { + VpeValue not() throws VpeExpressionException{ if (type != BOOLEAN_VALUE) { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$//$NON-NLS-2$ } return new VpeValue(!booleanValue); } - VpeValue and(VpeValue other) { + VpeValue and(VpeValue other) throws VpeExpressionException { if (type != BOOLEAN_VALUE || other.type() != BOOLEAN_VALUE) { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$ //$NON-NLS-2$ } return new VpeValue(booleanValue && other.booleanValue()); } - VpeValue or(VpeValue other) { + VpeValue or(VpeValue other) throws VpeExpressionException{ if (type != BOOLEAN_VALUE || other.type() != BOOLEAN_VALUE) { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$ //$NON-NLS-2$ } return new VpeValue(booleanValue || other.booleanValue()); } - VpeValue plus(VpeValue other) { + VpeValue plus(VpeValue other) throws VpeExpressionException{ if (type != STRING_VALUE || other.type() != STRING_VALUE) { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$//$NON-NLS-2$ } return new VpeValue(stringValue + other.stringValue()); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -17,6 +17,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.SourceDomUtil; @@ -139,6 +140,9 @@ }catch(VpeExpressionBuilderException ex){ VpePlugin.reportProblem(ex); resizeData = resizeData.getNext(); + } catch (VpeExpressionException ex) { + VpePlugin.reportProblem(ex); + resizeData = resizeData.getNext(); } }else{ setSize(resizeData, sourceElement, absolute, position, size); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml 2008-08-19 14:00:46 UTC (rev 9797) @@ -1,4 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> - <vpe:templates> + <vpe:tag case-sensitive="no" name=""> + <vpe:template children="no" modify="no"> + <vpe:any background-color="blue" border="yes" border-color="white" + display="tag-name1" icon="yes" value="tag-value" + value-background-color="green" value-color="red"/> + </vpe:template> + </vpe:tag> + <vpe:tag case-sensitive="no" name=""> + <vpe:template children="no" modify="no"> + <vpe:any background-color="blue" border="yes" border-color="white" + display="tag-name2" icon="yes" value="tag-value" + value-background-color="green" value-color="red"/> + </vpe:template> + </vpe:tag> </vpe:templates>

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9796 - trunk/jsf/docs/userguide/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2008-08-19 09:10:25 -0400 (Tue, 19 Aug 2008) New Revision: 9796 Modified: trunk/jsf/docs/userguide/en/modules/palette.xml Log: https://jira.jboss.org/jira/browse/JBDS-240- adding link to movie about RichFaces Toolkit within JBDS Modified: trunk/jsf/docs/userguide/en/modules/palette.xml =================================================================== --- trunk/jsf/docs/userguide/en/modules/palette.xml 2008-08-19 11:12:48 UTC (rev 9795) +++ trunk/jsf/docs/userguide/en/modules/palette.xml 2008-08-19 13:10:25 UTC (rev 9796) @@ -594,5 +594,13 @@ library</link>.</para> </note> + <section> + <title>Relevant Resources Links</title> + <para>It may be helpful for you to look through the <ulink + url="http://docs.jboss.org/tools/movies/demos/rich_faces_demo/rich_faces_demo.htm" + >movie</ulink> which covers a creation of a jsf application with simple content + using the RichFaces components.</para> + </section> + </section> </chapter>

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9795 - workspace/dart/release.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-19 07:12:48 -0400 (Tue, 19 Aug 2008) New Revision: 9795 Added: workspace/dart/release/Smooks_tools.zip Log: 2008.08.19 release Added: workspace/dart/release/Smooks_tools.zip =================================================================== (Binary files differ) Property changes on: workspace/dart/release/Smooks_tools.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9794 - workspace/dart.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-19 07:11:44 -0400 (Tue, 19 Aug 2008) New Revision: 9794 Added: workspace/dart/release/ Log: create a new folder for storing release plugin

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9793 - in workspace/dart/plugins: org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-19 06:57:04 -0400 (Tue, 19 Aug 2008) New Revision: 9793 Modified: workspace/dart/plugins/org.jboss.tools.smooks.javabean/plugin.xml workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AnalyzerFactory.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphViewerContextMenuProvider.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/RootModelEditPart.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java Log: Change some java file contents or thire location Modified: workspace/dart/plugins/org.jboss.tools.smooks.javabean/plugin.xml =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.javabean/plugin.xml 2008-08-19 10:54:54 UTC (rev 9792) +++ workspace/dart/plugins/org.jboss.tools.smooks.javabean/plugin.xml 2008-08-19 10:57:04 UTC (rev 9793) @@ -11,4 +11,16 @@ typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> </viewerInitor> </extension> + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <analyzer + class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" + name="JavaBean Analyzer" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + <targetSourceType + id="org.jboss.tools.smooks.ui.viewerInitor.javabean" + name="java2java"> + </targetSourceType> + </analyzer> + </extension> </plugin> Modified: workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-08-19 10:54:54 UTC (rev 9792) +++ workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-08-19 10:57:04 UTC (rev 9793) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.smooks.javabean.analyzer; -import java.io.OutputStream; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -32,8 +31,9 @@ import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; import org.jboss.tools.smooks.ui.gef.model.IConnectableModel; import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; -import org.jboss.tools.smooks.ui.gef.model.StructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.TreeItemRelationModel; import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; +import org.jboss.tools.smooks.utils.UIUtils; import org.milyn.xsd.smooks.ParamType; import org.milyn.xsd.smooks.ResourceConfigType; import org.milyn.xsd.smooks.ResourceType; @@ -83,7 +83,7 @@ List children = root.getChildren(); for (Iterator iterator = children.iterator(); iterator.hasNext();) { - StructuredDataModel dataModel = (StructuredDataModel) iterator + TreeItemRelationModel dataModel = (TreeItemRelationModel) iterator .next(); List targetConnections = dataModel.getModelTargetConnections(); if (targetConnections != null && !targetConnections.isEmpty()) { @@ -190,13 +190,18 @@ bindingsParam.setName("bindings"); resourceConfig.getParam().add(bindingsParam); // to dispatch the target's children (Order processing) - List children = ((AbstractStructuredDataModel) dataModel) - .getChildren(); + + List children = targetJavaBean.getProperties(); for (Iterator iterator2 = children.iterator(); iterator2 .hasNext();) { - AbstractStructuredDataModel child = (AbstractStructuredDataModel) iterator2 + JavaBeanModel childJavaBean = (JavaBeanModel) iterator2 .next(); - + AbstractStructuredDataModel child = UIUtils + .findGraphModel( + (AbstractStructuredDataModel) root, + childJavaBean); + if (child == null) + continue; if (child instanceof IConnectableModel) { if (((IConnectableModel) child) .getModelTargetConnections().isEmpty()) @@ -247,7 +252,7 @@ .getReferenceEntityModel(); JavaBeanModel currentbean = (JavaBeanModel) target .getReferenceEntityModel(); - if (currentRootModel.getChildren().indexOf(source) != -1) { + if (sourcebean.getParent() == currentRootModel.getReferenceEntityModel()) { if (!currentbean.isPrimitive()) { return "${" + currentbean.getName() + "}"; } else { @@ -255,13 +260,17 @@ + sourcebean.getName(); } } else { - AbstractStructuredDataModel parent = source.getParent(); + JavaBeanModel jbParent = ((JavaBeanModel)source.getReferenceEntityModel()).getParent(); + AbstractStructuredDataModel parent = UIUtils.findGraphModel(currentRootModel.getParent(), jbParent); String returnString = sourcebean.getName(); while (parent != currentRootModel && parent != null) { - returnString = ((JavaBeanModel) parent - .getReferenceEntityModel()).getName() - + " " + returnString; - parent = parent.getParent(); + JavaBeanModel jbm = (JavaBeanModel) parent + .getReferenceEntityModel(); + if (jbm != null) + returnString = jbm.getName() + " " + returnString; + + JavaBeanModel jb = ((JavaBeanModel)parent.getReferenceEntityModel()).getParent(); + parent = UIUtils.findGraphModel(currentRootModel.getParent(), jb); } // if no property if (returnString.equals(sourcebean.getName())) { Modified: workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2008-08-19 10:54:54 UTC (rev 9792) +++ workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2008-08-19 10:57:04 UTC (rev 9793) @@ -37,6 +37,8 @@ private boolean isPrimitive = false; private Class<? extends Object> beanClass = null; + + private JavaBeanModel parent = null; public Class getBeanClass() { return beanClass; @@ -219,8 +221,11 @@ this.name = name; } - public void addProperty(Object property) { - getProperties().add(property); + public void addProperty(JavaBeanModel property) { + if(properties != null){ + properties.add(property); + property.setParent(this); + } } private List properties; @@ -237,7 +242,7 @@ null, beanClass, this.lazyLoadProperties); beanType = componentClass; - properties.add(proxyModel); + addProperty(proxyModel); return properties; } @@ -252,7 +257,7 @@ continue; JavaBeanModel jbm = new JavaBeanModel(pd.getPropertyType(), pd .getName(), pd, beanClass, this.lazyLoadProperties); - properties.add(jbm); + addProperty(jbm); } } return properties; @@ -266,4 +271,18 @@ return properties != null; } + /** + * @return the parent + */ + public JavaBeanModel getParent() { + return parent; + } + + /** + * @param parent the parent to set + */ + public void setParent(JavaBeanModel parent) { + this.parent = parent; + } + } Modified: workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java 2008-08-19 10:54:54 UTC (rev 9792) +++ workspace/dart/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java 2008-08-19 10:57:04 UTC (rev 9793) @@ -26,16 +26,15 @@ import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTreeViewer; -import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.events.TreeEvent; +import org.eclipse.swt.events.TreeListener; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -44,6 +43,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.dialogs.SelectionDialog; import org.jboss.tools.smooks.javabean.model.BeanContentProvider; import org.jboss.tools.smooks.javabean.model.BeanlabelProvider; @@ -131,9 +131,8 @@ /* * (non-Javadoc) * - * @see - * org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse - * .swt.events.ModifyEvent) + * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse + * .swt.events.ModifyEvent) */ public void modifyText(ModifyEvent arg0) { classFullName = classText.getText(); @@ -148,66 +147,83 @@ classBrowseButton.setText("Browse..."); } -// final Button atomicLoadButton = new Button(com, SWT.RADIO); -// -// atomicLoadButton.setText("Atomicly load"); -// atomicLoadButton.setSelection(true); -// -// Button loadButton = new Button(com, SWT.RADIO); -// loadButton.setText("Load by hand"); -// -// final Button loadClassButton = new Button(com, SWT.NONE); -// loadClassButton.setText("Load Class"); -// loadClassButton.addSelectionListener(new SelectionAdapter() { -// -// /* -// * (non-Javadoc) -// * -// * @see -// * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse -// * .swt.events.SelectionEvent) -// */ -// @Override -// public void widgetSelected(SelectionEvent e) { -// super.widgetSelected(e); -// if (!loadAtomic) -// loadModelPropertiesAndRefreshViewer(runnableContext); -// } -// }); -// loadClassButton.setEnabled(false); -// -// SelectionAdapter radioButtonSelectionAdp = new SelectionAdapter() { -// /* -// * (non-Javadoc) -// * -// * @see -// * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse -// * .swt.events.SelectionEvent) -// */ -// @Override -// public void widgetSelected(SelectionEvent e) { -// super.widgetSelected(e); -// loadAtomic = atomicLoadButton.getSelection(); -// loadClassButton.setEnabled(!loadAtomic); -// } -// -// }; -// atomicLoadButton.addSelectionListener(radioButtonSelectionAdp); -// loadButton.addSelectionListener(radioButtonSelectionAdp); + // final Button atomicLoadButton = new Button(com, SWT.RADIO); + // + // atomicLoadButton.setText("Atomicly load"); + // atomicLoadButton.setSelection(true); + // + // Button loadButton = new Button(com, SWT.RADIO); + // loadButton.setText("Load by hand"); + // + // final Button loadClassButton = new Button(com, SWT.NONE); + // loadClassButton.setText("Load Class"); + // loadClassButton.addSelectionListener(new SelectionAdapter() { + // + // /* + // * (non-Javadoc) + // * + // * @see + // * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse + // * .swt.events.SelectionEvent) + // */ + // @Override + // public void widgetSelected(SelectionEvent e) { + // super.widgetSelected(e); + // if (!loadAtomic) + // loadModelPropertiesAndRefreshViewer(runnableContext); + // } + // }); + // loadClassButton.setEnabled(false); + // + // SelectionAdapter radioButtonSelectionAdp = new SelectionAdapter() { + // /* + // * (non-Javadoc) + // * + // * @see + // * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse + // * .swt.events.SelectionEvent) + // */ + // @Override + // public void widgetSelected(SelectionEvent e) { + // super.widgetSelected(e); + // loadAtomic = atomicLoadButton.getSelection(); + // loadClassButton.setEnabled(!loadAtomic); + // } + // + // }; + // atomicLoadButton.addSelectionListener(radioButtonSelectionAdp); + // loadButton.addSelectionListener(radioButtonSelectionAdp); Label spliter = new Label(com, SWT.SEPARATOR | SWT.HORIZONTAL); spliter.setVisible(false); treeViewer = new CheckboxTreeViewer(com, SWT.BORDER); treeViewer.setContentProvider(new BeanContentProvider()); treeViewer.setLabelProvider(new BeanlabelProvider()); - treeViewer.addCheckStateListener(new ICheckStateListener(){ + treeViewer.getTree().addTreeListener(new TreeListener(){ + /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent) + * @see org.eclipse.swt.events.TreeListener#treeCollapsed(org.eclipse.swt.events.TreeEvent) */ @Override - public void checkStateChanged(CheckStateChangedEvent event) { - recordModel(); + public void treeCollapsed(TreeEvent e) { + } + + /* (non-Javadoc) + * @see org.eclipse.swt.events.TreeListener#treeExpanded(org.eclipse.swt.events.TreeEvent) + */ + @Override + public void treeExpanded(TreeEvent e) { + TreeItem item = (TreeItem)e.item; + if(item.getChecked()){ + TreeItem[] items = item.getItems(); + for (int i = 0; i < items.length; i++) { + TreeItem ci = items[i]; + ci.setChecked(true); + } + } + } + }); gd = new GridData(GridData.FILL_BOTH); gd.horizontalSpan = 2; @@ -216,10 +232,10 @@ treeViewer.getTree().setLayoutData(gd); return com; } - - protected void recordModel(){ -// this.currentRootJavaBeanModel.setProperties(null); -// this.fillCheckStateModel(this.currentRootJavaBeanModel); + + protected void recordModel() { + // this.currentRootJavaBeanModel.setProperties(null); + // this.fillCheckStateModel(this.currentRootJavaBeanModel); } protected void fillTheModelWithCheckStatus(JavaBeanModel javaBeanModel, @@ -254,8 +270,8 @@ public JavaBeanModel fillCheckStateModel(JavaBeanModel rootJavaBean) { if (rootJavaBean == null) { List list = (List) treeViewer.getInput(); - if(list != null) - rootJavaBean = (JavaBeanModel) list.get(0); + if (list != null) + rootJavaBean = (JavaBeanModel) list.get(0); } if (rootJavaBean != null) this.fillTheModelWithCheckStatus(rootJavaBean, treeViewer); @@ -306,7 +322,6 @@ Class clazz = loader.loadClass(classFullName); currentRootJavaBeanModel = JavaBeanModelFactory .getJavaBeanModelWithLazyLoad(clazz); - } catch (ClassNotFoundException e) { throw new InvocationTargetException(e); } @@ -322,9 +337,10 @@ // TODO ignor???? treeViewer.setInput(Collections.EMPTY_LIST); } else { - if (currentRootJavaBeanModel != null) + if (currentRootJavaBeanModel != null) { treeViewer.setInput(currentRootJavaBeanModel.getProperties()); - else + treeViewer.setAllChecked(true); + } else treeViewer.setInput(Collections.EMPTY_LIST); } } Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AnalyzerFactory.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AnalyzerFactory.java 2008-08-19 10:54:54 UTC (rev 9792) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AnalyzerFactory.java 2008-08-19 10:57:04 UTC (rev 9793) @@ -73,7 +73,7 @@ .equals( SmooksExtensionPointConstants.EXTENTION_POINT_ELEMENT_TARGETSOURCETYPE)) { String tid = childElement - .getAttribute(SmooksExtensionPointConstants.EXTENTION_POINT_ATTRIBUTE_TYPE_ID); + .getAttribute(SmooksExtensionPointConstants.EXTENTION_POINT_ATTRIBUTE_ID); if (tid == null || "".equals(tid)) continue; mapper.addTargetDataTypeID(tid); Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-08-19 10:54:54 UTC (rev 9792) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-08-19 10:57:04 UTC (rev 9793) @@ -35,15 +35,9 @@ @Override public void doSave(IProgressMonitor monitor) { - + graphicalPage.doSave(monitor); } - - -// @Override -// protected void createHeaderContents(IManagedForm headerForm) { -// super.createHeaderContents(headerForm); -// } @Override public void doSaveAs() { Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphViewerContextMenuProvider.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphViewerContextMenuProvider.java 2008-08-19 10:54:54 UTC (rev 9792) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphViewerContextMenuProvider.java 2008-08-19 10:57:04 UTC (rev 9793) @@ -45,25 +45,27 @@ /* * (non-Javadoc) * - * @see - * org.eclipse.gef.ContextMenuProvider#buildContextMenu(org.eclipse.jface - * .action.IMenuManager) + * @see org.eclipse.gef.ContextMenuProvider#buildContextMenu(org.eclipse.jface + * .action.IMenuManager) */ @Override public void buildContextMenu(IMenuManager menu) { GEFActionConstants.addStandardActionGroups(menu); IAction action; + // TODO don't enable redo/undo now +// action = getActionRegistry().getAction(GEFActionConstants.UNDO); +// if (action != null) +// menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action); +// +// action = getActionRegistry().getAction(GEFActionConstants.REDO); +// if (action != null) +// menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action); - action = getActionRegistry().getAction(GEFActionConstants.UNDO); - menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action); - - action = getActionRegistry().getAction(GEFActionConstants.REDO); - menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action); - action = getActionRegistry() .getAction(IWorkbenchActionConstants.DELETE); - if (action.isEnabled()) - menu.appendToGroup(GEFActionConstants.GROUP_EDIT, action); + if (action != null) +// if (action.isEnabled()) + menu.appendToGroup(GEFActionConstants.GROUP_EDIT, action); } public SmooksGraphViewerContextMenuProvider(EditPartViewer viewer, Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-08-19 10:54:54 UTC (rev 9792) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-08-19 10:57:04 UTC (rev 9793) @@ -12,6 +12,7 @@ import java.io.IOException; import java.io.InputStream; +import java.util.EventObject; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; @@ -21,13 +22,29 @@ import org.eclipse.draw2d.ConnectionLayer; import org.eclipse.gef.DefaultEditDomain; import org.eclipse.gef.GraphicalViewer; +import org.eclipse.gef.KeyStroke; import org.eclipse.gef.LayerConstants; +import org.eclipse.gef.commands.CommandStack; +import org.eclipse.gef.commands.CommandStackListener; import org.eclipse.gef.dnd.TemplateTransfer; import org.eclipse.gef.editparts.LayerManager; +import org.eclipse.gef.ui.actions.ActionRegistry; +import org.eclipse.gef.ui.actions.DeleteAction; +import org.eclipse.gef.ui.actions.GEFActionConstants; +import org.eclipse.gef.ui.actions.PrintAction; +import org.eclipse.gef.ui.actions.RedoAction; +import org.eclipse.gef.ui.actions.SaveAction; +import org.eclipse.gef.ui.actions.SelectAllAction; +import org.eclipse.gef.ui.actions.UndoAction; +import org.eclipse.gef.ui.actions.UpdateAction; +import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler; import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer; import org.eclipse.gef.ui.parts.SelectionSynchronizer; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; @@ -40,9 +57,13 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.IFileEditorInput; +import org.eclipse.ui.IWorkbenchActionConstants; +import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.editor.FormEditor; import org.eclipse.ui.forms.editor.FormPage; @@ -75,7 +96,8 @@ * @author Dart Peng * @Date Jul 28, 2008 */ -public class SmooksGraphicalFormPage extends FormPage { +public class SmooksGraphicalFormPage extends FormPage implements + ISelectionChangedListener { protected IViewerInitor sourceViewerInitor; protected IViewerInitor targetViewerInitor; protected TreeViewer targetViewer; @@ -91,6 +113,9 @@ protected String targetDataTypeID = null; protected SmooksFileBuilder smooksFileBuilder = null; + protected boolean commandStackChanged = false; + protected ActionRegistry actionRegistry; + public SmooksGraphicalFormPage(FormEditor editor, String id, String title) { super(editor, id, title); editDomain = new DefaultEditDomain(this); @@ -104,6 +129,17 @@ } @Override + public Object getAdapter(Class type) { + if (type == CommandStack.class) + return this.getGEFCommandStack(); + return super.getAdapter(type); + } + + public CommandStack getGEFCommandStack() { + return this.getEditDomain().getCommandStack(); + } + + @Override protected void createFormContent(IManagedForm managedForm) { final ScrolledForm form = managedForm.getForm(); FormToolkit toolkit = managedForm.getToolkit(); @@ -147,12 +183,10 @@ event.doit = true; } }); - sourceViewer.getTree().addPaintListener(new PaintListener() { - public void paintControl(PaintEvent e) { - rootModel.firePropertyChange(RootModel.P_REFRESH_PANEL, - null, new Object()); - } - }); + sourceViewer.getTree().addPaintListener( + new TreePaintControlListener()); + sourceViewer.getTree().addListener(SWT.PaintItem, + new TreeItemPaintListener()); if (initSourceTreeViewerProviders()) { initSourceTreeViewer(); @@ -193,12 +227,11 @@ new Transfer[] { TemplateTransfer.getInstance() }, new TargetTreeDropTargetListener(targetViewer, getGraphicalViewer())); - targetViewer.getTree().addPaintListener(new PaintListener() { - public void paintControl(PaintEvent e) { - rootModel.firePropertyChange(RootModel.P_REFRESH_PANEL, - null, new Object()); - } - }); + targetViewer.getTree().addPaintListener( + new TreePaintControlListener()); + targetViewer.getTree().addListener(SWT.PaintItem, + new TreeItemPaintListener()); + if (initTargetTreeViewerProviders()) { initTargetTreeViewer(); } @@ -256,6 +289,8 @@ toolkit.paintBordersFor(rootMainControl); this.hookGraphicalViewer(); this.initGraphicalViewer(); + + getSite().getSelectionProvider().addSelectionChangedListener(this); } protected SmooksFileBuilder createSmooksFileBulder() { @@ -360,14 +395,14 @@ return viewer; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.ui.forms.editor.FormPage#isDirty() */ @Override public boolean isDirty() { - // TODO Test - if(true) return true; - return super.isDirty(); + return commandStackChanged || super.isDirty(); } /* @@ -393,10 +428,16 @@ e.printStackTrace(); } super.doSave(monitor); + commandStackChanged = false; + getManagedForm().dirtyStateChanged(); } protected SmooksConfigurationFileGenerateContext createContext() { SmooksConfigurationFileGenerateContext context = new SmooksConfigurationFileGenerateContext(); + context.setSourceDataTypeID(this.sourceDataTypeID); + context.setTargetDataTypeID(this.targetDataTypeID); + context.setSmooksType("SAX"); + context.setDataMappingRootModel(this.rootModel); return context; } @@ -417,12 +458,20 @@ protected void hookGraphicalViewer() { getSelectionSynchronizer().addViewer(getGraphicalViewer()); getSite().setSelectionProvider(getGraphicalViewer()); - getGraphicalViewer().addDropTargetListener( new MappingPanelDropTargetListener(this.getGraphicalViewer())); } + protected ActionRegistry getActionRegistry() { + if (actionRegistry == null) + actionRegistry = new ActionRegistry(); + return actionRegistry; + } + protected void initGraphicalViewer() { + + createActions(); + this.getGraphicalViewer().getControl().setBackground( ColorConstants.white); @@ -434,12 +483,33 @@ new SmooksEditPartFactory()); this.getGraphicalViewer().setContents(rootModel); + GraphicalViewerKeyHandler keyHandler = new GraphicalViewerKeyHandler( + getGraphicalViewer()); + keyHandler.put(KeyStroke.getPressed(SWT.DEL, 0), this + .getActionRegistry().getAction(GEFActionConstants.DELETE)); + + SmooksGraphViewerContextMenuProvider provider = new SmooksGraphViewerContextMenuProvider( + getGraphicalViewer(), this.getActionRegistry()); + getGraphicalViewer().setContextMenu(provider); + LayerManager manager = (LayerManager) getGraphicalViewer() .getEditPartRegistry().get(LayerManager.ID); ConnectionLayer layer = (ConnectionLayer) manager .getLayer(LayerConstants.CONNECTION_LAYER); if (layer != null) layer.setAntialias(SWT.SMOOTH); + + // hook command stack + this.getEditDomain().getCommandStack().addCommandStackListener( + new CommandStackListener() { + + public void commandStackChanged(EventObject event) { + commandStackChanged = true; + updateSelectionActions(); + getManagedForm().dirtyStateChanged(); + } + + }); } public SelectionSynchronizer getSelectionSynchronizer() { @@ -470,16 +540,6 @@ this.getEditDomain().addViewer(graphicalViewer); } - // public void treeCollapsed(TreeEvent e) { - // rootModel.firePropertyChange(RootModel.P_REFRESH_PANEL, null, - // new Object()); - // } - // - // public void treeExpanded(TreeEvent e) { - // rootModel.firePropertyChange(RootModel.P_REFRESH_PANEL, null, - // new Object()); - // } - public IViewerInitor getSourceViewerInitor() { return sourceViewerInitor; } @@ -534,6 +594,28 @@ } } + protected void createActions() { + ActionRegistry registry = getActionRegistry(); + IAction action; + + action = new UndoAction(this); + registry.registerAction(action); + + action = new RedoAction(this); + registry.registerAction(action); + + action = new SelectAllAction(this); + registry.registerAction(action); + + action = new DeleteAction((IWorkbenchPart) this); + registry.registerAction(action); + + action = new SaveAction(this); + registry.registerAction(action); + + registry.registerAction(new PrintAction(this)); + } + private class DataSelectLinkListener implements IHyperlinkListener { TreeViewer viewer = null; @@ -585,4 +667,73 @@ this.smooksFileBuilder = smooksFileBuilder; } + /** + * @author Dart Peng + * @Date Aug 19, 2008 + */ + private class TreeItemPaintListener implements Listener { + + /* + * (non-Javadoc) + * + * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) + */ + public void handleEvent(Event event) { + TreeItem item = (TreeItem) event.item; + if (item.getBounds().y == 0) + return; + Object obj = item + .getData(TreeItemRelationModel.PRO_TREE_ITEM_SELECTION_STATUS); + if (obj == null) { + return; + } + boolean drawLine = ((Boolean) obj).booleanValue(); + if (drawLine) { + // event.gc.draw(GraphicsConstants.groupHeaderColor); + // event.gc.fillRectangle(event.x, event.y, event.width, + // event.height); + // event.gc.setLineWidth(2); + // event.gc.drawLine(x + 20, y, + // item.getParent().getBounds().width - 2, y); + } + } + + } + + /** + * @author Dart Peng + * @Date Aug 19, 2008 + */ + private class TreePaintControlListener implements PaintListener { + + /* + * (non-Javadoc) + * + * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent) + */ + public void paintControl(PaintEvent e) { + Tree tree = (Tree) e.getSource(); + if (tree.getData(TreeItemRelationModel.PRO_TREE_REPAINT) != null) { + System.out.println("Block a event fire !!"); + return; + } + rootModel.firePropertyChange(RootModel.P_REFRESH_PANEL, null, + new Object()); + } + + } + + public void selectionChanged(SelectionChangedEvent event) { + updateSelectionActions(); + } + + protected void updateSelectionActions() { + IAction action = getActionRegistry().getAction( + IWorkbenchActionConstants.DELETE); + if (action != null) { + if (action instanceof UpdateAction) + ((UpdateAction) action).update(); + } + } + } Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/RootModelEditPart.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/RootModelEditPart.java 2008-08-19 10:54:54 UTC (rev 9792) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/RootModelEditPart.java 2008-08-19 10:57:04 UTC (rev 9793) @@ -1,11 +1,13 @@ package org.jboss.tools.smooks.ui.gef.editparts; import java.beans.PropertyChangeEvent; +import java.util.Iterator; import java.util.List; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.ScalableFreeformLayeredPane; import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.editparts.AbstractGraphicalEditPart; import org.jboss.tools.smooks.ui.gef.figures.GraphRootFigureLayout; import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; import org.jboss.tools.smooks.ui.gef.policy.RootGraphicsXYLayoutEditPolicy; @@ -13,7 +15,7 @@ public class RootModelEditPart extends AbstractStructuredDataEditPart { protected IFigure createFigure() { - IFigure figure = new ScalableFreeformLayeredPane() ; + IFigure figure = new ScalableFreeformLayeredPane(); figure.setLayoutManager(new GraphRootFigureLayout()); return figure; } @@ -27,10 +29,21 @@ AbstractStructuredDataModel.P_REFRESH_PANEL)) { this.getFigure().invalidate(); this.getFigure().validate(); - // this.getFigure().validate(); + refreshAllConnectionLineStyle(); } } + protected void refreshAllConnectionLineStyle() { + List children = this.getChildren(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + ConnectionPointEditPart editPart = (ConnectionPointEditPart) iterator + .next(); + if (editPart instanceof SourceConnectionPointEditPart) { + editPart.refreshAllSourceConnectionLineStyle(); + } + } + } + /* * (non-Javadoc) * Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java 2008-08-19 10:54:54 UTC (rev 9792) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java 2008-08-19 10:57:04 UTC (rev 9793) @@ -20,12 +20,26 @@ * @Date Jul 31, 2008 */ public class TreeItemRelationModel extends AbstractStructuredDataModel implements IConnectableModel { + + public static final String PRO_TREE_ITEM_SELECTION_STATUS = "__pro_treeitem_selection_status"; + + public static final String PRO_TREE_REPAINT = "__pro_tree_repaint"; + TreeItem treeItem = null; List<Object> modelSourceConnections = new ArrayList<Object>(); List<Object> modelTargetConnections = new ArrayList<Object>(); public TreeItem getTreeItem() { return treeItem; } + + public boolean isCollapse(){ + TreeItem item = getTreeItem(); + int y = Integer.MAX_VALUE; + if(item != null){ + y = item.getBounds().y; + } + return (y == 0); + } public void setTreeItem(TreeItem treeItem) { this.treeItem = treeItem; Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-08-19 10:54:54 UTC (rev 9792) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-08-19 10:57:04 UTC (rev 9793) @@ -1,5 +1,8 @@ package org.jboss.tools.smooks.utils; +import java.util.Iterator; +import java.util.List; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jdt.core.IJavaProject; @@ -14,6 +17,7 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IFileEditorInput; import org.jboss.tools.smooks.ui.ViewerInitorStore; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; /** * @@ -21,7 +25,7 @@ * */ public class UIUtils { - + public static FillLayout createFillLayout(int marginW, int marginH) { FillLayout fill = new FillLayout(); fill.marginHeight = marginH; @@ -32,7 +36,36 @@ public static FillLayout createFormCompositeFillLayout() { return createFillLayout(1, 1); } - + + /** + * + * @param parent + * @param referenceObject + * @return + */ + public static AbstractStructuredDataModel findGraphModel( + AbstractStructuredDataModel parent, Object referenceObject) { + if (referenceObject == null || parent == null) + return null; + Object ref = parent.getReferenceEntityModel(); + if (referenceObject == ref) + return parent; + List list = parent.getChildren(); + if (list == null) + return null; + if (list.isEmpty()) + return null; + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + AbstractStructuredDataModel child = (AbstractStructuredDataModel) iterator + .next(); + AbstractStructuredDataModel obj = findGraphModel(child, + referenceObject); + if (obj != null) + return obj; + } + return null; + } + public static IJavaProject getJavaProjectFromEditorPart(IEditorPart part) { IEditorInput input = part.getEditorInput(); if (input instanceof IFileEditorInput) { @@ -61,7 +94,7 @@ .getTreeCotentProvider(dataTypeID); if (tprovider == null) return false; - viewer.setLabelProvider(new DecoratingLabelProvider(lprovider,null)); + viewer.setLabelProvider(new DecoratingLabelProvider(lprovider, null)); viewer.setContentProvider(tprovider); return true; }

17 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r9792 - workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-08-19 06:54:54 -0400 (Tue, 19 Aug 2008) New Revision: 9792 Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/ConnectionPointEditPart.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataConnectionEditPart.java Log: add delete action and add save function Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/ConnectionPointEditPart.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/ConnectionPointEditPart.java 2008-08-19 09:59:43 UTC (rev 9791) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/ConnectionPointEditPart.java 2008-08-19 10:54:54 UTC (rev 9792) @@ -11,6 +11,7 @@ package org.jboss.tools.smooks.ui.gef.editparts; import java.beans.PropertyChangeEvent; +import java.util.Iterator; import java.util.List; import org.eclipse.draw2d.ChopboxAnchor; @@ -21,8 +22,9 @@ import org.eclipse.gef.EditPolicy; import org.eclipse.gef.NodeEditPart; import org.eclipse.gef.Request; -import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.eclipse.swt.widgets.TreeItem; import org.jboss.tools.smooks.ui.gef.model.IConnectableModel; +import org.jboss.tools.smooks.ui.gef.model.TreeItemRelationModel; import org.jboss.tools.smooks.ui.gef.policy.CustomGraphicalNodeEditPolicy; /** @@ -44,6 +46,11 @@ return figure; } + public boolean isCollapse(){ + TreeItemRelationModel model = (TreeItemRelationModel) this.getModel(); + if(model == null) return false; + return model.isCollapse(); + } @Override @@ -65,9 +72,17 @@ } return super.getModelTargetConnections(); } + + public void refreshAllSourceConnectionLineStyle(){ + List sourceConnection = this.getSourceConnections(); + for (Iterator iterator = sourceConnection.iterator(); iterator + .hasNext();) { + StructuredDataConnectionEditPart connection = (StructuredDataConnectionEditPart) iterator.next(); + connection.refresh(); + } + } - /* * (non-Javadoc) * Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataConnectionEditPart.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataConnectionEditPart.java 2008-08-19 09:59:43 UTC (rev 9791) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataConnectionEditPart.java 2008-08-19 10:54:54 UTC (rev 9792) @@ -5,14 +5,19 @@ import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.PolylineConnection; +import org.eclipse.draw2d.Shape; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.PointList; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.editparts.AbstractConnectionEditPart; import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.swt.widgets.TreeItem; import org.jboss.tools.smooks.ui.gef.figures.CurveLineConnection; +import org.jboss.tools.smooks.ui.gef.model.IConnectableModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; +import org.jboss.tools.smooks.ui.gef.model.TreeItemRelationModel; import org.jboss.tools.smooks.ui.gef.policy.DeleteConnectionEditPolicy; import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; @@ -23,6 +28,17 @@ super(); } + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.editparts.AbstractConnectionEditPart#refresh() + */ + @Override + public void refresh() { + super.refresh(); + changeLineStyleWithCollapseStatus(); + } + protected void createEditPolicies() { installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE, new ConnectionEndpointEditPolicy()); @@ -31,12 +47,12 @@ } protected IFigure createFigure() { - CurveLineConnection conn = new CurveLineConnection(){ - public void paintFigure(Graphics graphics){ + CurveLineConnection conn = new CurveLineConnection() { + public void paintFigure(Graphics graphics) { super.paintFigure(graphics); } }; -// conn.setSmoothness(SmoothPolyLineConnection.SMOOTH_MORE); + // conn.setSmoothness(SmoothPolyLineConnection.SMOOTH_MORE); Figure targetFlagFigure = new Figure() { /* @@ -75,7 +91,8 @@ public void paint(Graphics graphics) { graphics.pushState(); graphics.setForegroundColor(ColorConstants.black); - graphics.setBackgroundColor(GraphicsConstants.elementLabelColor); + graphics + .setBackgroundColor(GraphicsConstants.elementLabelColor); Point p = getBounds().getTopLeft(); Point p2 = getBounds().getBottomLeft(); Point p3 = getBounds().getTopRight(); @@ -102,13 +119,72 @@ return conn; } + protected void changeLineStyleWithCollapseStatus() { + Shape figure = (Shape) this.getFigure(); + LineConnectionModel model = (LineConnectionModel) this.getModel(); + IConnectableModel source = model.getSource(); + IConnectableModel target = model.getTarget(); + boolean collapse = false; + if (source instanceof TreeItemRelationModel) { + if (((TreeItemRelationModel) source).isCollapse()) { + collapse = true; + } + } + if (target instanceof TreeItemRelationModel) { + if (((TreeItemRelationModel) target).isCollapse()) { + collapse = true; + } + } + if (collapse) { + figure.setForegroundColor(GraphicsConstants.groupBorderColor); + figure.setLineStyle(Graphics.LINE_DOT); + } else { + figure.setForegroundColor(GraphicsConstants.groupBorderColor); + figure.setLineStyle(Graphics.LINE_SOLID); + } + } + + protected void changeTreeItemSelectionStatus(boolean selected) { + LineConnectionModel model = (LineConnectionModel) this.getModel(); + IConnectableModel source = model.getSource(); + IConnectableModel target = model.getTarget(); + Tree sourceTree = null; + Tree targetTree = null; + if (source instanceof TreeItemRelationModel) { + TreeItem item = ((TreeItemRelationModel) source).getTreeItem(); + item.setData(TreeItemRelationModel.PRO_TREE_ITEM_SELECTION_STATUS, + new Boolean(selected)); + sourceTree = item.getParent(); + } + if (target instanceof TreeItemRelationModel) { + TreeItem item = ((TreeItemRelationModel) target).getTreeItem(); + item.setData(TreeItemRelationModel.PRO_TREE_ITEM_SELECTION_STATUS, + new Boolean(selected)); + targetTree = item.getParent(); + } + refreshTree(sourceTree); + refreshTree(targetTree); + } + + private void refreshTree(Tree tree) { + if (tree != null) { + tree.setData(TreeItemRelationModel.PRO_TREE_REPAINT, new Object()); + tree.redraw(); + tree.setData(TreeItemRelationModel.PRO_TREE_REPAINT, null); + } + } + public void setSelected(int value) { super.setSelected(value); - if (value != EditPart.SELECTED_NONE){ - ((PolylineConnection) getFigure()).setLineStyle(Graphics.LINE_DOT); - ((PolylineConnection) getFigure()).setForegroundColor(GraphicsConstants.groupBorderColor); + if (value == EditPart.SELECTED_NONE) { + ((Shape) figure).setLineWidth(1); + ((Shape) figure) + .setForegroundColor(GraphicsConstants.groupBorderColor); + changeTreeItemSelectionStatus(false); + } else { + ((Shape) figure).setLineWidth(2); + figure.setForegroundColor(ColorConstants.darkBlue); + changeTreeItemSelectionStatus(true); } - else - ((PolylineConnection) getFigure()).setLineWidth(1); } } \ No newline at end of file

17 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2008