JBoss Tools SVN: r29374 - in trunk/drools/docs/reference/en-US: images/create_new_project and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-02-27 19:32:17 -0500 (Sun, 27 Feb 2011)
New Revision: 29374
Modified:
trunk/drools/docs/reference/en-US/create_new_project.xml
trunk/drools/docs/reference/en-US/editors.xml
trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project1.png
trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project10.png
trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project2.png
trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project3.png
trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project4.png
trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project5.png
trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project6.png
trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project7.png
trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project8.png
trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project9.png
trunk/drools/docs/reference/en-US/images/editors/editors1.png
trunk/drools/docs/reference/en-US/images/editors/editors1b.png
trunk/drools/docs/reference/en-US/images/editors/editors1c.png
trunk/drools/docs/reference/en-US/images/editors/editors1d.png
trunk/drools/docs/reference/en-US/images/editors/editors1e.png
trunk/drools/docs/reference/en-US/images/editors/editors1f.png
trunk/drools/docs/reference/en-US/images/editors/editors1g.png
trunk/drools/docs/reference/en-US/images/editors/editors4.png
trunk/drools/docs/reference/en-US/images/editors/editors5.png
trunk/drools/docs/reference/en-US/images/editors/editors6.png
trunk/drools/docs/reference/en-US/images/editors/editors7.png
trunk/drools/docs/reference/en-US/images/editors/editors8.png
trunk/drools/docs/reference/en-US/images/editors/editors9.png
Log:
updated screenshots
Modified: trunk/drools/docs/reference/en-US/create_new_project.xml
===================================================================
--- trunk/drools/docs/reference/en-US/create_new_project.xml 2011-02-27 22:46:43 UTC (rev 29373)
+++ trunk/drools/docs/reference/en-US/create_new_project.xml 2011-02-28 00:32:17 UTC (rev 29374)
@@ -17,7 +17,7 @@
<para>First, we suggest that you use <property>Drools perspective</property> which is aimed at work with Drools specific resources.</para>
<para>
- To create a new Drools project select <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>New</guimenuitem><guimenuitem>Drools Project</guimenuitem></menuchoice>. This will open the <guilabel>New Drools Project wizard</guilabel>, as shown in the figure below.
+ To create a new Drools project select <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>New</guimenuitem><guimenuitem>Project...</guimenuitem><guimenuitem>Drools</guimenuitem><guimenuitem>Drools Project</guimenuitem></menuchoice>. This will open the <guilabel>New Drools Project wizard</guilabel>, as shown in the figure below.
</para>
<para>On the first page type the project name and click the <guibutton>Next</guibutton> button.</para>
Modified: trunk/drools/docs/reference/en-US/editors.xml
===================================================================
--- trunk/drools/docs/reference/en-US/editors.xml 2011-02-27 22:46:43 UTC (rev 29373)
+++ trunk/drools/docs/reference/en-US/editors.xml 2011-02-28 00:32:17 UTC (rev 29374)
@@ -6,7 +6,7 @@
<keyword>Drools Tools</keyword>
</keywordset>
</chapterinfo>
-
+
<title>Editors</title>
<section id="dsl_editor">
<title>DSL Editor</title>
@@ -14,7 +14,11 @@
A domain-specific language is a set of custom rules, that is created specifically to solve problems in a particular domain and is not intended to be able to solve problems outside it. A DSL's configuration is stored in plain text.
</para>
<para>
- In Drools this configuration is presented by <filename>.dsl</filename> files that can be created selecting <menuchoice><guimenuitem>New</guimenuitem><guimenuitem>Other</guimenuitem><guimenuitem>Drools</guimenuitem><guimenuitem>Domain Specific Language</guimenuitem></menuchoice> from the projects context menu.
+ In Drools this configuration is presented by <filename>.dsl</filename> files that can be created selecting <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>New</guimenuitem>
+ <guimenuitem>Other</guimenuitem>
+ <guimenuitem>Drools</guimenuitem>
+ <guimenuitem>Domain Specific Language</guimenuitem>
+ </menuchoice> from the projects context menu.
</para>
<para>DSL Editor is a default editor for <filename>.dsl</filename> files:</para>
<figure>
@@ -26,12 +30,12 @@
</mediaobject>
</figure>
<para>In the table below all the components of the DSL Editor page are described:</para>
- <table>
+ <table id="dsl_editor_components">
<title>DSL Editor Components.</title>
<tgroup cols="2">
<colspec colnum="1" align="left" colwidth="1*"/>
<colspec colnum="2" align="left" colwidth="3*"/>
-
+
<thead>
<row>
<entry>Components</entry>
@@ -46,8 +50,9 @@
<row>
<entry>Table of language message mappings</entry>
<entry>The table is divided into 4 rows:
- <itemizedlist id="rows">
- <listitem><para><emphasis>Language Expression</emphasis>: expression you want to use as a rule</para>
+ <itemizedlist id="rows">
+ <listitem>
+ <para><emphasis>Language Expression</emphasis>: expression you want to use as a rule</para>
</listitem>
<listitem>
<para>
@@ -71,7 +76,7 @@
<entry>Expression</entry>
<entry>Shows the language expression of the selected table line (language message mapping).</entry>
</row>
-
+
<row>
<entry>Mapping</entry>
<entry>Shows the rule of language mapping for the selected table line (language message mapping).</entry>
@@ -80,9 +85,9 @@
<entry>Object</entry>
<entry>Shows the object for the selected table line (language message mapping)</entry>
</row>
-
- <row>
- <entry id="sort">Sort By</entry>
+
+ <row id="sort" title="DSL Editor Components - Sort By">
+ <entry>Sort By</entry>
<entry>
Using this option you can change the sorting order of the language message mappings. To do this select from the drop down list the method of sorting you want and click the <guibutton>Sort</guibutton> button.
</entry>
@@ -107,7 +112,7 @@
</listitem>
<listitem>
<para>
- <emphasis>Sort</emphasis>: please, for more information see the <xref linkend="sort"/> section.
+ <emphasis>Sort</emphasis>: please, for more information see the <emphasis>Sort By</emphasis> row above.
</para>
</listitem>
<listitem>
@@ -127,7 +132,7 @@
This wizard can be opened by double clicking some line in the table of language message mappings or by clicking the <guibutton>Edit</guibutton> button.
</para>
<para>On the picture below you can see all the options the Edit Language Mapping Wizard will allow you to change.</para>
- <para>Their names as well as the meaning of the options are correspond to the rows of the table (see <xref linkend="rows"/>).</para>
+ <para>Their names as well as the meaning of the options are correspond to the rows of the table (see the <emphasis>Table of language message mappings</emphasis> row in <xref linkend="dsl_editor_components"/>).</para>
<figure>
<title>Edit language mapping Wizard</title>
<mediaobject>
@@ -160,7 +165,10 @@
Drools tools also provides the ability to define the order in which rules should be executed. The Ruleflow file allows you to specify the order in which rule sets should be evaluated using a flow chart. This allows you to define which rule sets should be evaluated in sequence or in parallel as well as specify the conditions under which rule sets should be evaluated.
</para>
<para>
- Ruleflows can be set only by using the graphical flow editor which is part of the Drools plugin for Eclipse. Once you have set up a Drools project,you can start adding ruleflows. Add a ruleflow file(.rf) by clicking on the project and selecting <menuchoice><guimenuitem>New</guimenuitem><guimenuitem>Other...</guimenuitem><guimenuitem>Flow File</guimenuitem></menuchoice>:
+ Ruleflows can be set only by using the graphical flow editor which is part of the Drools plugin for Eclipse. Once you have set up a Drools project,you can start adding ruleflows. Add a ruleflow file(.rf) by clicking on the project and selecting <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>New</guimenuitem>
+ <guimenuitem>Other...</guimenuitem>
+ <guimenuitem>Flow File</guimenuitem>
+ </menuchoice>:
</para>
<figure>
<title>RuleFlow file creation</title>
@@ -221,7 +229,7 @@
<colspec colnum="1" align="left" colwidth="1*"/>
<colspec colnum="2" align="left" colwidth="1*"/>
<colspec colnum="3" align="left" colwidth="3*"/>
-
+
<thead>
<row>
<entry>Component Picture</entry>
@@ -264,14 +272,14 @@
<entry>Use this element to join two elements on the canvas</entry>
</row>
</tbody>
-
+
</tgroup>
</table>
</section>
-
+
<section>
<title>Different types of nodes in Flow Palette</title>
-
+
<para>Currently, ruleflow supports seven types of nodes. In the table below you can find information about them:</para>
<table>
<title>Flow Palette Components.Part 2.</title>
@@ -279,14 +287,14 @@
<colspec colnum="1" align="left" colwidth="1*"/>
<colspec colnum="2" align="left" colwidth="1*"/>
<colspec colnum="3" align="left" colwidth="3*"/>
-
+
<thead>
<row>
<entry>Component Picture</entry>
<entry>Component Name</entry>
<entry>Description</entry>
</row>
-
+
</thead>
<tbody>
<row>
@@ -380,20 +388,20 @@
Represents an action that should be executed in this ruleflow. An <property>Script Task</property> node should have one incoming connection and one outgoing connection. It contains the property "action" which specifies the action that should be executed. When a <property>Script Task</property> node is reached in the ruleflow, it will execute the action and continue with the next node. An action should be specified as a piece of (valid) MVEL code.
</entry>
</row>
-
+
</tbody>
</tgroup>
</table>
</section>
</section>
-
+
<section id="textual_rule_editor">
<title>The Rule Editor</title>
-
+
<para>
The <property>Rule editor</property> works on files that have a <filename>.drl</filename> (or <filename>.rule</filename> in the case of spreading rules across multiple rule files) extension.
</para>
-
+
<figure>
<title>New Rule</title>
<mediaobject>
@@ -402,16 +410,16 @@
</imageobject>
</mediaobject>
</figure>
-
+
<para>The editor follows the pattern of a normal text editor in eclipse, with all the normal features of a text editor:</para>
-
+
<itemizedlist>
<listitem>
<para>
<xref linkend="rules_editor_content_assist"/>
</para>
</listitem>
-
+
<listitem>
<para>
<xref linkend="rules_editor_code_folding"/>
@@ -423,23 +431,25 @@
<xref linkend="rules_editor_error_reporting"/>
</para>
</listitem>-->
-
+
<listitem>
<para>
<xref linkend="rules_editor_sync_with_outline"/>
</para>
</listitem>
</itemizedlist>
-
+
<section id="rules_editor_content_assist">
<title>Content Assist</title>
-
+
<para>
- While working in the <property>Rule editor</property> you can get a content assistance the usual way by pressing <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo>.
+ While working in the <property>Rule editor</property> you can get a content assistance the usual way by pressing <keycombo><keycap>Ctrl</keycap>
+ <keycap>Space</keycap>
+ </keycombo>.
</para>
-
+
<para>Content Assist shows all possible keywords for the current cursor position.</para>
-
+
<figure>
<title>Content Assist Demonstration</title>
<mediaobject>
@@ -448,9 +458,9 @@
</imageobject>
</mediaobject>
</figure>
-
+
<para>Content Assist inside of the <guilabel>Message</guilabel> suggests all available fields.</para>
-
+
<figure>
<title>Content Assist Demonstration</title>
<mediaobject>
@@ -459,16 +469,16 @@
</imageobject>
</mediaobject>
</figure>
-
+
</section>
-
+
<section id="rules_editor_code_folding">
<title>Code Folding</title>
-
+
<para>
Code folding is also available in the <guilabel>Rule editor</guilabel>. To hide and show sections of the file use the icons with minus and plus on the left vertical line of the editor.
</para>
-
+
<figure>
<title>Code Folding</title>
<mediaobject>
@@ -477,21 +487,21 @@
</imageobject>
</mediaobject>
</figure>
-
+
</section>
<!--section id="rules_editor_error_reporting">
<title>Error Reporting</title>
</section-->
-
+
<section id="rules_editor_sync_with_outline">
<title>Synchronization with Outline View</title>
-
+
<para>
The <guilabel>Rule editor</guilabel> works in synchronization with the <guilabel>Outline view</guilabel> which shows the structure of the rules, imports in the file and also globals and functions if the file has them.
</para>
-
+
<figure>
<title>Synchronization with Outline View</title>
<mediaobject>
@@ -500,19 +510,19 @@
</imageobject>
</mediaobject>
</figure>
-
+
<para>
The view is updated on save. It provides a quick way of navigating around rules by names in a file which may have hundreds of rules. The items are sorted alphabetically by default.
</para>
</section>
-
+
<section id="rete_view">
<title>The Rete Tree View</title>
-
+
<para>
The <property>Rete Tree view</property> shows you the current Rete Network for your <filename>.drl</filename> file. Just click on the <guilabel>Rete Tree tab</guilabel> at the bottom of the <guilabel>Rule editor</guilabel>.
</para>
-
+
<figure>
<title>Rete Tree</title>
<mediaobject>
@@ -521,12 +531,12 @@
</imageobject>
</mediaobject>
</figure>
-
+
<para>
Afterwards you can generate the current Rete Network visualization. You can push and pull the nodes to arrange your optimal network overview.
</para>
<para>If you have a large number of nodes, select some of them with a frame. Then you can pull groups of them.</para>
-
+
<figure>
<title>Selecting the nodes in the Rete Tree with Frame</title>
<mediaobject>
@@ -535,11 +545,11 @@
</imageobject>
</mediaobject>
</figure>
-
+
<para>
You can zoom in and out the Rete tree in case not all nodes are shown in the current view. For this use the combo box or <guibutton>+</guibutton> and <guibutton>-</guibutton> icons on the toolbar.
</para>
-
+
<figure>
<title>Rete Tree Zooming</title>
<mediaobject>
@@ -548,17 +558,17 @@
</imageobject>
</mediaobject>
</figure>
-
+
<note>
<title>Note:</title>
-
+
<para>The <property>Rete Tree view</property> works only in Drools Rule Projects, where the Drools Builder is set in the project properties.</para>
</note>
<para>
We hope, this guide helped you to get started with the JBoss BPMN Convert module. For additional information you are welcome on <ulink url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss forum</ulink>.
</para>
</section>
-
+
</section>
</chapter>
\ No newline at end of file
Modified: trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project1.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project10.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project2.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project3.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project4.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project5.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project6.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project7.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project8.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project9.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors1.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors1b.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors1c.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors1d.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors1e.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors1f.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors1g.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors4.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors5.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors6.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors7.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors8.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors9.png
===================================================================
(Binary files differ)
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29373 - in trunk/jbpm/docs/converter_ref/en-US: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-02-27 17:46:43 -0500 (Sun, 27 Feb 2011)
New Revision: 29373
Modified:
trunk/jbpm/docs/converter_ref/en-US/bpmn2jpdl.xml
trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_1.png
trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_2.png
trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_3.png
trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_4.png
trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_5.png
trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_7.png
trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_8.png
trunk/jbpm/docs/converter_ref/en-US/overview.xml
Log:
Updated screenshots to reflect what is displayed by JBDS
Modified: trunk/jbpm/docs/converter_ref/en-US/bpmn2jpdl.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en-US/bpmn2jpdl.xml 2011-02-26 21:45:21 UTC (rev 29372)
+++ trunk/jbpm/docs/converter_ref/en-US/bpmn2jpdl.xml 2011-02-27 22:46:43 UTC (rev 29373)
@@ -1,137 +1,136 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="bpmn2jpdl" >
- <title>Translate a BPMN file to a JPDL file</title>
- <para>This chapter provides you with the necessary steps to translate a BPMN file to a JPDL file.</para>
-
- <section id="createproject">
- <title>Creating a project</title>
- <para>Before creating a BPMN file, you should have a Project created.</para>
- <para>
+<chapter id="bpmn2jpdl">
+ <title>Translate a BPMN file to a JPDL file</title>
+ <para>This chapter provides you with the necessary steps to translate a BPMN file to a JPDL file.</para>
+
+ <section id="createproject">
+ <title>Creating a project</title>
+ <para>Before creating a BPMN file, you should have a Project created.</para>
+ <para>
Create a project by selecting
<menuchoice>
<guimenuitem>File</guimenuitem>
- <guimenuitem>New</guimenuitem>
- <guimenuitem>Project...</guimenuitem>
- <guimenuitem>General</guimenuitem>
- <guimenuitem>Project</guimenuitem>
- </menuchoice>.
+ <guimenuitem>New</guimenuitem>
+ <guimenuitem>Project...</guimenuitem>
+ <guimenuitem>General</guimenuitem>
+ <guimenuitem>Project</guimenuitem>
+ </menuchoice>.
</para>
- <para>Enter <guilabel>test</guilabel> in the <guilabel>Project name</guilabel> field, and click the <guibutton>Finish</guibutton> button.</para>
- <figure>
- <title>Creating a Project</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/bpmnconvert_bpmn2jpdl_1.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
- </section>
- <section id="createbpmnfile">
- <title>Creating a BPMN file using the STP BPMN editor</title>
- <para>Create a BPMN diagram file by selecting
+ <para>Enter <guilabel>test</guilabel> in the <guilabel>Project name</guilabel> field, and click the <guibutton>Finish</guibutton> button.</para>
+ <figure>
+ <title>Creating a Project</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_1.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+ <section id="createbpmnfile">
+ <title>Creating a BPMN file using the STP BPMN editor</title>
+ <para>Create a BPMN diagram file by selecting
<menuchoice>
<guimenuitem>File</guimenuitem>
- <guimenuitem>New</guimenuitem>
- <guimenuitem>Other...</guimenuitem>
- <guimenuitem>Other</guimenuitem>
- <guimenuitem>Bpmn Diagram</guimenuitem>
- </menuchoice>.
+ <guimenuitem>New</guimenuitem>
+ <guimenuitem>Other...</guimenuitem>
+ <guimenuitem>Other</guimenuitem>
+ <guimenuitem>Bpmn Diagram</guimenuitem>
+ </menuchoice>.
</para>
-
- <para>Enter <guilabel>test</guilabel> in the <guilabel>File name</guilabel> field, and click the <guibutton>Finish</guibutton> button.</para>
-
- <figure>
- <title>Creating BPMN Diagram</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/bpmnconvert_bpmn2jpdl_2.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
- <para>Open the <guilabel>test.bpmn_diagram</guilabel> file by double-clicking it.</para>
- <para>Draw the BPMN diagram using the STP BPMN editor. For more information on how to use the STP BPMN editor, please visit the <ulink url="http://www.eclipse.org/bpmn/">BPMN project page</ulink>.</para>
- </section>
- <section id="bpmntojpdl">
- <title>Exporting a BPMN File to JPDL files</title>
- <para>A BPMN file may include more than one pool. Every pool can be mapped to a corresponding JPDL file.</para>
- <itemizedlist>
- <listitem>
- <para>Select the <guilabel>test.bpmn</guilabel> file and right-click on it. Open the export wizard by selecting
+
+ <para>Enter <guilabel>test</guilabel> in the <guilabel>File name</guilabel> field, and click the <guibutton>Finish</guibutton> button.</para>
+
+ <figure>
+ <title>Creating BPMN Diagram</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_2.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Open the <guilabel>test.bpmn_diagram</guilabel> file by double-clicking it.</para>
+ <para>Draw the BPMN diagram using the STP BPMN editor. For more information on how to use the STP BPMN editor, please visit the <ulink url="http://www.eclipse.org/bpmn/">BPMN project page</ulink>.</para>
+ </section>
+ <section id="bpmntojpdl">
+ <title>Exporting a BPMN File to JPDL files</title>
+ <para>A BPMN file may include more than one pool. Every pool can be mapped to a corresponding JPDL file.</para>
+ <itemizedlist>
+ <listitem>
+ <para>Select the <guilabel>test.bpmn</guilabel> file and right-click on it. Open the export wizard by selecting
<menuchoice>
<guimenuitem>Export...</guimenuitem>
- <guimenuitem>BPMN</guimenuitem>
- <guimenuitem>BPMN to JPDL...</guimenuitem>
- </menuchoice>
+ <guimenuitem>BPMN</guimenuitem>
+ <guimenuitem>BPMN to JPDL...</guimenuitem>
+ </menuchoice>
from the context menu.
</para>
- <para>Click the <guibutton>Next</guibutton> button.</para>
- <figure>
- <title>BPMN Export</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/bpmnconvert_bpmn2jpdl_3.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
-
- </listitem>
- <listitem>
- <para>Select the BPMN file that you want to translate, and click the <guibutton>Next</guibutton> button.
+ <para>Click the <guibutton>Next</guibutton> button.</para>
+ <figure>
+ <title>BPMN Export</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_3.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ </listitem>
+ <listitem>
+ <para>Select the BPMN file that you want to translate, and click the <guibutton>Next</guibutton> button.
</para>
- <figure>
- <title>Choosing a BPMN File</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/bpmnconvert_bpmn2jpdl_4.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
- </listitem>
- <listitem>
- <para>Select the BPMN Pools that you want to translate, and click the <guibutton>Next</guibutton> button.
+ <figure>
+ <title>Choosing a BPMN File</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_4.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>Select the BPMN Pools that you want to translate, and click the <guibutton>Next</guibutton> button.
</para>
- <figure>
- <title>Choosing BPMN Pools</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/bpmnconvert_bpmn2jpdl_5.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
- </listitem>
- <listitem>
- <para>On the next page, you may get error or warning messages that occurred during the conversion. If there are no messages, this page is skipped.
+ <figure>
+ <title>Choosing BPMN Pools</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_5.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>On the next page, you may get error or warning messages that occurred during the conversion. If there are no messages, this page is skipped.
</para>
- <para>Click on the <guibutton>Next</guibutton> button.</para>
- </listitem>
- <listitem>
- <para>Select the target location where the generated JPDL files will be saved. If you'd like to overwrite existing resources,check this "Overwrite existing resources" checkbox.
+ <para>Click on the <guibutton>Next</guibutton> button.</para>
+ </listitem>
+ <listitem>
+ <para>Select the target location where the generated JPDL files will be saved. If you'd like to overwrite existing resources,check this "Overwrite existing resources" checkbox.
</para>
- <para>Click on the <guibutton>Finish</guibutton> button to generate the JPDL files in the target location.</para>
- <figure>
- <title>Target Location</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/bpmnconvert_bpmn2jpdl_7.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
-
+ <para>Click on the <guibutton>Finish</guibutton> button to generate the JPDL files in the target location.</para>
+ <figure>
+ <title>Target Location</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_7.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
- <para></para>
- </listitem>
- </itemizedlist>
- <para>The generated files look like this: </para>
- <figure>
- <title>The Generated JPDL Files</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/bpmnconvert_bpmn2jpdl_8.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
- <para>We hope this guide helped you to get started with the JBoss BPMN Convert module. For additional information and support please visit the <ulink
- url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss forum</ulink>.</para>
- </section>
-
+
+ <para></para>
+ </listitem>
+ </itemizedlist>
+ <para>The generated files look like this: </para>
+ <figure>
+ <title>The Generated JPDL Files</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/bpmnconvert_bpmn2jpdl_8.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>We hope this guide helped you to get started with the JBoss BPMN Convert module. For additional information and support please visit the <ulink url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss forum</ulink>.</para>
+ </section>
+
</chapter>
\ No newline at end of file
Modified: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_1.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_2.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_3.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_4.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_5.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_7.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_8.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en-US/overview.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en-US/overview.xml 2011-02-26 21:45:21 UTC (rev 29372)
+++ trunk/jbpm/docs/converter_ref/en-US/overview.xml 2011-02-27 22:46:43 UTC (rev 29373)
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<chapter id="overview">
<title>BPMN Convert Overview</title>
- <para>This chapter gives you a short overview of JBoss BPMN Convert module.</para>
- <para>JBoss BPMN Convert module is a tool used for a BPMN file translation.</para>
- <para>As a part of JBoss tools, JBoss BPMN Convert module implements BPMN to JPDL translation. You can get a basic JPDL file from a BPMN file by using this module.</para>
- <para>The BPMN file may be written by hand, or with the help of an editor. In this guide, we use the STP BPMN editor to draw a BPMN file.</para>
- <para>You can download the editor, which is included with the BPMN Modeler, using Eclipse and the SOA Tools project update site. You can find the necessary links and other related information on the <ulink url="http://www.eclipse.org/bpmn">Eclipse BPMN project page</ulink>.</para>
+ <para>This chapter provides a short overview of the JBoss BPMN Convert module, which is a tool used to translate BPMN files. Specifically, the JBoss BPMN Convert module allows you to translate BPMN files to a basic JPDL.</para>
+ <para>The BPMN file may be written by hand, or created with the aid of an editor. In this guide, we will use the STP BPMN editor to draw a BPMN file.</para>
+ <para>You can download the editor, which is included with the BPMN Modeller, using Eclipse and the SOA Tools project update site. You can find the necessary links and other related information on the <ulink url="http://www.eclipse.org/bpmn">Eclipse BPMN project page</ulink>.</para>
<section>
<title>Key Features of JBoss BPMN Convert module</title>
- <para>To start, take a look through the table of JBoss BPMN Convert module main features:</para>
+ <para>The table below lists the main features of the JBoss BPMN Convert module:</para>
<table>
@@ -32,7 +30,7 @@
<row>
<entry><para>STP BPMN Editor</para></entry>
- <entry><para>JBoss BPMN Convert module contains the STP Business Process Modeling Notation (BPMN) Editor, which is a tool to express any processes in a graphical form (as simple diagrams with a set of graphical elements). These BPMN files can then be converted to jPDL.</para></entry>
+ <entry><para>JBoss BPMN Convert module contains the STP Business Process Modeling Notation (BPMN) Editor, which is a tool to express any processes in a graphical form (as simple diagrams with a set of graphical elements). These BPMN files can then be converted to JPDL.</para></entry>
<entry>
<xref linkend="createbpmnfile"/>
</entry>
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29372 - trunk/documentation/whatsnew.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-02-26 16:45:21 -0500 (Sat, 26 Feb 2011)
New Revision: 29372
Modified:
trunk/documentation/whatsnew/upload.sh
Log:
test dcommit
Modified: trunk/documentation/whatsnew/upload.sh
===================================================================
--- trunk/documentation/whatsnew/upload.sh 2011-02-26 04:21:59 UTC (rev 29371)
+++ trunk/documentation/whatsnew/upload.sh 2011-02-26 21:45:21 UTC (rev 29372)
@@ -1 +1,2 @@
+#test
rsync -i -I -c -P -e ssh -C --exclude-from '.rsyncexclude' -avz . tools@filemgmt.jboss.org:/docs_htdocs/tools/whatsnew/
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29371 - trunk/download.jboss.org/jbosstools/updates/indigo.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-02-25 23:21:59 -0500 (Fri, 25 Feb 2011)
New Revision: 29371
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
Log:
use newer orbit release - http://download.jboss.org/jbosstools/updates/requirements/orbit/S20110124...
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-02-26 04:21:46 UTC (rev 29370)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-02-26 04:21:59 UTC (rev 29371)
@@ -11,7 +11,7 @@
</properties>
<children size='4'>
<child location='http://download.jboss.org/jbosstools/updates/requirements/indigo/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/S20100831...'/>
+<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/S20110124...'/>
<child location='http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/'/>
<child location='http://download.eclipse.org//birt/update-site/4.0-interim/'/>
</children>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-02-26 04:21:46 UTC (rev 29370)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-02-26 04:21:59 UTC (rev 29371)
@@ -11,7 +11,7 @@
</properties>
<children size='4'>
<child location='http://download.jboss.org/jbosstools/updates/requirements/indigo/'/>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/S20100831...'/>
+<child location='http://download.jboss.org/jbosstools/updates/requirements/orbit/S20110124...'/>
<child location='http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/'/>
<child location='http://download.eclipse.org//birt/update-site/4.0-interim/'/>
</children>
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29370 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-02-25 23:21:46 -0500 (Fri, 25 Feb 2011)
New Revision: 29370
Modified:
trunk/build/target-platform/build.xml
Log:
bump up to latest Helios SR2 release versions in TP
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2011-02-26 04:21:34 UTC (rev 29369)
+++ trunk/build/target-platform/build.xml 2011-02-26 04:21:46 UTC (rev 29370)
@@ -129,9 +129,9 @@
<target name="get.eclipse">
<!-- NOTE: must use same platform (50M) or SDK (103M - 168M) version as feature version on target platform, or will get install/update conflicts -->
<property name="eclipse.version" value="M20110105-0951" />
- <property name="eclipse.version" value="3.6.1" />
+ <property name="eclipse.version" value="3.6.2" />
<property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..." />
- <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..." />
+ <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..." />
<if>
<equals arg1="${arch}" arg2="x86" />
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29369 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-02-25 23:21:34 -0500 (Fri, 25 Feb 2011)
New Revision: 29369
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
bump up to latest Helios SR2 release versions in TP
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-02-26 01:40:18 UTC (rev 29368)
+++ trunk/build/target-platform/multiple.target 2011-02-26 04:21:34 UTC (rev 29369)
@@ -55,13 +55,13 @@
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.1.v201009092123-7H7F3AkF7B79N8WCTEH"/>
- <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s735346496D33"/>
- <unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.1.v201009092123-8X8ZFXlFLWUl6sr-z0fAKWO"/>
+ <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
+ <unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.2.v201101261720-8X8ZFXoFLWUl6wn5veAISx"/>
<unit id="org.eclipse.tptp.platform.jvmti.feature.group" version="4.5.1.v201009092123-797A38s7354466855B7"/>
<unit id="org.eclipse.tptp.platform.trace.feature.group" version="4.5.2.v201101261720-7L7O8fBgJ9EC9NDREaF9"/>
<unit id="org.eclipse.tptp.platform.xerces.feature.group" version="4.6.0.v201005032111-777K4AkF7B77R7c7N77"/>
- <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s735346496D33"/>
- <unit id="org.eclipse.tptp.platform.probekit.feature.group" version="4.5.1.v201009092123-7H7BF8PAkF7B77ZARCNEK"/>
+ <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
+ <unit id="org.eclipse.tptp.platform.probekit.feature.group" version="4.5.2.v201101271120-7H7BF8QAkF7B87RBVCFFD"/>
<unit id="org.eclipse.tptp.platform.commons.logging.feature.group" version="4.5.0.v201005032111-2-37w312116191612"/>
<unit id="org.eclipse.tptp.platform.jakarta.log4j.feature.group" version="4.5.0.v201005032111-217E7w312116191611"/>
<repository location="http://download.eclipse.org/tptp/updates/helios/"/>
@@ -83,16 +83,16 @@
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
- <unit id="org.eclipse.swtbot.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
+ <unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.2.r262_v20101008-57B381wLglLKxfjdt881PQeMU42p"/>
<unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
- <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
+ <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.1.v20100915-1750-35-7w31211A2602861"/>
<unit id="org.eclipse.birt.chart.feature.group" version="2.6.1.v20100709-7f9T7DFQCnv8nz0gRMa6NG1"/>
<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.1.v20100915-1750-3507w31211A2602861"/>
<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
@@ -100,63 +100,63 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="com.ibm.icu.base.feature.group" version="1.1.0.v20090119-79318s73533B57"/>
<unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.1.R36x_v20101007-7K7QEtDVci4YrnH_79P9K"/>
- <unit id="org.eclipse.cvs.feature.group" version="1.2.1.r362_v20101111-7B77FKt90GE5i0KBP5G_AA01911"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911"/>
<unit id="org.eclipse.help.feature.group" version="1.2.1.r362_v20101111-7e7jEVFDr6xg-LRkH_6-2D"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFUVFLFlmjAcz--86JeFAKTaF"/>
- <unit id="org.eclipse.platform.feature.group" version="3.6.1.r361_v20100909-9gF78GrkFqw7GrsZnvz0JWNTeb6fue6896L"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFW6FLFlmjJcvz03jyeFBLS_F"/>
+ <unit id="org.eclipse.platform.feature.group" version="3.6.2.r362_v20110210-9gF78Gs1FrIGnHDHWkEcopoN8AmxeZflGDGKQi"/>
<unit id="org.eclipse.platform.ide" version="3.6.2.M20110105-0951"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20101222-7N7K7bF8zk1BAKMh0h-590miBLY"/>
- <unit id="org.eclipse.platform.sdk" version="3.6.1.M20100909-0800"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi"/>
+ <unit id="org.eclipse.platform.sdk" version="3.6.2.M20110105-0951"/>
<unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL1FET3dhFTug95aglL"/>
- <unit id="org.eclipse.sdk.feature.group" version="3.6.2.r362_v20100929-7Q7m7ED5cWkFey77Di6JhDoIOyssgHka07bnz0bo8z-Oq"/>
+ <unit id="org.eclipse.sdk.feature.group" version="3.6.2.r362_v20100929-7Q7m7HD5cWlFgdCBHllpZMd2M468sbnm2RJvUWIbiJnWC"/>
<unit id="org.eclipse.rcp.id" version="3.6.0.M20100909-0800"/>
- <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20110105-0951"/>
+ <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20100909-0800"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211642"/>
<unit id="org.eclipse.sdk.ide" version="3.6.1.M20100909-0800"/>
- <unit id="org.eclipse.sdk.examples.feature.group" version="3.3.0.v20100527-817fFcfFEdcVcRZlgyBRcVX"/>
+ <unit id="org.eclipse.sdk.examples.feature.group" version="3.3.1.r362_v20101014-817fFcgFE_daeVKiesDUeYc"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.0.v20100527"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.1.R36x_v20101014-7V7RFiwFLSgEt4Pctn77c7J"/>
- <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.0.v20100603-7sF99FsHFTw8HQBta4g33J3F"/>
+ <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.1.r36x_v20110210-7sF99FsNFS-Ci4TSP4RDFHLIA5B3"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.0.v20100510-4--9oB5855K7P"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZNFXzxlyl0CrPS8t_228D9D"/>
- <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.1.R36x_v20101007-9I7VGAuG6-3q1X4grrGiDgF5HRJR"/>
- <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.0.v20100421-7u7NFVgFN5JdPKPhDHd_6Yqc54uw"/>
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20101216-7H7R57v9rtOsIdV8XVDKQ6wjHuKB"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr"/>
+ <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.0.v20100503-9I7VGAeG8tz-BY6jz0w2HLRYr"/>
+ <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.1.R36x_v20101014-7u7NFVmFL9O33b-_gENgz0SvfGYz"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20100903-7H7R07v8rtOZyYbv1I6aZgou5z07"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.0.v20100421-79--EVVFNFFsFc"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ"/>
- <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.1.R36x_v20101007-7x7IFGRFPd5kuz-H8NUDo15S0212"/>
+ <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.1.R36x_v20101007-7x7IFI3FOf7yk63X6z0kz-Z2T158"/>
<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL"/>
- <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.M20110105-0951"/>
+ <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.M20110210-1200"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.0.v20100510-42A79oB5855K5E"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.0.v20100510-44DF8s734C48662444"/>
- <unit id="org.eclipse.rcp.feature.group" version="3.6.2.r362_v20101104-9SAxFLyFkSAqhRGvl2z-fCfimiBL"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.6.2.r362_v20101104-9SAxFMKFkSAqi8axkv1ZjegmiBLY"/>
<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.1.v20100618-7C7b8hEt1ZvtiLkdlO7BVoL_wm6"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.1.v20100618-7J8x7FBWwUL6z-2z-fcrYC2s55KI"/>
- <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.1.v20100618-2-07w31211518181A"/>
- <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.1.v20100618-77078CcNBGKBZI_FcRd"/>
- <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.1.v20100618-77778eBmKDNOMgJvJ8Of7QBR"/>
- <unit id="org.eclipse.draw2d.feature.group" version="3.6.1.v20100908-1100-4507w31211A2403131"/>
+ <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.2.v201010181125-2-07w31211518181A"/>
+ <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.2.v201010181125-77078CcNBGKBZI_FcRd"/>
+ <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.2.v201010181125-77778fBmKDNOMgJvJ8Of7QBR"/>
+ <unit id="org.eclipse.draw2d.feature.group" version="3.6.2.v20110128-0100-4517w3122123901211"/>
<unit id="org.eclipse.gef.feature.group" version="3.6.1.v20100908-1100-777B181A3Bz-6B663E7974242"/>
<unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67808yE5F-8HAH4HECF4242"/>
- <unit id="org.eclipse.uml2.feature.group" version="3.1.1.v201008191505"/>
+ <unit id="org.eclipse.uml2.feature.group" version="3.1.2.v201010261927"/>
<unit id="org.eclipse.rse.feature.group" version="3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ"/>
<unit id="org.eclipse.rse.ssh.feature.group" version="3.0.100.v201005221100-7A2BhAkF77g7VEYDG7C"/>
- <unit id="org.eclipse.rse.terminals.feature.group" version="1.0.101.v201008191400-77-DH9uCFiO1U8MBKTDB3622"/>
+ <unit id="org.eclipse.rse.terminals.feature.group" version="1.0.102.R32x_v201102011435-77-DI9uCFjNZVBGlDNC332423365"/>
<unit id="org.eclipse.rse.telnet.feature.group" version="2.2.100.v201005221100-7730AkF77g7UDXELEF"/>
<unit id="org.eclipse.rse.ftp.feature.group" version="3.0.200.v201005221100-780Bg9oB56N5J9QBADD"/>
- <unit id="org.eclipse.rse.local.feature.group" version="2.1.201.v201009071110-7B4F8PBgJ9Ai9dIaHNA9"/>
+ <unit id="org.eclipse.rse.local.feature.group" version="2.1.202.R32x_v201102011435-7B4F8QBCKC5H2XIVHMB922546"/>
<unit id="org.eclipse.rse.useractions.feature.group" version="1.1.200.v201005221100-31A78s733L3D7H7933"/>
- <unit id="org.eclipse.tm.terminal.feature.group" version="3.0.201.v201008191400-4-8_7w3121192A2511"/>
- <unit id="org.eclipse.tm.terminal.view.feature.group" version="2.1.0.v201006030830-30-7w312117152351"/>
+ <unit id="org.eclipse.tm.terminal.feature.group" version="3.0.202.R32x_v201102011435-4-8a7S43yaw312213122546"/>
+ <unit id="org.eclipse.tm.terminal.view.feature.group" version="2.1.2.R32x_v201102011435-3017S43yaw312213122546"/>
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.0.200.v201005032000-3-8_7w311A1A271116"/>
<unit id="org.eclipse.tm.terminal.serial.feature.group" version="2.0.200.v201005032000-3-8Z7w311A16383411"/>
- <unit id="org.eclipse.tm.terminal.feature.group" version="3.0.201.v201008191400-4-8_7w3121192A2511"/>
+ <unit id="org.eclipse.tm.terminal.feature.group" version="3.0.202.R32x_v201102011435-4-8a7S43yaw312213122546"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.0.200.v201005271030-3-A77w312116382141"/>
<!-- SAVARA dependencies -->
@@ -179,7 +179,7 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.jst.jee" version="1.0.301.v201007151900"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/>
- <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.102.v201008170019"/>
+ <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.103.v201101271715"/>
<unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.2.v201008170019-377AB8s73533J5J759F"/>
@@ -188,7 +188,7 @@
<unit id="org.eclipse.jpt.feature.feature.group" version="2.3.2.v201008242310-7N7UF75FD3wTgbUpoff0aT"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.2.v201008170019-377AB8s73533J5H335L"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.2.v201008190400-7b7GHf2FSK2WBLQ2D-mrubYEOrRh"/>
- <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.2.v201008100100-7O7CFbKEMf84nUlEJyX7-SPQjhYZ"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.3.v201102160541-7O7CFbWEMf84qYjGDyP3DNEwcgFU"/>
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.2.v201008170029-7H7AFUQDxumQGOpBqffOY2f1qxDZ"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.2.v201009091745-7S7WFAPFIpS-1-NbCE6tnacCXKP"/>
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.2.v201008170101-7C78FGMF9JgLWLMUUEMtXc"/>
@@ -200,18 +200,18 @@
<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201005241530-208Z7w31211419"/>
<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.2.0.v201005241530-31FA28s73533C66"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.2.v20100908-7A5FEi9xFc7RCJMToAIOJC43A"/>
- <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.2.v201008170029-7F77FJSC25Tkdy1nqglPjqLAoDgh"/>
+ <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.3.v201101262333-7F77FJ_C25TkfyypjhqQuxNYsMrJ"/>
<unit id="org.eclipse.jsf.feature.source.feature.group" version="3.2.2.v201008231400-7E7I6F9JgLWLMUW3"/>
<unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.5.v201009091745-67K2BgJ9DIAXCbBWJO"/>
<unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.1.v20100906-4609oB5855L6N"/>
<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.300.v201005241450-2407w312116191741"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.2.v201008091400-7B7DFElF7RZHOZJ6W0PsNJ"/>
- <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.2.v201008091400-7C78FPhEdhO_mXde7kbap_K7X1Qt"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.3.v201011031800-7B7DFEsF7RZHOaLfS0KpNJ"/>
+ <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.3.v201011031800-7C78FPlEdhO_oXWe4k_elbMgT1Lq"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.2.2.v20100908-30F8V8s734C3I3K"/>
- <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.2.v20100908-7B4FBrAtJb1nESKmCJHPGQ347"/>
- <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.2.v201008100100-7E7AFHwAJrn5PM15pUYBwJLkSG8j"/>
- <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.2.v201008211705-7I78FZFEtEoO2c5BlJ4jPNvNC-yS"/>
+ <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.3.v20101104-7B4FBuAtJb1qEKLnCKHHHI347"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.3.v201102160541-7E7AFI3AJrn5TN32vSJ8nRIWLD7_"/>
+ <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.3.v201102160541-7I78FZIEtEoO2d7AsK6jSNqC-8jj"/>
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.2.v201008170029-7C7OFXYF7RZHQHI5PyJwPT"/>
<repository location="http://download.eclipse.org/webtools/repository/helios/"/>
</location>
@@ -219,7 +219,7 @@
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
+ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
<!-- <repository location="http://dl.google.com/eclipse/plugin/3.6/"/> -->
<repository location="http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/"/>
@@ -244,4 +244,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-02-26 01:40:18 UTC (rev 29368)
+++ trunk/build/target-platform/unified.target 2011-02-26 04:21:34 UTC (rev 29369)
@@ -55,13 +55,13 @@
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.1.v201009092123-7H7F3AkF7B79N8WCTEH"/>
- <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s735346496D33"/>
- <unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.1.v201009092123-8X8ZFXlFLWUl6sr-z0fAKWO"/>
+ <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
+ <unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.2.v201101261720-8X8ZFXoFLWUl6wn5veAISx"/>
<unit id="org.eclipse.tptp.platform.jvmti.feature.group" version="4.5.1.v201009092123-797A38s7354466855B7"/>
<unit id="org.eclipse.tptp.platform.trace.feature.group" version="4.5.2.v201101261720-7L7O8fBgJ9EC9NDREaF9"/>
<unit id="org.eclipse.tptp.platform.xerces.feature.group" version="4.6.0.v201005032111-777K4AkF7B77R7c7N77"/>
- <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s735346496D33"/>
- <unit id="org.eclipse.tptp.platform.probekit.feature.group" version="4.5.1.v201009092123-7H7BF8PAkF7B77ZARCNEK"/>
+ <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
+ <unit id="org.eclipse.tptp.platform.probekit.feature.group" version="4.5.2.v201101271120-7H7BF8QAkF7B87RBVCFFD"/>
<unit id="org.eclipse.tptp.platform.commons.logging.feature.group" version="4.5.0.v201005032111-2-37w312116191612"/>
<unit id="org.eclipse.tptp.platform.jakarta.log4j.feature.group" version="4.5.0.v201005032111-217E7w312116191611"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
@@ -83,16 +83,16 @@
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
- <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
- <unit id="org.eclipse.swtbot.feature.group" version="2.0.2.20110117_1743-b492ddb-dev-e36"/>
+ <unit id="org.eclipse.swtbot.feature.group" version="2.0.3.20110219_0655-4d933cf-dev-e36"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.2.r262_v20101008-57B381wLglLKxfjdt881PQeMU42p"/>
<unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
- <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
+ <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.1.v20100915-1750-35-7w31211A2602861"/>
<unit id="org.eclipse.birt.chart.feature.group" version="2.6.1.v20100709-7f9T7DFQCnv8nz0gRMa6NG1"/>
<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.1.v20100915-1750-3507w31211A2602861"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
@@ -100,63 +100,63 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="com.ibm.icu.base.feature.group" version="1.1.0.v20090119-79318s73533B57"/>
<unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.1.R36x_v20101007-7K7QEtDVci4YrnH_79P9K"/>
- <unit id="org.eclipse.cvs.feature.group" version="1.2.1.r362_v20101111-7B77FKt90GE5i0KBP5G_AA01911"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911"/>
<unit id="org.eclipse.help.feature.group" version="1.2.1.r362_v20101111-7e7jEVFDr6xg-LRkH_6-2D"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFUVFLFlmjAcz--86JeFAKTaF"/>
- <unit id="org.eclipse.platform.feature.group" version="3.6.1.r361_v20100909-9gF78GrkFqw7GrsZnvz0JWNTeb6fue6896L"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFW6FLFlmjJcvz03jyeFBLS_F"/>
+ <unit id="org.eclipse.platform.feature.group" version="3.6.2.r362_v20110210-9gF78Gs1FrIGnHDHWkEcopoN8AmxeZflGDGKQi"/>
<unit id="org.eclipse.platform.ide" version="3.6.2.M20110105-0951"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20101222-7N7K7bF8zk1BAKMh0h-590miBLY"/>
- <unit id="org.eclipse.platform.sdk" version="3.6.1.M20100909-0800"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi"/>
+ <unit id="org.eclipse.platform.sdk" version="3.6.2.M20110105-0951"/>
<unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL1FET3dhFTug95aglL"/>
- <unit id="org.eclipse.sdk.feature.group" version="3.6.2.r362_v20100929-7Q7m7ED5cWkFey77Di6JhDoIOyssgHka07bnz0bo8z-Oq"/>
+ <unit id="org.eclipse.sdk.feature.group" version="3.6.2.r362_v20100929-7Q7m7HD5cWlFgdCBHllpZMd2M468sbnm2RJvUWIbiJnWC"/>
<unit id="org.eclipse.rcp.id" version="3.6.0.M20100909-0800"/>
- <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20110105-0951"/>
+ <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20100909-0800"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211642"/>
<unit id="org.eclipse.sdk.ide" version="3.6.1.M20100909-0800"/>
- <unit id="org.eclipse.sdk.examples.feature.group" version="3.3.0.v20100527-817fFcfFEdcVcRZlgyBRcVX"/>
+ <unit id="org.eclipse.sdk.examples.feature.group" version="3.3.1.r362_v20101014-817fFcgFE_daeVKiesDUeYc"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.0.v20100527"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.1.R36x_v20101014-7V7RFiwFLSgEt4Pctn77c7J"/>
- <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.0.v20100603-7sF99FsHFTw8HQBta4g33J3F"/>
+ <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.1.r36x_v20110210-7sF99FsNFS-Ci4TSP4RDFHLIA5B3"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.0.v20100510-4--9oB5855K7P"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZNFXzxlyl0CrPS8t_228D9D"/>
- <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.1.R36x_v20101007-9I7VGAuG6-3q1X4grrGiDgF5HRJR"/>
- <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.0.v20100421-7u7NFVgFN5JdPKPhDHd_6Yqc54uw"/>
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20101216-7H7R57v9rtOsIdV8XVDKQ6wjHuKB"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr"/>
+ <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.0.v20100503-9I7VGAeG8tz-BY6jz0w2HLRYr"/>
+ <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.1.R36x_v20101014-7u7NFVmFL9O33b-_gENgz0SvfGYz"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20100903-7H7R07v8rtOZyYbv1I6aZgou5z07"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.0.v20100421-79--EVVFNFFsFc"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ"/>
- <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.1.R36x_v20101007-7x7IFGRFPd5kuz-H8NUDo15S0212"/>
+ <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.1.R36x_v20101007-7x7IFI3FOf7yk63X6z0kz-Z2T158"/>
<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL"/>
- <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.M20110105-0951"/>
+ <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.M20110210-1200"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.0.v20100510-42A79oB5855K5E"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.0.v20100510-44DF8s734C48662444"/>
- <unit id="org.eclipse.rcp.feature.group" version="3.6.2.r362_v20101104-9SAxFLyFkSAqhRGvl2z-fCfimiBL"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.6.2.r362_v20101104-9SAxFMKFkSAqi8axkv1ZjegmiBLY"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.1.v20100618-7C7b8hEt1ZvtiLkdlO7BVoL_wm6"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.1.v20100618-7J8x7FBWwUL6z-2z-fcrYC2s55KI"/>
- <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.1.v20100618-2-07w31211518181A"/>
- <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.1.v20100618-77078CcNBGKBZI_FcRd"/>
- <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.1.v20100618-77778eBmKDNOMgJvJ8Of7QBR"/>
- <unit id="org.eclipse.draw2d.feature.group" version="3.6.1.v20100908-1100-4507w31211A2403131"/>
+ <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.2.v201010181125-2-07w31211518181A"/>
+ <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.2.v201010181125-77078CcNBGKBZI_FcRd"/>
+ <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.2.v201010181125-77778fBmKDNOMgJvJ8Of7QBR"/>
+ <unit id="org.eclipse.draw2d.feature.group" version="3.6.2.v20110128-0100-4517w3122123901211"/>
<unit id="org.eclipse.gef.feature.group" version="3.6.1.v20100908-1100-777B181A3Bz-6B663E7974242"/>
<unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67808yE5F-8HAH4HECF4242"/>
- <unit id="org.eclipse.uml2.feature.group" version="3.1.1.v201008191505"/>
+ <unit id="org.eclipse.uml2.feature.group" version="3.1.2.v201010261927"/>
<unit id="org.eclipse.rse.feature.group" version="3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ"/>
<unit id="org.eclipse.rse.ssh.feature.group" version="3.0.100.v201005221100-7A2BhAkF77g7VEYDG7C"/>
- <unit id="org.eclipse.rse.terminals.feature.group" version="1.0.101.v201008191400-77-DH9uCFiO1U8MBKTDB3622"/>
+ <unit id="org.eclipse.rse.terminals.feature.group" version="1.0.102.R32x_v201102011435-77-DI9uCFjNZVBGlDNC332423365"/>
<unit id="org.eclipse.rse.telnet.feature.group" version="2.2.100.v201005221100-7730AkF77g7UDXELEF"/>
<unit id="org.eclipse.rse.ftp.feature.group" version="3.0.200.v201005221100-780Bg9oB56N5J9QBADD"/>
- <unit id="org.eclipse.rse.local.feature.group" version="2.1.201.v201009071110-7B4F8PBgJ9Ai9dIaHNA9"/>
+ <unit id="org.eclipse.rse.local.feature.group" version="2.1.202.R32x_v201102011435-7B4F8QBCKC5H2XIVHMB922546"/>
<unit id="org.eclipse.rse.useractions.feature.group" version="1.1.200.v201005221100-31A78s733L3D7H7933"/>
- <unit id="org.eclipse.tm.terminal.feature.group" version="3.0.201.v201008191400-4-8_7w3121192A2511"/>
- <unit id="org.eclipse.tm.terminal.view.feature.group" version="2.1.0.v201006030830-30-7w312117152351"/>
+ <unit id="org.eclipse.tm.terminal.feature.group" version="3.0.202.R32x_v201102011435-4-8a7S43yaw312213122546"/>
+ <unit id="org.eclipse.tm.terminal.view.feature.group" version="2.1.2.R32x_v201102011435-3017S43yaw312213122546"/>
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.0.200.v201005032000-3-8_7w311A1A271116"/>
<unit id="org.eclipse.tm.terminal.serial.feature.group" version="2.0.200.v201005032000-3-8Z7w311A16383411"/>
- <unit id="org.eclipse.tm.terminal.feature.group" version="3.0.201.v201008191400-4-8_7w3121192A2511"/>
+ <unit id="org.eclipse.tm.terminal.feature.group" version="3.0.202.R32x_v201102011435-4-8a7S43yaw312213122546"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.0.200.v201005271030-3-A77w312116382141"/>
<!-- SAVARA dependencies -->
@@ -179,7 +179,7 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.jst.jee" version="1.0.301.v201007151900"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/>
- <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.102.v201008170019"/>
+ <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.103.v201101271715"/>
<unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.2.v201008170019-377AB8s73533J5J759F"/>
@@ -188,7 +188,7 @@
<unit id="org.eclipse.jpt.feature.feature.group" version="2.3.2.v201008242310-7N7UF75FD3wTgbUpoff0aT"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.2.v201008170019-377AB8s73533J5H335L"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.2.v201008190400-7b7GHf2FSK2WBLQ2D-mrubYEOrRh"/>
- <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.2.v201008100100-7O7CFbKEMf84nUlEJyX7-SPQjhYZ"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.3.v201102160541-7O7CFbWEMf84qYjGDyP3DNEwcgFU"/>
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.2.v201008170029-7H7AFUQDxumQGOpBqffOY2f1qxDZ"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.2.v201009091745-7S7WFAPFIpS-1-NbCE6tnacCXKP"/>
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.2.v201008170101-7C78FGMF9JgLWLMUUEMtXc"/>
@@ -200,18 +200,18 @@
<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201005241530-208Z7w31211419"/>
<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.2.0.v201005241530-31FA28s73533C66"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.2.v20100908-7A5FEi9xFc7RCJMToAIOJC43A"/>
- <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.2.v201008170029-7F77FJSC25Tkdy1nqglPjqLAoDgh"/>
+ <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.3.v201101262333-7F77FJ_C25TkfyypjhqQuxNYsMrJ"/>
<unit id="org.eclipse.jsf.feature.source.feature.group" version="3.2.2.v201008231400-7E7I6F9JgLWLMUW3"/>
<unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.5.v201009091745-67K2BgJ9DIAXCbBWJO"/>
<unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.1.v20100906-4609oB5855L6N"/>
<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.300.v201005241450-2407w312116191741"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.2.v201008091400-7B7DFElF7RZHOZJ6W0PsNJ"/>
- <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.2.v201008091400-7C78FPhEdhO_mXde7kbap_K7X1Qt"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.3.v201011031800-7B7DFEsF7RZHOaLfS0KpNJ"/>
+ <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.3.v201011031800-7C78FPlEdhO_oXWe4k_elbMgT1Lq"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.2.2.v20100908-30F8V8s734C3I3K"/>
- <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.2.v20100908-7B4FBrAtJb1nESKmCJHPGQ347"/>
- <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.2.v201008100100-7E7AFHwAJrn5PM15pUYBwJLkSG8j"/>
- <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.2.v201008211705-7I78FZFEtEoO2c5BlJ4jPNvNC-yS"/>
+ <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.3.v20101104-7B4FBuAtJb1qEKLnCKHHHI347"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.3.v201102160541-7E7AFI3AJrn5TN32vSJ8nRIWLD7_"/>
+ <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.3.v201102160541-7I78FZIEtEoO2d7AsK6jSNqC-8jj"/>
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.2.v201008170029-7C7OFXYF7RZHQHI5PyJwPT"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
@@ -219,8 +219,9 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
+ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="2.2.0.v201102111811"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
+ <!-- <repository location="http://dl.google.com/eclipse/plugin/3.6/"/> -->
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
@@ -243,4 +244,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29368 - in trunk: common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-02-25 20:40:18 -0500 (Fri, 25 Feb 2011)
New Revision: 29368
Added:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerProblemAnnotationHoverProcessor.java
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.java
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.properties
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java
Log:
https://issues.jboss.org/browse/JBIDE-8350
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2011-02-25 22:44:11 UTC (rev 29367)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2011-02-26 01:40:18 UTC (rev 29368)
@@ -26,6 +26,7 @@
org.eclipse.wst.sse.core,
org.eclipse.core.resources,
org.eclipse.wst.xsd.ui,
- org.eclipse.wst.dtd.ui
+ org.eclipse.wst.dtd.ui,
+ org.eclipse.ui.ide;bundle-version="3.6.0"
Bundle-Version: 3.2.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java 2011-02-26 01:40:18 UTC (rev 29368)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.text.xml;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Position;
+import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.texteditor.SimpleMarkerAnnotation;
+
+public class MarkerAnnotationInfo {
+ public final SimpleMarkerAnnotation annotation;
+ public final Position position;
+ public final ITextViewer viewer;
+
+ public MarkerAnnotationInfo(SimpleMarkerAnnotation annotation, Position position, ITextViewer textViewer) {
+ this.annotation= annotation;
+ this.position= position;
+ this.viewer= textViewer;
+ }
+
+ public QuickFixProposal[] getCompletionProposals() {
+ ArrayList<QuickFixProposal> proposals = new ArrayList<QuickFixProposal>();
+
+ IMarker marker = annotation.getMarker();
+ IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry().getResolutions(marker);
+ for (IMarkerResolution resolution : resolutions) {
+ proposals.add(new QuickFixProposal(resolution, marker));
+ }
+
+ return proposals.toArray(new QuickFixProposal[proposals.size()]);
+ }
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerProblemAnnotationHoverProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerProblemAnnotationHoverProcessor.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerProblemAnnotationHoverProcessor.java 2011-02-26 01:40:18 UTC (rev 29368)
@@ -0,0 +1,379 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.text.xml;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.text.AbstractInformationControl;
+import org.eclipse.jface.text.AbstractReusableInformationControlCreator;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.IInformationControlCreator;
+import org.eclipse.jface.text.IInformationControlExtension2;
+import org.eclipse.jface.text.IInformationControlExtension4;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.IRewriteTarget;
+import org.eclipse.jface.text.ITextHoverExtension;
+import org.eclipse.jface.text.ITextHoverExtension2;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.ITextViewerExtension;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.ScrollBar;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;
+import org.eclipse.ui.texteditor.SimpleMarkerAnnotation;
+import org.eclipse.wst.sse.ui.internal.taginfo.ProblemAnnotationHoverProcessor;
+
+public class MarkerProblemAnnotationHoverProcessor extends ProblemAnnotationHoverProcessor implements ITextHoverExtension, ITextHoverExtension2{
+
+ private IInformationControlCreator controlCreator = null;
+ private static IInformationControlCreator presenterControlCreator;
+
+ public String getHoverInfo(ITextViewer viewer, IRegion hoverRegion) {
+ return null;
+ }
+
+ public Object getHoverInfo2(ITextViewer viewer, IRegion hoverRegion) {
+ IAnnotationModel model = ((SourceViewer) viewer).getAnnotationModel();
+ if (model != null) {
+ Iterator<Annotation> iterator = model.getAnnotationIterator();
+ while (iterator.hasNext()) {
+ Annotation annotation = (Annotation) iterator.next();
+ if (!isAnnotationValid(annotation))
+ continue;
+
+ Position position = model.getPosition(annotation);
+
+ if (position.overlapsWith(hoverRegion.getOffset(), hoverRegion.getLength())) {
+ return new MarkerAnnotationInfo((SimpleMarkerAnnotation)annotation, position, viewer);
+ }
+ }
+ }
+ return null;
+ }
+
+ public IInformationControlCreator getInformationPresenterControlCreator() {
+ if (presenterControlCreator == null)
+ presenterControlCreator= new PresenterControlCreator();
+ return presenterControlCreator;
+ }
+
+ protected boolean isAnnotationValid(Annotation annotation) {
+ if(annotation instanceof SimpleMarkerAnnotation)
+ return true;
+ return false;
+ }
+
+ public IInformationControlCreator getHoverControlCreator() {
+ if (controlCreator == null)
+ controlCreator= new AnnotationHoverControlCreator(getInformationPresenterControlCreator());
+ return controlCreator;
+ }
+
+ private static class MarkerAnnotationInformationControl extends AbstractInformationControl implements IInformationControlExtension2{
+ private final DefaultMarkerAnnotationAccess annotationAccess;
+ private MarkerAnnotationInfo info;
+ private Composite parent;
+
+ public MarkerAnnotationInformationControl(Shell parentShell,
+ String str) {
+ super(parentShell, str);
+ annotationAccess= new DefaultMarkerAnnotationAccess();
+ create();
+ }
+
+ public boolean hasContents() {
+ return info != null;
+ }
+
+ private MarkerAnnotationInfo getAnnotationInfo() {
+ return info;
+ }
+
+ @Override
+ protected void createContent(Composite parent) {
+ this.parent = parent;
+ GridLayout layout= new GridLayout(1, false);
+ layout.verticalSpacing= 0;
+ layout.marginWidth= 0;
+ layout.marginHeight= 0;
+ parent.setLayout(layout);
+ }
+
+ public final void setVisible(boolean visible) {
+ if (!visible)
+ disposeContent();
+ super.setVisible(visible);
+ }
+
+ public Point computeSizeHint() {
+ Point preferedSize= getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+
+ Point constrains= getSizeConstraints();
+ if (constrains == null)
+ return preferedSize;
+
+ Point constrainedSize= getShell().computeSize(constrains.x, SWT.DEFAULT, true);
+
+ int width= Math.min(preferedSize.x, constrainedSize.x);
+ int height= Math.max(preferedSize.y, constrainedSize.y);
+
+ return new Point(width, height);
+ }
+
+ public void setInput(Object input) {
+ Assert.isLegal(input instanceof MarkerAnnotationInfo);
+ info = (MarkerAnnotationInfo)input;
+ disposeContent();
+ createContent();
+ }
+
+ protected void disposeContent() {
+ for (Control child : parent.getChildren()) {
+ child.dispose();
+ }
+ }
+
+ protected void createContent() {
+ createInfo(parent, getAnnotationInfo().annotation);
+ setDecoration(parent, parent.getForeground(), parent.getBackground(), JFaceResources.getDialogFont());
+
+ QuickFixProposal[] proposals = getAnnotationInfo().getCompletionProposals();
+ if (proposals.length > 0)
+ createControl(parent, proposals);
+
+ parent.layout(true);
+ }
+
+ private void createControl(Composite parent, QuickFixProposal[] proposals) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ GridLayout layout2 = new GridLayout(1, false);
+ layout2.marginHeight = 0;
+ layout2.marginWidth = 0;
+ layout2.verticalSpacing = 2;
+ composite.setLayout(layout2);
+
+ Label separator= new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
+ GridData gridData= new GridData(SWT.FILL, SWT.CENTER, true, false);
+ separator.setLayoutData(gridData);
+
+ Label quickFixLabel= new Label(composite, SWT.NONE);
+ GridData layoutData= new GridData(SWT.BEGINNING, SWT.CENTER, false, false);
+ layoutData.horizontalIndent = 4;
+ quickFixLabel.setLayoutData(layoutData);
+ String text;
+ if (proposals.length == 1) {
+ text= TextXMLMessages.SINGLE_QUICK_FIX;
+ } else {
+ text= NLS.bind(TextXMLMessages.MULTIPLE_QUICK_FIX, proposals.length);
+ }
+ quickFixLabel.setText(text);
+
+ setDecoration(composite, parent.getForeground(), parent.getBackground(), JFaceResources.getDialogFont());
+ createList(composite, proposals);
+ }
+
+ private void createList(Composite parent, QuickFixProposal[] proposals) {
+ final ScrolledComposite scrolledComposite= new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);
+ GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
+ scrolledComposite.setLayoutData(gridData);
+ scrolledComposite.setExpandVertical(false);
+ scrolledComposite.setExpandHorizontal(false);
+
+ Composite composite = new Composite(scrolledComposite, SWT.NONE);
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ GridLayout layout = new GridLayout(2, false);
+ layout.marginLeft = 5;
+ layout.verticalSpacing = 2;
+ composite.setLayout(layout);
+
+ List<Link> list = new ArrayList<Link>();
+ for (QuickFixProposal proposal : proposals) {
+ list.add(createLink(composite, proposal));
+ }
+
+ scrolledComposite.setContent(composite);
+ setDecoration(scrolledComposite, parent.getForeground(), parent.getBackground(), JFaceResources.getDialogFont());
+
+ Point contentSize= composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ composite.setSize(contentSize);
+
+ Point constraints= getSizeConstraints();
+ if (constraints != null && contentSize.x < constraints.x) {
+ ScrollBar horizontalBar= scrolledComposite.getHorizontalBar();
+
+ int scrollBarHeight;
+ if (horizontalBar == null) {
+ Point scrollSize = scrolledComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ scrollBarHeight = scrollSize.y - contentSize.y;
+ } else {
+ scrollBarHeight = horizontalBar.getSize().y;
+ }
+ gridData.heightHint = contentSize.y - scrollBarHeight;
+ }
+ }
+
+ private Link createLink(Composite parent, final QuickFixProposal proposal) {
+ Link proposalLink = new Link(parent, SWT.WRAP);
+ GridData layoutData = new GridData(SWT.BEGINNING, SWT.CENTER, false, false);
+ String linkText = proposal.getDisplayString();
+ proposalLink.setText("<a>" + linkText + "</a>"); //$NON-NLS-1$ //$NON-NLS-2$
+ proposalLink.setLayoutData(layoutData);
+ proposalLink.addMouseListener(new MouseListener(){
+ public void mouseDoubleClick(MouseEvent e) {
+ }
+
+ public void mouseDown(MouseEvent e) {
+ fix(proposal, info.viewer, info.position.offset);
+ }
+
+ public void mouseUp(MouseEvent e) {
+ }
+ });
+ return proposalLink;
+ }
+
+ private void fix(QuickFixProposal p, ITextViewer viewer, int offset) {
+ dispose();
+
+ IRewriteTarget target = null;
+ try {
+ IDocument document = viewer.getDocument();
+
+ if (viewer instanceof ITextViewerExtension) {
+ ITextViewerExtension extension= (ITextViewerExtension) viewer;
+ target= extension.getRewriteTarget();
+ }
+
+ if (target != null)
+ target.beginCompoundChange();
+
+ p.apply(document);
+
+ Point selection = p.getSelection(document);
+ if (selection != null) {
+ viewer.setSelectedRange(selection.x, selection.y);
+ viewer.revealRange(selection.x, selection.y);
+ }
+ } finally {
+ if (target != null)
+ target.endCompoundChange();
+ }
+ }
+
+ private void createInfo(Composite parent, final Annotation annotation) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+ GridLayout layout = new GridLayout(2, false);
+ layout.marginHeight = 2;
+ layout.marginWidth = 2;
+ layout.horizontalSpacing = 0;
+ composite.setLayout(layout);
+
+ final Canvas canvas = new Canvas(composite, SWT.NO_FOCUS);
+ GridData gridData = new GridData(SWT.BEGINNING, SWT.BEGINNING, false, false);
+ gridData.widthHint = 17;
+ gridData.heightHint = 16;
+ canvas.setLayoutData(gridData);
+ canvas.addPaintListener(new PaintListener() {
+ public void paintControl(PaintEvent e) {
+ e.gc.setFont(null);
+ annotationAccess.paint(annotation, e.gc, canvas, new Rectangle(0, 0, 16, 16));
+ }
+ });
+
+ StyledText text = new StyledText(composite, SWT.MULTI | SWT.WRAP | SWT.READ_ONLY);
+ GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+ text.setLayoutData(data);
+ String annotationText = annotation.getText();
+ if (annotationText != null)
+ text.setText(annotationText);
+ }
+
+ private void setDecoration(Control control, Color foreground, Color background, Font font) {
+ control.setForeground(foreground);
+ control.setBackground(background);
+ control.setFont(font);
+
+ if (control instanceof Composite) {
+ for (Control child : ((Composite) control).getChildren()) {
+ setDecoration(child, foreground, background, font);
+ }
+ }
+ }
+
+ }
+
+ private static final class AnnotationHoverControlCreator extends AbstractReusableInformationControlCreator {
+ private final IInformationControlCreator presenterControlCreator;
+
+ public AnnotationHoverControlCreator(IInformationControlCreator presenterControlCreator) {
+ this.presenterControlCreator = presenterControlCreator;
+ }
+
+ public IInformationControl doCreateInformationControl(Shell parent) {
+ return new MarkerAnnotationInformationControl(parent, EditorsUI.getTooltipAffordanceString()) {
+ public IInformationControlCreator getInformationPresenterControlCreator() {
+ return presenterControlCreator;
+ }
+ };
+ }
+
+ public boolean canReuse(IInformationControl control) {
+ if (!super.canReuse(control))
+ return false;
+
+ if (control instanceof IInformationControlExtension4)
+ ((IInformationControlExtension4) control).setStatusText(EditorsUI.getTooltipAffordanceString());
+
+ return true;
+ }
+ }
+
+ private static final class PresenterControlCreator extends AbstractReusableInformationControlCreator {
+ public IInformationControl doCreateInformationControl(Shell parent) {
+ return new MarkerAnnotationInformationControl(parent, EditorsUI.getTooltipAffordanceString()) {
+ public IInformationControlCreator getInformationPresenterControlCreator() {
+ return presenterControlCreator;
+ }
+ };
+ }
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerProblemAnnotationHoverProcessor.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java 2011-02-26 01:40:18 UTC (rev 29368)
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.text.xml;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.IMarkerResolution2;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+
+class QuickFixProposal implements ICompletionProposal{
+ private IMarkerResolution resolution;
+ private IMarker marker;
+
+ public QuickFixProposal(IMarkerResolution resolution, IMarker marker){
+ this.resolution = resolution;
+ this.marker = marker;
+ }
+
+ public void apply(IDocument document) {
+ resolution.run(marker);
+ }
+
+ public Point getSelection(IDocument document) {
+ return null;
+ }
+
+ public String getAdditionalProposalInfo() {
+ if (resolution instanceof IMarkerResolution2)
+ return ((IMarkerResolution2) resolution).getDescription();
+
+ return (String)marker.getAttribute(IMarker.MESSAGE, ""); //$NON-NLS-1$
+ }
+
+ public String getDisplayString() {
+ return resolution.getLabel();
+ }
+
+ public Image getImage() {
+ if (resolution instanceof IMarkerResolution2)
+ return ((IMarkerResolution2)resolution).getImage();
+ return null;
+ }
+
+ public IContextInformation getContextInformation() {
+ return null;
+ }
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.java 2011-02-26 01:40:18 UTC (rev 29368)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.common.text.xml;
+
+import org.eclipse.osgi.util.NLS;
+
+public class TextXMLMessages extends NLS{
+ private static final String BUNDLE_NAME = "org.jboss.tools.common.text.xml.TextXMLMessages"; //$NON-NLS-1$
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, TextXMLMessages.class);
+ }
+
+ public static String SINGLE_QUICK_FIX;
+ public static String MULTIPLE_QUICK_FIX;
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.properties (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.properties 2011-02-26 01:40:18 UTC (rev 29368)
@@ -0,0 +1,13 @@
+##################################################################################
+### Copyright (c) 2011 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
+##################################################################################
+
+SINGLE_QUICK_FIX=one quick fix available:
+MULTIPLE_QUICK_FIX=''{0}''quick fixes available:
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/TextXMLMessages.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java 2011-02-25 22:44:11 UTC (rev 29367)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java 2011-02-26 01:40:18 UTC (rev 29368)
@@ -19,6 +19,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
+import org.eclipse.jface.text.ITextHover;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
import org.eclipse.jface.text.source.ISourceViewer;
@@ -26,6 +27,11 @@
import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext;
+import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.taginfo.AnnotationHoverProcessor;
+import org.eclipse.wst.sse.ui.internal.taginfo.BestMatchHover;
+import org.eclipse.wst.sse.ui.internal.taginfo.ProblemAnnotationHoverProcessor;
+import org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager;
import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
import org.eclipse.wst.xml.ui.internal.contentassist.XMLStructuredContentAssistProcessor;
import org.jboss.tools.common.text.xml.contentassist.ProposalSorter;
@@ -180,4 +186,21 @@
return findDeclaredMethod(sc, name, paramTypes);
}
+ @Override
+ public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask) {
+ TextHoverManager.TextHoverDescriptor[] hoverDescs = SSEUIPlugin.getDefault().getTextHoverManager().getTextHovers();
+ int i = 0;
+ while (i < hoverDescs.length) {
+ if (hoverDescs[i].isEnabled() && computeStateMask(hoverDescs[i].getModifierString()) == stateMask) {
+ String hoverType = hoverDescs[i].getId();
+ if (TextHoverManager.COMBINATION_HOVER.equalsIgnoreCase(hoverType)){
+ return new MarkerProblemAnnotationHoverProcessor();
+ }
+ }
+ i++;
+ }
+
+ return super.getTextHover(sourceViewer, contentType, stateMask);
+ }
+
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2011-02-25 22:44:11 UTC (rev 29367)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2011-02-26 01:40:18 UTC (rev 29368)
@@ -40,6 +40,7 @@
import org.eclipse.wst.sse.ui.internal.taginfo.AnnotationHoverProcessor;
import org.eclipse.wst.sse.ui.internal.taginfo.ProblemAnnotationHoverProcessor;
import org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager;
+import org.jboss.tools.common.text.xml.MarkerProblemAnnotationHoverProcessor;
import org.jboss.tools.common.text.xml.contentassist.ProposalSorter;
import org.jboss.tools.jst.jsp.format.HTMLFormatProcessor;
import org.jboss.tools.jst.jsp.jspeditor.info.ChainTextHover;
@@ -204,8 +205,7 @@
textHover = new AnnotationHoverProcessor();
else if (TextHoverManager.COMBINATION_HOVER
.equalsIgnoreCase(hoverType))
- textHover = new ChainTextHover(
- createDocumentationHovers(contentType));
+ return new MarkerProblemAnnotationHoverProcessor();
else if (TextHoverManager.DOCUMENTATION_HOVER
.equalsIgnoreCase(hoverType)) {
ITextHover[] hovers = createDocumentationHovers(contentType);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2011-02-25 22:44:11 UTC (rev 29367)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2011-02-26 01:40:18 UTC (rev 29368)
@@ -15,6 +15,7 @@
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.text.ITextHover;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
import org.eclipse.jface.text.source.ISourceViewer;
@@ -24,7 +25,10 @@
import org.eclipse.jst.jsp.ui.internal.style.jspel.LineStyleProviderForJSPEL;
import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext;
+import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
+import org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager;
+import org.jboss.tools.common.text.xml.MarkerProblemAnnotationHoverProcessor;
import org.jboss.tools.common.text.xml.contentassist.ProposalSorter;
/**
@@ -145,4 +149,22 @@
// return super.getContentAssistProcessors(sourceViewer, partitionType);
return new IContentAssistProcessor[0];
}
+
+ @Override
+ public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask) {
+ TextHoverManager.TextHoverDescriptor[] hoverDescs = SSEUIPlugin.getDefault().getTextHoverManager().getTextHovers();
+ int i = 0;
+ while (i < hoverDescs.length) {
+ if (hoverDescs[i].isEnabled() && computeStateMask(hoverDescs[i].getModifierString()) == stateMask) {
+ String hoverType = hoverDescs[i].getId();
+ if (TextHoverManager.COMBINATION_HOVER.equalsIgnoreCase(hoverType)){
+ return new MarkerProblemAnnotationHoverProcessor();
+ }
+ }
+ i++;
+ }
+
+ return super.getTextHover(sourceViewer, contentType, stateMask);
+ }
+
}
\ No newline at end of file
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29367 - in branches/jbosstools-3.2.x: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-02-25 17:44:11 -0500 (Fri, 25 Feb 2011)
New Revision: 29367
Added:
branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPIncludeContentDescriber.java
Modified:
branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java
Log:
JBIDE-8049
*.inc content type JSP clash with PDT
Issue is fixed. Fixed for 3.2.1
Modified: branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
===================================================================
--- branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2011-02-25 22:29:48 UTC (rev 29366)
+++ branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2011-02-25 22:44:11 UTC (rev 29367)
@@ -21,3 +21,4 @@
vpe.toolbar.name=VPE Toolbar
+ContentType_JBossToolsINC=JBoss Tools JSP Include
\ No newline at end of file
Modified: branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-02-25 22:29:48 UTC (rev 29366)
+++ branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-02-25 22:44:11 UTC (rev 29367)
@@ -194,7 +194,7 @@
contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor"
id="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"
matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl"
- extensions="jsp, jspf, jspx, tag, tagf, inc">
+ extensions="jsp, jspf, jspx, tag, tagf">
<contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.jspsource"/>
</editor>
<editor
@@ -538,13 +538,23 @@
</extension>
<extension
point="org.eclipse.core.runtime.contentTypes">
- <file-association
+ <!--file-association
content-type="org.eclipse.jst.jsp.core.jspsource"
- file-extensions="inc"/>
+ file-extensions="inc"/ -->
<file-association
content-type="org.eclipse.wst.html.core.htmlsource"
file-extensions="jsf"/>
</extension>
+
+ <extension point="org.eclipse.core.contenttype.contentTypes">
+ <content-type id="org.eclipse.jst.jsp.core.jspsource"
+ name="%ContentType_JBossToolsINC"
+ base-type="org.eclipse.core.runtime.text"
+ describer="org.jboss.tools.jst.jsp.jspeditor.JSPIncludeContentDescriber"
+ file-extensions="inc"
+ priority="normal"
+ />
+ </extension>
<extension
point="org.jboss.tools.common.model.resourceMapping">
Added: branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPIncludeContentDescriber.java
===================================================================
--- branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPIncludeContentDescriber.java (rev 0)
+++ branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPIncludeContentDescriber.java 2011-02-25 22:44:11 UTC (rev 29367)
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.jst.jsp.jspeditor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+import org.eclipse.core.internal.content.TextContentDescriber;
+import org.eclipse.core.runtime.content.IContentDescription;
+import org.eclipse.core.runtime.content.ITextContentDescriber;
+
+/**
+ * Content decriber class that helps Eclipse to detect if the *.inc file has jsp content inside.
+ *
+ * @author Victor Rubezhny
+ *
+ */
+@SuppressWarnings("restriction")
+public class JSPIncludeContentDescriber extends TextContentDescriber implements ITextContentDescriber {
+
+ public int describe(InputStream input, IContentDescription description) throws IOException {
+ InputStreamReader reader = new InputStreamReader(input);
+ try {
+ return (containsJspElements(reader) ?
+ VALID :
+ INVALID);
+ } finally {
+ reader.close();
+ }
+ }
+
+ public int describe(Reader contents, IContentDescription description) throws IOException {
+ return (containsJspElements(contents) ?
+ VALID :
+ INVALID);
+ }
+
+ private boolean containsJspElements(Reader contents) {
+ try {
+ int c = contents.read();
+ while (c != -1) {
+ if (c == '<') { // JSP Code/Tag/Directive Opener check
+ if ((c = contents.read()) == -1)
+ return false;
+ if (c == '%') { // JSP Code/Directive opened
+ return true;
+ }
+ if (c == 'j') { // JSP Tag opener check
+ if ((c = contents.read()) == -1)
+ return false;
+ if (c != 's')
+ continue;
+ if ((c = contents.read()) == -1)
+ return false;
+ if (c != 'p')
+ continue;
+ if ((c = contents.read()) == -1)
+ return false;
+ if (c != ':')
+ continue;
+
+ // Find the tag close
+ while ((c = contents.read()) != -1) {
+ if (c == '>') {
+ return true;
+ }
+ }
+ continue;
+ }
+ }
+ c = contents.read();
+ }
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ // Ignore
+ }
+ return false;
+ }
+}
Property changes on: branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPIncludeContentDescriber.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
===================================================================
--- branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2011-02-25 22:29:48 UTC (rev 29366)
+++ branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2011-02-25 22:44:11 UTC (rev 29367)
@@ -488,7 +488,13 @@
private void addNodeListenerTo(Node node) {
if (node instanceof INodeNotifier) {
INodeNotifier notifier = (INodeNotifier) node;
- if (notifier.getExistingAdapter(this) == null) {
+
+ /* yradtsevich:
+ * checking for notifier.getExistingAdapter(this) == null
+ * is not used because of JBIDE-8049 (JBIDE-8051)
+ * (PDT implementation of getExistingAdapter(Object type) works
+ * incorrectly with non Class parameters) */
+ if (!nodeNotifiers.contains(notifier)) {
notifier.addAdapter(nodeListener);
nodeNotifiers.add(notifier);
}
Modified: branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java
===================================================================
--- branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java 2011-02-25 22:29:48 UTC (rev 29366)
+++ branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java 2011-02-25 22:44:11 UTC (rev 29367)
@@ -47,7 +47,14 @@
domMapping.mapNodes(nodeMapping);
Node sourceNode = nodeMapping.getSourceNode();
- if (((INodeNotifier) sourceNode).getExistingAdapter(sorceAdapter) == null) {
+
+
+ /* yradtsevich:
+ * checking for ((INodeNotifier) sourceNode).getExistingAdapter(sorceAdapter) == null
+ * is not used because of JBIDE-8049 (JBIDE-8051)
+ * (PDT implementation of getExistingAdapter(Object type) works
+ * incorrectly with non Class parameters) */
+ if (!sourceNodes.contains(sourceNode)) {
((INodeNotifier) sourceNode).addAdapter(sorceAdapter);
sourceNodes.add(sourceNode);
}
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29366 - trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-02-25 17:29:48 -0500 (Fri, 25 Feb 2011)
New Revision: 29366
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFTemplateTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
JBIDE-8484
https://issues.jboss.org/browse/JBIDE-8484
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFTemplateTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFTemplateTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFTemplateTest.java 2011-02-25 22:29:48 UTC (rev 29366)
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.jsf.test;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.tools.jsf.web.JSFTemplate;
+import org.jboss.tools.jst.web.project.version.ProjectVersion;
+import org.jboss.tools.jst.web.project.version.ProjectVersions;
+
+import junit.framework.TestCase;
+
+public class JSFTemplateTest extends TestCase {
+ static String JSF_2_0 = "JSF 2.0";
+
+ public void testJSFTemplate() throws Exception {
+ JSFTemplate template = JSFTemplate.getInstance();
+ ProjectVersions vs = template.getProjectVersions();
+ String[] versionList = vs.getVersionList();
+
+ Set<String> versionSet = toSet(versionList);
+ assertTrue(versionSet.contains("JSF 1.1.02 - Reference Implementation"));
+ assertTrue(versionSet.contains("JSF 1.2"));
+ assertTrue(versionSet.contains("JSF 1.2 with Facelets"));
+ assertTrue(versionSet.contains(JSF_2_0));
+
+ ProjectVersion v = vs.getVersion(JSF_2_0);
+ assertNotNull(v);
+ String minVersion = v.getMinimalServletVersion();
+ assertEquals("2.5", minVersion);
+ String preferredVersion = v.getPreferredServletVersion();
+ assertEquals("3.0", preferredVersion);
+
+ String[] templateList = template.getTemplateList(JSF_2_0);
+ assertEquals(1, templateList.length);
+ assertEquals("JSFKickStartWithoutLibs", templateList[0]);
+
+ String s = v.getProjectTemplatesLocation();
+ assertEquals("jsf-2.0", new File(s).getName());
+
+ }
+
+ private Set<String> toSet(String[] list) {
+ Set<String> set = new HashSet<String>();
+ for (String s: list) set.add(s);
+ return set;
+ }
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFTemplateTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-02-25 22:26:32 UTC (rev 29365)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-02-25 22:29:48 UTC (rev 29366)
@@ -40,6 +40,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("Test model loading for JSF projects"); //$NON-NLS-1$
+ suite.addTestSuite(JSFTemplateTest.class);
TestSuite old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$
old.addTestSuite(JSFModelTest.class);
old.addTestSuite(ModelFormat_2_0_0_Test.class);
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29365 - trunk/jst/plugins/org.jboss.tools.jst.jsp.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-02-25 17:26:32 -0500 (Fri, 25 Feb 2011)
New Revision: 29365
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
Log:
JBIDE-8049
*.inc content type JSP clash with PDT
Issue is fixed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2011-02-25 22:19:14 UTC (rev 29364)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2011-02-25 22:26:32 UTC (rev 29365)
@@ -20,3 +20,5 @@
Externalize.Selected.Property=Externalize Strings...
vpe.toolbar.name=VPE Toolbar
+
+ContentType_JBossToolsINC=JBoss Tools JSP Include
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-02-25 22:19:14 UTC (rev 29364)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-02-25 22:26:32 UTC (rev 29365)
@@ -194,7 +194,7 @@
contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor"
id="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"
matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl"
- extensions="jsp, jspf, jspx, tag, tagf, inc">
+ extensions="jsp, jspf, jspx, tag, tagf">
<contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.jspsource"/>
</editor>
<editor
@@ -538,9 +538,9 @@
</extension>
<extension point="org.eclipse.core.runtime.contentTypes">
- <file-association
+ <!--file-association
content-type="org.eclipse.jst.jsp.core.jspsource"
- file-extensions="inc"/>
+ file-extensions="inc"/ -->
<file-association
content-type="org.eclipse.wst.html.core.htmlsource"
file-extensions="jsf"/>
@@ -972,6 +972,17 @@
</extension>
+ <extension point="org.eclipse.core.contenttype.contentTypes">
+ <content-type id="org.eclipse.jst.jsp.core.jspsource"
+ name="%ContentType_JBossToolsINC"
+ base-type="org.eclipse.core.runtime.text"
+ describer="org.jboss.tools.jst.jsp.jspeditor.JSPIncludeContentDescriber"
+ file-extensions="inc"
+ priority="normal"
+ />
+ </extension>
+
+
<extension
point="org.jboss.tools.common.model.resourceMapping">
<mapping
13 years, 10 months
- 1
- 0