JBoss Tools SVN: r15113 - trunk/esb/docs/esb_ref_guide/en.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-05-07 11:59:34 -0400 (Thu, 07 May 2009)
New Revision: 15113
Modified:
trunk/esb/docs/esb_ref_guide/en/master_output.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-717 - master_output.xml is generated;
Modified: trunk/esb/docs/esb_ref_guide/en/master_output.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/master_output.xml 2009-05-07 15:57:10 UTC (rev 15112)
+++ trunk/esb/docs/esb_ref_guide/en/master_output.xml 2009-05-07 15:59:34 UTC (rev 15113)
@@ -28,11 +28,11 @@
<pubdate>April 2008</pubdate>
<copyright>
<year>2007</year>
- <year><diffmk:wrapper diffmk:change="changed">2009</diffmk:wrapper></year>
- <holder><diffmk:wrapper diffmk:change="changed">JBoss, a division of Red Hat</diffmk:wrapper></holder>
+ <year>2009</year>
+ <holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo><diffmk:wrapper diffmk:change="changed">
- Version: 1.1.0.GA
+ Version: 1.1.1.GA
</diffmk:wrapper></releaseinfo>
<abstract>
@@ -251,7 +251,7 @@
<listitem diffmk:change="added"><para diffmk:change="added"><emphasis diffmk:change="added" role="bold"><diffmk:wrapper diffmk:change="added">JBoss ESB Web Service consumer1 Example</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> - demonstrates how to consume a 181 Web Service in an ESB action.</diffmk:wrapper></para></listitem>
<listitem diffmk:change="added"><para diffmk:change="added"><emphasis diffmk:change="added" role="bold"><diffmk:wrapper diffmk:change="added">JBoss ESB Web Service producer Example</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> - demonstrates how to deploy a JSR181 Webservice endpoint on JBossESB using the SOAPProcessor action.</diffmk:wrapper></para></listitem>
<listitem diffmk:change="added"><para diffmk:change="added"><emphasis diffmk:change="added" role="bold"><diffmk:wrapper diffmk:change="added">JBoss ESB Smooks CSV -> XML Example</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> - demonstrates how to transform a comma separated value (CSV) file to an XML.</diffmk:wrapper></para></listitem>
- <listitem diffmk:change="added"><para diffmk:change="added"><emphasis diffmk:change="added" role="bold"><diffmk:wrapper diffmk:change="added">JBoss ESB Smooks XML -> POJO Example</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> - demonstrates the use of Smooks performing a simpe transformation by converting an XML file into Java POJOs.</diffmk:wrapper></para></listitem>
+ <listitem diffmk:change="added"><para diffmk:change="added"><emphasis diffmk:change="added" role="bold"><diffmk:wrapper diffmk:change="added">JBoss ESB Smooks XML -> POJO Example</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> - demonstrates the use of Smooks performing a simple transformation by converting an XML file into Java POJOs.</diffmk:wrapper></para></listitem>
<listitem diffmk:change="added"><para diffmk:change="added"><emphasis diffmk:change="added" role="bold"><diffmk:wrapper diffmk:change="added">JBoss ESB Smooks XML -> XML date-manipulation Example</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> - demonstrates how to manually define and apply a Message Transformation within JBoss ESB.</diffmk:wrapper></para></listitem>
<listitem diffmk:change="added"><para diffmk:change="added"><emphasis diffmk:change="added" role="bold"><diffmk:wrapper diffmk:change="added">JBoss ESB Smooks XML -> XML Example</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> - a very basic example of how to manually define and apply a Message Transformation within JBoss ESB. It applies a very simple XSLT to a SampleOrder.xml message and prints the before and after XML to the console. </diffmk:wrapper></para></listitem>
@@ -288,7 +288,7 @@
<section>
<title>Deploying a ESB Project</title>
- <para>In this chapter youwill see how to deploy a ESB project using the WTP deployment framework.</para>
+ <para><diffmk:wrapper diffmk:change="changed">In this chapter you will see how to deploy a ESB project using the WTP deployment framework.</diffmk:wrapper></para>
<para>Before deploying the project, open the JBoss Server View by selecting <emphasis><property moreinfo="none">Window > Show View > Other >
Server > JBoss Server View</property></emphasis>,
@@ -504,7 +504,7 @@
<para>You can find out what is SOA here: <ulink url="http://www.jboss.org/jbossesb/resources/SOABasics.html">Basics of SOA</ulink> and <ulink url="http://www.jboss.org/jbossesb/resources/SOAEOA.html">SOA and EOA</ulink>.</para>
<para>To configure the JBoss Enterprise SOA platform select <emphasis>
- <property moreinfo="none">Window > Preferences > Server > Runtime Enironments</property></emphasis>, that will open the Server Runtime Environments Preferences page where you can add, remove and edit a Server Runtime Environment.</para>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Window > Preferences > Server > Runtime Environments</diffmk:wrapper></property></emphasis>, that will open the Server Runtime Environments Preferences page where you can add, remove and edit a Server Runtime Environment.</para>
<figure float="0">
<title>Configure new Server Runtime Environment</title>
@@ -525,7 +525,7 @@
</mediaobject>
</figure>
- <para>On the next step you can specify a name of the server runtime environement and browse to its location. Click <emphasis><property moreinfo="none">Finish</property></emphasis> to add the server runtime environment.</para>
+ <para><diffmk:wrapper diffmk:change="changed">On the next step you can specify a name of the server runtime environment and browse to its location. Click </diffmk:wrapper><emphasis><property moreinfo="none">Finish</property></emphasis> to add the server runtime environment.</para>
<figure float="0">
@@ -785,10 +785,10 @@
<section id="ESBSupportXMLSchema">
<title>Support for XML Schema</title>
- <para>JBoss ESB Framework fully <link linkend="sourceView"><diffmk:wrapper diffmk:change="changed">supports XML files based on
- schemas as well as DTDs</diffmk:wrapper></link>.</para>
- <note diffmk:change="added"><title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Note:</diffmk:wrapper></title>
- <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">The schema used behind ESB editor now uses the latest version available (from SOA-P 4.3). This removes the errors/warnings some users have reported seeing when using SOA-P specific esb.xml files.</diffmk:wrapper></para> </note>
+ <para>JBoss ESB Framework fully <link linkend="sourceView">supports XML files based on
+ schemas as well as DTDs</link>.</para>
+ <note><title>Note:</title>
+ <para>The schema used behind ESB editor now uses the latest version available (from SOA-P 4.3). This removes the errors/warnings some users have reported seeing when using SOA-P specific esb.xml files.</para> </note>
</section>
@@ -881,8 +881,11 @@
</mediaobject>
</figure>
- <para>In summary, this reference supplies you with all necessary information on the
- functionality that JBoss ESB Editor provides for work with JBoss ESB.</para>
+ <para><diffmk:wrapper diffmk:change="changed">In summary, this reference supplies you with all necessary information on the
+ functionality that JBoss ESB Editor provides for work with JBoss ESB.</diffmk:wrapper></para>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">We hope, this guide helped you to get started with the JBoss ESB Tools. Besides, for additional information you are welcome on </diffmk:wrapper><ulink diffmk:change="added" url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201"><diffmk:wrapper diffmk:change="added">JBoss forum</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></para>
+
</section>
</section>
</chapter>
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r15112 - trunk/documentation/guides/GettingStartedGuide/en.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-05-07 11:57:10 -0400 (Thu, 07 May 2009)
New Revision: 15112
Modified:
trunk/documentation/guides/GettingStartedGuide/en/master_output.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-717 - master_output.xml is generated;
Modified: trunk/documentation/guides/GettingStartedGuide/en/master_output.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/master_output.xml 2009-05-07 15:56:21 UTC (rev 15111)
+++ trunk/documentation/guides/GettingStartedGuide/en/master_output.xml 2009-05-07 15:57:10 UTC (rev 15112)
@@ -26,16 +26,21 @@
<!ENTITY jbossportallink "../../jboss_portal_tools_ref_guide/html_single/index.html">
<!ENTITY migrationlink "../../Exadel-migration/html_single/index.html">
<!ENTITY wslink "../../ws_ref_guide/html_single/index.html">
+<!ENTITY smookslink "../../jboss_smooks_plugin_ref_guide/html_single/index.html">
+<!ENTITY droolslink "../../drools_tools_ref_guide/html_single/index.html">
+<!ENTITY jmxlink "../../jmx_ref_guide/html_single/index.html">
+
+
]><book xmlns:diffmk="http://diffmk.sf.net/ns/diff">
<bookinfo>
<title>Getting Started with JBoss Developer Studio</title>
<pubdate>April 2008</pubdate>
<copyright>
<year>2007</year>
- <year><diffmk:wrapper diffmk:change="changed">2009</diffmk:wrapper></year>
- <holder><diffmk:wrapper diffmk:change="changed">JBoss, a division of Red Hat</diffmk:wrapper></holder>
+ <year>2009</year>
+ <holder>JBoss, a division of Red Hat</holder>
</copyright>
- <releaseinfo><diffmk:wrapper diffmk:change="changed">Version: 2.0.0.GA</diffmk:wrapper></releaseinfo>
+ <releaseinfo><diffmk:wrapper diffmk:change="changed">Version: 2.0.1.GA</diffmk:wrapper></releaseinfo>
<abstract>
<title></title>
<para>
@@ -508,8 +513,8 @@
<para>Get Eclipse and Web Tools</para>
</listitem>
</itemizedlist>
- <para><diffmk:wrapper diffmk:change="changed">The current version of JBoss Tools (3.0.0.GA) targets at Eclipse 3.4.2/Ganymede SR2 and WTP
- 3.0.3+</diffmk:wrapper></para>
+ <para><diffmk:wrapper diffmk:change="changed">The current version of JBoss Tools (3.0.1.GA) targets at Eclipse 3.4.2 and WTP
+ 3.0.4</diffmk:wrapper></para>
<tip>
<title>Tip:</title>
@@ -724,9 +729,9 @@
AS</property> from <property moreinfo="none">JBoss Developer Studio</property>.</para>
<para><property moreinfo="none">JBoss Developer Studio</property> ships with <property moreinfo="none">JBoss EAP
v.4.2</property> bundled. When you followed the default installation of <property moreinfo="none">JBoss
- Developer Studio</property><diffmk:wrapper diffmk:change="changed">, you should already have a JBoss EAP 4.3 Server installed and
+ Developer Studio</property>, you should already have a JBoss EAP 4.3 Server installed and
defined. To run JBoss AS you need JDK 1.5, JDK 6 is not formally supported yet, although
- you may be able to start the server with it.</diffmk:wrapper></para>
+ you may be able to start the server with it.</para>
<section id="JBossbundled">
<?dbhtml filename="JBossbundled.html"?>
@@ -740,9 +745,9 @@
<?dbhtml filename="StartingServer.html"?>
<title>Starting JBoss Server</title>
<para>Starting <property moreinfo="none">JBoss Server</property> is quite simple. <property moreinfo="none">JBoss
- Developer Studio</property><diffmk:wrapper diffmk:change="changed"> allows you to control its behaviour with the help of
+ Developer Studio</property> allows you to control its behaviour with the help of
a special toolbar, where you could start it in a regular or debug mode, stop it or
- restart it.</diffmk:wrapper></para>
+ restart it.</para>
<itemizedlist>
<listitem>
@@ -778,8 +783,8 @@
</figure>
<para>When the server is started you should see <emphasis>
<property moreinfo="none">Started</property>
- </emphasis><diffmk:wrapper diffmk:change="changed"> in the square brackets right next its name in </diffmk:wrapper><property moreinfo="none"><diffmk:wrapper diffmk:change="changed">JBoss Server
- View</diffmk:wrapper></property><diffmk:wrapper diffmk:change="changed">.</diffmk:wrapper></para>
+ </emphasis> in the square brackets right next its name in <property moreinfo="none">JBoss Server
+ View</property>.</para>
<figure float="0">
<title>Server is Started</title>
@@ -806,9 +811,9 @@
<title>Stopping JBoss Server</title>
<para>To stop the server, click the <emphasis>
<property moreinfo="none">Stop</property>
- </emphasis> icon in <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">JBoss Server View</diffmk:wrapper></property> or right click the server
+ </emphasis> icon in <property moreinfo="none">JBoss Server View</property> or right click the server
name and press <emphasis>
- <property moreinfo="none">Stop</property><diffmk:wrapper diffmk:change="changed">. </diffmk:wrapper></emphasis></para>
+ <property moreinfo="none">Stop</property>. </emphasis></para>
<figure float="0">
<title>Stopping Server</title>
@@ -820,7 +825,7 @@
</figure>
<para>When the server is stopped you will see <emphasis>
<property moreinfo="none">Stopped</property>
- </emphasis><diffmk:wrapper diffmk:change="changed"> in the square brackets next to its name.</diffmk:wrapper></para>
+ </emphasis> in the square brackets next to its name.</para>
</section>
<section id="ServerPreferences">
<?dbhtml filename="ServerPreferences.html"?>
@@ -851,14 +856,14 @@
<property moreinfo="none">JBoss EAP 4.2</property> we do not ultimately tie you to any particular
server for deployment. There are some servers that Studio supports directly (via the
bundled Eclipse WTP plug-ins). In this section we discuss how to manage self-installed
- JBoss AS. Suppose you want to deploy the application to <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">JBoss 4.2.3
- server</diffmk:wrapper></property>. First of all you need to install it.</para>
+ JBoss AS. Suppose you want to deploy the application to <property moreinfo="none">JBoss 4.2.3
+ server</property>. First of all you need to install it.</para>
<section id="JBossInstalling">
<?dbhtml filename="JBossInstalling.html"?>
<title>JBoss AS Installation</title>
<itemizedlist>
<listitem>
- <para>Download the binary package of <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">JBoss 4.2.3</diffmk:wrapper></property> and save
+ <para><diffmk:wrapper diffmk:change="changed">Download the binary package of JBoss AS, e.g. </diffmk:wrapper><property moreinfo="none">JBoss 4.2.3</property> and save
it on your computer: <ulink url="http://labs.jboss.com/jbossas/downloads">http://labs.jboss.com/jbossas/downloads</ulink></para>
</listitem>
</itemizedlist>
@@ -876,24 +881,24 @@
range.</para>
<itemizedlist>
<listitem>
- <para><diffmk:wrapper diffmk:change="changed">After you have the binary archive you want to install, use the JDK jar
+ <para>After you have the binary archive you want to install, use the JDK jar
tool (or any other ZIP extraction tool) to extract the jboss-4.2.3.GA.zip
archive contents into a location of your choice. The jboss-4.2.3.GA.tgz
archive is a gzipped tar file that requires a gnutar compatible tar which
can handle the long pathnames in the archive. The extraction process will
- create a jboss-4.2.3.GA directory. </diffmk:wrapper></para>
+ create a jboss-4.2.3.GA directory. </para>
</listitem>
</itemizedlist>
</section>
<section id="AddingJBossServer">
<?dbhtml filename="AddingJBossServer.html"?>
- <title><diffmk:wrapper diffmk:change="changed">Adding and Configuring JBoss Server</diffmk:wrapper></title>
+ <title>Adding and Configuring JBoss Server</title>
<para>Now we should add just installed server into server manager in <property moreinfo="none">JBoss
Developer Studio</property>.</para>
<itemizedlist>
<listitem>
- <para><diffmk:wrapper diffmk:change="added">Open the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Server View</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> by selecting </diffmk:wrapper><emphasis>
+ <para>Open the <property moreinfo="none">JBoss Server View</property> by selecting <emphasis>
<property moreinfo="none">Window > Show View > Other > Server
> JBoss Server View</property>
</emphasis></para>
@@ -905,7 +910,7 @@
</listitem>
<listitem>
<para>Select <emphasis>
- <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">JBoss Community > JBoss 4.2 Server</diffmk:wrapper></property>
+ <property moreinfo="none">JBoss Community > JBoss 4.2 Server</property>
</emphasis></para>
</listitem>
</itemizedlist>
@@ -918,21 +923,21 @@
</mediaobject>
</figure>
- <note diffmk:change="added">
- <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Note:</diffmk:wrapper></title>
+ <note>
+ <title>Note:</title>
- <para><diffmk:wrapper diffmk:change="changed">Now in the </diffmk:wrapper><property moreinfo="none"><diffmk:wrapper diffmk:change="changed">New Server wizard</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> there is a separation
- between the .org servers (the </diffmk:wrapper><emphasis diffmk:change="added">
- <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Community</diffmk:wrapper></property>
- </emphasis><diffmk:wrapper diffmk:change="added"> category) and product server that comes bundled with JBoss EAP (the
- </diffmk:wrapper><emphasis diffmk:change="added">
- <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Enterprise Middleware</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> category).</diffmk:wrapper></para>
+ <para>Now in the <property moreinfo="none">New Server wizard</property> there is a separation
+ between the .org servers (the <emphasis>
+ <property moreinfo="none">JBoss Community</property>
+ </emphasis> category) and product server that comes bundled with JBoss EAP (the
+ <emphasis>
+ <property moreinfo="none">JBoss Enterprise Middleware</property></emphasis> category).</para>
</note>
<itemizedlist>
<listitem>
- <para><diffmk:wrapper diffmk:change="changed">To create a new runtime, which Jboss AS 4.2 matches to, click </diffmk:wrapper><emphasis>
- <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Next</diffmk:wrapper></property>
+ <para>To create a new runtime, which Jboss AS 4.2 matches to, click <emphasis>
+ <property moreinfo="none">Next</property>
</emphasis></para>
</listitem>
</itemizedlist>
@@ -960,8 +965,8 @@
<itemizedlist>
<listitem>
- <para><diffmk:wrapper diffmk:change="added">In the next dialog verify the specified information and if something is
- unfair go back and correct it</diffmk:wrapper></para>
+ <para>In the next dialog verify the specified information and if something is
+ unfair go back and correct it</para>
</listitem>
</itemizedlist>
<figure float="0">
@@ -1277,17 +1282,13 @@
<para>The complete information on how to manage JBoss AS from JBoss Developer Studio you can
read in a <link linkend="manage">corresponding chapter</link>.</para>
- <para>Now you just need to start the server by clicking on green circle/triangle icon in the
- JBoss Server View.</para>
-
- <figure float="0">
- <title>Starting the Server</title>
- <mediaobject>
+ <para><diffmk:wrapper diffmk:change="added">Now you just need to start the server by clicking on the Start the server icon (
+ </diffmk:wrapper><inlinemediaobject diffmk:change="added">
<imageobject>
- <imagedata fileref="images/first_seam/first_seam15.png"></imagedata>
+ <imagedata fileref="images/first_seam/first_seam50.png"></imagedata>
</imageobject>
- </mediaobject>
- </figure>
+ </inlinemediaobject><diffmk:wrapper diffmk:change="added"> ) in the
+ JBoss Server View.</diffmk:wrapper></para>
<para>Then run the project by selecting the project and use <emphasis><property moreinfo="none">Run As... >
Run on Server</property>.</emphasis></para>
@@ -2024,15 +2025,15 @@
</keywordset>
</chapterinfo>
<title>Developing a simple JSP web application</title>
-
+
<note>
<title>Note:</title>
<para>We highly recommend developing in <property moreinfo="none">Seam</property>. This chapter is for users
who for some reason cannot use Seam.</para>
</note>
-
- <para>In this chapter you'll find out how to create a simple <ulink url="http://java.sun.com/products/jsp/">JSP</ulink> application using the
- <property moreinfo="none">JBoss Developer Studio</property>. The application will show a classic
+
+ <para>In this chapter you'll find out how to create a simple <ulink url="http://java.sun.com/products/jsp/">JSP</ulink><diffmk:wrapper diffmk:change="changed"> application using the
+ </diffmk:wrapper><property moreinfo="none">JBoss Developer Studio</property>. The application will show a classic
"Hello World!" on the page.</para>
<para>We'll assume that you have already launched <property moreinfo="none">JBoss Developer
Studio</property> and also that the <property moreinfo="none">Web Development</property> perspective is the
@@ -2042,7 +2043,7 @@
<property moreinfo="none">Window > Open Perspective > Other...</property>
</emphasis> from the menu bar and then selecting Web Development from the Select Perspective
dialog box.</para>
-
+
<section id="SettingUpTheProject">
<?dbhtml filename="SettingUpTheProject.html"?>
<title>Setting Up the Project</title>
@@ -2052,18 +2053,18 @@
<itemizedlist>
<listitem>
<para>Go to the menu bar and select <emphasis>
- <property moreinfo="none">File > New > Other...</property>
- </emphasis></para>
+ <property moreinfo="none">File > New > Other...</property>
+ </emphasis></para>
</listitem>
<listitem>
<para>Select <emphasis>
- <property moreinfo="none">Web > Dynamic Web Project</property>
- </emphasis> in the New Project dialog box</para>
+ <property moreinfo="none">Web > Dynamic Web Project</property>
+ </emphasis> in the New Project dialog box</para>
</listitem>
<listitem>
<para>Click <emphasis>
- <property moreinfo="none">Next</property>
- </emphasis>
+ <property moreinfo="none">Next</property>
+ </emphasis>
</para>
</listitem>
<listitem>
@@ -2071,10 +2072,10 @@
</listitem>
<listitem>
<para>Then select <emphasis>
- <property moreinfo="none">Minimal Configuration</property>
- </emphasis> from the list of possible configurations and click <emphasis>
- <property moreinfo="none">Finish</property>
- </emphasis></para>
+ <property moreinfo="none">Minimal Configuration</property>
+ </emphasis> from the list of possible configurations and click <emphasis>
+ <property moreinfo="none">Finish</property>
+ </emphasis></para>
</listitem>
</itemizedlist>
<figure float="0">
@@ -2085,10 +2086,10 @@
</imageobject>
</mediaobject>
</figure>
-
+
<para>The <emphasis>
- <property moreinfo="none">jspHello</property>
- </emphasis> node should appear in the upper-left <property moreinfo="none">Package Explorer</property>
+ <property moreinfo="none">jspHello</property>
+ </emphasis> node should appear in the upper-left <property moreinfo="none">Package Explorer</property>
view.</para>
<figure float="0">
<title>New Web Project</title>
@@ -2099,32 +2100,32 @@
</mediaobject>
</figure>
</section>
-
+
<section id="CreatingJSPPage">
<?dbhtml filename="CreatingJSPPage.html"?>
<title>Creating JSP Page</title>
<para>This section covers all the points how to create, edit and then preview JSP page.</para>
- <para>In our simple application we need to create only one JSP page which displays a
- <emphasis>"Hello World!"</emphasis> message.</para>
+ <para><diffmk:wrapper diffmk:change="changed">In our simple application we need to create only one JSP page which displays a
+ </diffmk:wrapper><emphasis>"Hello World!"</emphasis> message.</para>
<itemizedlist>
<listitem>
- <para>Right click <emphasis><property moreinfo="none">WebContent > New >
- JSP</property>. </emphasis></para>
+ <para>Right click <emphasis><property moreinfo="none"><diffmk:wrapper diffmk:change="changed">WebContent > New >
+ JSP</diffmk:wrapper></property>. </emphasis></para>
</listitem>
<listitem>
<para>Type "hello.jsp" for a file name and click the <emphasis>
- <property moreinfo="none">Next</property>
- </emphasis> button.</para>
+ <property moreinfo="none">Next</property>
+ </emphasis> button.</para>
</listitem>
</itemizedlist>
<para>In the next window you can choose a template for your jsp page and see its preview.</para>
<itemizedlist>
<listitem>
<para>Select <emphasis>
- <property moreinfo="none">New JSP File (xhtml)</property>
- </emphasis> template and click <emphasis>
- <property moreinfo="none">Finish</property>
- </emphasis> button.</para>
+ <property moreinfo="none">New JSP File (xhtml)</property>
+ </emphasis> template and click <emphasis>
+ <property moreinfo="none">Finish</property>
+ </emphasis> button.</para>
</listitem>
</itemizedlist>
<figure float="0">
@@ -2141,20 +2142,27 @@
<section id="EditingJSPPage">
<?dbhtml filename="EditingJSPPage.html"?>
<title>Editing a JSP Page</title>
- <para>Let's now make a little change so that a jsp page displays
- <emphasis>"Hello World!"</emphasis> message.</para>
+ <para><diffmk:wrapper diffmk:change="changed">Let's now make a little change so that a jsp page displays
+ </diffmk:wrapper><emphasis>"Hello World!"</emphasis> message.</para>
<itemizedlist>
<listitem>
- <para>Insert this line inside the <emphasis role="bold">
- <property moreinfo="none"><body></property>
+ <!--<para>Insert this line inside the <emphasis role="bold">
+ <property><body></property>
</emphasis><emphasis role="bold">
- <property moreinfo="none"></body></property>
- </emphasis> tag: </para>
+ <property></body></property>
+ </emphasis> tag: </para>-->
+ <para><diffmk:wrapper diffmk:change="added">
+
+ Insert this line inside the
+ </diffmk:wrapper><code diffmk:change="added"><diffmk:wrapper diffmk:change="added"><body> </body>
+ </diffmk:wrapper></code><diffmk:wrapper diffmk:change="added">
+ tag:
+ </diffmk:wrapper></para>
</listitem>
</itemizedlist>
<programlisting format="linespecific" role="XML"><![CDATA[<% System.out.println("Hello World!"); %>]]>
-</programlisting>
-
+ </programlisting>
+
<para>Notice that content assist functionality is always available when you are typing:</para>
<figure float="0">
<title>Content Assist in JSP Page</title>
@@ -2165,8 +2173,8 @@
</mediaobject>
</figure>
<para>After changes made your <emphasis>
- <property moreinfo="none">hello.jsp</property>
- </emphasis> page should look like this:</para>
+ <property moreinfo="none">hello.jsp</property>
+ </emphasis> page should look like this:</para>
<figure float="0">
<title>Hello.jsp Page</title>
<mediaobject>
@@ -2175,21 +2183,21 @@
</imageobject>
</mediaobject>
</figure>
-
+
<para>This line will actually output <emphasis>"Hello
- World!"</emphasis> message in the <property moreinfo="none">Console</property>. To make the
+ World!"</emphasis> message in the <property moreinfo="none">Console</property><diffmk:wrapper diffmk:change="changed">. To make the
message displayed in the Browser, just replace this line with the simple
- <emphasis>Hello World!</emphasis>.</para>
+ </diffmk:wrapper><emphasis>Hello World!</emphasis>.</para>
</section>
-
+
<section id="WebXML">
<?dbhtml filename="WebXML.html"?>
<title>web.xml file</title>
<para>When you are creating web project the wizard creates the <emphasis>
- <property moreinfo="none">web.xml</property>
- </emphasis> for you automatically. The <property moreinfo="none">web.xml file editor</property>
- provided by <property moreinfo="none">JBoss Developer Studio</property> is available in two modes:
- <property moreinfo="none">Tree</property> and <property moreinfo="none">Source</property>.</para>
+ <property moreinfo="none">web.xml</property>
+ </emphasis> for you automatically. The <property moreinfo="none">web.xml file editor</property>
+ provided by <property moreinfo="none">JBoss Developer Studio</property><diffmk:wrapper diffmk:change="changed"> is available in two modes:
+ </diffmk:wrapper><property moreinfo="none">Tree</property> and <property moreinfo="none">Source</property>.</para>
<figure float="0">
<title>Web.xml in Design and Source Mode</title>
<mediaobject>
@@ -2199,18 +2207,18 @@
</mediaobject>
</figure>
<para>Both modes are fully synchronized. Let's add mapping to our <emphasis>
- <property moreinfo="none">hello.jsp</property>
- </emphasis> page in <emphasis>
- <property moreinfo="none">web.xml</property>
- </emphasis> file.</para>
+ <property moreinfo="none">hello.jsp</property>
+ </emphasis> page in <emphasis>
+ <property moreinfo="none">web.xml</property>
+ </emphasis> file.</para>
<itemizedlist>
<listitem>
<para>Switch to <property moreinfo="none">Source</property> tab.</para>
</listitem>
<listitem>
- <para>Add the next code into <emphasis role="bold">
- <property moreinfo="none"><welcome-file-list></property>
- </emphasis>:</para>
+ <para><diffmk:wrapper diffmk:change="added">Add the next code into
+ </diffmk:wrapper><code diffmk:change="added"><welcome-file-list></code><diffmk:wrapper diffmk:change="added">
+ :</diffmk:wrapper></para>
</listitem>
</itemizedlist>
<programlisting format="linespecific" role="XML"><![CDATA[<welcome-file>hello.jsp</welcome-file>
@@ -2219,13 +2227,13 @@
made are automatically reflected in that mode.</para>
<para>Actually you don't really need to do any configurations right now.</para>
</section>
-
+
<section id="DeployTheProject">
<?dbhtml filename="DeployTheProject.html"?>
<title>Deploying the project</title>
- <para>While creating any web project you could experience a pain writing ant scripts and
+ <para><diffmk:wrapper diffmk:change="changed">While creating any web project you could experience a pain writing ant scripts and
managing the packaging even when writing the most trivial web applications. With
- <property moreinfo="none">JBoss Developer Studio</property> you are saved from such a pain. All
+ </diffmk:wrapper><property moreinfo="none">JBoss Developer Studio</property> you are saved from such a pain. All
you need is to start <property moreinfo="none">JBoss Server</property> and launch your application
in your favorite browser.</para>
<para>You can also create a war archive with <ulink url="../../as/html_single/index.html#Project_archivesView">JBDS's Archive Tools</ulink>
@@ -2237,9 +2245,9 @@
<itemizedlist>
<listitem>
<para>Select <emphasis>
- <property moreinfo="none">Window > Show view > Other > JBoss
- Tools > Project archives</property>
- </emphasis> from menu bar</para>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Window > Show view > Other > JBoss
+ Tools > Project archives</diffmk:wrapper></property>
+ </emphasis> from menu bar</para>
</listitem>
<listitem>
<para>Select a project in Package Explorer you want to be archived</para>
@@ -2258,8 +2266,8 @@
<itemizedlist>
<listitem>
<para>Click, for example, <emphasis>
- <property moreinfo="none">WAR</property>
- </emphasis> option to create war archive</para>
+ <property moreinfo="none">WAR</property>
+ </emphasis> option to create war archive</para>
</listitem>
</itemizedlist>
<para>In the <property moreinfo="none">New WAR</property> dialog you can see automatically selected
@@ -2275,22 +2283,22 @@
<itemizedlist>
<listitem>
<para>Click <emphasis>
- <property moreinfo="none">Next</property>
- </emphasis> to see a stub archive configuration for your project: <figure float="0">
- <title>Stub Archive Configuration</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsp_application/jsp_application_10.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
+ <property moreinfo="none">Next</property>
+ </emphasis> to see a stub archive configuration for your project: <figure float="0">
+ <title>Stub Archive Configuration</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsp_application/jsp_application_10.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
</para>
</listitem>
<listitem>
<para>Click <emphasis>
- <property moreinfo="none">Finish</property>. </emphasis> The
- <emphasis>.war</emphasis> file will appear in <property moreinfo="none">Package
- Explorer</property> and also in <property moreinfo="none">Project Archives</property>
+ <property moreinfo="none">Finish</property>. </emphasis> The
+ <emphasis>.war</emphasis> file will appear in <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Package
+ Explorer</diffmk:wrapper></property> and also in <property moreinfo="none">Project Archives</property>
view as structure tree: <figure float="0">
<title>Archive is Created</title>
<mediaobject>
@@ -2321,19 +2329,19 @@
</mediaobject>
</figure>
</section>
-
+
<section id="AutoRedeploy">
<?dbhtml filename="AutoRedeploy.html"?>
<title>Auto redeploy</title>
- <para>When you are creating a web application and register it on <property moreinfo="none">JBoss
- Server</property> it is automatically deployed into
- <emphasis>/deploy</emphasis> directory of the server. JBDS comes with the
+ <para>When you are creating a web application and register it on <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">JBoss
+ Server</diffmk:wrapper></property> it is automatically deployed into
+ <emphasis>/deploy</emphasis><diffmk:wrapper diffmk:change="changed"> directory of the server. JBDS comes with the
feature of auto-redeploy. It means that you don't need to restart
- <property moreinfo="none">JBoss Server</property>. Any changes made in the application in
+ </diffmk:wrapper><property moreinfo="none">JBoss Server</property>. Any changes made in the application in
exploded format will trigger a redeployment on the server.</para>
</section>
</section>
-
+
<section id="Previewtab">
<?dbhtml filename="Previewtab.html"?>
<title>JSP Page Preview</title>
@@ -2344,8 +2352,8 @@
<itemizedlist>
<listitem>
<para>Make a little change to <emphasis>
- <property moreinfo="none">hello.jsp</property>
- </emphasis> page, e.g. put this code snippet:</para>
+ <property moreinfo="none">hello.jsp</property>
+ </emphasis> page, e.g. put this code snippet:</para>
</listitem>
</itemizedlist>
<programlisting format="linespecific" role="XML"><![CDATA[<%= new java.util.Date() %>
@@ -2353,8 +2361,8 @@
<itemizedlist>
<listitem>
<para>Click <emphasis>
- <property moreinfo="none">Save</property>
- </emphasis> button.</para>
+ <property moreinfo="none">Save</property>
+ </emphasis> button.</para>
</listitem>
<listitem>
<para>Switch to Preview page by clicking <property moreinfo="none">Preview</property> tab at the
@@ -2362,56 +2370,52 @@
</listitem>
</itemizedlist>
<!-- <figure>
- <title>Preview Page</title>
- <mediaobject>
+ <title>Preview Page</title>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/jsp_application/jsp_application_14.png"/>
+ <imagedata fileref="images/jsp_application/jsp_application_14.png"/>
</imageobject>
- </mediaobject>
- </figure>
--->
+ </mediaobject>
+ </figure>
+ -->
</section>
<section id="LaunchingTheProject">
<?dbhtml filename="LaunchingTheProject.html"?>
<title>Launch JSP Project</title>
- <para>Let's now launch our project on server. We'll use
- <property moreinfo="none">JBoss Server</property> that is shipped with <property moreinfo="none">JBoss Developer
+ <para><diffmk:wrapper diffmk:change="changed">Let's now launch our project on server. We'll use
+ </diffmk:wrapper><property moreinfo="none">JBoss Server</property> that is shipped with <property moreinfo="none">JBoss Developer
Studio</property>. You can do it by performing one of the following actions:</para>
<itemizedlist>
<listitem>
- <para>Start JBoss Server from <ulink url="../../as/html_single/index.html#JBossServerView">JBoss
- Server view</ulink> by clicking the Start icon.</para>
+ <para>Start JBoss Server from <ulink url="../../as/html_single/index.html#JBossServerView"><diffmk:wrapper diffmk:change="changed">JBoss
+ Server view</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added"> by clicking the Start the server icon (
+ </diffmk:wrapper><inlinemediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/jsp_application/jsp_application_18.png"></imagedata>
+ </imageobject>
+ </inlinemediaobject><diffmk:wrapper diffmk:change="added"> ) .</diffmk:wrapper></para>
</listitem>
</itemizedlist>
- <figure float="0">
- <title>Starting Server</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsp_application/jsp_application_15.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
+
<itemizedlist>
<listitem>
<para>Click the Run icon or right click your project folder and select <emphasis>
- <property moreinfo="none">Run As > Run on Server</property>. </emphasis> If you
+ <property moreinfo="none">Run As > Run on Server</property>. </emphasis> If you
haven't made any changes in <emphasis>
<property moreinfo="none">web.xml</property>
</emphasis> file or cleared it out you can launch the application by right
clicking the <emphasis>
<property moreinfo="none">hello.jsp</property>
</emphasis> page and selecting <emphasis>
- <property moreinfo="none">Run on the Server</property>. </emphasis></para>
+ <property moreinfo="none">Run on the Server</property> </emphasis><diffmk:wrapper diffmk:change="added">(
+ </diffmk:wrapper><inlinemediaobject diffmk:change="added">
+ <imageobject>
+ <imagedata fileref="images/jsp_application/jsp_application_16.png"></imagedata>
+ </imageobject>
+ </inlinemediaobject><diffmk:wrapper diffmk:change="added"> ).</diffmk:wrapper></para>
</listitem>
</itemizedlist>
- <figure float="0">
- <title>Run Project</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsp_application/jsp_application_16.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
+
<para>You should see the next page in a Browser :</para>
<figure float="0">
<title>Running Project</title>
@@ -2427,8 +2431,8 @@
shipped with <property moreinfo="none">JBDS</property>.
</para>
</section>
-
- </section>
+
+ </section>
</chapter>
@@ -3001,25 +3005,24 @@
<para>The Visual Page Editor will open in a screen split between source code along the
top and a WYSIWIG view along the bottom. You can see that some JSF code will be
already generated as we choose a template when creating the page.</para>
- <para>At the beginning it's necessary to create a <emphasis role="bold">
- <property moreinfo="none"><h:form></property>
- </emphasis> component where all others components are put.</para>
+ <para><diffmk:wrapper diffmk:change="added">At the beginning it's necessary to create a
+ </diffmk:wrapper><code diffmk:change="added"><h:form></code><diffmk:wrapper diffmk:change="added">
+ component where all others components are put.</diffmk:wrapper></para>
<itemizedlist>
<listitem>
- <para>Place the mouse cursor inside <emphasis role="bold">
- <property moreinfo="none"><f:view></property>
- </emphasis><emphasis role="bold">
- <property moreinfo="none"></f:view></property>
- </emphasis></para>
+ <para><diffmk:wrapper diffmk:change="added">Place the mouse cursor inside
+ </diffmk:wrapper><code diffmk:change="added"><diffmk:wrapper diffmk:change="added"><f:view>
+ </f:view></diffmk:wrapper></code>
+ </para>
</listitem>
<listitem>
<para>Go to JBoss Tools Palette and expand JSF HTML folder by selecting
it</para>
</listitem>
<listitem>
- <para>Click on <emphasis role="bold">
- <property moreinfo="none"><h:form></property>
- </emphasis> tag <figure float="0">
+ <para><diffmk:wrapper diffmk:change="added">Click on
+ </diffmk:wrapper><code diffmk:change="added"><h:form></code><diffmk:wrapper diffmk:change="added">
+ tag </diffmk:wrapper><figure float="0">
<title>Insert h:form</title>
<mediaobject>
<imageobject>
@@ -3144,11 +3147,11 @@
</figure>
<itemizedlist>
<listitem>
- <para>Switch to Source mode and insert <emphasis role="bold">
- <property moreinfo="none"><br/></property>
- </emphasis> tag after <emphasis role="bold">
- <property moreinfo="none"><h:outputText></property>
- </emphasis> component to make a new line.</para>
+ <para><diffmk:wrapper diffmk:change="added">Switch to Source mode and insert
+ </diffmk:wrapper><code diffmk:change="added"><br/></code><diffmk:wrapper diffmk:change="added">
+ tag after
+ </diffmk:wrapper><code diffmk:change="added"><h:outputText></code><diffmk:wrapper diffmk:change="added">
+ component to make a new line.</diffmk:wrapper></para>
</listitem>
<listitem>
<para>Click <emphasis>
@@ -3161,11 +3164,11 @@
editor, and drop it inside the editor after the text.</para>
</listitem>
<listitem>
- <para>Switch to a Source mode and insert <emphasis role="bold">
- <property moreinfo="none"><br/></property>
- </emphasis> tag after <emphasis role="bold">
- <property moreinfo="none"><h:outputText></property>
- </emphasis> component to make a new line</para>
+ <para><diffmk:wrapper diffmk:change="added">Switch to a Source mode and insert
+ </diffmk:wrapper><code diffmk:change="added"><br/></code><diffmk:wrapper diffmk:change="added">
+ tag after
+ </diffmk:wrapper><code diffmk:change="added"><h:outputText></code><diffmk:wrapper diffmk:change="added">
+ component to make a new line</diffmk:wrapper></para>
</listitem>
<listitem>
<para>Click <emphasis>
@@ -3250,9 +3253,9 @@
<para>Go to Source mode</para>
</listitem>
<listitem>
- <para>Add the validation attribute to <emphasis role="bold">
- <property moreinfo="none"><f:validateLongRange></property>
- </emphasis> for user input validation</para>
+ <para><diffmk:wrapper diffmk:change="added">Add the validation attribute to
+ </diffmk:wrapper><code diffmk:change="added"><f:validateLongRange></code><diffmk:wrapper diffmk:change="added">
+ for user input validation</diffmk:wrapper></para>
</listitem>
</itemizedlist>
<programlisting format="linespecific" role="XML"><![CDATA[<h:inputText id="userNumber" value="#{NumberBean.userNumber}" required="true">
@@ -3314,37 +3317,41 @@
</emphasis></para>
</listitem>
<listitem>
- <para>In Source mode add <emphasis role="bold">
- <property moreinfo="none"><br/></property>
- </emphasis> tags between <emphasis role="bold">
- <property moreinfo="none"><outputText></property>
- </emphasis>, <emphasis role="bold">
- <property moreinfo="none"><inputText></property>
- </emphasis> and <emphasis role="bold">
- <property moreinfo="none"><commandButton></property>
- </emphasis> components to place them on different lines</para>
+ <para><diffmk:wrapper diffmk:change="added">In Source mode add
+ </diffmk:wrapper><code diffmk:change="added"><br/></code><diffmk:wrapper diffmk:change="added">
+ tags between
+ </diffmk:wrapper><code diffmk:change="added"><outputText></code><diffmk:wrapper diffmk:change="added">
+ , </diffmk:wrapper><code diffmk:change="added"><inputText></code><diffmk:wrapper diffmk:change="added">
+ and </diffmk:wrapper><code diffmk:change="added"><commandButton></code><diffmk:wrapper diffmk:change="added">
+ components to place them on different lines</diffmk:wrapper></para>
</listitem>
</itemizedlist>
<para>inputnumber.jsp page should look like this:</para>
<programlisting format="linespecific" role="XML"><![CDATA[<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<f:loadBundle basename="game.messages" var="msg"/>
-
+<f:loadBundle basename="game.messages" var="msg" />
<html>
- <f:view>
- <h:form id="inputNumbers">
- <h:outputText value="#{msg.how_to_play}"/>
- <br/>
- <h:messages style="color: blue"/>
- <br/>
- <h:inputText id="userNumber" value="#{NumberBean.userNumber}" required="true">
- <f:validateLongRange minimum="0" maximum="100"/>
- </h:inputText>
- <br/><br/>
- <h:commandButton value=
- "#{msg.makeguess_button}" action="#{NumberBean.checkGuess}"/>
- </h:form>
- </f:view>
+<head>
+<title></title>
+</head>
+ <body>
+ <f:view>
+ <h:form id="inputNumbers">
+ <h:outputText value="#{msg.how_to_play}" />
+ <br />
+ <h:messages style="color: blue" />
+ <br />
+ <h:inputText value="#{NumberBean.userNumber}" id="userNumber"
+ required="true">
+ <f:validateLongRange minimum="0" maximum="100" />
+ </h:inputText>
+ <br />
+ <br />
+ <h:commandButton value="#{msg.makeguess_button}"
+ action="#{NumberBean.checkGuess}" />
+ </h:form>
+ </f:view>
+ </body>
</html>
]]></programlisting>
</section>
@@ -3358,17 +3365,24 @@
<f:loadBundle basename="game.messages" var="msg"/>
<html>
- <f:view>
- <h:form id="result">
- <h:outputFormat value="#{msg.success_text}">
- <f:param value="#{NumberBean.userNumber}"/>
- </h:outputFormat>
- <br/><br/>
- <h:commandButton value=
- "#{msg.trayagain_button}" action="#{NumberBean.playagain}"/>
- </h:form>
- </f:view>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <h:form id="result">
+ <h:outputFormat value="#{msg.success_text}">
+ <f:param value="#{NumberBean.userNumber}" />
+ </h:outputFormat>
+ <br />
+ <br />
+ <h:commandButton value="#{msg.trayagain_button}"
+ action="#{NumberBean.playagain}" />
+ </h:form>
+ </f:view>
+ </body>
</html>
+
]]></programlisting>
<para>Again you can use code assist provided by JBDS when editing jsp page:</para>
<figure float="0">
@@ -3379,14 +3393,12 @@
</imageobject>
</mediaobject>
</figure>
- <para>This page, success.jsp, is shown if you correctly guessed the number. The
- <emphasis role="bold">
- <property moreinfo="none"><h:outputFormat></property>
- </emphasis> tag will get the value of success_text from the properties file. The {0}
+ <para><diffmk:wrapper diffmk:change="added">This page, success.jsp, is shown if you correctly guessed the number. The
+ </diffmk:wrapper><code diffmk:change="added"><h:outputFormat></code><diffmk:wrapper diffmk:change="added">
+ tag will get the value of success_text from the properties file. The {0}
in success_text will be substituted for by the value of the value attribute within
- the <emphasis role="bold">
- <property moreinfo="none"><f:param></property>
- </emphasis> tag during runtime.</para>
+ the </diffmk:wrapper><code diffmk:change="added"><f:param></code><diffmk:wrapper diffmk:change="added">
+ tag during runtime.</diffmk:wrapper></para>
<para>At the end, you have a button which allows you to replay the game. The action
value references a backing bean method. In this case, the method only terminates the
current session so that when you are shown the first page, the input text box is
@@ -3549,7 +3561,7 @@
</figure>
<itemizedlist>
- <listitem><para>Now in the New Project Example dialog you can select a project you would like to explore</para>
+ <listitem><para><diffmk:wrapper diffmk:change="changed">Now in the New Project Example dialog you can select a project you would like to explore and a site to download it from</diffmk:wrapper></para>
<para>Project Examples Wizard provides a filter field to more easily locate the project examples you want, so you can type in the project you would like to explore in the field.</para></listitem>
</itemizedlist>
@@ -3852,135 +3864,163 @@
</chapterinfo>
<title>Further Reading</title>
-
- <para>
- <emphasis role="bold">JSF Tools Reference Guide</emphasis>
- <ulink url="../../jsf_tools_ref_guide/html_single/index.html">(html)</ulink>
-
+<itemizedlist diffmk:change="added">
+
+ <listitem diffmk:change="added">
+ <para diffmk:change="added">
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">Seam Dev Tools Reference Guide</diffmk:wrapper></emphasis>
+ <ulink url="../../seam/html_single/index.html">(html)
+ </ulink>
+ <para><diffmk:wrapper diffmk:change="changed"> This guide helps you to understand what Seam is and how to install Seam plug-in into
+ Eclipse. It tells you the necessary steps to start working with Seam Framework and assists in a
+ simple Seam Project creation. Also you will learn how to create and run the CRUD Database
+ Application with Seam as well as find out what Seam Editors Features and Seam Components are. </diffmk:wrapper></para>
</para>
- <para> From this guide you'll discover all peculiarities of work at a JSF project. You'll
- learn all shades that cover the process of project creation and take a closer look at the JSF
- configuration file. Also you'll get to know managed beans and how to work with them and
- find out, how to create and register a custom converter, custom validator and referenced beans
- in a JSF project. </para>
-
-<itemizedlist>
+
<listitem>
+ <para diffmk:change="added">
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">Visual Web Tools Reference Guide</diffmk:wrapper></emphasis>
+ <ulink url="../../jsf/html_single/index.html">(html)<diffmk:wrapper diffmk:change="changed"> provides general orientation and an overview of JBDS visual web tools functionality. This guide discusses the following topics: editors, palette, web properties view, openOn, content assist, RichFaces support.
+ </diffmk:wrapper></ulink>
+ </para>
+
+ <listitem diffmk:change="added">
+ <para>
+ <emphasis diffmk:change="added" role="bold"><diffmk:wrapper diffmk:change="added">JBoss Server Manager Reference Guide</diffmk:wrapper></emphasis>
+ <ulink diffmk:change="added" url="../../as/html_single/index.html"><diffmk:wrapper diffmk:change="added">(html)</diffmk:wrapper></ulink>
+ </para>
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added"> This guide covers the basics of working with the JBoss server manager. You will read how to
+ install runtimes and servers and quickly learn how to configure, start, stop the server and know
+ how deployment and archiving process. You will find out how to manage installed JBoss Servers
+ via JBoss AS Perspective. You will also read how to deploy modules onto the server. </diffmk:wrapper></para>
+ </listitem>
+
+ <listitem>
+ <para diffmk:change="added">
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">jBPM Tools Reference Guide</diffmk:wrapper></emphasis>
+ <ulink url="../../jbpm/html_single/index.html">(html)
+ </ulink>
+ <para><diffmk:wrapper diffmk:change="changed">With jBPM Tools Reference Guide we'll help you to facilitate a cross-product
+ learning and know how you can speed your development using special editors and visual designers.
+ We'll also guide you through the steps on how to create a simple process and test it
+ within jBPM jPDL perspective.</diffmk:wrapper></para>
+ </para>
+
+ <listitem>
+ <para diffmk:change="added">
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">Hibernate Tools Reference Guide</diffmk:wrapper></emphasis>
+ <ulink url="../../hibernatetools/html_single/index.html">(html)
+ </ulink>
+ <para><diffmk:wrapper diffmk:change="changed">Throughout this guide you will learn how to install and use Hibernate Tools bath via Ant and
+ through Eclipse. We'll supply you with the information on how to create mapping files,
+ configuration file as well as a file for controlling reverse engineering by using specific
+ wizards that Hibernate tooling provides. Also you will know about Code Generation and
+ peculiarities of work within Hibernate Console Perspective.</diffmk:wrapper></para>
+ </para>
+
+ <listitem>
+ <para diffmk:change="added">
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">ESB Editor Reference Guide</diffmk:wrapper></emphasis>
+ <ulink url="../../esb_ref_guide/html_single/index.html">(html)
+ </ulink>
+ <para><diffmk:wrapper diffmk:change="changed">This guide provides you with the information on ESB Editor and all necessary wizards for ESB
+ files development.</diffmk:wrapper></para>
+ </para>
+
+ <listitem>
+ <para diffmk:change="added">
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">JBoss Portal Tools Reference Guide</diffmk:wrapper></emphasis>
+ <ulink url="../../jboss_portal_tools_ref_guide/html_single/index.html">(html)
+ </ulink>
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">The guide gives a detail look at how you can easily build a Portlet Web Application with
+ JBoss Tools and deploy it onto JBoss Portal.</diffmk:wrapper></para>
+ </para>
+
+ <listitem>
+ <para diffmk:change="added">
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">JBoss WS User Guide</diffmk:wrapper></emphasis>
+ <ulink url="../../ws_ref_guide/html_single/index.html">(html)</ulink>
+ </para>
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">This guide gives you practical help on JBossWS usage. You will learn how to create a web service using JBossWS runtime, find out how to create a web service client from a WSDL document using JBoss WS and also see how to set your development environment.</diffmk:wrapper></para>
+ </listitem>
+
+ <listitem diffmk:change="added">
+ <para>
+ <emphasis diffmk:change="added" role="bold"><diffmk:wrapper diffmk:change="added">Smooks Tools Reference Guide</diffmk:wrapper></emphasis>
+ <ulink diffmk:change="added" url="../../jboss_smooks_plugin_ref_guide/html_single/index.html"><diffmk:wrapper diffmk:change="added">(html)</diffmk:wrapper></ulink>
+ </para>
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">This guide is packed with useful and easy-to-understand information about graphical, configuration and source editor pages.</diffmk:wrapper></para>
+ </listitem>
+
+ <listitem>
+ <para diffmk:change="added">
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">Drools Tools Reference Guide</diffmk:wrapper></emphasis>
+ <ulink url="../../drools_tools_ref_guide/html_single/index.html">(html)</ulink>
+ </para>
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">The guide help you to discover how to create a new Drools project, use debugging rules and work with different editors.</diffmk:wrapper></para>
+ </listitem>
+
+ <listitem diffmk:change="added">
+ <para>
+ <emphasis diffmk:change="added" role="bold"><diffmk:wrapper diffmk:change="added">JMX Tools Reference Guide</diffmk:wrapper></emphasis>
+ <ulink diffmk:change="added" url="../../jmx_ref_guide/html_single/index.html"><diffmk:wrapper diffmk:change="added">(html)</diffmk:wrapper></ulink>
+ </para>
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">With the help of this guide you'll explore the best practices to follow when working with MBean Explorer, MBean Editor, Connections and etc.</diffmk:wrapper></para>
+ </listitem>
+
+ <listitem>
<para>
- <emphasis role="bold">JSF Tools Tutorial</emphasis>
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">JSF Tools Tutorial</diffmk:wrapper></emphasis>
<ulink url="../../jsf_tools_tutorial/html_single/index.html">(html)</ulink>
</para>
- <para> This tutorial will describe how to deal with classic/old style of JSF development and how
- to create a simple JSF application using the JBoss Developer Studio. </para>
+ <para><diffmk:wrapper diffmk:change="changed"> This tutorial will describe how to deal with classic/old style of JSF development and how
+ to create a simple JSF application using the JBoss Developer Studio. </diffmk:wrapper></para>
</listitem>
<listitem> <para>
- <emphasis role="bold">Struts Tools Reference Guide</emphasis>
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">JSF Tools Reference Guide</diffmk:wrapper></emphasis>
+ <ulink url="../../jsf_tools_ref_guide/html_single/index.html">(html)
+
+ </ulink>
+ <para><diffmk:wrapper diffmk:change="changed"> From this guide you'll discover all peculiarities of work at a JSF project. You'll
+ learn all shades that cover the process of project creation and take a closer look at the JSF
+ configuration file. Also you'll get to know managed beans and how to work with them and
+ find out, how to create and register a custom converter, custom validator and referenced beans
+ in a JSF project. </diffmk:wrapper></para>
+ </para>
+
+ <listitem> <para>
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">Struts Tools Reference Guide</diffmk:wrapper></emphasis>
<ulink url="../../struts_tools_ref_guide/html_single/index.html">(html)</ulink>
</para>
- <para> In Struts Tools Reference Guide you will learn how to create and work with a new struts
+ <para><diffmk:wrapper diffmk:change="changed"> In Struts Tools Reference Guide you will learn how to create and work with a new struts
project. This guide also provides information about graphical editor for struts configuration
- files, tiles files, and struts validation files. </para>
+ files, tiles files, and struts validation files. </diffmk:wrapper></para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Struts Tools Tutorial</emphasis>
+ <emphasis role="bold"><diffmk:wrapper diffmk:change="changed">Struts Tools Tutorial</diffmk:wrapper></emphasis>
<ulink url="../../struts_tools_tutorial/html_single/index.html">(html)</ulink>
</para>
- <para> This tutorial will describe the classical style of Struts development, and will
- step-by-step show you how to create a simple Struts application in JBoss Developer Studio.</para>
+ <para><diffmk:wrapper diffmk:change="changed"> This tutorial will describe the classical style of Struts development, and will
+ step-by-step show you how to create a simple Struts application in JBoss Developer Studio.</diffmk:wrapper></para>
</listitem>
-<listitem>
- <para>
- <emphasis role="bold">Seam Dev Tools Reference Guide</emphasis>
- <ulink url="../../seam/html_single/index.html">(html)</ulink>
- </para>
- <para> This guide helps you to understand what Seam is and how to install Seam plug-in into
- Eclipse. It tells you the necessary steps to start working with Seam Framework and assists in a
- simple Seam Project creation. Also you will learn how to create and run the CRUD Database
- Application with Seam as well as find out what Seam Editors Features and Seam Components are. </para>
- </listitem>
-
- <listitem>
- <para>
- <emphasis role="bold">Visual Web Tools Reference Guide</emphasis>
- <ulink url="../../jsf/html_single/index.html">(html)</ulink>
- </para>
- </listitem>
-
- <listitem>
- <para>
- <emphasis role="bold">JBoss Server Manager Reference Guide</emphasis>
- <ulink url="../../as/html_single/index.html">(html)</ulink>
- </para>
- <para> This guide covers the basics of working with the JBoss server manager. You will read how to
- install runtimes and servers and quickly learn how to configure, start, stop the server and know
- how deployment and archiving process. You will find out how to manage installed JBoss Servers
- via JBoss AS Perspective. You will also read how to deploy modules onto the server. </para>
- </listitem>
-
- <listitem>
- <para>
- <emphasis role="bold">jBPM Tools Reference Guide</emphasis>
- <ulink url="../../jbpm/html_single/index.html">(html)</ulink>
- </para>
- <para>With jBPM Tools Reference Guide we'll help you to facilitate a cross-product
- learning and know how you can speed your development using special editors and visual designers.
- We'll also guide you through the steps on how to create a simple process and test it
- within jBPM jPDL perspective.</para>
- </listitem>
-
- <listitem>
- <para>
- <emphasis role="bold">Hibernate Tools Reference Guide</emphasis>
- <ulink url="../../hibernatetools/html_single/index.html">(html)</ulink>
- </para>
- <para>Throughout this guide you will learn how to install and use Hibernate Tools bath via Ant and
- through Eclipse. We'll supply you with the information on how to create mapping files,
- configuration file as well as a file for controlling reverse engineering by using specific
- wizards that Hibernate tooling provides. Also you will know about Code Generation and
- peculiarities of work within Hibernate Console Perspective.</para>
- </listitem>
- <listitem>
- <para>
- <emphasis role="bold">ESB Editor Reference Guide</emphasis>
- <ulink url="../../esb_ref_guide/html_single/index.html">(html)</ulink>
- </para>
- <para>This guide provides you with the information on ESB Editor which allows you to develop ESB
- file.</para>
- </listitem>
-
- <listitem>
- <para>
- <emphasis role="bold">JBoss Portal Tools Reference Guide</emphasis>
- <ulink url="../../jboss_portal_tools_ref_guide/html_single/index.html">(html)</ulink>
- </para>
- <para>The guide gives a detail look at how you can easily build a Portlet Web Application with
- JBoss Tools and deploy it onto JBoss Portal.</para>
- </listitem>
-
- <listitem>
- <para>
- <emphasis role="bold">JBoss WS User Guide</emphasis>
- <ulink url="../../ws_ref_guide/html_single/index.html">(html)</ulink>
- </para>
- <para>This guide gives you practical help on JBossWS usage.</para>
- </listitem>
-
<listitem>
<para>
<emphasis role="bold">Exadel Studio Migration Guide</emphasis>
<ulink url="../../Exadel-migration/html_single/index.html">(html)</ulink>
</para>
- <para>This document is intended to help you to migrate an existing Exadel JSF or Struts projects
- from Exadel Studio into JBoss Developer Studio. </para>
+ <para><diffmk:wrapper diffmk:change="changed">This document is intended to help you to migrate an existing Exadel JSF or Struts projects
+ from Exadel Studio into JBoss Developer Studio. </diffmk:wrapper></para>
</listitem>
-
-</itemizedlist>
-</chapter>
+</listitem>
+
+<para diffmk:change="added"><diffmk:wrapper diffmk:change="added">If there's anything we didn't cover in this guide, please feel free to visit our </diffmk:wrapper><ulink diffmk:change="added" url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=258"><diffmk:wrapper diffmk:change="added">JBoss Developer Studio Users Forum</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added"> or </diffmk:wrapper><ulink diffmk:change="added" url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201"><diffmk:wrapper diffmk:change="added">JBoss Tools Users Forum</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added"> to ask questions. There we are also looking for
+ your suggestions and comments.</diffmk:wrapper></para>
+</listitem>
-</book>
+</listitem></listitem></listitem></listitem></listitem></itemizedlist></chapter></book>
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r15111 - trunk/birt/docs/en.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-05-07 11:56:21 -0400 (Thu, 07 May 2009)
New Revision: 15111
Added:
trunk/birt/docs/en/master_output.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-717 - master_output.xml is generated;
Added: trunk/birt/docs/en/master_output.xml
===================================================================
--- trunk/birt/docs/en/master_output.xml (rev 0)
+++ trunk/birt/docs/en/master_output.xml 2009-05-07 15:56:21 UTC (rev 15111)
@@ -0,0 +1,843 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.docbook.org/xml/4.3/docbookx.dtd"
+
+[
+<!ENTITY introduction SYSTEM "modules/introduction.xml">
+<!ENTITY birt_integration_with_seam SYSTEM "modules/birt_integration_with_seam.xml">
+<!ENTITY hibernate_datasource SYSTEM "modules/hibernate_datasource.xml">
+<!ENTITY birt_reports_deployment SYSTEM "modules/birt_reports_deployment.xml">
+
+<!ENTITY gsglink "../../GettingStartedGuide/html_single/index.html">
+]><book xmlns:diffmk="http://diffmk.sf.net/ns/diff">
+ <bookinfo>
+ <title><diffmk:wrapper diffmk:change="changed">Birt Plugin Integration Reference Guide</diffmk:wrapper></title>
+
+ <author><firstname>Anastasiya</firstname><surname>Bogachuk</surname><email>abogachuk(a)exadel.com</email></author>
+ <author diffmk:change="added"><firstname diffmk:change="added"><diffmk:wrapper diffmk:change="added">Olga</diffmk:wrapper></firstname><surname diffmk:change="added"><diffmk:wrapper diffmk:change="added">Chikvina</diffmk:wrapper></surname></author>
+
+ <pubdate>August 2008</pubdate>
+ <copyright>
+ <year>2008</year>
+ <year>2009</year>
+ <holder>JBoss, a division of Red Hat</holder>
+ </copyright>
+ <releaseinfo>
+ Version: 1.0.0.GA
+ </releaseinfo>
+
+
+<abstract>
+ <title></title>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/jboss_birt_plugin_re...">PDF version</ulink>
+ </para>
+</abstract>
+
+
+ </bookinfo>
+ <toc></toc>
+
+
+<chapter id="introduction" xml:base="file:///home/ochikvina/WORK/for_compare/trunk/birt/docs/en/modules/introduction.xml">
+ <?dbhtml filename="introduction.html"?>
+
+ <chapterinfo>
+ <keywordset>
+ <keyword>JBoss Developer Studio</keyword>
+ <keyword>Eclipse</keyword>
+ <keyword>JBoss</keyword>
+ <keyword>JBoss Tools</keyword>
+ <keyword>JBDS</keyword>
+ <keyword>BIRT Plugin</keyword>
+ </keywordset>
+ </chapterinfo>
+
+ <title>Introduction</title>
+
+ <section>
+
+ <title>What is BIRT?</title>
+ <para><diffmk:wrapper diffmk:change="changed">BIRT plugin is an Eclipse-based open source reporting system for web applications
+ based on Java and J2EE. BIRT consists of two main components: a report designer based on
+ Eclipse, and a runtime component that can be added to your app server. BIRT also offers
+ a charting engine that lets you add charts to your own Web application.</diffmk:wrapper></para>
+ <para>With the help of BIRT you can generate a great number of reports to be used in your
+ application:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Lists</para>
+ </listitem>
+ <listitem>
+ <para>Charts</para>
+ </listitem>
+ <listitem>
+ <para>Crosstabs, or cross-tabulation, or matrix</para>
+ </listitem>
+ <listitem>
+ <para>Letters and Documents</para>
+ </listitem>
+ <listitem>
+ <para>Compound Reports</para>
+ </listitem>
+ </itemizedlist>
+
+ <para><diffmk:wrapper diffmk:change="added">You can find more detailed information on the BIRT plugin, its report types and
+ anatomy on the </diffmk:wrapper><ulink url="http://www.eclipse.org/birt/phoenix/intro/"><diffmk:wrapper diffmk:change="changed">BIRT Homepage</diffmk:wrapper></ulink>.</para>
+
+ <para><diffmk:wrapper diffmk:change="added">To understand the basic BIRT concepts and to know how to create a basic BIRT report,
+ refer to the </diffmk:wrapper><ulink diffmk:change="added" url="http://www.eclipse.org/birt/phoenix/tutorial/"><diffmk:wrapper diffmk:change="added">Eclipse BIRT
+ Tutorials</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">. What extensions </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> provides for
+ Eclipse BIRT you'll find out in the next sections.</diffmk:wrapper></para>
+ </section>
+
+ <section diffmk:change="added">
+ <title><diffmk:wrapper diffmk:change="changed">JBoss BIRT Integration Functionality Overview</diffmk:wrapper></title>
+
+ <para><diffmk:wrapper diffmk:change="added">This reference guide describes the one module of the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> project which
+ performs the integration with BIRT. The integration includes the following functionalities:</diffmk:wrapper></para>
+ <itemizedlist>
+ <listitem>
+ <para><diffmk:wrapper diffmk:change="changed">Hibernate ODA driver that includes a dialog to create HQL queries with
+ syntax-highlighting, content-assist, formatting as well as other functionalities
+ available in the HQL editor. There is also a possibility to add
+ parameters.</diffmk:wrapper></para>
+ </listitem>
+ <listitem>
+ <para><diffmk:wrapper diffmk:change="changed">possibility to add JBoss BIRT functionality to the standard Seam web
+ project</diffmk:wrapper></para>
+ </listitem>
+ <listitem>
+ <para><diffmk:wrapper diffmk:change="changed">BIRT JSF/Seam control</diffmk:wrapper></para>
+ </listitem>
+ <listitem>
+ <para><diffmk:wrapper diffmk:change="changed">deployment of BIRT reports within web projects (Seam, JSF, etc.)</diffmk:wrapper></para>
+ </listitem>
+ </itemizedlist>
+
+ <para><diffmk:wrapper diffmk:change="added">To enable </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> integration with BIRT you are intended to
+ have the next:</diffmk:wrapper></para>
+ <itemizedlist diffmk:change="added">
+ <listitem>
+ <para><diffmk:wrapper diffmk:change="added">Eclipse with </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">
+ installed (how to install </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> on Eclipse, what
+ dependences and versions requirements are needed reed in the </diffmk:wrapper><ulink diffmk:change="added" url="../../GettingStartedGuide/html_single/index.html#JBossToolsInstall"><diffmk:wrapper diffmk:change="added">JBoss Tools Installation</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added"> section)</diffmk:wrapper></para>
+ </listitem>
+ <listitem>
+ <para><diffmk:wrapper diffmk:change="added">BIRT Report Designer (BIRT Report Designer 2.3.2
+ you can download from </diffmk:wrapper><ulink diffmk:change="added" url="http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/..."><diffmk:wrapper diffmk:change="added">Eclipse downloads site</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">)</diffmk:wrapper></para>
+ </listitem>
+ <listitem>
+ <para><diffmk:wrapper diffmk:change="added">BIRT Web Tools Integration ( BIRT WTP Integration 2.3.2 you can download from
+ </diffmk:wrapper><ulink diffmk:change="added" url="http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/..."><diffmk:wrapper diffmk:change="added">Eclipse downloads site</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">)</diffmk:wrapper></para>
+ </listitem>
+ </itemizedlist>
+
+ <note diffmk:change="added">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Note:</diffmk:wrapper></title>
+ <para><diffmk:wrapper diffmk:change="added">Versions of BIRT framework and BIRT WTP integration should be no less than RC4 in
+ order to the BIRT facet works correctly.</diffmk:wrapper></para>
+ </note>
+ </section>
+
+ <section diffmk:change="added" id="birt_plugin_rel_resources">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Other Relevant Resources on the Topic</diffmk:wrapper></title>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">All JBoss Developer Studio/JBoss Tools release documentation you can find at</diffmk:wrapper><ulink diffmk:change="added" url="http://docs.jboss.org/tools/"><diffmk:wrapper diffmk:change="added">http://docs.jboss.org/tools</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added"> in the corresponding release directory.</diffmk:wrapper></para>
+ <para><diffmk:wrapper diffmk:change="added">The latest documentation builds are available at </diffmk:wrapper><ulink diffmk:change="added" url="http://download.jboss.org/jbosstools/nightly-docs/"><diffmk:wrapper diffmk:change="added">http://download.jboss.org/jbosstools/nightly-docs</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></para>
+ </section>
+
+</chapter>
+
+
+<chapter diffmk:change="added" id="birt_integration_with_seam" xml:base="file:///home/ochikvina/WORK/for_compare/trunk/birt/docs/en/modules/birt_integration_with_seam.xml" xreflabel="birt_integration_with_seam">
+
+ <?dbhtml filename="birt_integration_with_seam.html"?>
+ <chapterinfo diffmk:change="added">
+ <keywordset diffmk:change="added">
+ <keyword diffmk:change="added"><diffmk:wrapper diffmk:change="added">JBoss</diffmk:wrapper></keyword>
+ <keyword diffmk:change="added"><diffmk:wrapper diffmk:change="added">BIRT</diffmk:wrapper></keyword>
+ <keyword diffmk:change="added"><diffmk:wrapper diffmk:change="added">Seam</diffmk:wrapper></keyword>
+ </keywordset>
+ </chapterinfo>
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Adding BIRT Functionality to Standard Seam Web Project</diffmk:wrapper></title>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">In this chapter you'll know how to create a Seam web project with BIRT
+ capabilities included.</diffmk:wrapper></para>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">You are supposed to have Seam runtime and JBoss Application Server downloaded and
+ extracted somewhere on you hard drive.</diffmk:wrapper></para>
+
+ <tip diffmk:change="added">
+ <title><diffmk:wrapper diffmk:change="changed">Tip:</diffmk:wrapper></title>
+ <para><diffmk:wrapper diffmk:change="added">We used</diffmk:wrapper><ulink diffmk:change="added" url="http://sourceforge.net/project/showfiles.php?group_id=22866&package_i..."><diffmk:wrapper diffmk:change="added">JBoss Seam 2.0.1 GA</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added"> and </diffmk:wrapper><ulink diffmk:change="added" url="http://sourceforge.net/project/showfiles.php?group_id=22866&package_i..."><diffmk:wrapper diffmk:change="added">JBoss Application Server 4.2.2 GA</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added"> in examples of this guide.</diffmk:wrapper></para>
+ </tip>
+
+ <section diffmk:change="added" id="creatin_project_with_birt">
+ <title><diffmk:wrapper diffmk:change="changed">Creating Seam Web Project with Birt Facet</diffmk:wrapper></title>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">First, open </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Seam perspective</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> by going to </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Window > Open Perspective > Other > Seam</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.
+ </diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> To create a new Seam Web project follow to </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">File > New > Seam Web Project</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> (or </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">File > New > Other > Seam > Seam Web
+ Project</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> if you are not in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Seam perspective</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">).</diffmk:wrapper></para>
+
+ <para><diffmk:wrapper diffmk:change="added">On the first wizard page enter the project name, then specify the target runtime and
+ target server. In the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Configuration</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> section click </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Modify</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> to configure the project facets.</diffmk:wrapper></para>
+
+ <figure diffmk:change="added" float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Creating Seam Web Project</diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/birt_integration_with_seam/testBirtProject.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="changed">Choose the 2.0 version of the </diffmk:wrapper><emphasis>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Seam</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="changed"> facet and enable the </diffmk:wrapper><emphasis>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Birt Reporting Runtime Component</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> facet.</diffmk:wrapper></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Adding the Birt Reporting Runtime Component Facet </diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/birt_integration_with_seam/addingBirtFacet.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Or you can just choose the </diffmk:wrapper><emphasis>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">JBoss BIRT Integration Web Project</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="changed"> configuration.</diffmk:wrapper></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Choosing the JBoss BIRT Integration Web Project Configuration</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata
+ fileref="images/birt_integration_with_seam/projectBirtConfiguration.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="changed">Next three pages are filled out with defaults, just leave them through by pressing </diffmk:wrapper><emphasis>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Next</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="changed"> On the </diffmk:wrapper><emphasis>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Seam Facet</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="changed"> page you should specify the Seam runtime and Connection profile.</diffmk:wrapper></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Configuring the Seam Facet settings</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/birt_integration_with_seam/seamFacet.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Hit </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Finish</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> to create the project with Birt functionality enabled.</diffmk:wrapper></para>
+ </section>
+
+ <section diffmk:change="added" id="integration">
+ <title><diffmk:wrapper diffmk:change="changed">Integration with Seam</diffmk:wrapper></title>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">The JBoss BIRT Integration feature contains the BIRT tag that allows the user to add a
+ BIRT report to an </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">.xhtml</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> file:</diffmk:wrapper></para>
+
+ <programlisting diffmk:change="added" format="linespecific" role="XHTML"><diffmk:wrapper diffmk:change="added"><![CDATA[<p:birt xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:p="http://jboss.com/products/seam/birt"
+ designType="run"
+ format="pdf"
+ designName="test.rptdesign"
+ title="JBoss Birt Test">
+
+</p:birt>]]></diffmk:wrapper></programlisting>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Let's look how it works.</diffmk:wrapper></para>
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Create in the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Web Content</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> folder three </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">.xhtml</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> pages with the following content:</diffmk:wrapper></para>
+
+ <itemizedlist diffmk:change="added">
+ <listitem diffmk:change="added">
+ <para diffmk:change="added">
+ <emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">birttests.xhtml</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">:</diffmk:wrapper></emphasis>
+ </para>
+ <programlisting diffmk:change="added" format="linespecific" role="XHTML"><diffmk:wrapper diffmk:change="added"><![CDATA[<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ template="layout/template.xhtml">
+
+ <ui:define name="body">
+ <h:messages globalOnly="true" styleClass="message"/>
+ <rich:panel>
+ <f:facet name="header">Welcome to JBoss BIRT!</f:facet>
+ <ul>
+ <li><s:link view="/testbirt.xhtml" value="Test Birt" /></li>
+ <li><s:link view="/testbirt1.xhtml" value="Test Birt 1" /></li>
+ </ul>
+ </rich:panel>
+ </ui:define>
+ </ui:composition>]]></diffmk:wrapper></programlisting>
+ </listitem>
+ <listitem diffmk:change="added">
+ <para>
+ <emphasis>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">testbirt.xhtml</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">:</diffmk:wrapper></emphasis>
+ </para>
+ <programlisting diffmk:change="added" format="linespecific" role="XHTML"><diffmk:wrapper diffmk:change="added"><![CDATA[<p:birt xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:p="http://jboss.com/products/seam/birt"
+ designType="run"
+ format="pdf"
+ designName="test.rptdesign"
+ title="JBoss Birt Test">
+
+ <p:param name="sample" value="sample param"/>
+</p:birt>]]></diffmk:wrapper></programlisting>
+ </listitem>
+ <listitem diffmk:change="added">
+ <para diffmk:change="added">
+ <emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">testbirt1.xhtml</diffmk:wrapper></property>:</emphasis>
+ </para>
+ <programlisting diffmk:change="added" format="linespecific" role="XHTML"><diffmk:wrapper diffmk:change="added"><![CDATA[<p:birt xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:p="http://jboss.com/products/seam/birt"
+ designType="frameset"
+ designName="test1.rptdesign"
+ title="JBoss Birt Test">
+</p:birt>]]></diffmk:wrapper></programlisting>
+ </listitem>
+ </itemizedlist>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Now start the application server by clicking the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Start</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> option in the context menu of the server in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Server
+ View</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> (if the view isn't open go to </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Window > Show View > Other > JBoss Server
+ View</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">)</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added">. Try the tests out by accessing </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">http://localhost:8080/hellobirt/birttests.seam</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> in your web browser.</diffmk:wrapper></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Welcome Page in the Browser</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/birt_integration_with_seam/birttestsPage.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="added">Now if you click </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Test Birt</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> you should see the following </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">.pdf</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> file:</diffmk:wrapper></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">After Clicking Test Birt</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/birt_integration_with_seam/testbirtPage.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="changed">After clicking </diffmk:wrapper><emphasis>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Test Birt 1</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> the next page is displayed:</diffmk:wrapper></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">After Clicking Test Birt 1</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/birt_integration_with_seam/testbirt1Page1.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Put the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">test param</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> as Sample Parameter value, specify the maximum possible Customer Number as
+ </diffmk:wrapper><emphasis>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="added">1001</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">,</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> for instance, and then press </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Ok</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="changed"> You'll see the following BIRT
+ report:</diffmk:wrapper></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">BIRT Report in the Browser Window</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/birt_integration_with_seam/testbirt1Page2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">The BIRT tag recognizes most of the parameters described on </diffmk:wrapper><ulink diffmk:change="added" url="http://www.eclipse.org/birt/phoenix/deploy/viewerUsage2.2.php#parameters"><diffmk:wrapper diffmk:change="added">the
+ BIRT Report Viewer Parameters page</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">. The attributes of the BIRT tag
+ don't contain the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">"__"</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> prefix.</diffmk:wrapper></para>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">The </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">param</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> tag describes report parameters (see the listing for the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">testbirt.xhtml</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> above). It supports the following attributes: </diffmk:wrapper></para>
+ <itemizedlist diffmk:change="added">
+ <listitem diffmk:change="added">
+ <para diffmk:change="added"><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">name</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> - the parameter name (required)</diffmk:wrapper></para>
+ </listitem>
+ <listitem diffmk:change="added">
+ <para diffmk:change="added"><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">value</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> - the parameter value (required)</diffmk:wrapper></para>
+ </listitem>
+ <listitem diffmk:change="added">
+ <para diffmk:change="added"><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">isnull</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> - specifies that a report parameter has a null value
+ (optional)</diffmk:wrapper></para>
+ </listitem>
+ <listitem diffmk:change="added">
+ <para diffmk:change="added"><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">islocale</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> - specifies whether the parameter is localized (optional)</diffmk:wrapper></para>
+ </listitem>
+ </itemizedlist>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">These tags are defined in the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">org.jboss.birt.core/resources/jboss-seam-birt.jar</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> library that contains source. </diffmk:wrapper></para>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">It is also possible to embed a BIRT report in some Seam </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">.xhtml</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> page. See how it may be done:</diffmk:wrapper></para>
+ <para diffmk:change="added"></para>
+
+ <para diffmk:change="added">
+ <emphasis diffmk:change="added" role="bold"><diffmk:wrapper diffmk:change="added">Example:</diffmk:wrapper></emphasis>
+ </para>
+ <programlisting diffmk:change="added" format="linespecific" role="XHTML"><diffmk:wrapper diffmk:change="added"><![CDATA[<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:b="http://jboss.com/products/seam/birt"
+ template="layout/template.xhtml">
+ <ui:define name="body">
+ <h:messages globalOnly="true" styleClass="message" id="globalMessages"/>
+ <rich:panel>
+ <f:facet name="header">Products</f:facet>
+ <b:birt designType="embed" designName="ProductCatalog.rptdesign"
+ embeddable="true" masterpage="false"/>
+ <div style="clear:both"/>
+ </rich:panel>
+ <div class="actionButtons">
+ <s:button view="/ProductsEdit.xhtml" id="edit" value="Edit"/>
+
+ <s:button view="/#{empty productsFrom ? 'ProductsList' : productsFrom}.xhtml"
+ id="done" value="Done"/>
+ </div>
+ </ui:define>
+</ui:composition>]]></diffmk:wrapper></programlisting>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">See the result in a Browser:</diffmk:wrapper></para>
+
+ <figure diffmk:change="added" float="0">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Embedding BIRT Report in Seam xhtml Page</diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/birt_integration_with_seam/embeddedReportInSeamPage.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ </section>
+</chapter>
+
+
+<chapter diffmk:change="added" id="hibernate_datasource" xml:base="file:///home/ochikvina/WORK/for_compare/trunk/birt/docs/en/modules/hibernate_datasource.xml" xreflabel="hibernate_datasource">
+
+ <?dbhtml filename="hibernate_datasource.html"?>
+ <chapterinfo diffmk:change="added">
+ <keywordset diffmk:change="added">
+ <keyword diffmk:change="added"><diffmk:wrapper diffmk:change="added">JBoss</diffmk:wrapper></keyword>
+ <keyword diffmk:change="added"><diffmk:wrapper diffmk:change="added">BIRT</diffmk:wrapper></keyword>
+ <keyword diffmk:change="added"><diffmk:wrapper diffmk:change="added">Seam</diffmk:wrapper></keyword>
+ </keywordset>
+ </chapterinfo>
+
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Hibernate ODA Data Source</diffmk:wrapper></title>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">The JBoss BIRT Integration feature includes the Hibernate ODA Data Source completely
+ integrated with Hibernate Tools. You can use it in the way you use any of BIRT ODA drivers.
+ Let's perform simple actions that demonstrate it.</diffmk:wrapper></para>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">First, run the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Seam Generate Entities</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> action (You can access it from </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">File > New > Seam Generate Entities</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Seam perspective</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">. More details on the Seam Generate
+ Entities read in our </diffmk:wrapper><ulink diffmk:change="added" url="http://download.jboss.org/jbosstools/nightly-docs/en/seam/html_single/ind..."><diffmk:wrapper diffmk:change="added">Seam Dev Tools Reference guide</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">). This action will create a Hibernate Console
+ configuration.</diffmk:wrapper></para>
+
+ <tip diffmk:change="added">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Tip:</diffmk:wrapper></title>
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Before performing Seam Generate Entities, you should have a connection profile
+ adjusted and connected to a database. How to do this see in the </diffmk:wrapper><ulink diffmk:change="added" url="http://download.jboss.org/jbosstools/nightly-docs/en/seam/html_single/ind..."><diffmk:wrapper diffmk:change="added">CRUD Database Application</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added"> chapter of the Seam Dev Tools Reference
+ guide.</diffmk:wrapper></para>
+ </tip>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Next add a new BIRT report. To do that navigate to </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">File > New > Other > Business Intelligence and Reporting
+ Tools > Report</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> In the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">New Report
+ wizard</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> enter the report name, for instance </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">testHibernateOda.rptdesign</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">,</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> then click </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Finish</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></emphasis></para>
+
+ <figure diffmk:change="added" float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Creating a New BIRT Report </diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/hibernate_datasource/creatingNewBirtReport.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="added">Now switch to the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Report Design perspective</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></para>
+
+ <para><diffmk:wrapper diffmk:change="added">In the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Data Explorer View</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> right-click the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Data Source</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> node and choose </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">New Data Source</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></emphasis></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Creating a New Data Source</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/hibernate_datasource/creatingDataSource.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="added">In the wizard select </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Hibernate Data Source</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> and give it a proper name, </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">HbDataSource</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> for instance. Hit </diffmk:wrapper><emphasis>
+ <property moreinfo="none">Next</property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></emphasis></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Creating Hibernate Data Source</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/hibernate_datasource/hibernateDataSource.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="added">On the next wizard page leave everything as it is, just press the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Test Connection</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> button to verify the connection is successful.</diffmk:wrapper></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Hibernate Data Source Profile</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/hibernate_datasource/connectionSuccessful.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="added">Click </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Ok</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> and then </diffmk:wrapper><emphasis>
+ <property moreinfo="none">Finish</property>
+ </emphasis><diffmk:wrapper diffmk:change="changed"> to complete.</diffmk:wrapper></para>
+
+ <para><diffmk:wrapper diffmk:change="added">Now let's add a Hibernate ODA dataset. To do that you should bring up the
+ </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">New Data Set wizard</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">. In the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Data Explorer View</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">
+ right-click the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Data Set</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> node and select </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">New Data Set</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></emphasis></para>
+
+ <figure diffmk:change="added" float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Creating a New Data Set</diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/hibernate_datasource/creatingDataSet.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="added">In the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Data Set Name</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> section specify the name. Let's it be </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">HbDataSet</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></emphasis></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Creating a Hibernate ODA Data Set</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/hibernate_datasource/addingHibernateODADataset.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="changed">Next you'll be prompted to define the query for this data set. To validate the
+ entered query you can press the </diffmk:wrapper><emphasis>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Test query</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="changed"> button. All the HQL features like syntax highlighting, content assist,
+ formatting, Drag and Drop, etc., are available to you here.</diffmk:wrapper></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Testing Query </diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/hibernate_datasource/testingQuery.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="changed">Next the output columns will be displayed. It's possible to edit them
+ here.</diffmk:wrapper></para>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">HQL Features - Output Columns Section</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/hibernate_datasource/hqlFeaturesOutputColumns.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="changed">To preview the results of the defined query click the </diffmk:wrapper><emphasis>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Preview Results</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="changed"> item.</diffmk:wrapper></para>
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">HQL Features - Preview Results Section</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/hibernate_datasource/hqlFeaturesPreviewResults.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">So far you have the Hibernate data source and data set defined. Now you can create a BIRT
+ report using this data source and data set.</diffmk:wrapper></para>
+
+ <tip diffmk:change="added">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Tip:</diffmk:wrapper></title>
+ <para><diffmk:wrapper diffmk:change="added">If you don't know how to do this we suggest that you refer to the </diffmk:wrapper><ulink diffmk:change="added" url="http://www.eclipse.org/birt/phoenix/tutorial/"><diffmk:wrapper diffmk:change="added">Eclipse BIRT Tutorial</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></para>
+ </tip>
+
+ <figure float="0">
+ <title><diffmk:wrapper diffmk:change="changed">Creating a BIRT Report using Created Data Source and Data Set</diffmk:wrapper></title>
+ <mediaobject>
+ <imageobject>
+ <imagedata
+ fileref="images/hibernate_datasource/BIRTReportUsingDataSourceAndSet.png "/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="changed">If you switch to the </diffmk:wrapper><emphasis>
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Preview</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="changed"> tab, it will run your report and show the output.</diffmk:wrapper></para>
+
+ <figure diffmk:change="added" float="0">
+ <title><diffmk:wrapper diffmk:change="changed">BIRT Report -Preview Tab</diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/hibernate_datasource/BIRTReportPreviewTab.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="added">You can also use parameters within the Hibernate ODA driver.</diffmk:wrapper></para>
+
+ <figure diffmk:change="added" float="0">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Using Parameters within the Hibernate ODA Driver</diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/hibernate_datasource/parametersWithinHibernateODADriver.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+
+ <figure diffmk:change="added" float="0">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Adding New Parameter</diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/hibernate_datasource/addingNewParameter.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Again, to preview the results switch to the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Preview Results</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> item.</diffmk:wrapper></para>
+ <figure diffmk:change="added" float="0">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Previewing the Results</diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/hibernate_datasource/previewingResults.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+</chapter>
+
+
+<chapter diffmk:change="added" id="birt_reports_deployment" xml:base="file:///home/ochikvina/WORK/for_compare/trunk/birt/docs/en/modules/birt_reports_deployment.xml" xreflabel="birt_reports_deployment">
+
+ <?dbhtml filename="birt_reports_deployment"?>
+ <chapterinfo>
+ <keywordset>
+ <keyword>JBoss</keyword>
+ <keyword>BIRT</keyword>
+ <keyword><diffmk:wrapper diffmk:change="changed">Seam</diffmk:wrapper></keyword>
+ </keywordset>
+ </chapterinfo>
+
+ <title><diffmk:wrapper diffmk:change="changed">BIRT Reports Deployment</diffmk:wrapper></title>
+
+ <para><diffmk:wrapper diffmk:change="changed">When everything is configured correctly you will be able to view/render the designed
+ reports in your Seam (or any other) Web application.</diffmk:wrapper></para>
+
+ <para><diffmk:wrapper diffmk:change="added">You can deploy a report by adding an action button to the Seam's CRUD </diffmk:wrapper><emphasis diffmk:change="added">
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">.xhtml</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> file.</diffmk:wrapper></para>
+
+ <figure diffmk:change="added" float="0">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Adding Action Button to the Seam file</diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/birt_reports_deployment/addingActionButton.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="added">As you can see on the figure you should have the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">testHibernateOda.xhtml</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> file. It's content should be the following:</diffmk:wrapper></para>
+
+ <programlisting diffmk:change="added" format="linespecific" role="XHTML"><diffmk:wrapper diffmk:change="added"><![CDATA[<p:birt xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:p="http://jboss.com/products/seam/birt"
+ designType="run"
+ format="pdf"
+ designName="testHibernateOda.rptdesign"
+ title="JBoss Birt Test">
+
+</p:birt>
+]]></diffmk:wrapper></programlisting>
+
+ <para><diffmk:wrapper diffmk:change="added">Next run the Seam page with embedded report on the server by right-clicking the file and
+ going to </diffmk:wrapper><emphasis diffmk:change="added">
+ <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Run > Run on Server</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></emphasis></para>
+
+ <figure diffmk:change="added" float="0">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Opening Employees.xhtml Page</diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/birt_reports_deployment/openingArticlesPage.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="added">After clicking the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">BIRT PDF Report</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> button, you should see the following report:</diffmk:wrapper></para>
+
+ <figure diffmk:change="added" float="0">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Birt PDF Report</diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/birt_reports_deployment/BirtPDFReport.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para><diffmk:wrapper diffmk:change="added">Thus, 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. If you
+ don't specify the JNDI URL property, our engine will try the following JNDI
+ URLs:</diffmk:wrapper></para>
+ <itemizedlist diffmk:change="added">
+ <listitem>
+ <para>
+ <emphasis><diffmk:wrapper diffmk:change="changed">java:/<project_name></diffmk:wrapper></emphasis>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis diffmk:change="added"><diffmk:wrapper diffmk:change="added">java:/<project_name>EntityManagerFactory</diffmk:wrapper></emphasis>
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <para><diffmk:wrapper diffmk:change="added">When creating a Seam EAR project, Hibernate Entity Manager Factory is bound to
+ </diffmk:wrapper><emphasis diffmk:change="added"><diffmk:wrapper diffmk:change="added">java:/{projectName}EntityManagerFactory</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added">. All you need to do is
+ using the Hibernate Configuration created automatically. You can use default values for the
+ Hibernate Configuration and JNDI URL within the BIRT Hibernate Data Source.</diffmk:wrapper></para>
+
+ <para><diffmk:wrapper diffmk:change="added">When using a Seam WAR project, neither HSF nor HEMF aren't binded to JNDI by
+ default. You has to do this manually. For instance, HSF can be bound to JNDI by adding the
+ following property to the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">persistence.xml</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> file:</diffmk:wrapper></para>
+
+ <programlisting diffmk:change="added" format="linespecific" role="XHTML"><diffmk:wrapper diffmk:change="added"><![CDATA[<property name="hibernate.session_factory_name" value="java:/projectname"/>
+ ]]></diffmk:wrapper></programlisting>
+
+ <para><diffmk:wrapper diffmk:change="added">And you can use </diffmk:wrapper><emphasis diffmk:change="added"><diffmk:wrapper diffmk:change="added">java:/projectname</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> as the JNDI URL property when creating a BIRT
+ Hibernate Data Source.</diffmk:wrapper></para>
+
+ <note diffmk:change="added">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Note:</diffmk:wrapper></title>
+ <para><diffmk:wrapper diffmk:change="added">If you want to test this feature using PDE Runtime, you need to add </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">osgi.dev=bin</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> to the </diffmk:wrapper><emphasis diffmk:change="added">
+ <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">WebContent/WEB-INF/platform/configuration/config.ini</diffmk:wrapper></property>
+ </emphasis><diffmk:wrapper diffmk:change="added"> file.</diffmk:wrapper></para>
+ </note>
+ <para><diffmk:wrapper diffmk:change="added">In conclusion, the main goal of this document is to get you know with a full featureset
+ that </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss BIRT Tools</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> provide. Thus if you have some questions,
+ comments or suggestions on the topic, please feel free to ask in the </diffmk:wrapper><ulink diffmk:change="added" url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=201"><diffmk:wrapper diffmk:change="added">JBoss
+ Tools Forum</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">. You can also influence on how you want to see JBoss Tools docs in
+ future leaving your vote on our page </diffmk:wrapper><ulink diffmk:change="added" url="http://www.jboss.org/community/docs/DOC-10795"><diffmk:wrapper diffmk:change="added">here</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></para>
+
+
+
+
+</chapter></book>
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r15110 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-05-07 11:53:50 -0400 (Thu, 07 May 2009)
New Revision: 15110
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenFileActionUtils.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4285 - code review - add updateSelection function and reduce "returns" - functionality remains the same
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenFileActionUtils.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenFileActionUtils.java 2009-05-07 15:00:34 UTC (rev 15109)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenFileActionUtils.java 2009-05-07 15:53:50 UTC (rev 15110)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.actions;
import java.io.FileInputStream;
@@ -52,14 +62,20 @@
private static final String HIBERNATE_TAG_RESOURCE = "resource"; //$NON-NLS-1$
private static final String HIBERNATE_TAG_CATALOG = "catalog"; //$NON-NLS-1$
private static final String HIBERNATE_TAG_SCHEMA = "schema"; //$NON-NLS-1$
+
+ private OpenFileActionUtils() {
+ }
public static IEditorPart openEditor(IWorkbenchPage page, IResource resource) throws PartInitException {
return IDE.openEditor(page, (IFile) resource);
}
- public static boolean rootClassHasAnnotations(ConsoleConfiguration consoleConfiguration, java.io.File configXMLFile, PersistentClass rootClass) {
- if (configXMLFile == null) return true;
+ public static boolean rootClassHasAnnotations(ConsoleConfiguration consoleConfiguration, PersistentClass rootClass) {
+ java.io.File configXMLFile = consoleConfiguration.getPreferences().getConfigXMLFile();
+ if (configXMLFile == null) {
+ return true;
+ }
Document doc = getDocument(consoleConfiguration, configXMLFile);
return getElements(doc, HIBERNATE_TAG_MAPPING, HIBERNATE_TAG_CLASS, getPersistentClassName(rootClass)).hasNext();
}
@@ -82,15 +98,15 @@
private static boolean elementInResource(ConsoleConfiguration consoleConfiguration, IResource resource, Object element) {
+ boolean res = false;
if (element instanceof RootClass) {
- return rootClassInResource(consoleConfiguration, resource, (RootClass)element);
+ res = rootClassInResource(consoleConfiguration, resource, (RootClass)element);
} else if (element instanceof Subclass) {
- return subclassInResource(consoleConfiguration, resource, (Subclass)element);
+ res = subclassInResource(consoleConfiguration, resource, (Subclass)element);
} else if (element instanceof Table) {
- return tableInResource(consoleConfiguration, resource, (Table)element);
- } else {
- return false;
+ res = tableInResource(consoleConfiguration, resource, (Table)element);
}
+ return res;
}
// TODO: this is *extremely* inefficient - no need to scan the whole tree again and again.
@@ -143,8 +159,6 @@
) {
return true;
}
-
-
}
Attribute classNameAttr = element.attribute( HIBERNATE_TAG_NAME );
@@ -257,11 +271,12 @@
return doc;
}
- public static IResource getResource(ConsoleConfiguration consoleConfiguration, IJavaProject proj, java.io.File configXMLFile, Object element) {
+ public static IResource getResource(ConsoleConfiguration consoleConfiguration, IJavaProject proj, Object element) {
IResource resource = null;
if (consoleConfiguration == null) {
return resource;
}
+ java.io.File configXMLFile = consoleConfiguration.getPreferences().getConfigXMLFile();
Document doc = getDocument(consoleConfiguration, configXMLFile);
if (proj != null && doc != null) {
Element sfNode = doc.getRootElement().element( HIBERNATE_TAG_SESSION_FACTORY );
@@ -270,9 +285,9 @@
Element subelement = (Element) elements.next();
Attribute file = subelement.attribute( HIBERNATE_TAG_RESOURCE );
if (file != null) {
- IPackageFragmentRoot[] packageFragmentRoots;
try {
- packageFragmentRoots = proj.getAllPackageFragmentRoots();
+ IPackageFragmentRoot[] packageFragmentRoots =
+ proj.getAllPackageFragmentRoots();
for (int i = 0; i < packageFragmentRoots.length; i++) {
//search in source folders.
if (packageFragmentRoots[i].getClass() == PackageFragmentRoot.class) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-05-07 15:00:34 UTC (rev 15109)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-05-07 15:53:50 UTC (rev 15110)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.hibernate.eclipse.console.actions;
-import java.io.File;
import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.List;
@@ -107,25 +106,22 @@
public static IEditorPart run(Object selection, ConsoleConfiguration consoleConfiguration) throws PartInitException, JavaModelException, FileNotFoundException {
IEditorPart editorPart = null;
IJavaProject proj = ProjectUtils.findJavaProject(consoleConfiguration);
- java.io.File configXMLFile = consoleConfiguration.getPreferences().getConfigXMLFile();
IResource resource = null;
if (selection instanceof Property) {
Property p = (Property)selection;
if (p.getPersistentClass() != null) {
//use PersistentClass to open editor
- resource = OpenFileActionUtils.getResource(consoleConfiguration, proj, configXMLFile, p.getPersistentClass());
+ resource = OpenFileActionUtils.getResource(consoleConfiguration, proj, p.getPersistentClass());
//editorPart = openMapping(p.getPersistentClass(), consoleConfiguration);
}
}
else {
- resource = OpenFileActionUtils.getResource(consoleConfiguration, proj, configXMLFile, selection);
+ resource = OpenFileActionUtils.getResource(consoleConfiguration, proj, selection);
//editorPart = openMapping(selection, consoleConfiguration);
}
if (resource != null) {
editorPart = openMapping(resource);
- if (editorPart != null){
- applySelectionToEditor(selection, editorPart);
- }
+ applySelectionToEditor(selection, editorPart);
}
if (editorPart == null) {
//try to find hibernate-annotations
@@ -140,7 +136,7 @@
}
}
if (rootClass != null){
- if (OpenFileActionUtils.rootClassHasAnnotations(consoleConfiguration, configXMLFile, rootClass)) {
+ if (OpenFileActionUtils.rootClassHasAnnotations(consoleConfiguration, rootClass)) {
String fullyQualifiedName = rootClass.getClassName();
editorPart = OpenSourceAction.run(selection, proj, fullyQualifiedName);
}
@@ -154,6 +150,38 @@
}
/**
+ * @param selection
+ * @param editorPart
+ */
+ static public boolean applySelectionToEditor(Object selection, IEditorPart editorPart) {
+ ITextEditor[] textEditors = getTextEditors(editorPart);
+ if (textEditors.length == 0) {
+ return false;
+ }
+ textEditors[0].selectAndReveal(0, 0);
+ FindReplaceDocumentAdapter findAdapter = null;
+ ITextEditor textEditor = null;
+ for (int i = 0; i < textEditors.length && findAdapter == null; i++) {
+ textEditor = textEditors[i];
+ findAdapter = getFindDocAdapter(textEditor);
+ }
+ if (findAdapter == null) {
+ return false;
+ }
+ IRegion selectRegion = null;
+ if (selection instanceof RootClass || selection instanceof Subclass) {
+ selectRegion = findSelection((PersistentClass)selection, findAdapter);
+ } else if (selection instanceof Property){
+ selectRegion = findSelection((Property)selection, findAdapter);
+ }
+ if (selectRegion != null){
+ textEditor.selectAndReveal(selectRegion.getOffset(), selectRegion.getLength());
+ return true;
+ }
+ return false;
+ }
+
+ /**
* @param compositeProperty
* @param parentProperty
* @param consoleConfiguration
@@ -163,79 +191,37 @@
* @throws BadLocationException
*/
public static IEditorPart run(Property compositeProperty, Property parentProperty, ConsoleConfiguration consoleConfiguration) throws PartInitException, JavaModelException, FileNotFoundException{
- if (parentProperty.getPersistentClass() == null) return null;
+ PersistentClass rootClass = parentProperty.getPersistentClass();
IJavaProject proj = ProjectUtils.findJavaProject(consoleConfiguration);
- java.io.File configXMLFile = consoleConfiguration.getPreferences().getConfigXMLFile();
- if (configXMLFile == null) return null;
- IResource resource = OpenFileActionUtils.getResource(consoleConfiguration, proj, configXMLFile, parentProperty.getPersistentClass());
-
+ IResource resource = OpenFileActionUtils.getResource(consoleConfiguration, proj, rootClass);
IEditorPart editorPart = null;
if (resource != null){
editorPart = openMapping(resource);
- if (editorPart != null){
- ITextEditor[] textEditors = getTextEditors(editorPart);
- if (textEditors.length == 0) return editorPart;
- textEditors[0].selectAndReveal(0, 0);
- FindReplaceDocumentAdapter findAdapter = null;
- ITextEditor textEditor = null;
- for (int i = 0; i < textEditors.length && findAdapter == null; i++) {
- textEditor = textEditors[i];
- findAdapter = getFindDocAdapter(textEditor);
- }
- if (findAdapter == null) return null;
-
- IRegion parentRegion = findSelection(parentProperty, findAdapter);
- if (parentRegion == null) return editorPart;
- IRegion propRegion = null;
- try {
- propRegion = findAdapter.find(parentRegion.getOffset()+parentRegion.getLength(), generatePattern(compositeProperty), true, true, false, true);
- if (propRegion == null && parentProperty.isComposite()
- && parentProperty.getPersistentClass().getIdentifierProperty() == parentProperty){
- // try to use key-property
- String pattern = generatePattern(compositeProperty).replaceFirst("<property", "<key-property"); //$NON-NLS-1$ //$NON-NLS-2$
- propRegion = findAdapter.find(parentRegion.getOffset()+parentRegion.getLength(), pattern, true, true, false, true);
-
- if (propRegion == null){
- // try to use key-many-to-one
- pattern = generatePattern(compositeProperty).replaceFirst("<many-to-one", "<key-many-to-one"); //$NON-NLS-1$ //$NON-NLS-2$
- propRegion = findAdapter.find(parentRegion.getOffset()+parentRegion.getLength(), pattern, true, true, false, true);
- }
- }
- } catch (BadLocationException e) {
- HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.OpenMappingAction_selection_not_found, e);
- }
-
- if (propRegion != null){
- int length = compositeProperty.getNodeName().length();
- int offset = propRegion.getOffset() + propRegion.getLength() - length - 1;
- propRegion = new Region(offset, length);
- textEditor.selectAndReveal(propRegion.getOffset(), propRegion.getLength());
- return editorPart;
- }
- }
- return editorPart;
+ updateEditorSelection(compositeProperty, parentProperty, editorPart);
}
-
- if (parentProperty.getPersistentClass() != null && parentProperty.isComposite()){
- PersistentClass rootClass = parentProperty.getPersistentClass();
- if (OpenFileActionUtils.rootClassHasAnnotations(consoleConfiguration, configXMLFile, rootClass)) {
+ if (editorPart == null && parentProperty.isComposite()) {
+ if (OpenFileActionUtils.rootClassHasAnnotations(consoleConfiguration, rootClass)) {
String fullyQualifiedName =((Component)((Property) parentProperty).getValue()).getComponentClassName();
- IEditorPart editor = OpenSourceAction.run(compositeProperty, proj, fullyQualifiedName);
- return editor;
+ editorPart = OpenSourceAction.run(compositeProperty, proj, fullyQualifiedName);
}
}
- // here editorPart := null
- String out = NLS.bind(HibernateConsoleMessages.OpenMappingAction_mapping_file_for_property_not_found, compositeProperty.getNodeName());
- throw new FileNotFoundException(out);
+ if (editorPart == null) {
+ String out = NLS.bind(HibernateConsoleMessages.OpenMappingAction_mapping_file_for_property_not_found, compositeProperty.getNodeName());
+ throw new FileNotFoundException(out);
+ }
+ return editorPart;
}
/**
- * @param selection
+ * @param compositeProperty
+ * @param parentProperty
* @param editorPart
*/
- static public boolean applySelectionToEditor(Object selection, IEditorPart editorPart) {
+ static public boolean updateEditorSelection(Property compositeProperty, Property parentProperty, IEditorPart editorPart) {
ITextEditor[] textEditors = getTextEditors(editorPart);
- if (textEditors.length == 0) return false;
+ if (textEditors.length == 0) {
+ return false;
+ }
textEditors[0].selectAndReveal(0, 0);
FindReplaceDocumentAdapter findAdapter = null;
ITextEditor textEditor = null;
@@ -243,21 +229,39 @@
textEditor = textEditors[i];
findAdapter = getFindDocAdapter(textEditor);
}
- if (findAdapter == null) return false;
- IRegion selectRegion = null;
-
- if (selection instanceof RootClass
- || selection instanceof Subclass){
- selectRegion = findSelection((PersistentClass)selection, findAdapter);
- } else if (selection instanceof Property){
- selectRegion = findSelection((Property)selection, findAdapter);
+ if (findAdapter == null) {
+ return false;
}
-
- if (selectRegion != null){
- textEditor.selectAndReveal(selectRegion.getOffset(), selectRegion.getLength());
- return true;
+ IRegion parentRegion = findSelection(parentProperty, findAdapter);
+ if (parentRegion == null) {
+ return false;
}
- return false;
+ IRegion propRegion = null;
+ try {
+ propRegion = findAdapter.find(parentRegion.getOffset()+parentRegion.getLength(), generatePattern(compositeProperty), true, true, false, true);
+ PersistentClass rootClass = parentProperty.getPersistentClass();
+ if (propRegion == null && parentProperty.isComposite()
+ && rootClass.getIdentifierProperty() == parentProperty) {
+ // try to use key-property
+ String pattern = generatePattern(compositeProperty).replaceFirst("<property", "<key-property"); //$NON-NLS-1$ //$NON-NLS-2$
+ propRegion = findAdapter.find(parentRegion.getOffset()+parentRegion.getLength(), pattern, true, true, false, true);
+ if (propRegion == null) {
+ // try to use key-many-to-one
+ pattern = generatePattern(compositeProperty).replaceFirst("<many-to-one", "<key-many-to-one"); //$NON-NLS-1$ //$NON-NLS-2$
+ propRegion = findAdapter.find(parentRegion.getOffset()+parentRegion.getLength(), pattern, true, true, false, true);
+ }
+ }
+ } catch (BadLocationException e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.OpenMappingAction_selection_not_found, e);
+ }
+ if (propRegion == null) {
+ return false;
+ }
+ int length = compositeProperty.getNodeName().length();
+ int offset = propRegion.getOffset() + propRegion.getLength() - length - 1;
+ propRegion = new Region(offset, length);
+ textEditor.selectAndReveal(propRegion.getOffset(), propRegion.getLength());
+ return true;
}
/**
@@ -270,78 +274,70 @@
if (textEditor.getDocumentProvider() != null){
document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
}
- if (document == null) return null;
+ if (document == null) {
+ return null;
+ }
FindReplaceDocumentAdapter findAdapter = new FindReplaceDocumentAdapter(document);
return findAdapter;
}
static public IEditorPart openMapping(IResource resource) {
+ IEditorPart editorPart = null;
if (resource != null && resource instanceof IFile){
try {
- return OpenFileActionUtils.openEditor(HibernateConsolePlugin.getDefault().getActiveWorkbenchWindow().getActivePage(), (IFile) resource);
+ editorPart = OpenFileActionUtils.openEditor(HibernateConsolePlugin.getDefault().getActiveWorkbenchWindow().getActivePage(), (IFile) resource);
} catch (PartInitException e) {
-
+ // ignore
}
} else {
HibernateConsolePlugin.getDefault().log(HibernateConsoleMessages.OpenMappingAction_cannot_open_mapping_file + resource);
}
- return null;
+ return editorPart;
}
- /*static public IEditorPart openMapping(Object selElement,
- ConsoleConfiguration consoleConfiguration) {
- IJavaProject proj = ProjectUtils.findJavaProject(consoleConfiguration);
- java.io.File configXMLFile = consoleConfiguration.getPreferences().getConfigXMLFile();
- IResource resource = OpenFileActionUtils.getResource(consoleConfiguration, proj, configXMLFile, selElement);
-
- if (resource != null && resource instanceof IFile){
- try {
- return OpenFileActionUtils.openEditor(HibernateConsolePlugin.getDefault().getActiveWorkbenchWindow().getActivePage(), (IFile) resource);
- } catch (PartInitException e) {
- HibernateConsolePlugin.getDefault().logErrorMessage("Can't open mapping or source file.", e);
- }
- } else {
- HibernateConsolePlugin.getDefault().log("Can't open mapping file for " + selElement);
- }
- return null;
- }*/
-
public static IRegion findSelection(Property property, FindReplaceDocumentAdapter findAdapter) {
Assert.isNotNull(property.getPersistentClass());
+ IRegion classRegion = findSelection(property.getPersistentClass(), findAdapter);
+ if (classRegion == null) {
+ return null;
+ }
+ IRegion finalRegion = null;
+ IRegion propRegion = null;
try {
- IRegion classRegion = findSelection(property.getPersistentClass(), findAdapter);
- if (classRegion == null) return null;
- IRegion finalRegion = findAdapter.find(classRegion.getOffset()+classRegion.getLength(), "</class", true, true, false, false); //$NON-NLS-1$
- IRegion propRegion = findAdapter.find(classRegion.getOffset()+classRegion.getLength(), generatePattern(property), true, true, false, true);
- if (propRegion == null) return null;
- if (finalRegion != null
- && propRegion.getOffset() > finalRegion.getOffset()){
- return null;
- } else {
- int length = property.getName().length();
- int offset = propRegion.getOffset() + propRegion.getLength() - length - 1;
- return new Region(offset, length);
- }
+ finalRegion = findAdapter.find(classRegion.getOffset()+classRegion.getLength(), "</class", true, true, false, false); //$NON-NLS-1$
+ propRegion = findAdapter.find(classRegion.getOffset()+classRegion.getLength(), generatePattern(property), true, true, false, true);
} catch (BadLocationException e) {
- return null;
+ //ignore
}
-
+ IRegion res = null;
+ if (propRegion != null) {
+ int length = property.getName().length();
+ int offset = propRegion.getOffset() + propRegion.getLength() - length - 1;
+ res = new Region(offset, length);
+ if (finalRegion != null && propRegion.getOffset() > finalRegion.getOffset()) {
+ res = null;
+ }
+ }
+ return res;
}
public static IRegion findSelection(PersistentClass persClass,
FindReplaceDocumentAdapter findAdapter) {
+ IRegion res = null;
try {
String[] classPatterns = generatePatterns(persClass);
IRegion classRegion = null;
for (int i = 0; (classRegion == null) && (i < classPatterns.length); i++){
classRegion = findAdapter.find(0, classPatterns[i], true, true, false, true);
}
- if (classRegion == null) return null;
- int length = persClass.getNodeName().length();
- int offset = classRegion.getOffset() + classRegion.getLength() - length - 1;
- return new Region(offset, length);
+ if (classRegion != null) {
+ int length = persClass.getNodeName().length();
+ int offset = classRegion.getOffset() + classRegion.getLength() - length - 1;
+ res = new Region(offset, length);
+ }
} catch (BadLocationException e) {
- return null;
+ //ignore
}
+ return res;
}
private static String[] generatePatterns(PersistentClass persClass){
@@ -429,6 +425,7 @@
/*
* if EditorPart is MultiPageEditorPart then get ITextEditor from it.
*/
+ ITextEditor[] res = new ITextEditor[0];
if (editorPart instanceof MultiPageEditorPart) {
List testEditors = new ArrayList();
IEditorPart[] editors = ((MultiPageEditorPart) editorPart).findEditors(editorPart.getEditorInput());
@@ -437,10 +434,10 @@
testEditors.add(editors[i]);
}
}
- return (ITextEditor[])testEditors.toArray(new ITextEditor[0]);
+ res = (ITextEditor[])testEditors.toArray(res);
} else if (editorPart instanceof ITextEditor){
- return new ITextEditor[]{(ITextEditor) editorPart};
+ res = new ITextEditor[]{(ITextEditor) editorPart};
}
- return new ITextEditor[0];
+ return res;
}
}
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r15109 - in trunk: portlet/docs/reference/en/modules and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-05-07 11:00:34 -0400 (Thu, 07 May 2009)
New Revision: 15109
Modified:
trunk/documentation/guides/GettingStartedGuide/en/modules/manage.xml
trunk/portlet/docs/reference/en/modules/intro.xml
trunk/seam/docs/reference/en/modules/directory_structure.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-715 versions and dates are corrected in 3.0.1 guides
Modified: trunk/documentation/guides/GettingStartedGuide/en/modules/manage.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/modules/manage.xml 2009-05-07 13:38:44 UTC (rev 15108)
+++ trunk/documentation/guides/GettingStartedGuide/en/modules/manage.xml 2009-05-07 15:00:34 UTC (rev 15109)
@@ -15,8 +15,8 @@
<para>In this chapter we'll focus more on how to operate the <property>JBoss
AS</property> from <property>JBoss Developer Studio</property>.</para>
- <para><property>JBoss Developer Studio</property> ships with <property>JBoss EAP
- v.4.2</property> bundled. When you followed the default installation of <property>JBoss
+ <para><property>JBoss Developer Studio</property> is shipped with <property>JBoss EAP
+ </property>. When you followed the default installation of <property>JBoss
Developer Studio</property>, you should already have a JBoss EAP 4.3 Server installed and
defined. To run JBoss AS you need JDK 1.5, JDK 6 is not formally supported yet, although
you may be able to start the server with it.</para>
Modified: trunk/portlet/docs/reference/en/modules/intro.xml
===================================================================
--- trunk/portlet/docs/reference/en/modules/intro.xml 2009-05-07 13:38:44 UTC (rev 15108)
+++ trunk/portlet/docs/reference/en/modules/intro.xml 2009-05-07 15:00:34 UTC (rev 15109)
@@ -124,10 +124,7 @@
</listitem>
<listitem>
- <para>
- <ulink url="http://www.jboss.com/products/devstudio/docs">Stable JBossTools/JBDS
- documentation</ulink> (supplied with the latest JBDS release, 1.1.0 GA
- currently) </para>
+ <para>JBoss Developer Studio/JBoss Tools release documentation you can find at<ulink url="http://docs.jboss.org/tools/">http://docs.jboss.org/tools</ulink> in the corresponding release directory.</para>
</listitem>
</itemizedlist>
Modified: trunk/seam/docs/reference/en/modules/directory_structure.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/directory_structure.xml 2009-05-07 13:38:44 UTC (rev 15108)
+++ trunk/seam/docs/reference/en/modules/directory_structure.xml 2009-05-07 15:00:34 UTC (rev 15109)
@@ -34,12 +34,12 @@
<para>A WAR project can only use Seam JavaBean and JPA Entity bean components; it cannot use
EJB3 Session beans etc.</para>
- <para>WAR projects are generated to enable Seam 1.2.1 war hotdeploy feature. Classes put
+ <para>WAR projects are generated to enable Seam war hotdeploy feature. Classes put
into <emphasis>
<property>src/action</property>
</emphasis> will be deployed to <emphasis>
<property>WEB-INF/dev</property>
- </emphasis> from which Seam 1.2.1 automatically will perform hotdeploy of new
+ </emphasis> from which Seam automatically will perform hotdeploy of new
components.</para>
<note>
<title>Note:</title>
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r15108 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-05-07 09:38:44 -0400 (Thu, 07 May 2009)
New Revision: 15108
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/ovr16/
trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/ovr16/error_co.gif
trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/ovr16/warning_co.gif
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ValidateResultLabelDecorator.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/Codegenerator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
Log:
JBIDE-4232
Validate smooks file, if found any errors or warnings , draw the images on "FieldMarker" canvas.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -124,7 +124,7 @@
while (waiting) {
try {
waiting = false;
- Thread.sleep(1000);
+ Thread.sleep(700);
Thread.yield();
} catch (InterruptedException e) {
e.printStackTrace();
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/ovr16/error_co.gif
===================================================================
(Binary files differ)
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/ovr16/error_co.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/ovr16/warning_co.gif
===================================================================
(Binary files differ)
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/ovr16/warning_co.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2009-05-07 13:38:44 UTC (rev 15108)
@@ -47,5 +47,24 @@
class="org.jboss.tools.smooks.configuration.editors.SmooksToolsStartup">
</startup>
</extension>
+ <extension
+ point="org.eclipse.ui.decorators">
+ <decorator
+ adaptable="false"
+ class="org.jboss.tools.smooks.configuration.validate.ValidateResultLabelDecorator"
+ id="org.jboss.tools.smooks.ui.configurationPage.decorator"
+ label="Smooks Configuration Page Viewer Decorator"
+ lightweight="true"
+ state="false">
+ <description>
+ Decorate smooks configuration page viewer
+ </description>
+ <enablement>
+ <objectClass
+ name="org.jboss.tools.smooks.model.common.AbstractAnyType">
+ </objectClass>
+ </enablement>
+ </decorator>
+ </extension>
</plugin>
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -66,7 +66,12 @@
super.initializeImageRegistry(reg);
reg.put(GraphicsConstants.JAVA_PROPERTY_ICON,
getImageDescriptor(GraphicsConstants.JAVA_PROPERTY_ICON_PATH));
+
+ // regist ovr images
+ reg.put(GraphicsConstants.IMAGE_OVR_ERROR, getImageDescriptor(GraphicsConstants.IMAGE_OVR_ERROR));
+ reg.put(GraphicsConstants.IMAGE_OVR_WARING, getImageDescriptor(GraphicsConstants.IMAGE_OVR_WARING));
+ // regist
reg.put(GraphicsConstants.IMAGE_EMPTY, getImageDescriptor(GraphicsConstants.IMAGE_PATH_BLANK));
reg.put(GraphicsConstants.IMAGE_ERROR, getImageDescriptor(GraphicsConstants.IMAGE_PATH_ERROR));
reg.put(GraphicsConstants.IMAGE_WARNING, getImageDescriptor(GraphicsConstants.IMAGE_PATH_WARNING));
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/Codegenerator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/Codegenerator.java 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/Codegenerator.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -13,7 +13,6 @@
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-import org.jboss.tools.smooks.model.calc.CalcPackage;
import org.jboss.tools.smooks.model.datasource.DatasourcePackage;
public class Codegenerator {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -30,12 +30,12 @@
// private Image informationImage = null;
- private int type = -1;
+ private int type = TYPE_NONE;
public FieldMarkerComposite(Composite parent, int style) {
super(parent, style);
- errorImage = SmooksConfigurationActivator.getDefault().getImageRegistry().get(GraphicsConstants.IMAGE_ERROR);
- waringImage = SmooksConfigurationActivator.getDefault().getImageRegistry().get(GraphicsConstants.IMAGE_WARNING);
+ errorImage = SmooksConfigurationActivator.getDefault().getImageRegistry().get(GraphicsConstants.IMAGE_OVR_ERROR);
+ waringImage = SmooksConfigurationActivator.getDefault().getImageRegistry().get(GraphicsConstants.IMAGE_OVR_WARING);
this.addPaintListener(this);
}
@@ -49,6 +49,10 @@
this.type = type;
this.redraw();
}
+
+ public int getMarkerType(){
+ return type;
+ }
/*
* (non-Javadoc)
@@ -59,9 +63,15 @@
public void setMessage(String message) {
this.setToolTipText(message);
}
+
+ public String getMessage(){
+ return getToolTipText();
+ }
public void clean() {
+ setMarkerType(TYPE_NONE);
this.setToolTipText(null);
+ this.redraw();
}
public void paintControl(PaintEvent e) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -10,6 +10,10 @@
public static final String IMAGE_JAVA_OBJECT = "java_object";
+ public static final String IMAGE_OVR_ERROR = "icons/full/ovr16/error_co.gif";
+
+ public static final String IMAGE_OVR_WARING = "icons/full/ovr16/warning_co.gif";
+
public static final String IMAGE_JAVA_INTERFACE = "icons/full/obj16/int_obj.gif";
public static final String IMAGE_JAVA_COLLECTION = "icons/full/obj16/javalistmodel.gif";
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -20,9 +20,15 @@
int TYPE_WARINING = 2;
+ int TYPE_NONE = 0;
+
void setMessage(String message);
void setMarkerType(int type);
+ int getMarkerType();
+
+ String getMessage();
+
void clean();
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -287,7 +287,6 @@
}
public void validateEnd(Diagnostic diagnosticResult) {
- System.out.println(diagnosticResult);
}
public void validateStart() {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -28,6 +28,7 @@
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -52,6 +53,7 @@
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
+import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
/**
@@ -156,10 +158,14 @@
tableComposite.setLayout(fillLayout);
smooksTreeViewer = new TreeViewer(tableComposite, SWT.NONE);
smooksTreeViewer.addSelectionChangedListener(this);
+
smooksTreeViewer.setContentProvider(new AdapterFactoryContentProvider(editingDomain
.getAdapterFactory()));
- smooksTreeViewer.setLabelProvider(new AdapterFactoryLabelProvider(editingDomain
- .getAdapterFactory()));
+
+ smooksTreeViewer.setLabelProvider(new DecoratingLabelProvider(new AdapterFactoryLabelProvider(editingDomain
+ .getAdapterFactory()),
+ SmooksConfigurationActivator.getDefault().getWorkbench()
+ .getDecoratorManager().getLabelDecorator()));
smooksTreeViewer.setFilters(new ViewerFilter[] { new TextEObjectModelFilter() });
Object smooksModel = ((SmooksMultiFormEditor) this.formEditor).getSmooksModel();
if (smooksModel != null) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -33,6 +33,7 @@
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.command.CommandStack;
import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
@@ -77,6 +78,7 @@
import org.jboss.tools.smooks.model.json.provider.JsonItemProviderAdapterFactory;
import org.jboss.tools.smooks.model.medi.provider.MEdiItemProviderAdapterFactory;
import org.jboss.tools.smooks.model.smooks.provider.SmooksItemProviderAdapterFactory;
+import org.jboss.tools.smooks.model.validate.ISmooksModelValidateListener;
import org.jboss.tools.smooks.model.validate.SmooksModelValidator;
import org.jboss.tools.smooks.model.xsl.provider.XslItemProviderAdapterFactory;
import org.jboss.tools.smooks10.model.smooks.util.SmooksResourceFactoryImpl;
@@ -85,7 +87,7 @@
*
* @author Dart Peng (dpeng(a)redhat.com) Date Apr 1, 2009
*/
-public class SmooksMultiFormEditor extends FormEditor implements IEditingDomainProvider {
+public class SmooksMultiFormEditor extends FormEditor implements IEditingDomainProvider , ISmooksModelValidateListener{
public static final String EDITOR_ID = "org.jboss.tools.smooks.configuration.editors.MultiPageEditor";
@@ -106,6 +108,8 @@
private EObject smooksModel;
private boolean handleEMFModelChange;
+
+ private Diagnostic diagnostic;
public SmooksMultiFormEditor() {
super();
@@ -221,6 +225,14 @@
configurationPage.setSelectionToViewer(newList);
}
}
+
+ public void addValidateListener(ISmooksModelValidateListener listener){
+ validator.addValidateListener(listener);
+ }
+
+ public void removeValidateListener(ISmooksModelValidateListener listener){
+ validator.removeValidateListener(listener);
+ }
/*
* (non-Javadoc)
@@ -230,7 +242,7 @@
@Override
protected void addPages() {
configurationPage = createSmooksConfigurationFormPage();
- validator.addValidateListener(configurationPage);
+ addValidateListener(configurationPage);
try {
int index = this.addPage(configurationPage);
setPageText(index, "Design");
@@ -364,10 +376,7 @@
}
}
if (this.smooksModel != null) {
- List<Object> lists = new ArrayList<Object>();
- lists.add(smooksModel);
-// SmooksModelValidator validator = new SmooksModelValidator(lists, getEditingDomain());
-// validator.startValidate(smooksModel.eResource().getContents(), editingDomain);
+ validator.startValidate(smooksModel.eResource().getContents(), editingDomain);
}
} catch (IOException e) {
SmooksConfigurationActivator.getDefault().log(e);
@@ -391,6 +400,9 @@
super.init(site, input);
validator = new SmooksModelValidator();
+ addValidateListener(this);
+ setDiagnostic(validator.validate(smooksModel.eResource().getContents(), editingDomain));
+
// if success to open editor , check if there isn't ext file and create
// a new one
String extFileName = file.getName() + SmooksConstants.SMOOKS_GRAPHICSEXT_EXTENTION_NAME_WITHDOT;
@@ -447,6 +459,20 @@
this.editingDomain = editingDomain;
}
+ /**
+ * @return the diagnostic
+ */
+ public Diagnostic getDiagnostic() {
+ return diagnostic;
+ }
+
+ /**
+ * @param diagnostic the diagnostic to set
+ */
+ public void setDiagnostic(Diagnostic diagnostic) {
+ this.diagnostic = diagnostic;
+ }
+
/*
* (non-Javadoc)
*
@@ -456,4 +482,12 @@
return false;
}
+ public void validateEnd(Diagnostic diagnosticResult) {
+ setDiagnostic(diagnosticResult);
+ }
+
+ public void validateStart() {
+
+ }
+
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -11,8 +11,12 @@
package org.jboss.tools.smooks.configuration.editors;
import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
+import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.Enumerator;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClassifier;
@@ -40,6 +44,8 @@
import org.eclipse.ui.forms.widgets.Section;
import org.jboss.tools.smooks.configuration.editors.uitls.IModelProcsser;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
+import org.jboss.tools.smooks.model.common.AbstractAnyType;
+import org.jboss.tools.smooks.model.validate.ISmooksModelValidateListener;
/**
*
@@ -47,25 +53,38 @@
* <p>
* Apr 7, 2009
*/
-public class SmooksStuffPropertyDetailPage implements IDetailsPage {
- FormToolkit formToolkit = null;
+public class SmooksStuffPropertyDetailPage implements IDetailsPage, ISmooksModelValidateListener {
+
+ private FormToolkit formToolkit = null;
+
private IManagedForm managedForm;
+
private ISelection selection;
+
private IFormPart formPart;
+
private Section section;
+
private SmooksMultiFormEditor formEditor;
+
private AdapterFactoryEditingDomain editingDomain = null;
+
private IItemPropertySource itemPropertySource = null;
+ private Map<Object, Object> currentPropertyUIMap = new HashMap<Object, Object>();
+
private Object oldModel = null;
private boolean isStale = false;
+
private Composite propertyMainComposite;
+
private Composite propertyComposite;
public SmooksStuffPropertyDetailPage(SmooksMultiFormEditor formEditor) {
super();
this.formEditor = formEditor;
+ this.formEditor.addValidateListener(this);
editingDomain = (AdapterFactoryEditingDomain) formEditor.getEditingDomain();
}
@@ -92,6 +111,7 @@
*/
protected void createStuffDetailsComposite(Composite detailsComposite) {
try {
+ cleanCurrentPropertyUIMap();
GridLayout layout = new GridLayout();
layout.numColumns = 2;
detailsComposite.setLayout(layout);
@@ -101,29 +121,91 @@
IItemPropertyDescriptor pd = propertyDes.get(i);
EAttribute attribute = (EAttribute) pd.getFeature(getModel());
if (attribute.isRequired()) {
- createAttributeUI(detailsComposite, pd, creator);
+ AttributeFieldEditPart editPart = createAttributeUI(detailsComposite, pd, creator);
+ if (editPart != null) {
+ currentPropertyUIMap.put(attribute, editPart);
+ }
}
}
for (int i = 0; i < propertyDes.size(); i++) {
IItemPropertyDescriptor pd = propertyDes.get(i);
EAttribute attribute = (EAttribute) pd.getFeature(getModel());
if (!attribute.isRequired()) {
- createAttributeUI(detailsComposite, pd, creator);
+ AttributeFieldEditPart editPart = createAttributeUI(detailsComposite, pd, creator);
+ if (editPart != null) {
+ currentPropertyUIMap.put(attribute, editPart);
+ }
}
}
if (creator != null) {
- creator.createExtendUI((AdapterFactoryEditingDomain) formEditor.getEditingDomain(), formToolkit, detailsComposite, getModel(),
- getFormEditor());
+ creator.createExtendUI((AdapterFactoryEditingDomain) formEditor.getEditingDomain(), formToolkit,
+ detailsComposite, getModel(), getFormEditor());
}
formToolkit.paintBordersFor(detailsComposite);
detailsComposite.pack();
propertyMainComposite.layout();
+
+ markPropertyUI(formEditor.getDiagnostic());
} catch (Exception e) {
e.printStackTrace();
}
}
- protected AttributeFieldEditPart createAttributeUI(Composite detailsComposite, IItemPropertyDescriptor propertyDescriptor, IPropertyUICreator creator) {
+ protected void markPropertyUI(Diagnostic diagnostic) {
+ for (Iterator<?> iterator = currentPropertyUIMap.values().iterator(); iterator.hasNext();) {
+ AttributeFieldEditPart editPart = (AttributeFieldEditPart) iterator.next();
+ if (editPart.getFieldMarker() != null) {
+ editPart.getFieldMarker().clean();
+ }
+ }
+ markErrorWarningPropertyUI(diagnostic);
+ }
+
+ protected void markErrorWarningPropertyUI(Diagnostic diagnostic) {
+ if (diagnostic == null || diagnostic.getSeverity() == Diagnostic.OK) {
+ return;
+ }
+ List<?> data = diagnostic.getData();
+ for (Object object : data) {
+ if (object instanceof EObject) {
+ EObject eObject = (EObject) object;
+ if (eObject instanceof AbstractAnyType) {
+ if (eObject != getModel()) {
+ return;
+ }
+ }
+ if (eObject instanceof EAttribute) {
+ AttributeFieldEditPart editPart = (AttributeFieldEditPart) currentPropertyUIMap.get(eObject);
+ if (editPart == null) {
+ return;
+ }
+ IFieldMarker marker = editPart.getFieldMarker();
+ if (marker == null)
+ return;
+ marker.setMessage(diagnostic.getMessage());
+ if (diagnostic.getSeverity() == Diagnostic.ERROR) {
+ if (marker.getMarkerType() != IFieldMarker.TYPE_ERROR)
+ marker.setMarkerType(IFieldMarker.TYPE_ERROR);
+ }
+
+ if (diagnostic.getSeverity() == Diagnostic.WARNING) {
+ if (marker.getMarkerType() != IFieldMarker.TYPE_WARINING)
+ marker.setMarkerType(IFieldMarker.TYPE_WARINING);
+ }
+ }
+ }
+ }
+
+ List<Diagnostic> children = diagnostic.getChildren();
+ for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
+ Diagnostic diagnostic2 = (Diagnostic) iterator.next();
+ markErrorWarningPropertyUI(diagnostic2);
+ }
+
+ }
+
+ protected AttributeFieldEditPart createAttributeUI(Composite detailsComposite,
+ IItemPropertyDescriptor propertyDescriptor, IPropertyUICreator creator) {
final IItemPropertyDescriptor itemPropertyDescriptor = propertyDescriptor;
EAttribute feature = (EAttribute) itemPropertyDescriptor.getFeature(getModel());
AttributeFieldEditPart editPart = null;
@@ -132,8 +214,8 @@
if (creator.ignoreProperty(feature)) {
return null;
}
- editPart = creator.createPropertyUI(formToolkit, detailsComposite, itemPropertyDescriptor, getModel(), feature,
- getFormEditor());
+ editPart = creator.createPropertyUI(formToolkit, detailsComposite, itemPropertyDescriptor, getModel(),
+ feature, getFormEditor());
if (editPart != null) {
createDefault = false;
}
@@ -142,7 +224,8 @@
EClassifier typeClazz = feature.getEType();
boolean hasCreated = false;
if (typeClazz instanceof EEnum) {
- editPart = createEnumFieldEditor(detailsComposite, feature, (EEnum) typeClazz, formToolkit, itemPropertyDescriptor);
+ editPart = createEnumFieldEditor(detailsComposite, feature, (EEnum) typeClazz, formToolkit,
+ itemPropertyDescriptor);
hasCreated = true;
}
if (typeClazz.getInstanceClass() == String.class) {
@@ -163,12 +246,12 @@
// itemPropertyDescriptor);
}
}
-
+
return editPart;
}
- protected AttributeFieldEditPart createEnumFieldEditor(Composite propertyComposite, EAttribute feature, final EEnum typeClass, FormToolkit formToolKit,
- final IItemPropertyDescriptor itemPropertyDescriptor) {
+ protected AttributeFieldEditPart createEnumFieldEditor(Composite propertyComposite, EAttribute feature,
+ final EEnum typeClass, FormToolkit formToolKit, final IItemPropertyDescriptor itemPropertyDescriptor) {
List<EEnumLiteral> literalList = typeClass.getELiterals();
String[] items = new String[literalList.size()];
for (int i = 0; i < literalList.size(); i++) {
@@ -201,11 +284,12 @@
}
};
- return SmooksUIUtils.createChoiceFieldEditor(propertyComposite, formToolkit, itemPropertyDescriptor, getModel(), items, processer, true);
+ return SmooksUIUtils.createChoiceFieldEditor(propertyComposite, formToolkit, itemPropertyDescriptor,
+ getModel(), items, processer, true);
}
- protected AttributeFieldEditPart createBooleanFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolkit,
- final IItemPropertyDescriptor itemPropertyDescriptor) {
+ protected AttributeFieldEditPart createBooleanFieldEditor(final Composite propertyComposite, EAttribute feature,
+ FormToolkit formToolkit, final IItemPropertyDescriptor itemPropertyDescriptor) {
IModelProcsser processer = new IModelProcsser() {
public Object unwrapValue(Object model) {
@@ -228,18 +312,20 @@
}
};
- return SmooksUIUtils.createChoiceFieldEditor(propertyComposite, formToolkit, itemPropertyDescriptor, getModel(), new String[] { "TRUE", "FALSE" },
- processer, true);
+ return SmooksUIUtils.createChoiceFieldEditor(propertyComposite, formToolkit, itemPropertyDescriptor,
+ getModel(), new String[] { "TRUE", "FALSE" }, processer, true);
}
- protected AttributeFieldEditPart createStringFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolKit,
- final IItemPropertyDescriptor itemPropertyDescriptor) {
- return SmooksUIUtils.createStringFieldEditor(propertyComposite, formToolKit, itemPropertyDescriptor, getModel(), false, false, null);
+ protected AttributeFieldEditPart createStringFieldEditor(final Composite propertyComposite, EAttribute feature,
+ FormToolkit formToolKit, final IItemPropertyDescriptor itemPropertyDescriptor) {
+ return SmooksUIUtils.createStringFieldEditor(propertyComposite, formToolKit, itemPropertyDescriptor,
+ getModel(), false, false, null);
}
- protected void createIntegerFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolKit,
- final IItemPropertyDescriptor itemPropertyDescriptor) {
- SmooksUIUtils.createFieldEditorLabel(null,propertyComposite, formToolKit, itemPropertyDescriptor, getModel(), false);
+ protected void createIntegerFieldEditor(final Composite propertyComposite, EAttribute feature,
+ FormToolkit formToolKit, final IItemPropertyDescriptor itemPropertyDescriptor) {
+ SmooksUIUtils.createFieldEditorLabel(null, propertyComposite, formToolKit, itemPropertyDescriptor, getModel(),
+ false);
final Spinner spinner = new Spinner(propertyComposite, SWT.BORDER);
Object value = itemPropertyDescriptor.getPropertyValue(getModel());
if (value != null && value instanceof PropertyValueWrapper) {
@@ -280,7 +366,8 @@
setOldModel(oldModel);
this.selection = selection;
this.formPart = part;
- this.itemPropertySource = (IItemPropertySource) editingDomain.getAdapterFactory().adapt(getModel(), IItemPropertySource.class);
+ this.itemPropertySource = (IItemPropertySource) editingDomain.getAdapterFactory().adapt(getModel(),
+ IItemPropertySource.class);
if (getOldModel() == getModel())
return;
if (getOldModel() != getModel()) {
@@ -356,6 +443,10 @@
}
}
+ protected void cleanCurrentPropertyUIMap() {
+ currentPropertyUIMap.clear();
+ }
+
public SmooksMultiFormEditor getFormEditor() {
return formEditor;
}
@@ -371,4 +462,12 @@
public void setStale(boolean isStale) {
this.isStale = isStale;
}
+
+ public void validateEnd(Diagnostic diagnosticResult) {
+ markPropertyUI(diagnosticResult);
+ }
+
+ public void validateStart() {
+
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-07 13:37:00 UTC (rev 15107)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -53,7 +53,6 @@
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
@@ -157,7 +156,6 @@
}
}
Composite labelComposite = formToolKit.createComposite(parent);
- labelComposite.setBackground(new Color(null, 128, 132, 132));
GridLayout layout = new GridLayout();
layout.numColumns = 2;
layout.marginLeft = 0;
@@ -166,6 +164,7 @@
labelComposite.setLayout(layout);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
Control labelControl = null;
+
if (!isLink) {
Label label = formToolKit.createLabel(labelComposite, displayName + " :");
label.setForeground(formToolKit.getColors().getColor(IFormColors.TITLE));
@@ -174,6 +173,7 @@
Hyperlink link = formToolKit.createHyperlink(labelComposite, displayName + " :", SWT.NONE);
labelControl = link;
}
+ gd = new GridData();
labelControl.setLayoutData(gd);
FieldMarkerComposite notificationComposite = new FieldMarkerComposite(labelComposite, SWT.NONE);
@@ -183,6 +183,7 @@
gd.horizontalAlignment = GridData.BEGINNING;
gd.verticalAlignment = GridData.BEGINNING;
notificationComposite.setLayoutData(gd);
+
wrapper.setLabelControl(labelControl);
wrapper.setMarker(notificationComposite);
return wrapper;
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ValidateResultLabelDecorator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ValidateResultLabelDecorator.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ValidateResultLabelDecorator.java 2009-05-07 13:38:44 UTC (rev 15108)
@@ -0,0 +1,178 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.smooks.configuration.validate;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.jface.viewers.IDecorationContext;
+import org.eclipse.jface.viewers.ILabelDecorator;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ILightweightLabelDecorator;
+import org.eclipse.jface.viewers.LabelDecorator;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
+import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
+import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
+import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
+import org.jboss.tools.smooks.model.common.AbstractAnyType;
+
+/**
+ * @author Dart (dpeng(a)redhat.com)
+ *
+ */
+public class ValidateResultLabelDecorator extends LabelDecorator implements ILabelDecorator, ILightweightLabelDecorator {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt
+ * .graphics.Image, java.lang.Object)
+ */
+ public Image decorateImage(Image image, Object element) {
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String,
+ * java.lang.Object)
+ */
+ public String decorateText(String text, Object element) {
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.
+ * jface.viewers.ILabelProviderListener)
+ */
+ public void addListener(ILabelProviderListener listener) {
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+ */
+ public void dispose() {
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang
+ * .Object, java.lang.String)
+ */
+ public boolean isLabelProperty(Object element, String property) {
+ return true;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse
+ * .jface.viewers.ILabelProviderListener)
+ */
+ public void removeListener(ILabelProviderListener listener) {
+
+ }
+
+ protected int markErrorWarningPropertyUI(Diagnostic diagnostic, Object model) {
+ if (diagnostic == null || diagnostic.getSeverity() == Diagnostic.OK) {
+ return Diagnostic.OK;
+ }
+ List<?> data = diagnostic.getData();
+ for (Object object : data) {
+ if (object instanceof EObject) {
+ EObject eObject = (EObject) object;
+ if (eObject instanceof AbstractAnyType) {
+ if (eObject == model) {
+ return diagnostic.getSeverity();
+ }
+ }
+ }
+ }
+
+ List<Diagnostic> children = diagnostic.getChildren();
+ for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
+ Diagnostic diagnostic2 = (Diagnostic) iterator.next();
+ int i = markErrorWarningPropertyUI(diagnostic2, model);
+ if (i != -1) {
+ return i;
+ }
+ }
+
+ return -1;
+
+ }
+
+ public void decorate(Object element, IDecoration decoration) {
+ try {
+ element = AdapterFactoryEditingDomain.unwrap(element);
+ if (element instanceof AbstractAnyType) {
+ IResource resource = SmooksUIUtils.getResource((EObject) element);
+ IWorkbenchWindow window = SmooksConfigurationActivator.getDefault().getWorkbench().getActiveWorkbenchWindow();
+ if (window == null) {
+ return;
+ }
+ SmooksMultiFormEditor editor = (SmooksMultiFormEditor) window.getActivePage().findEditor(
+ new FileEditorInput((IFile) resource));
+ int type = markErrorWarningPropertyUI(editor.getDiagnostic(), element);
+ decoration.addOverlay(null, IDecoration.BOTTOM_RIGHT);
+ if (type == Diagnostic.ERROR) {
+ decoration.addOverlay(SmooksConfigurationActivator.getDefault().getImageRegistry().getDescriptor(
+ GraphicsConstants.IMAGE_OVR_ERROR), IDecoration.BOTTOM_RIGHT);
+ }
+ if (type == Diagnostic.WARNING) {
+ decoration.addOverlay(SmooksConfigurationActivator.getDefault().getImageRegistry().getDescriptor(
+ GraphicsConstants.IMAGE_OVR_WARING), IDecoration.BOTTOM_RIGHT);
+ }
+ }
+ } catch (Exception e) {
+ // e.printStackTrace();
+ }
+ }
+
+ @Override
+ public Image decorateImage(Image image, Object element, IDecorationContext context) {
+ return null;
+ }
+
+ @Override
+ public String decorateText(String text, Object element, IDecorationContext context) {
+ return null;
+ }
+
+ @Override
+ public boolean prepareDecoration(Object element, String originalText, IDecorationContext context) {
+ return true;
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/ValidateResultLabelDecorator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r15107 - in trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink: xml and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-05-07 09:37:00 -0400 (Thu, 07 May 2009)
New Revision: 15107
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLRootHyperlinkPartitioner.java
Log:
JBIDE-1739 OpenOn for JSF components' atributes used with the help of 'jsfc'
The 'jsfc' tag attribute is taken into account while calculating open-ons.
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java 2009-05-07 12:32:40 UTC (rev 15106)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java 2009-05-07 13:37:00 UTC (rev 15107)
@@ -75,13 +75,36 @@
if (n != null) {
if ((n instanceof Element || n instanceof Attr) &&
n.getNodeName() != null && n.getNodeName().length() > 0) {
- String nodeName = extractName(n.getNodeName(), trackersMap, tm);
+
+ String name = n.getNodeName();
+
+ // The node name extraction must be done by taking into account 'jsfc' attribute value
+ if (n instanceof Element) {
+ Element e = (Element)n;
+ String jsfcAttrValue = e.getAttribute("jsfc");
+ if (jsfcAttrValue != null && jsfcAttrValue.trim().length() > 0) {
+ name = jsfcAttrValue;
+ }
+ }
+
+ String nodeName = extractName(name, trackersMap, tm);
axis = "/" + nodeName;
}
Node parent = (n instanceof Attr)? ((Attr)n).getOwnerElement() : n.getParentNode();
while (parent instanceof Element) {
// Get the axis part depending on the type and name of node
- String nodeName = extractName(parent.getNodeName(), trackersMap, tm);
+ String name = parent.getNodeName();
+
+ // The node name extraction must be done by taking into account 'jsfc' attribute value
+ if (parent instanceof Element) {
+ Element e = (Element)parent;
+ String jsfcAttrValue = e.getAttribute("jsfc");
+ if (jsfcAttrValue != null && jsfcAttrValue.trim().length() > 0) {
+ name = jsfcAttrValue;
+ }
+ }
+
+ String nodeName = extractName(name, trackersMap, tm);
if (nodeName != null && nodeName.length() > 0)
axis = "/" + nodeName + axis;
parent = parent.getParentNode();
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLRootHyperlinkPartitioner.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLRootHyperlinkPartitioner.java 2009-05-07 12:32:40 UTC (rev 15106)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLRootHyperlinkPartitioner.java 2009-05-07 13:37:00 UTC (rev 15107)
@@ -62,13 +62,35 @@
if (n != null) {
if ((n instanceof Element || n instanceof Attr) &&
n.getNodeName() != null && n.getNodeName().length() > 0) {
- String nodeName = extractName(n.getNodeName(), trackersMap);
+ String name = n.getNodeName();
+
+ // The node name extraction must be done by taking into account 'jsfc' attribute value
+ if (n instanceof Element) {
+ Element e = (Element)n;
+ String jsfcAttrValue = e.getAttribute("jsfc");
+ if (jsfcAttrValue != null && jsfcAttrValue.trim().length() > 0) {
+ name = jsfcAttrValue;
+ }
+ }
+
+ String nodeName = extractName(name, trackersMap);
axis = "/" + nodeName;
}
Node parent = (n instanceof Attr)? ((Attr)n).getOwnerElement():n.getParentNode();
while (parent instanceof Element) {
// Get the axis part depending on the type and name of node
- String nodeName = extractName(parent.getNodeName(), trackersMap);
+ String name = parent.getNodeName();
+
+ // The node name extraction must be done by taking into account 'jsfc' attribute value
+ if (parent instanceof Element) {
+ Element e = (Element)parent;
+ String jsfcAttrValue = e.getAttribute("jsfc");
+ if (jsfcAttrValue != null && jsfcAttrValue.trim().length() > 0) {
+ name = jsfcAttrValue;
+ }
+ }
+
+ String nodeName = extractName(name, trackersMap);
if (nodeName != null && nodeName.length() > 0)
axis = "/" + nodeName + axis;
parent = parent.getParentNode();
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r15106 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-05-07 08:32:40 -0400 (Thu, 07 May 2009)
New Revision: 15106
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4270, tooltips were fixed.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2009-05-07 10:09:49 UTC (rev 15105)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2009-05-07 12:32:40 UTC (rev 15106)
@@ -344,17 +344,32 @@
if (currentSashInfo.cursorOver != i) {
currentSashInfo.cursorOver = i;
currentSashInfo.sash.redraw();
+ String splitting = VpePreference.VISUAL_SOURCE_EDITORS_SPLITTING.getValue();
switch (locs[ARROW_TYPE_INDEX]) {
- case UP_ARROW:
- case DOWN_ARROW:
- currentSashInfo.sash.setToolTipText(VpeUIMessages.RESTORE_PREVIOUS_LOCATION);
- break;
- case UP_MAX_ARROW:
- currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_VISUAL_PANE);
- break;
- case DOWN_MAX_ARROW:
- currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_SOURCE_PANE);
- break;
+ case UP_ARROW:
+ case DOWN_ARROW:
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.RESTORE_PREVIOUS_LOCATION);
+ break;
+ case UP_MAX_ARROW:
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-4270
+ * Tooltip text should correspond panes position.
+ */
+ if (LAYOUT_HORIZONTAL_SOURCE_LEFT.equalsIgnoreCase(splitting)
+ || LAYOUT_VERTICAL_SOURCE_TOP.equalsIgnoreCase(splitting)) {
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_VISUAL_PANE);
+ } else {
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_SOURCE_PANE);
+ }
+ break;
+ case DOWN_MAX_ARROW:
+ if (LAYOUT_HORIZONTAL_SOURCE_LEFT.equalsIgnoreCase(splitting)
+ || LAYOUT_VERTICAL_SOURCE_TOP.equalsIgnoreCase(splitting)) {
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_SOURCE_PANE);
+ } else {
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_VISUAL_PANE);
+ }
+ break;
}
}
return;
@@ -545,7 +560,7 @@
weights[0] = 1000-sashinfo.weight; // Assume weights are always in units of 1000.
weights[1] = sashinfo.weight;
sashinfo.weight = NO_WEIGHT;
-
+
setWeights(weights);
fireDividerMoved();
}
@@ -566,6 +581,7 @@
setWeights(weights);
if (upperFocus)
children[1].setFocus();
+
fireDividerMoved();
}
@@ -576,7 +592,7 @@
weights[0] = 1000-sashinfo.weight; // Assume weights are always in units of 1000.
weights[1] = sashinfo.weight;
sashinfo.weight = NO_WEIGHT;
-
+
setWeights(weights);
fireDividerMoved();
}
@@ -595,7 +611,8 @@
boolean lowerFocus = isFocusAncestorA(children[1]);
setWeights(weights);
if (lowerFocus)
- children[0].setFocus();
+ children[0].setFocus();
+
fireDividerMoved();
}
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r15105 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-05-07 06:09:49 -0400 (Thu, 07 May 2009)
New Revision: 15105
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java
Log:
GPD-315
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2009-05-07 05:48:55 UTC (rev 15104)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2009-05-07 10:09:49 UTC (rev 15105)
@@ -84,7 +84,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "cancel",
+ "end-cancel",
"Create a new cancel end event",
"org.jboss.tools.flow.jpdl4.cancelEndEvent",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.cancelEndEvent"),
@@ -93,7 +93,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "error",
+ "end-error",
"Create a new error end event",
"org.jboss.tools.flow.jpdl4.errorEndEvent",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.errorEndEvent"),
@@ -170,7 +170,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "subprocess",
+ "sub-process",
"Create a new Subprocess",
"org.jboss.tools.flow.jpdl4.subprocess",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.subprocessTask"),
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r15104 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration and 19 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-05-07 01:48:55 -0400 (Thu, 07 May 2009)
New Revision: 15104
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/ISmooksModelValidateListener.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/ValidateSmooksAction.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/AttributeFieldEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldMarkerWrapper.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksMarkerHelper.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CsvReaderUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DataSourceJndiUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ExecutorUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetRowSelectorUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DescriptionUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EdiMapUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/FieldUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/MappingNodeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentsUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SubComponentUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/HighWaterMarkUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/InlineUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/OutputToUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/UseUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/ScriptUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/iorouting/IORouterUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/ConnectionUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/HighWaterMarkUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JndiUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/MessageUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/SessionUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonReaderUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyMapUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionsTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/FeaturesTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlerTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlersTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ImportTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamsTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfileTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfilesTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ReaderTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOffTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOnTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/OutputToUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java
Log:
JBIDE-4232
Add a "FieldMarker" on the attribute label.
Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/ISmooksModelValidateListener.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/ISmooksModelValidateListener.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/ISmooksModelValidateListener.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -0,0 +1,8 @@
+package org.jboss.tools.smooks.model.validate;
+
+import org.eclipse.emf.common.util.Diagnostic;
+
+public interface ISmooksModelValidateListener {
+ void validateStart();
+ void validateEnd(Diagnostic diagnosticResult);
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/ISmooksModelValidateListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validate/SmooksModelValidator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -10,11 +10,14 @@
******************************************************************************/
package org.jboss.tools.smooks.model.validate;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.DiagnosticChain;
@@ -24,8 +27,8 @@
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.swt.widgets.Display;
-
/**
* @author Dart (dpeng(a)redhat.com)
* <p>
@@ -35,12 +38,36 @@
Collection<?> selectedObjects;
EditingDomain domain;
-
- public SmooksModelValidator(Collection<?> selectedObjects,EditingDomain domain){
+ private boolean starting = false;
+ private boolean waiting = false;
+ private Object lock = new Object();
+
+ private List<ISmooksModelValidateListener> listeners = new ArrayList<ISmooksModelValidateListener>();
+
+ public SmooksModelValidator(Collection<?> selectedObjects, EditingDomain domain) {
this.selectedObjects = selectedObjects;
this.domain = domain;
}
+ public SmooksModelValidator() {
+
+ }
+
+ public void addValidateListener(ISmooksModelValidateListener l) {
+ if (!listeners.contains(l))
+ listeners.add(l);
+ }
+
+ public void removeValidateListener(ISmooksModelValidateListener l) {
+ listeners.remove(l);
+ }
+
+ public Diagnostic validate(Collection<?> selectedObjects, EditingDomain editingDomain) {
+ this.selectedObjects = selectedObjects;
+ domain = editingDomain;
+ return validate(new NullProgressMonitor());
+ }
+
public Diagnostic validate(final IProgressMonitor progressMonitor) {
EObject eObject = (EObject) selectedObjects.iterator().next();
int count = 0;
@@ -80,4 +107,69 @@
return diagnostician.validate(eObject);
}
+
+ public void startValidate(final Collection<?> selectedObjects, final EditingDomain editingDomain) {
+ Thread thread = new Thread() {
+ public void run() {
+ if (starting) {
+ synchronized (lock) {
+ waiting = true;
+ }
+ return;
+ } else {
+ synchronized (lock) {
+ starting = true;
+ waiting = true;
+ }
+ while (waiting) {
+ try {
+ waiting = false;
+ Thread.sleep(1000);
+ Thread.yield();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ try {
+ for (Iterator<?> iterator = listeners.iterator(); iterator.hasNext();) {
+ final ISmooksModelValidateListener l = (ISmooksModelValidateListener) iterator.next();
+ Display.getDefault().syncExec(new Runnable(){
+
+ /* (non-Javadoc)
+ * @see java.lang.Runnable#run()
+ */
+ public void run() {
+ l.validateStart();
+ }
+
+ });
+
+ }
+
+ final Diagnostic d = validate(selectedObjects, editingDomain);
+
+ for (Iterator<?> iterator = listeners.iterator(); iterator.hasNext();) {
+ final ISmooksModelValidateListener l = (ISmooksModelValidateListener) iterator.next();
+ Display.getDefault().syncExec(new Runnable(){
+
+ /* (non-Javadoc)
+ * @see java.lang.Runnable#run()
+ */
+ public void run() {
+ l.validateEnd(d);
+ }
+
+ });
+ }
+ } finally {
+ waiting = false;
+ starting = false;
+ }
+ }
+
+ }
+ };
+ thread.setName("Validate Smooks model");
+ thread.start();
+ }
}
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/ValidateSmooksAction.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/ValidateSmooksAction.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/ValidateSmooksAction.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.configuration.actions;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.ui.dialogs.DiagnosticDialog;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.ISetSelectionTarget;
+import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
+import org.jboss.tools.smooks.configuration.validate.SmooksMarkerHelper;
+import org.jboss.tools.smooks.model.validate.SmooksModelValidator;
+
+/**
+ * @author Dart (dpeng(a)redhat.com)
+ *
+ */
+public class ValidateSmooksAction extends Action {
+
+ private Resource resource = null;
+
+ private EditingDomain editingDomain;
+
+ private SmooksModelValidator validator = null;
+
+ private SmooksMarkerHelper markerHelper = new SmooksMarkerHelper();
+
+ @Override
+ public void run() {
+ final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+ IRunnableWithProgress runnableWithProgress = new IRunnableWithProgress() {
+ public void run(final IProgressMonitor progressMonitor) throws InvocationTargetException,
+ InterruptedException {
+ try {
+ final Diagnostic diagnostic = validate(progressMonitor);
+ shell.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ if (progressMonitor.isCanceled()) {
+ handleDiagnostic(Diagnostic.CANCEL_INSTANCE);
+ } else {
+ handleDiagnostic(diagnostic);
+ }
+ }
+ });
+ } finally {
+ progressMonitor.done();
+ }
+ }
+ };
+
+ if (markerHelper != null) {
+ runnableWithProgress = markerHelper.getWorkspaceModifyOperation(runnableWithProgress);
+ }
+
+ try {
+ // This runs the operation, and shows progress.
+ // (It appears to be a bad thing to fork this onto another thread.)
+ //
+ new ProgressMonitorDialog(shell).run(true, true, runnableWithProgress);
+ } catch (Exception exception) {
+ SmooksConfigurationActivator.getDefault().log(exception);
+ }
+ }
+
+ protected void handleDiagnostic(Diagnostic diagnostic) {
+ int severity = diagnostic.getSeverity();
+ String title = null;
+ String message = null;
+
+ if (severity == Diagnostic.ERROR || severity == Diagnostic.WARNING) {
+ title = "Error";
+ message = "Validate Messages";
+ } else {
+ title = "Information";
+ message = "Validate success";
+ }
+
+ int result = 0;
+ if (diagnostic.getSeverity() == Diagnostic.OK) {
+// MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), title,
+// message);
+// result = Window.CANCEL;
+ return;
+ } else {
+ result = DiagnosticDialog.open(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), title,
+ message, diagnostic);
+ }
+
+ if (markerHelper != null) {
+ Resource resource = editingDomain.getResourceSet().getResources().get(0);
+ if (resource != null) {
+ markerHelper.deleteMarkers(resource);
+ }
+
+ if (result == Window.OK) {
+ if (!diagnostic.getChildren().isEmpty()) {
+ List<?> data = (diagnostic.getChildren().get(0)).getData();
+ if (!data.isEmpty() && data.get(0) instanceof EObject) {
+ Object part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .getActivePart();
+ if (part instanceof ISetSelectionTarget) {
+ ((ISetSelectionTarget) part).selectReveal(new StructuredSelection(data.get(0)));
+ } else if (part instanceof IViewerProvider) {
+ Viewer viewer = ((IViewerProvider) part).getViewer();
+ if (viewer != null) {
+ viewer.setSelection(new StructuredSelection(data.get(0)), true);
+ }
+ }
+ }
+ }
+
+ if (resource != null) {
+ for (Diagnostic childDiagnostic : diagnostic.getChildren()) {
+ markerHelper.createMarkers(resource, childDiagnostic);
+ }
+ }
+ }
+ }
+ }
+
+ protected Diagnostic validate(IProgressMonitor progressMonitor) {
+ if (resource != null && editingDomain != null) {
+ validator = new SmooksModelValidator(resource.getContents(), editingDomain);
+ return validator.validate(progressMonitor);
+ }
+ return Diagnostic.OK_INSTANCE;
+ }
+
+ public Resource getResource() {
+ return resource;
+ }
+
+ public void setResource(Resource resource) {
+ this.resource = resource;
+ }
+
+ public EditingDomain getEditingDomain() {
+ return editingDomain;
+ }
+
+ public void setEditingDomain(EditingDomain editingDomain) {
+ this.editingDomain = editingDomain;
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/ValidateSmooksAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/AttributeFieldEditPart.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/AttributeFieldEditPart.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/AttributeFieldEditPart.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.configuration.editors;
+
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * @author Dart (dpeng(a)redhat.com)
+ *
+ */
+public class AttributeFieldEditPart {
+
+ private IFieldMarker fieldMarker;
+
+ private Control contentControl;
+
+ /**
+ * @return the fieldMarker
+ */
+ public IFieldMarker getFieldMarker() {
+ return fieldMarker;
+ }
+
+ /**
+ * @param fieldMarker the fieldMarker to set
+ */
+ public void setFieldMarker(IFieldMarker fieldMarker) {
+ this.fieldMarker = fieldMarker;
+ }
+
+ /**
+ * @return the contentControl
+ */
+ public Control getContentControl() {
+ return contentControl;
+ }
+
+ /**
+ * @param contentControl the contentControl to set
+ */
+ public void setContentControl(Control contentControl) {
+ this.contentControl = contentControl;
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/AttributeFieldEditPart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.configuration.editors;
+
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
+
+/**
+ * @author Dart (dpeng(a)redhat.com)
+ *
+ */
+public class FieldMarkerComposite extends Canvas implements IFieldMarker, PaintListener {
+
+ private Image errorImage = null;
+
+ private Image waringImage = null;
+
+// private Image informationImage = null;
+
+ private int type = -1;
+
+ public FieldMarkerComposite(Composite parent, int style) {
+ super(parent, style);
+ errorImage = SmooksConfigurationActivator.getDefault().getImageRegistry().get(GraphicsConstants.IMAGE_ERROR);
+ waringImage = SmooksConfigurationActivator.getDefault().getImageRegistry().get(GraphicsConstants.IMAGE_WARNING);
+ this.addPaintListener(this);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.configuration.editors.IFieldMarker#setMarkerType()
+ */
+ public void setMarkerType(int type) {
+ this.type = type;
+ this.redraw();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.configuration.editors.IFieldMarker#setMessage()
+ */
+ public void setMessage(String message) {
+ this.setToolTipText(message);
+ }
+
+ public void clean() {
+ this.setToolTipText(null);
+ }
+
+ public void paintControl(PaintEvent e) {
+ GC gc = e.gc;
+ gc.fillRectangle(getBounds());
+ if (type == IFieldMarker.TYPE_ERROR) {
+ gc.drawImage(errorImage, 0, 0);
+ }
+ if (type == IFieldMarker.TYPE_WARINING) {
+ gc.drawImage(waringImage, 0, 0);
+ }
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FieldMarkerComposite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.configuration.editors;
+
+/**
+ * @author Dart (dpeng(a)redhat.com)
+ *
+ */
+public interface IFieldMarker {
+
+ int TYPE_ERROR = 1;
+
+ int TYPE_WARINING = 2;
+
+ void setMessage(String message);
+
+ void setMarkerType(int type);
+
+ void clean();
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IFieldMarker.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -22,7 +22,7 @@
* Apr 7, 2009
*/
public interface IPropertyUICreator {
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -32,6 +32,7 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.forms.events.IHyperlinkListener;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.uitls.FieldMarkerWrapper;
import org.jboss.tools.smooks.configuration.editors.uitls.IFieldDialog;
import org.jboss.tools.smooks.configuration.editors.uitls.IModelProcsser;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -63,7 +64,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (isBeanIDRefFieldFeature(feature)) {
return createBeanIDRefFieldEditor(toolkit, parent, propertyDescriptor, model, feature, formEditor);
@@ -78,8 +79,8 @@
return createFileSelectionFieldEditor(toolkit, parent, propertyDescriptor, model, feature, formEditor);
}
if(isConditionSelectionFeature(feature)){
- SmooksUIUtils.createContionsChoiceFieldEditor(parent, toolkit, propertyDescriptor, model);
- return parent;
+ return SmooksUIUtils.createConditionsChoiceFieldEditor(parent, toolkit, propertyDescriptor, model);
+// return parent;
}
if (feature == SmooksPackage.eINSTANCE.getAbstractReader_TargetProfile()) {
@@ -131,7 +132,7 @@
return false;
}
- public Composite createFileSelectionFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createFileSelectionFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
IFieldDialog dialog = new IFieldDialog() {
public Object open(Shell shell) {
@@ -166,7 +167,7 @@
return false;
}
- public Composite createSelectorFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createSelectorFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
SmooksGraphicsExtType ext = formEditor.getSmooksGraphicsExt();
if (ext != null) {
@@ -179,7 +180,7 @@
return false;
}
- public Composite createJavaTypeSearchEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createJavaTypeSearchEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (model instanceof EObject)
return SmooksUIUtils.createJavaTypeSearchFieldEditor(parent, toolkit, propertyDescriptor, (EObject) model);
@@ -190,13 +191,16 @@
return false;
}
- public Composite createBeanIDRefFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createBeanIDRefFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (model instanceof EObject) {
+ AttributeFieldEditPart editPart = new AttributeFieldEditPart();
SmooksResourceListType smooksResourceList = getSmooksResourceList((EObject) model);
if (smooksResourceList != null) {
- SmooksUIUtils.createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, false);
+ FieldMarkerWrapper wrapper = SmooksUIUtils.createFieldEditorLabel(null,parent, toolkit, propertyDescriptor, model, false);
+ editPart.setFieldMarker(wrapper.getMarker());
final Combo combo = new Combo(parent, SWT.BORDER);
+ editPart.setContentControl(combo);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
combo.setLayoutData(gd);
Object editValue = SmooksUIUtils.getEditValue(propertyDescriptor, model);
@@ -223,7 +227,7 @@
ip.setPropertyValue(cmodel, combo.getText());
}
});
- return combo;
+ return editPart;
}
}
return null;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -54,6 +54,7 @@
import org.eclipse.ui.actions.ActionFactory;
import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
import org.jboss.tools.smooks.configuration.actions.AddSmooksResourceAction;
+import org.jboss.tools.smooks.configuration.actions.ValidateSmooksAction;
import org.jboss.tools.smooks.model.datasource.DataSourceJndi;
import org.jboss.tools.smooks.model.datasource.Direct;
import org.jboss.tools.smooks.model.dbrouting.Executor;
@@ -204,6 +205,8 @@
* @generated
*/
protected IMenuManager createSiblingMenuManager;
+
+ private ValidateSmooksAction validateSmooksAction;
/**
* This creates an instance of the contributor. <!-- begin-user-doc --> <!--
@@ -346,6 +349,10 @@
public void init(IActionBars actionBars) {
super.init(actionBars);
ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
+
+ validateSmooksAction = new ValidateSmooksAction();
+ validateSmooksAction.setText("Validate");
+
cutAction = new CutAction() {
public void runWithEvent(Event event) {
@@ -440,6 +447,9 @@
EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();
newChildDescriptors = domain.getNewChildDescriptors(object, null);
+
+ validateSmooksAction.setResource(domain.getResourceSet().getResources().get(0));
+ validateSmooksAction.setEditingDomain(domain);
// newSiblingDescriptors = domain.getNewChildDescriptors(null,
// object);
}
@@ -622,7 +632,7 @@
menuManager.insertBefore("edit", submenuManager);
// don't show properties that
// menuManager.insertAfter("additions-end", showPropertiesViewAction);
- menuManager.insertAfter("additions-end", validateAction);
+ menuManager.insertAfter("additions-end", validateSmooksAction);
this.addGlobalActions(menuManager);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -18,6 +18,7 @@
import java.util.List;
import java.util.Properties;
+import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -48,14 +49,16 @@
import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtFactory;
import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType;
import org.jboss.tools.smooks.model.smooks.DocumentRoot;
+import org.jboss.tools.smooks.model.validate.ISmooksModelValidateListener;
import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
/**
* @author Dart Peng (dpeng(a)redhat.com) Date Apr 1, 2009
*/
-public class SmooksConfigurationFormPage extends FormPage {
+public class SmooksConfigurationFormPage extends FormPage implements ISmooksModelValidateListener{
private SmooksMasterDetailBlock masterDetailBlock = null;
+
private TableViewer inputDataViewer;
public SmooksConfigurationFormPage(FormEditor editor, String id, String title) {
@@ -111,7 +114,7 @@
protected void createExtentionArea(IManagedForm managedForm) {
FormToolkit toolkit = managedForm.getToolkit();
final ScrolledForm form = managedForm.getForm();
- Section section = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.TWISTIE);
+ Section section = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.TWISTIE | Section.EXPANDED);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
section.setLayoutData(gd);
section.setText("Input Data");
@@ -283,4 +286,12 @@
}
}
+ public void validateEnd(Diagnostic diagnosticResult) {
+ System.out.println(diagnosticResult);
+ }
+
+ public void validateStart() {
+
+ }
+
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -25,7 +25,6 @@
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -100,6 +100,8 @@
private PropertySheetPage propertySheetPage = null;
private SmooksGraphicsExtType smooksGraphicsExt = null;
+
+ private SmooksModelValidator validator = null;
private EObject smooksModel;
@@ -155,6 +157,9 @@
int length = oldEndIndex - startIndex + 1;
handleEMFModelChange = true;
document.replace(startIndex, length, replacement);
+
+ validator.startValidate(smooksModel.eResource().getContents(), editingDomain);
+
} catch (Exception exception) {
SmooksConfigurationActivator.getDefault().log(exception);
}
@@ -225,6 +230,7 @@
@Override
protected void addPages() {
configurationPage = createSmooksConfigurationFormPage();
+ validator.addValidateListener(configurationPage);
try {
int index = this.addPage(configurationPage);
setPageText(index, "Design");
@@ -313,6 +319,8 @@
SmooksConfigurationActivator.getDefault().log(e);
}
configurationPage.setSmooksModel(this.smooksModel);
+
+ validator.startValidate(smooksModel.eResource().getContents(), editingDomain);
}
protected SmooksConfigurationFormPage createSmooksConfigurationFormPage() {
@@ -358,8 +366,8 @@
if (this.smooksModel != null) {
List<Object> lists = new ArrayList<Object>();
lists.add(smooksModel);
- SmooksModelValidator validator = new SmooksModelValidator(lists, getEditingDomain());
- validator.validate(monitor);
+// SmooksModelValidator validator = new SmooksModelValidator(lists, getEditingDomain());
+// validator.startValidate(smooksModel.eResource().getContents(), editingDomain);
}
} catch (IOException e) {
SmooksConfigurationActivator.getDefault().log(e);
@@ -381,6 +389,8 @@
}
editingDomain.getResourceSet().getResources().add(smooksResource);
super.init(site, input);
+
+ validator = new SmooksModelValidator();
// if success to open editor , check if there isn't ext file and create
// a new one
String extFileName = file.getName() + SmooksConstants.SMOOKS_GRAPHICSEXT_EXTENTION_NAME_WITHDOT;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -32,9 +32,7 @@
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.IDetailsPage;
import org.eclipse.ui.forms.IFormPart;
import org.eclipse.ui.forms.IManagedForm;
@@ -125,17 +123,18 @@
}
}
- protected void createAttributeUI(Composite detailsComposite, IItemPropertyDescriptor propertyDescriptor, IPropertyUICreator creator) {
+ protected AttributeFieldEditPart createAttributeUI(Composite detailsComposite, IItemPropertyDescriptor propertyDescriptor, IPropertyUICreator creator) {
final IItemPropertyDescriptor itemPropertyDescriptor = propertyDescriptor;
EAttribute feature = (EAttribute) itemPropertyDescriptor.getFeature(getModel());
+ AttributeFieldEditPart editPart = null;
boolean createDefault = true;
if (creator != null) {
if (creator.ignoreProperty(feature)) {
- return;
+ return null;
}
- Composite composite = creator.createPropertyUI(formToolkit, detailsComposite, itemPropertyDescriptor, getModel(), feature,
+ editPart = creator.createPropertyUI(formToolkit, detailsComposite, itemPropertyDescriptor, getModel(), feature,
getFormEditor());
- if (composite != null) {
+ if (editPart != null) {
createDefault = false;
}
}
@@ -143,18 +142,19 @@
EClassifier typeClazz = feature.getEType();
boolean hasCreated = false;
if (typeClazz instanceof EEnum) {
- createEnumFieldEditor(detailsComposite, feature, (EEnum) typeClazz, formToolkit, itemPropertyDescriptor);
+ editPart = createEnumFieldEditor(detailsComposite, feature, (EEnum) typeClazz, formToolkit, itemPropertyDescriptor);
hasCreated = true;
}
if (typeClazz.getInstanceClass() == String.class) {
- createStringFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor);
+ editPart = createStringFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor);
+ hasCreated = true;
}
if (typeClazz.getInstanceClass() == Boolean.class || typeClazz.getInstanceClass() == boolean.class) {
- createBooleanFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor);
+ editPart = createBooleanFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor);
hasCreated = true;
}
if (typeClazz.getInstanceClass() == Integer.class || typeClazz.getInstanceClass() == int.class) {
- createStringFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor);
+ editPart = createStringFieldEditor(detailsComposite, feature, formToolkit, itemPropertyDescriptor);
hasCreated = true;
}
if (!hasCreated) {
@@ -163,9 +163,11 @@
// itemPropertyDescriptor);
}
}
+
+ return editPart;
}
- protected Control createEnumFieldEditor(Composite propertyComposite, EAttribute feature, final EEnum typeClass, FormToolkit formToolKit,
+ protected AttributeFieldEditPart createEnumFieldEditor(Composite propertyComposite, EAttribute feature, final EEnum typeClass, FormToolkit formToolKit,
final IItemPropertyDescriptor itemPropertyDescriptor) {
List<EEnumLiteral> literalList = typeClass.getELiterals();
String[] items = new String[literalList.size()];
@@ -202,7 +204,7 @@
return SmooksUIUtils.createChoiceFieldEditor(propertyComposite, formToolkit, itemPropertyDescriptor, getModel(), items, processer, true);
}
- protected void createBooleanFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolkit,
+ protected AttributeFieldEditPart createBooleanFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolkit,
final IItemPropertyDescriptor itemPropertyDescriptor) {
IModelProcsser processer = new IModelProcsser() {
@@ -226,18 +228,18 @@
}
};
- SmooksUIUtils.createChoiceFieldEditor(propertyComposite, formToolkit, itemPropertyDescriptor, getModel(), new String[] { "TRUE", "FALSE" },
+ return SmooksUIUtils.createChoiceFieldEditor(propertyComposite, formToolkit, itemPropertyDescriptor, getModel(), new String[] { "TRUE", "FALSE" },
processer, true);
}
- protected Text createStringFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolKit,
+ protected AttributeFieldEditPart createStringFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolKit,
final IItemPropertyDescriptor itemPropertyDescriptor) {
return SmooksUIUtils.createStringFieldEditor(propertyComposite, formToolKit, itemPropertyDescriptor, getModel(), false, false, null);
}
protected void createIntegerFieldEditor(final Composite propertyComposite, EAttribute feature, FormToolkit formToolKit,
final IItemPropertyDescriptor itemPropertyDescriptor) {
- SmooksUIUtils.createFieldEditorLabel(propertyComposite, formToolKit, itemPropertyDescriptor, getModel(), false);
+ SmooksUIUtils.createFieldEditorLabel(null,propertyComposite, formToolKit, itemPropertyDescriptor, getModel(), false);
final Spinner spinner = new Spinner(propertyComposite, SWT.BORDER);
Object value = itemPropertyDescriptor.getPropertyValue(getModel());
if (value != null && value instanceof PropertyValueWrapper) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.calc.CalcPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == CalcPackage.eINSTANCE.getCounter_StartExpression()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CsvReaderUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CsvReaderUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv/CsvReaderUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.csv.CsvPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == CsvPackage.eINSTANCE.getCsvReader_Encoding()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DataSourceJndiUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DataSourceJndiUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DataSourceJndiUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.datasource.DatasourcePackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == DatasourcePackage.eINSTANCE.getDataSourceJndi_AutoCommit()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.datasource.DatasourcePackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == DatasourcePackage.eINSTANCE.getDirect_AutoCommit()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ExecutorUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ExecutorUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ExecutorUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.dbrouting.DbroutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == DbroutingPackage.eINSTANCE.getExecutor_Statement()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetRowSelectorUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetRowSelectorUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetRowSelectorUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.dbrouting.DbroutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == DbroutingPackage.eINSTANCE.getResultSetRowSelector_Where()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/dbrouting/ResultSetUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.dbrouting.DbroutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == DbroutingPackage.eINSTANCE.getResultSet_Name()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/ComponentUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.medi.MEdiPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == MEdiPackage.eINSTANCE.getComponent_Required()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.medi.MEdiPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DescriptionUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DescriptionUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DescriptionUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.medi.MEdiPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EdiMapUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EdiMapUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EdiMapUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
@@ -31,7 +32,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/FieldUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/FieldUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/FieldUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.medi.MEdiPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/MappingNodeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/MappingNodeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/MappingNodeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.medi.MEdiPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.medi.MEdiPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentsUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentsUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SegmentsUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
@@ -31,7 +32,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SubComponentUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SubComponentUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/SubComponentUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.medi.MEdiPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -36,14 +37,13 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == EdiPackage.eINSTANCE.getEDIReader_Encoding()) {
}
if (feature == EdiPackage.eINSTANCE.getEDIReader_MappingModel()) {
- SmooksUIUtils.createFileSelectionTextFieldEditor(null, parent, null, toolkit, propertyDescriptor, model, SmooksUIUtils.VALUE_TYPE_VALUE,
+ return SmooksUIUtils.createFileSelectionTextFieldEditor(null, parent, null, toolkit, propertyDescriptor, model, SmooksUIUtils.VALUE_TYPE_VALUE,
SmooksMultiFormEditor.EDITOR_ID,null);
- return parent;
}
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/HighWaterMarkUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/HighWaterMarkUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/HighWaterMarkUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == FileRoutingPackage.eINSTANCE.getHighWaterMark_Mark()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == FileRoutingPackage.eINSTANCE.getOutputStream_FileNamePattern()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == FreemarkerPackage.eINSTANCE.getBindTo_Id()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == FreemarkerPackage.eINSTANCE.getFreemarker_ApplyBefore()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/InlineUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/InlineUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/InlineUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == FreemarkerPackage.eINSTANCE.getInline_Directive()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/OutputToUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/OutputToUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/OutputToUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == FreemarkerPackage.eINSTANCE.getOutputTo_OutputStreamResource()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -18,6 +18,7 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.jboss.tools.smooks.configuration.actions.OpenEditorEditInnerContentsAction;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -36,7 +37,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == FreemarkerPackage.eINSTANCE.getTemplate_Value()) {
}
@@ -54,11 +55,11 @@
SmooksUIUtils.createFileSelectionTextFieldEditor("Text Value", parent, editingdomain, toolkit, null, model, SmooksUIUtils.VALUE_TYPE_TEXT,
null, null);
- Text cdatatext = SmooksUIUtils.createCDATAFieldEditor("Template Contents(CDATA)", editingdomain, toolkit, parent, model, openCDATAEditorAction);
- Text commenttext = SmooksUIUtils.createCommentFieldEditor("Template Contents(Comment)", editingdomain, toolkit, parent, model, openCommentEditorAction);
+ AttributeFieldEditPart cdatatext = SmooksUIUtils.createCDATAFieldEditor("Template Contents(CDATA)", editingdomain, toolkit, parent, model, openCDATAEditorAction);
+ AttributeFieldEditPart commenttext = SmooksUIUtils.createCommentFieldEditor("Template Contents(Comment)", editingdomain, toolkit, parent, model, openCommentEditorAction);
- openCDATAEditorAction.setRelateText(cdatatext);
- openCommentEditorAction.setRelateText(commenttext);
+ openCDATAEditorAction.setRelateText((Text)cdatatext.getContentControl());
+ openCommentEditorAction.setRelateText((Text)commenttext.getContentControl());
}
@Override
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/UseUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/UseUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/UseUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
@@ -31,7 +32,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -15,6 +15,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.groovy.GroovyPackage;
@@ -33,7 +34,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == GroovyPackage.eINSTANCE.getGroovy_Imports()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/ScriptUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/ScriptUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/ScriptUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -18,6 +18,7 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.jboss.tools.smooks.configuration.actions.OpenEditorEditInnerContentsAction;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -35,7 +36,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor);
}
@@ -44,8 +45,8 @@
public void createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model,
SmooksMultiFormEditor formEditor) {
OpenEditorEditInnerContentsAction action2 = new OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, SmooksUIUtils.VALUE_TYPE_COMMENT, "groovy");
- Text text = SmooksUIUtils.createCommentFieldEditor("Script Contents", editingdomain, toolkit, parent, model, action2);
- action2.setRelateText(text);
+ AttributeFieldEditPart editPart = SmooksUIUtils.createCommentFieldEditor("Script Contents", editingdomain, toolkit, parent, model, action2);
+ action2.setRelateText((Text)editPart.getContentControl());
}
@Override
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/iorouting/IORouterUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/iorouting/IORouterUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/iorouting/IORouterUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.iorouting.IoroutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == IoroutingPackage.eINSTANCE.getIORouter_BeanId()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -15,6 +15,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -51,7 +52,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) {
if (feature == JavabeanPackage.eINSTANCE.getBindingsType_Class()) {
return createBeanClassTextWithButton(parent, toolkit, propertyDescriptor, model);
@@ -69,7 +70,7 @@
return super.isSelectorFeature(attribute);
}
- protected Composite createBeanClassTextWithButton(Composite composite, FormToolkit toolkit,
+ protected AttributeFieldEditPart createBeanClassTextWithButton(Composite composite, FormToolkit toolkit,
final IItemPropertyDescriptor propertyDescriptor, final Object model) {
return SmooksUIUtils.createJavaTypeSearchFieldEditor(composite, toolkit, propertyDescriptor, (EObject)model);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.javabean.JavabeanPackage;
@@ -45,7 +46,7 @@
* @see org.jboss.tools.smooks.configuration.editors.javabean.PropertiesAndSetterMethodSearchFieldEditorCreator#createPropertyUI(org.eclipse.ui.forms.widgets.FormToolkit, org.eclipse.swt.widgets.Composite, org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, org.eclipse.emf.ecore.EAttribute, org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor)
*/
@Override
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.javabean.JavabeanPackage;
@@ -57,7 +58,7 @@
}
@Override
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature,
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -15,6 +15,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -26,7 +27,7 @@
public class PropertiesAndSetterMethodSearchFieldEditorCreator extends PropertyUICreator {
@Override
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) {
if(canCreatePropertiesSearchFieldEditor(feature)){
return createPropertiesSearchFieldEditor(toolkit, parent, propertyDescriptor, model);
@@ -53,7 +54,7 @@
return "Search setter method";
}
- protected Composite createPropertiesSearchFieldEditor(FormToolkit toolkit, Composite parent,
+ protected AttributeFieldEditPart createPropertiesSearchFieldEditor(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model) {
if (model instanceof EObject) {
EObject container = ((EObject) model).eContainer();
@@ -65,7 +66,7 @@
return null;
}
- protected Composite createMethodsSearchFieldEditor(FormToolkit toolkit, Composite parent,
+ protected AttributeFieldEditPart createMethodsSearchFieldEditor(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model) {
if (model instanceof EObject) {
EObject container = ((EObject) model).eContainer();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/ConnectionUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/ConnectionUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/ConnectionUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == JmsroutingPackage.eINSTANCE.getConnection_Factory()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/HighWaterMarkUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/HighWaterMarkUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/HighWaterMarkUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == JmsroutingPackage.eINSTANCE.getHighWaterMark_Mark()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == JmsroutingPackage.eINSTANCE.getJmsRouter_BeanId()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JndiUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JndiUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JndiUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == JmsroutingPackage.eINSTANCE.getJndi_ContextFactory()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/MessageUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/MessageUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/MessageUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == JmsroutingPackage.eINSTANCE.getMessage_CorrelationIdPattern()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/SessionUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/SessionUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/SessionUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == JmsroutingPackage.eINSTANCE.getSession_AcknowledgeMode()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonReaderUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonReaderUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/JsonReaderUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.json.JsonPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == JsonPackage.eINSTANCE.getJsonReader_ArrayElementName()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyMapUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyMapUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyMapUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
@@ -31,7 +32,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature ,SmooksMultiFormEditor formEditor) {
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature,
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/json/KeyUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.json.JsonPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == JsonPackage.eINSTANCE.getKey_Value()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -15,6 +15,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -34,7 +35,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) {
if (feature == SmooksPackage.eINSTANCE.getConditionType_Value()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionsTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionsTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionsTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
@@ -31,7 +32,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/FeaturesTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/FeaturesTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/FeaturesTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
@@ -31,7 +32,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlerTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlerTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlerTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.smooks.SmooksPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlersTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlersTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/HandlersTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
@@ -31,7 +32,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ImportTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ImportTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ImportTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -33,12 +34,11 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == SmooksPackage.eINSTANCE.getImportType_File()) {
- SmooksUIUtils.createFileSelectionTextFieldEditor(null, parent, null, toolkit, propertyDescriptor, model, SmooksUIUtils.VALUE_TYPE_VALUE,
+ return SmooksUIUtils.createFileSelectionTextFieldEditor(null, parent, null, toolkit, propertyDescriptor, model, SmooksUIUtils.VALUE_TYPE_VALUE,
SmooksMultiFormEditor.EDITOR_ID,null);
- return parent;
}
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -15,6 +15,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -34,7 +35,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) {
if (feature == SmooksPackage.eINSTANCE.getParamType_Name()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamsTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamsTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamsTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
@@ -31,7 +32,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature ,SmooksMultiFormEditor formEditor) {
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature,
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfileTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfileTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfileTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.smooks.SmooksPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == SmooksPackage.eINSTANCE.getProfileType_Value()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfilesTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfilesTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ProfilesTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
@@ -31,7 +32,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature ,SmooksMultiFormEditor formEditor) {
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature,
formEditor);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ReaderTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ReaderTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ReaderTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.smooks.SmooksPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -34,7 +35,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == SmooksPackage.eINSTANCE.getResourceConfigType_Selector()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -15,6 +15,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -34,7 +35,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) {
if (feature == SmooksPackage.eINSTANCE.getResourceType_Value()) {
return SmooksUIUtils.createJavaTypeSearchFieldEditor(parent, toolkit,
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOffTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOffTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOffTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.smooks.SmooksPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOnTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOnTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SetOnTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.smooks.SmooksPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == SmooksPackage.eINSTANCE.getSetOnType_Feature()) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.smooks.SmooksPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == SmooksPackage.eINSTANCE.getSmooksResourceListType_AbstractReaderGroup()) {
}
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldMarkerWrapper.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldMarkerWrapper.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldMarkerWrapper.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.configuration.editors.uitls;
+
+import org.eclipse.swt.widgets.Control;
+import org.jboss.tools.smooks.configuration.editors.IFieldMarker;
+
+/**
+ * @author Dart (dpeng(a)redhat.com)
+ *
+ */
+public class FieldMarkerWrapper {
+ private IFieldMarker marker;
+
+ private Control labelControl;
+
+ /**
+ * @return the marker
+ */
+ public IFieldMarker getMarker() {
+ return marker;
+ }
+
+ /**
+ * @param marker the marker to set
+ */
+ public void setMarker(IFieldMarker marker) {
+ this.marker = marker;
+ }
+
+ /**
+ * @return the labelControl
+ */
+ public Control getLabelControl() {
+ return labelControl;
+ }
+
+ /**
+ * @param labelControl the labelControl to set
+ */
+ public void setLabelControl(Control labelControl) {
+ this.labelControl = labelControl;
+ }
+
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldMarkerWrapper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -53,6 +53,7 @@
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
@@ -78,8 +79,10 @@
import org.eclipse.ui.part.FileEditorInput;
import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
import org.jboss.tools.smooks.configuration.actions.OpenEditorEditInnerContentsAction;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.ClassPathFileProcessor;
import org.jboss.tools.smooks.configuration.editors.CurrentProjecViewerFilter;
+import org.jboss.tools.smooks.configuration.editors.FieldMarkerComposite;
import org.jboss.tools.smooks.configuration.editors.FileSelectionWizard;
import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
import org.jboss.tools.smooks.configuration.editors.OpenFileHyperLinkListener;
@@ -117,36 +120,72 @@
public static int VALUE_TYPE_CDATA = 0;
- public static void createMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent,
- Object model, boolean linkLabel, IHyperlinkListener listener) {
- createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, false, 0, linkLabel, false, listener,null);
+ public static void createMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain,
+ FormToolkit toolkit, Composite parent, Object model, boolean linkLabel, IHyperlinkListener listener) {
+ createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, false, 0, linkLabel, false, listener,
+ null);
}
- public static void createMultiMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit,
- Composite parent, Object model, int height,OpenEditorEditInnerContentsAction action) {
- createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, true, height, false, false, null,action);
+ public static void createMultiMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain,
+ FormToolkit toolkit, Composite parent, Object model, int height, OpenEditorEditInnerContentsAction action) {
+ createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, true, height, false, false, null,
+ action);
}
- public static void createMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent,
- Object model, boolean multiText, int height, boolean linkLabel, boolean openFile, IHyperlinkListener listener,OpenEditorEditInnerContentsAction action) {
- createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, multiText, linkLabel, openFile, height, listener, VALUE_TYPE_TEXT,action);
+ public static void createMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain,
+ FormToolkit toolkit, Composite parent, Object model, boolean multiText, int height, boolean linkLabel,
+ boolean openFile, IHyperlinkListener listener, OpenEditorEditInnerContentsAction action) {
+ createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, multiText, linkLabel, openFile,
+ height, listener, VALUE_TYPE_TEXT, action);
}
- public static Control createFieldEditorLabel(Composite parent, FormToolkit formToolKit, IItemPropertyDescriptor itemPropertyDescriptor,
- Object model, boolean isLink) {
- String displayName = itemPropertyDescriptor.getDisplayName(model);
- EAttribute feature = (EAttribute) itemPropertyDescriptor.getFeature(model);
- if (feature.isRequired()) {
- displayName = "*" + displayName;
+ public static FieldMarkerWrapper createFieldEditorLabel(Composite parent, FormToolkit formToolKit,
+ IItemPropertyDescriptor itemPropertyDescriptor, Object model, boolean isLink) {
+ return createFieldEditorLabel(null, parent, formToolKit, itemPropertyDescriptor, model, isLink);
+ }
+
+ public static FieldMarkerWrapper createFieldEditorLabel(String labelText, Composite parent,
+ FormToolkit formToolKit, IItemPropertyDescriptor itemPropertyDescriptor, Object model, boolean isLink) {
+ FieldMarkerWrapper wrapper = new FieldMarkerWrapper();
+ String displayName = labelText;
+ if (itemPropertyDescriptor == null) {
+ } else {
+ displayName = itemPropertyDescriptor.getDisplayName(model);
+ EAttribute feature = (EAttribute) itemPropertyDescriptor.getFeature(model);
+ if (feature.isRequired()) {
+ displayName = "*" + displayName;
+ }
}
+ Composite labelComposite = formToolKit.createComposite(parent);
+ labelComposite.setBackground(new Color(null, 128, 132, 132));
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 2;
+ layout.marginLeft = 0;
+ layout.marginRight = 0;
+ layout.horizontalSpacing = 0;
+ labelComposite.setLayout(layout);
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ Control labelControl = null;
if (!isLink) {
- Label label = formToolKit.createLabel(parent, displayName + " :");
+ Label label = formToolKit.createLabel(labelComposite, displayName + " :");
label.setForeground(formToolKit.getColors().getColor(IFormColors.TITLE));
- return label;
+ labelControl = label;
} else {
- Hyperlink link = formToolKit.createHyperlink(parent, displayName + " :", SWT.NONE);
- return link;
+ Hyperlink link = formToolKit.createHyperlink(labelComposite, displayName + " :", SWT.NONE);
+ labelControl = link;
}
+ labelControl.setLayoutData(gd);
+
+ FieldMarkerComposite notificationComposite = new FieldMarkerComposite(labelComposite, SWT.NONE);
+ gd = new GridData();
+ gd.heightHint = 8;
+ gd.widthHint = 8;
+ gd.horizontalAlignment = GridData.BEGINNING;
+ gd.verticalAlignment = GridData.BEGINNING;
+ notificationComposite.setLayoutData(gd);
+ wrapper.setLabelControl(labelControl);
+ wrapper.setMarker(notificationComposite);
+ return wrapper;
}
/**
@@ -157,12 +196,14 @@
* @param parent
* @param model
*/
- public static void createFilePathFieldEditor(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model) {
+ public static void createFilePathFieldEditor(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit,
+ Composite parent, Object model) {
// IHyperlinkListener link
}
- public static void createLinkMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent,
- Object model, boolean multiText, int height, boolean linkLabel, IHyperlinkListener listener) {
+ public static void createLinkMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain,
+ FormToolkit toolkit, Composite parent, Object model, boolean multiText, int height, boolean linkLabel,
+ IHyperlinkListener listener) {
if (linkLabel) {
Hyperlink link = toolkit.createHyperlink(parent, label, SWT.NONE);
if (listener != null) {
@@ -206,9 +247,10 @@
}
public static void createLinkTextValueFieldEditor(String label, AdapterFactoryEditingDomain editingdomain,
- IItemPropertyDescriptor propertyDescriptor, FormToolkit toolkit, Composite parent, Object model, boolean multiText, int height,
- boolean linkLabel, IHyperlinkListener listener) {
- Control control = createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, linkLabel);
+ IItemPropertyDescriptor propertyDescriptor, FormToolkit toolkit, Composite parent, Object model,
+ boolean multiText, int height, boolean linkLabel, IHyperlinkListener listener) {
+ FieldMarkerWrapper warpper = createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, linkLabel);
+ Control control = warpper.getLabelControl();
if (linkLabel) {
Hyperlink link = (Hyperlink) control;
if (listener != null) {
@@ -268,22 +310,27 @@
return path;
}
- public static Text createStringFieldEditor(final Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor itemPropertyDescriptor,
- Object model, boolean linkLabel, boolean openFile, IHyperlinkListener listener) {
- return createStringFieldEditor(null, parent, null, toolkit, itemPropertyDescriptor, model, false, linkLabel, openFile, 0, listener,
- VALUE_TYPE_VALUE,null);
+ public static AttributeFieldEditPart createStringFieldEditor(final Composite parent, FormToolkit toolkit,
+ final IItemPropertyDescriptor itemPropertyDescriptor, Object model, boolean linkLabel, boolean openFile,
+ IHyperlinkListener listener) {
+ return createStringFieldEditor(null, parent, null, toolkit, itemPropertyDescriptor, model, false, linkLabel,
+ openFile, 0, listener, VALUE_TYPE_VALUE, null);
}
- public static Text createFileSelectionTextFieldEditor(String label, final Composite parent, EditingDomain editingdomain, FormToolkit toolkit,
- final IItemPropertyDescriptor itemPropertyDescriptor, final Object model, int valueType, String editorID,OpenEditorEditInnerContentsAction action) {
- OpenFileHyperLinkListener listener = new OpenFileHyperLinkListener(valueType, itemPropertyDescriptor, model, editorID);
- return createStringFieldEditor(label, parent, editingdomain, toolkit, itemPropertyDescriptor, model, false, true, true, 0, listener,
- valueType,action);
+ public static AttributeFieldEditPart createFileSelectionTextFieldEditor(String label, final Composite parent,
+ EditingDomain editingdomain, FormToolkit toolkit, final IItemPropertyDescriptor itemPropertyDescriptor,
+ final Object model, int valueType, String editorID, OpenEditorEditInnerContentsAction action) {
+ OpenFileHyperLinkListener listener = new OpenFileHyperLinkListener(valueType, itemPropertyDescriptor, model,
+ editorID);
+ return createStringFieldEditor(label, parent, editingdomain, toolkit, itemPropertyDescriptor, model, false,
+ true, true, 0, listener, valueType, action);
}
- public static Text createStringFieldEditor(String label, final Composite parent, EditingDomain editingdomain, FormToolkit toolkit,
- final IItemPropertyDescriptor itemPropertyDescriptor, Object model, boolean multiText, boolean linkLabel, boolean openFile, int height,
- IHyperlinkListener listener, int valueType,OpenEditorEditInnerContentsAction openEditorAction) {
+ public static AttributeFieldEditPart createStringFieldEditor(String label, final Composite parent,
+ EditingDomain editingdomain, FormToolkit toolkit, final IItemPropertyDescriptor itemPropertyDescriptor,
+ Object model, boolean multiText, boolean linkLabel, boolean openFile, int height,
+ IHyperlinkListener listener, int valueType, OpenEditorEditInnerContentsAction openEditorAction) {
+ AttributeFieldEditPart fieldEditPart = new AttributeFieldEditPart();
GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
Section section = null;
Composite textContainer = null;
@@ -303,13 +350,13 @@
gd.heightHint = 10;
space.setLayoutData(gd);
- section = toolkit.createSection(parent, Section.TITLE_BAR |Section.TWISTIE);
+ section = toolkit.createSection(parent, Section.TITLE_BAR | Section.TWISTIE);
FillLayout layout = new FillLayout();
section.setLayout(layout);
section.setText(label);
if (openEditorAction != null) {
ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
-
+
ToolBar toolbar = toolBarManager.createControl(section);
final Cursor handCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND);
toolbar.setCursor(handCursor);
@@ -335,13 +382,15 @@
section.setLayoutData(gd);
textContainer = textComposite;
} else {
- if (linkLabel) {
- Hyperlink link = toolkit.createHyperlink(parent, label + " :", SWT.NONE);
+ FieldMarkerWrapper warpper = createFieldEditorLabel(label, parent, toolkit, itemPropertyDescriptor, model,
+ linkLabel);
+ fieldEditPart.setFieldMarker(warpper.getMarker());
+ Control labelControl = warpper.getLabelControl();
+ if (labelControl instanceof Hyperlink) {
+ Hyperlink link = (Hyperlink) labelControl;
if (listener != null) {
link.addHyperlinkListener(listener);
}
- } else {
- toolkit.createLabel(parent, label + " :").setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
}
if (openFile) {
Composite fileSelectionComposite = toolkit.createComposite(parent);
@@ -472,12 +521,14 @@
});
}
}
- if(section != null ) section.layout();
- return valueText;
+ if (section != null)
+ section.layout();
+ fieldEditPart.setContentControl(valueText);
+ return fieldEditPart;
}
- public static Composite createSelectorFieldEditor(FormToolkit toolkit, Composite parent, final IItemPropertyDescriptor propertyDescriptor,
- Object model, final SmooksGraphicsExtType extType) {
+ public static AttributeFieldEditPart createSelectorFieldEditor(FormToolkit toolkit, Composite parent,
+ final IItemPropertyDescriptor propertyDescriptor, Object model, final SmooksGraphicsExtType extType) {
return createDialogFieldEditor(parent, toolkit, propertyDescriptor, "Browse", new IFieldDialog() {
public Object open(Shell shell) {
SelectoreSelectionDialog dialog = new SelectoreSelectionDialog(shell, extType);
@@ -504,8 +555,8 @@
}
public static SmooksGraphicsExtType loadSmooksGraphicsExt(IFile file) throws IOException {
- Resource resource = new SmooksGraphicsExtResourceFactoryImpl().createResource(URI.createPlatformResourceURI(file.getFullPath()
- .toPortableString(), false));
+ Resource resource = new SmooksGraphicsExtResourceFactoryImpl().createResource(URI.createPlatformResourceURI(
+ file.getFullPath().toPortableString(), false));
resource.load(Collections.emptyMap());
if (resource.getContents().size() > 0) {
Object obj = resource.getContents().get(0);
@@ -516,19 +567,24 @@
return null;
}
- public static Text createCDATAFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent,
- Object model,OpenEditorEditInnerContentsAction action) {
- return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300, null, VALUE_TYPE_CDATA,action);
+ public static AttributeFieldEditPart createCDATAFieldEditor(String label,
+ AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model,
+ OpenEditorEditInnerContentsAction action) {
+ return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300,
+ null, VALUE_TYPE_CDATA, action);
}
- public static Text createCommentFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent,
- Object model,OpenEditorEditInnerContentsAction action) {
- return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300, null, VALUE_TYPE_COMMENT,action);
+ public static AttributeFieldEditPart createCommentFieldEditor(String label,
+ AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model,
+ OpenEditorEditInnerContentsAction action) {
+ return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300,
+ null, VALUE_TYPE_COMMENT, action);
}
- public static Composite createJavaTypeSearchFieldEditor(Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor,
- final EObject model) {
+ public static AttributeFieldEditPart createJavaTypeSearchFieldEditor(Composite parent, FormToolkit toolkit,
+ final IItemPropertyDescriptor propertyDescriptor, final EObject model) {
if (model instanceof EObject) {
+ AttributeFieldEditPart editpart = new AttributeFieldEditPart();
final Resource resource = ((EObject) model).eResource();
URI uri = resource.getURI();
IResource workspaceResource = null;
@@ -536,7 +592,9 @@
String path = uri.toPlatformString(true);
workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path));
JavaTypeFieldDialog dialog = new JavaTypeFieldDialog(workspaceResource);
- Hyperlink link = (Hyperlink) createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, true);
+ FieldMarkerWrapper warpper = createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, true);
+ editpart.setFieldMarker(warpper.getMarker());
+ Hyperlink link = (Hyperlink) warpper.getLabelControl();
final Composite classTextComposite = toolkit.createComposite(parent);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
classTextComposite.setLayoutData(gd);
@@ -544,7 +602,8 @@
fillLayout.marginHeight = 0;
fillLayout.marginWidth = 0;
classTextComposite.setLayout(fillLayout);
- final SearchComposite searchComposite = new SearchComposite(classTextComposite, toolkit, "Search Class", dialog, SWT.NONE);
+ final SearchComposite searchComposite = new SearchComposite(classTextComposite, toolkit,
+ "Search Class", dialog, SWT.NONE);
Object editValue = getEditValue(propertyDescriptor, model);
if (editValue != null) {
searchComposite.getText().setText(editValue.toString());
@@ -580,8 +639,9 @@
if (result != null)
JavaUI.openInEditor(result);
else {
- MessageDialog.openInformation(classTextComposite.getShell(), "Can't find type", "Can't find type \"" + typeName
- + "\" in \"" + javaProject.getProject().getName() + "\" project.");
+ MessageDialog.openInformation(classTextComposite.getShell(), "Can't find type",
+ "Can't find type \"" + typeName + "\" in \""
+ + javaProject.getProject().getName() + "\" project.");
}
}
} catch (PartInitException ex) {
@@ -604,7 +664,8 @@
});
toolkit.paintBordersFor(classTextComposite);
- return classTextComposite;
+ editpart.setContentControl(classTextComposite);
+ return editpart;
}
}
return null;
@@ -630,15 +691,17 @@
return null;
}
- public static Composite createJavaMethodSearchFieldEditor(BindingsType container, Composite parent, FormToolkit toolkit,
- final IItemPropertyDescriptor propertyDescriptor, String buttonName, final EObject model) {
+ public static AttributeFieldEditPart createJavaMethodSearchFieldEditor(BindingsType container, Composite parent,
+ FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName,
+ final EObject model) {
String classString = ((BindingsType) container).getClass_();
IJavaProject project = getJavaProject(container);
try {
ProjectClassLoader classLoader = new ProjectClassLoader(project);
Class<?> clazz = classLoader.loadClass(classString);
JavaMethodsSelectionDialog dialog = new JavaMethodsSelectionDialog(project, clazz);
- return SmooksUIUtils.createDialogFieldEditor(parent, toolkit, propertyDescriptor, "Select method", dialog, (EObject) model);
+ return SmooksUIUtils.createDialogFieldEditor(parent, toolkit, propertyDescriptor, "Select method", dialog,
+ (EObject) model);
} catch (Exception e) {
// ignore
}
@@ -685,7 +748,8 @@
return generateFullPath(node, sperator);
}
- public static String generatePath(IXMLStructuredObject startNode, IXMLStructuredObject stopNode, final String sperator, boolean includeContext) {
+ public static String generatePath(IXMLStructuredObject startNode, IXMLStructuredObject stopNode,
+ final String sperator, boolean includeContext) {
String name = "";
if (startNode == stopNode) {
return startNode.getNodeName();
@@ -725,8 +789,8 @@
return null;
}
- public static Control createContionsChoiceFieldEditor(Composite parent, FormToolkit formToolkit, IItemPropertyDescriptor itemPropertyDescriptor,
- Object model) {
+ public static AttributeFieldEditPart createConditionsChoiceFieldEditor(Composite parent, FormToolkit formToolkit,
+ IItemPropertyDescriptor itemPropertyDescriptor, Object model) {
SmooksResourceListType listType = getSmooks11ResourceListType((EObject) model);
List<String> names = new ArrayList<String>();
if (listType != null) {
@@ -739,12 +803,17 @@
}
}
}
- return createChoiceFieldEditor(parent, formToolkit, itemPropertyDescriptor, model, names.toArray(new String[] {}), null, false);
+ return createChoiceFieldEditor(parent, formToolkit, itemPropertyDescriptor, model, names
+ .toArray(new String[] {}), null, false);
}
- public static Control createChoiceFieldEditor(Composite parent, FormToolkit formToolkit, IItemPropertyDescriptor itemPropertyDescriptor,
- Object model, String[] items, IModelProcsser processer, boolean readOnly) {
- SmooksUIUtils.createFieldEditorLabel(parent, formToolkit, itemPropertyDescriptor, model, false);
+ public static AttributeFieldEditPart createChoiceFieldEditor(Composite parent, FormToolkit formToolkit,
+ IItemPropertyDescriptor itemPropertyDescriptor, Object model, String[] items, IModelProcsser processer,
+ boolean readOnly) {
+ AttributeFieldEditPart fieldEditPart = new AttributeFieldEditPart();
+ FieldMarkerWrapper markerWrapper = SmooksUIUtils.createFieldEditorLabel(parent, formToolkit,
+ itemPropertyDescriptor, model, false);
+ fieldEditPart.setFieldMarker(markerWrapper.getMarker());
Object editValue = getEditValue(itemPropertyDescriptor, model);
if (processer != null) {
editValue = processer.unwrapValue(editValue);
@@ -784,18 +853,21 @@
fipd.setPropertyValue(fm, setValue);
}
});
- return combo;
+ fieldEditPart.setContentControl(combo);
+ return fieldEditPart;
}
- public static Composite createJavaPropertySearchFieldEditor(BindingsType container, Composite parent, FormToolkit toolkit,
- final IItemPropertyDescriptor propertyDescriptor, String buttonName, final EObject model) {
+ public static AttributeFieldEditPart createJavaPropertySearchFieldEditor(BindingsType container, Composite parent,
+ FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName,
+ final EObject model) {
String classString = ((BindingsType) container).getClass_();
IJavaProject project = getJavaProject(container);
try {
ProjectClassLoader classLoader = new ProjectClassLoader(project);
Class<?> clazz = classLoader.loadClass(classString);
JavaPropertiesSelectionDialog dialog = new JavaPropertiesSelectionDialog(project, clazz);
- return SmooksUIUtils.createDialogFieldEditor(parent, toolkit, propertyDescriptor, "Select property", dialog, (EObject) model);
+ return SmooksUIUtils.createDialogFieldEditor(parent, toolkit, propertyDescriptor, "Select property",
+ dialog, (EObject) model);
} catch (Exception e) {
// ignore
}
@@ -811,14 +883,19 @@
return null;
}
- public static Composite createDialogFieldEditor(Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor,
- String buttonName, IFieldDialog dialog, final EObject model) {
+ public static AttributeFieldEditPart createDialogFieldEditor(Composite parent, FormToolkit toolkit,
+ final IItemPropertyDescriptor propertyDescriptor, String buttonName, IFieldDialog dialog,
+ final EObject model) {
return createDialogFieldEditor(parent, toolkit, propertyDescriptor, buttonName, dialog, model, false, null);
}
- public static Composite createDialogFieldEditor(Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor,
- String buttonName, IFieldDialog dialog, final EObject model, boolean labelLink, IHyperlinkListener listener) {
- Control label = createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, labelLink);
+ public static AttributeFieldEditPart createDialogFieldEditor(Composite parent, FormToolkit toolkit,
+ final IItemPropertyDescriptor propertyDescriptor, String buttonName, IFieldDialog dialog,
+ final EObject model, boolean labelLink, IHyperlinkListener listener) {
+ AttributeFieldEditPart editpart = new AttributeFieldEditPart();
+ FieldMarkerWrapper wrapper = createFieldEditorLabel(parent, toolkit, propertyDescriptor, model, labelLink);
+ editpart.setFieldMarker(wrapper.getMarker());
+ Control label = wrapper.getLabelControl();
if (label instanceof Hyperlink && listener != null) {
((Hyperlink) label).addHyperlinkListener(listener);
}
@@ -829,7 +906,8 @@
fillLayout.marginHeight = 0;
fillLayout.marginWidth = 0;
classTextComposite.setLayout(fillLayout);
- final SearchComposite searchComposite = new SearchComposite(classTextComposite, toolkit, buttonName, dialog, SWT.NONE);
+ final SearchComposite searchComposite = new SearchComposite(classTextComposite, toolkit, buttonName, dialog,
+ SWT.NONE);
Object editValue = getEditValue(propertyDescriptor, model);
if (editValue != null) {
searchComposite.getText().setText(editValue.toString());
@@ -848,7 +926,8 @@
}
});
toolkit.paintBordersFor(classTextComposite);
- return classTextComposite;
+ editpart.setContentControl(classTextComposite);
+ return editpart;
}
public static void openFile(String uri, IProject project) throws PartInitException {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.xsl.XslPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) {
if (feature == XslPackage.eINSTANCE.getBindTo_Id()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/OutputToUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/OutputToUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/OutputToUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.xsl.XslPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,SmooksMultiFormEditor formEditor) {
if (feature == XslPackage.eINSTANCE.getOutputTo_OutputStreamResource()) {
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -18,6 +18,7 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.jboss.tools.smooks.configuration.actions.OpenEditorEditInnerContentsAction;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -37,7 +38,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
EAttribute feature, SmooksMultiFormEditor formEditor) {
if (feature == XslPackage.eINSTANCE.getTemplate_Value()) {
}
@@ -69,10 +70,10 @@
OpenEditorEditInnerContentsAction openCommentEditorAction = new OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, SmooksUIUtils.VALUE_TYPE_COMMENT, "xsl");
SmooksUIUtils.createFileSelectionTextFieldEditor("Text Value", parent, editingdomain, toolkit, null, model, SmooksUIUtils.VALUE_TYPE_TEXT,
null, null);
- Text text1 = SmooksUIUtils.createCDATAFieldEditor("Template Contents (CDATA)", editingdomain, toolkit, parent, model, openCdataEditorAction);
- Text text2 = SmooksUIUtils.createCommentFieldEditor("Template Contents (Comment)", editingdomain, toolkit, parent, model, openCommentEditorAction);
- openCdataEditorAction.setRelateText(text1);
- openCommentEditorAction.setRelateText(text2);
+ AttributeFieldEditPart text1 = SmooksUIUtils.createCDATAFieldEditor("Template Contents (CDATA)", editingdomain, toolkit, parent, model, openCdataEditorAction);
+ AttributeFieldEditPart text2 = SmooksUIUtils.createCommentFieldEditor("Template Contents (Comment)", editingdomain, toolkit, parent, model, openCommentEditorAction);
+ openCdataEditorAction.setRelateText((Text)text1.getContentControl());
+ openCommentEditorAction.setRelateText((Text)text2.getContentControl());
}
}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java 2009-05-07 04:59:16 UTC (rev 15103)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -14,6 +14,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart;
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.model.xsl.XslPackage;
@@ -32,7 +33,7 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public Composite createPropertyUI(FormToolkit toolkit, Composite parent,
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
SmooksMultiFormEditor formEditor) {
if (feature == XslPackage.eINSTANCE.getXsl_ApplyBefore()) {
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksMarkerHelper.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksMarkerHelper.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksMarkerHelper.java 2009-05-07 05:48:55 UTC (rev 15104)
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.configuration.validate;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
+import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
+
+/**
+ * @author Dart (dpeng(a)redhat.com)
+ *
+ */
+public class SmooksMarkerHelper extends EditUIMarkerHelper {
+
+ public IRunnableWithProgress getWorkspaceModifyOperation(IRunnableWithProgress runnableWithProgress) {
+ return new WorkspaceModifyDelegatingOperation(runnableWithProgress);
+ }
+
+ @Override
+ protected String getMarkerID() {
+ return EValidator.MARKER;
+ }
+
+ public void createMarkers(Resource resource, Diagnostic diagnostic) {
+ try {
+ createMarkers(getFile(resource), diagnostic, null);
+ } catch (CoreException e) {
+ SmooksConfigurationActivator.getDefault().log(e);
+ }
+ }
+
+ @Override
+ protected String composeMessage(Diagnostic diagnostic, Diagnostic parentDiagnostic) {
+ String message = diagnostic.getMessage();
+ if (parentDiagnostic != null) {
+ String parentMessage = parentDiagnostic.getMessage();
+ if (parentMessage != null) {
+ message = message != null ? parentMessage + ". " + message : parentMessage;
+ }
+ }
+ return message;
+ }
+
+ @Override
+ protected void adjustMarker(IMarker marker, Diagnostic diagnostic, Diagnostic parentDiagnostic)
+ throws CoreException {
+ List<?> data = diagnostic.getData();
+ StringBuilder relatedURIs = new StringBuilder();
+ boolean first = true;
+ for (Object object : data) {
+ if (object instanceof EObject) {
+ EObject eObject = (EObject) object;
+ if (first) {
+ first = false;
+ marker.setAttribute(EValidator.URI_ATTRIBUTE, EcoreUtil.getURI(eObject).toString());
+ } else {
+ if (relatedURIs.length() != 0) {
+ relatedURIs.append(' ');
+ }
+ relatedURIs.append(URI.encodeFragment(EcoreUtil.getURI(eObject).toString(), false));
+ }
+ }
+ }
+
+ if (relatedURIs.length() > 0) {
+ marker.setAttribute(EValidator.RELATED_URIS_ATTRIBUTE, relatedURIs.toString());
+ }
+ super.adjustMarker(marker, diagnostic, parentDiagnostic);
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksMarkerHelper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 1 month
- 1
- 0