JBoss Tools SVN: r29951 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-03-22 18:37:28 -0400 (Tue, 22 Mar 2011)
New Revision: 29951
Modified:
trunk/jsf/docs/userguide/en-US/editors.xml
Log:
"Updated screenshots, general editing"
Modified: trunk/jsf/docs/userguide/en-US/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/editors.xml 2011-03-22 22:14:13 UTC (rev 29950)
+++ trunk/jsf/docs/userguide/en-US/editors.xml 2011-03-22 22:37:28 UTC (rev 29951)
@@ -1722,7 +1722,7 @@
</figure>
<para>
- The <guilabel>Edited properties</guilabel> tab gives a preview of the properties which are set for the existing style class. You can easily modify them with the help of this wizard.
+ The <guilabel>Edited properties</guilabel> tab provides a preview of the properties which are set for the existing style class. You can easily modify them with the help of this wizard.
</para>
<figure>
@@ -1748,7 +1748,7 @@
</figure>
<para>
- The <guilabel>Preview</guilabel> tab is for observing the content of the chosen <filename>CSS</filename> file. This tab is hidden if no <filename>CSS</filename> file is chosen.
+ The <guilabel>Preview</guilabel> tab provides a way to view the content of the selected <filename>CSS</filename> file. This tab is hidden if no <filename>CSS</filename> file is selected.
</para>
<figure>
@@ -1761,7 +1761,7 @@
</figure>
<para>
- At the top of the <guilabel>CSS Class</guilabel> Dialog you can see a preview box which visualizes the result. To edit the preview you should double click in the box. To leave the focus, use <keycombo><keycap>Ctrl</keycap><keycap>Tab</keycap></keycombo>.
+ At the top of the <guilabel>CSS Class</guilabel> dialog you can see a preview box which visualizes the result. To edit the preview you should double click in the box. To leave the focus, use <keycombo><keycap>Ctrl</keycap><keycap>Tab</keycap></keycombo>.
</para>
<figure>
@@ -1774,7 +1774,7 @@
</figure>
<para>
- The dialog for creating a new CSS class, which is called from <menuchoice><guimenuitem>New</guimenuitem><guimenuitem>Other...</guimenuitem><guimenuitem>JBoss Tools Web</guimenuitem><guimenuitem>CSS Class</guimenuitem></menuchoice>, looks this way:
+ The dialog for creating a new CSS class, which is called from <menuchoice><guimenuitem>New</guimenuitem><guimenuitem>Other...</guimenuitem><guimenuitem>JBoss Tools Web</guimenuitem><guimenuitem>CSS Class</guimenuitem></menuchoice>, is shown in the image below:
</para>
<figure>
@@ -1787,7 +1787,7 @@
</figure>
<para>
- Click on the <guibutton>Browse</guibutton> button to open a dialog to select the CSS file to create a CSS class for:
+ Click on the <guibutton>Browse</guibutton> button to open a dialog where you can select the CSS file to create a CSS class for:
</para>
<figure>
@@ -1800,7 +1800,7 @@
</figure>
<para>
- Choose the necessary <filename>CSS</filename> file and click on the <guibutton>Ok</guibutton> button.
+ Choose the appropriate <filename>CSS</filename> file and click on the <guibutton>OK</guibutton> button.
</para>
</section>
</section>
@@ -1808,11 +1808,11 @@
<section id="vpe_templating">
<title>Visual Templates for Unknown Tags</title>
<para>
- The VPE also makes it possible to create visual templates for unknown tags.
+ The Visual Page Editor also makes it possible to create visual templates for unknown tags.
</para>
<para>
- To call the <guilabel>Template</guilabel> dialog for a tag, right-click on it in Visual mode and select <guimenuitem>Setup Visual Template for <tag name></guimenuitem> option.
+ To display the <guilabel>Template</guilabel> dialog for a tag, right-click on it in Visual mode and select <guimenuitem>Setup Visual Template for <tag name></guimenuitem> option.
</para>
<figure>
@@ -1825,7 +1825,7 @@
</figure>
<para id="template_dialog">
- Here is what the <guilabel>Template</guilabel> dialog looks like.
+ The <guilabel>Template</guilabel> dialog is shown in the image below:
</para>
<figure>
@@ -1838,7 +1838,7 @@
</figure>
<para>
- The <guilabel>Tag Name</guilabel> field is for setting the name of the unknown tag.
+ The <guilabel>Tag Name</guilabel> field is used to define the name of the unknown tag.
</para>
<note>
@@ -1846,36 +1846,37 @@
<para>
The given field should be filled in according to the pattern: <code>taglib:tag</code>. Also make sure you do not surround the name with angle brackets which will cause the validation error (see the figure below).
</para>
+ <figure>
+ <title>Validation Error in the Template Dialog</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/validation_error.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
</note>
- <figure>
- <title>Validation Error in the Template Dialog</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/validation_error.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+
<para>
- <guilabel>Tag for Display</guilabel> field in the <guilabel>Template</guilabel> dialog requires specifying a type of tag. It can be SPAN, DIV, TABLE or any other html element. Check <guilabel>Children</guilabel>, if you want to mark a tag as a child element.
+ The <guilabel>Tag for Display</guilabel> field in the <guilabel>Template</guilabel> dialog requires specifying a type of tag. It can be SPAN, DIV, TABLE or any other HTML element. Check the <guilabel>Children</guilabel> field if you want to mark a tag as a child element.
</para>
<para>
- The <guilabel>Value</guilabel> field is for setting a tag value.
+ The <guilabel>Value</guilabel> defines a tags' value.
</para>
<para>
- As for the <guilabel>Style</guilabel> field, you can fill it out manually or make use of the button next to the field to bring the <xref linkend="css_dialog"/> for editing styles.
+ As for the <guilabel>Style</guilabel> field, you can fill it out manually or make use of the button next to the field to bring the <guilabel>CSS Style</guilabel> dialog (See <xref linkend="css_dialog"/>) for editing styles.
</para>
<para>
- You can observe all defined templates in the <xref linkend="VisualPageEditor2"/> on the <guilabel>Visual Templates</guilabel> tab which you can quickly access by pressing
+ You can view all defined templates in the <xref linkend="VisualPageEditor2"/> on the <guilabel>Visual Templates</guilabel> tab which, you can quickly access by pressing the
<inlinemediaobject>
<imageobject>
<imagedata fileref="images/visual_page/icon_1.png"/>
</imageobject>
- </inlinemediaobject>
+ </inlinemediaobject> toolbar button
(see <xref linkend="AdvancedSettings954"/>).
</para>
@@ -1889,18 +1890,18 @@
</figure>
<para>
- Here it's possible to add a new and edit or remove any listed in the table template.
+ Here it's possible to add, edit or remove any listed in the table template.
</para>
</section>
<section id="templates_export_import">
<title>Export/Import of the Templates for Unknown Tags</title>
<para>
- If you have a number of custom tags for which you have defined visual templates, you may need to share the templates definitions with other team members. In this case you can use export/import functionality for unknown tag templates.
+ If you have a number of custom tags for which you have defined visual templates, you may need to share the templates definitions with other team members. In this case you can use export and import functionality for unknown tag templates.
</para>
<para>
- To export all visual templates you defined for unknown tags, navigate to <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Export</guimenuitem> <guimenuitem>Other</guimenuitem><guimenuitem>Unknown tags templates</guimenuitem></menuchoice>. Here is what the wizard looks like.
+ To export all visual templates you defined for unknown tags, select <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Export</guimenuitem> <guimenuitem>Other</guimenuitem><guimenuitem>Unknown tags templates</guimenuitem></menuchoice>. Here is what the wizard looks like.
</para>
<figure>
@@ -1913,11 +1914,11 @@
</figure>
<para>
- At this point click the <guibutton>Browse</guibutton> button to set the path where to save the external XML file with templates and then click the <guibutton>Finish</guibutton> button to complete the export.
+ At this point click the <guibutton>Browse</guibutton> button to set the path where to save the external XML file with templates, and then click the <guibutton>Finish</guibutton> button to complete the export.
</para>
<para>
- For import, use the similar steps. Select <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Import</guimenuitem><guimenuitem>Other</guimenuitem><guimenuitem>Unknown tags templates</guimenuitem></menuchoice> to open the import wizard. Click the <guibutton>Browse</guibutton> to point to the <filename>XML</filename> file which stores the custom tags templates and then click the <guibutton>Finish</guibutton> button to complete the import.
+ Importing follows a similar procedure. Select <menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Import</guimenuitem><guimenuitem>Other</guimenuitem><guimenuitem>Unknown tags templates</guimenuitem></menuchoice> to open the import wizard. Click the <guibutton>Browse</guibutton> to point to the <filename>XML</filename> file which stores the custom tags templates, and then click the <guibutton>Finish</guibutton> button to complete the import.
</para>
<figure>
@@ -2064,7 +2065,7 @@
<imagedata fileref="images/visual_page/icon_1.png"/>
</imageobject>
</inlinemediaobject>
- ) provides a quick access to the Visual Page Editor preferences.
+ ) provides quick access to the Visual Page Editor preferences.
</para>
<figure>
@@ -2077,7 +2078,7 @@
</figure>
<para>
- This page provides a number of options associated with the editor representation. The more detailed description on each one you can find in the "JBoss Tools Preferences" chapter under <xref linkend="VisualPageEditor2"/>.
+ This page provides a number of options associated with the editor representation. For more detailed description on each option please read the "JBoss Tools Preferences" chapter under <xref linkend="VisualPageEditor2"/>.
</para>
</section>
@@ -2103,7 +2104,7 @@
<imagedata fileref="images/visual_page/icon_3.png"/>
</imageobject>
</inlinemediaobject>
- ) leads to a window which helps you specify necessary references of the resources. It is represented by a window with 4 tabs. The first one, <guilabel>Actual Run-Time folders</guilabel>, is used to replace absolute and relative path values when generating a preview:
+ ) displays a window which helps you specify necessary references of the resources. It is represented by a window with four tabs. The first one, <guilabel>Actual Run-Time folders</guilabel>, is used to replace absolute and relative path values when generating a preview:
</para>
<figure>
@@ -2129,7 +2130,7 @@
</figure>
<para>
- The third one, <guilabel>Included tag libs</guilabel>, can be used to add Taglibs that can be used by the editor for getting appropriate templates to generate a preview:
+ The third tab, <guilabel>Included tag libs</guilabel>, can be used to add Taglibs that can be used by the editor for getting appropriate templates to generate a preview:
</para>
<figure>
@@ -2192,13 +2193,13 @@
</programlisting>
<para>
- When you open the <filename>main.jsp</filename> file in Visual Page Editor, it will not be able to resolve the image from the header, however it will work fine in runtime. To fix this in design time, click the <guibutton>Page Design Options</guibutton> button and set <guilabel>Actual Run-Time Relative Folder</guilabel> to <menuchoice><guimenuitem>[Project Name]</guimenuitem><guimenuitem>WebContent</guimenuitem><guimenuitem>pages</guimenuitem></menuchoice> and you will see the image appeared.
+ When you open the <filename>main.jsp</filename> file in the Visual Page Editor, it will not be able to resolve the image from the header, however it will work fine in runtime. To fix this in design time, click the <guibutton>Page Design Options</guibutton> button and set <guilabel>Actual Run-Time Relative Folder</guilabel> to <menuchoice><guimenuitem>[Project Name]</guimenuitem><guimenuitem>WebContent</guimenuitem><guimenuitem>pages</guimenuitem></menuchoice>, and you will see the image appeared.
</para>
<para/>
<para>
- Let' consider an example for other tabs. For instance, the definition of your CSS on the page is the next:
+ Let's consider an example for other tabs. For instance, the definition of your CSS on the page is the next:
</para>
<programlisting role="XML">
@@ -2208,7 +2209,7 @@
</programlisting>
<para>
- This will work fine in runtime, but the Visual Page Editor does not know what <code>requestContextPath</code> in design time is. In order to see the necessary styles applied in design time your should add a path to your stylesheet in the <guilabel>CSS File Path</guilabel> section.
+ This will work fine in runtime, but the Visual Page Editor does not know the value of <code>requestContextPath</code> in design time. In order to see the necessary styles applied in design time your should add a path to your stylesheet in the <guilabel>CSS File Path</guilabel> section.
</para>
<para>
@@ -2233,7 +2234,7 @@
</figure>
<para>
- Here both in Source and Visual modes you see the EL expression <code>#{user.name}</code>. When you switch to <guilabel>Preview</guilabel> view, you will also see this expression. Now press <guibutton>Page Design Options</guibutton> button and set the value for the <guilabel>user.name</guilabel> as <guilabel>World</guilabel>.
+ Here both in <guilabel>Source</guilabel> and <guilabel>Visual</guilabel> modes you see the EL expression <code>#{user.name}</code>. When you switch to <guilabel>Preview</guilabel> view, you will also see this expression. Now click the <guibutton>Page Design Options</guibutton> button and set the value for the <guilabel>user.name</guilabel> as <guilabel>World</guilabel>.
</para>
<figure>
@@ -2246,7 +2247,7 @@
</figure>
<para>
- As a result in Visual mode and Preview view the word <guilabel>World</guilabel> is displayed.
+ As a result in <guilabel>Visual</guilabel> mode and <guilabel>Preview</guilabel> view the word <guilabel>World</guilabel> is displayed.
</para>
<figure>
@@ -2262,7 +2263,7 @@
<section id="splitting_buttons">
<title>Visual/Source Editors splitting buttons</title>
<para>
- The Visual/Source Editors splitting buttons provide a way to choose one of the four possible layouts for the Visual/Source Editor.
+ The <guilabel>Visual/Source</guilabel> Editors splitting buttons provide a way to choose one of the four possible layouts for the <guilabel>Visual/Source</guilabel> Editor.
</para>
<para>
@@ -2325,7 +2326,7 @@
</imageobject>
</mediaobject>
</figure>
- Note, at the current view there is only <emphasis>one</emphasis> button, that proposes the possibility to change it in order the Source and the View are moved <emphasis>in a clockwise direction</emphasis>.
+ Note, with the current view there is only <emphasis>one</emphasis> button, which provides the ability to move the <guilabel>Source</guilabel> and the <guilabel>View</guilabel> <emphasis>in a clockwise direction</emphasis>.
<figure>
<title>Visual Page Editor After Layout Changing </title>
<mediaobject>
@@ -2340,30 +2341,30 @@
<section id="vpe_show_border">
<title>Show Border for Unknown Tags</title>
<para>
- The option is a self explanatory, i. e. if you want unknown tags to be wrapped in a border in the VPE visual part, just press the <guibutton>Show border for unknown tags</guibutton> button (
+ The <guibutton>Show border for unknown tags</guibutton> button (
<inlinemediaobject>
<imageobject>
<imagedata fileref="images/visual_page/show_border_button.png"/>
</imageobject>
</inlinemediaobject>
- ) on the toolbar.
+ ) will display unknown tags in a border in the <guilabel>Visual</guilabel> section of the Visual Page Editor.
</para>
</section>
<section id="vpe_show_nonvisual_tags">
<title>Show Non-visual Tags</title>
<para>
- Visual Page Editor provides the option for displaying non-visual tags in Visual mode of the editor. To enable it select the <guibutton>Show non-visual tags</guibutton> button (
+ The <guibutton>Show non-visual tags</guibutton> button (
<inlinemediaobject>
<imageobject>
<imagedata fileref="images/visual_page/show_nonvisual.png"/>
</imageobject>
</inlinemediaobject>
- ) on the VPE toolbar.
+ ) will display non-visual tags in the <guilabel>Visual</guilabel> section of the Visual Page Editor.
</para>
<para>
- On the figure you can see non-visual elements with gray dashed borders.
+ In the figure you can see that the non-visual elements are displayed with gray dashed borders.
</para>
<figure>
@@ -2376,7 +2377,7 @@
</figure>
<para>
- You can also switch on this option in the VPE preferences, having clicked on the <guibutton>Preferences</guibutton> button (
+ You can also switch on this option in the Visual Page Editor preferences, having clicked on the <guibutton>Preferences</guibutton> button (
<inlinemediaobject>
<imageobject>
<imagedata fileref="images/visual_page/icon_1.png"/>
@@ -2389,7 +2390,7 @@
<section id="vpe_show_selection_bar">
<title>Show Selection Bar</title>
<para>
- You can find useful one more functionality provided by VPE. At the bottom of the <guilabel>Visual/Source</guilabel> view there is a <guilabel>Selection Tag Bar</guilabel>. It's updated automatically allowing to see tags tree for a current component selected in Visual or Source mode, also it allows to select tags back and forward.
+ At the bottom of the <guilabel>Visual/Source</guilabel> view there is a <guilabel>Selection Tag Bar</guilabel>. It's updated automatically, allowing you to see tags tree for a current component selected in Visual or Source mode. It also allows you to select tags parent and child tags.
</para>
<figure>
@@ -2408,7 +2409,7 @@
<imagedata fileref="images/visual_page/show_selection_bar.png"/>
</imageobject>
</inlinemediaobject>
- ) on the VPE toolbar.
+ ) on the Visual Page Editor toolbar.
</para>
</section>
</section>
@@ -2416,7 +2417,7 @@
<section id="page_preview">
<title>Page Preview</title>
<para>
- The Visual Page Editor comes with design-time preview feature which is available for:
+ The Visual Page Editor comes with a design-time preview feature, which is available for:
</para>
<itemizedlist>
@@ -2440,7 +2441,7 @@
</itemizedlist>
<para>
- <guilabel>Preview</guilabel> view is read-only, it shows how the page will look like in a browser.
+ <guilabel>Preview</guilabel> view is read-only, and it shows how the page will look like in a browser.
</para>
<figure>
@@ -2458,7 +2459,7 @@
<section id="vpe_errors">
<title>Error Messages</title>
<para>
- Visual Page Editor provide a user friendly and effective error messages, which should make solving problems easier. Error message contains a reference to the problem and its description. Also in Error area you can find a link to Visual Page Editor forum and a <guibutton>Details</guibutton> button which is used to see a error trace.
+ The Visual Page Editor provides user friendly and effective error messages, which should make solving problems easier. The error messages contains a reference to the problem and its description. Also in the <guilabel>Error</guilabel> area you can find a link to Visual Page Editor forum and a <guibutton>Details</guibutton> button which is used to see a error trace.
</para>
<para>
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29950 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-03-22 18:14:13 -0400 (Tue, 22 Mar 2011)
New Revision: 29950
Modified:
trunk/jsf/docs/userguide/en-US/Visual_Web_Tools.xml
trunk/jsf/docs/userguide/en-US/editors.xml
Log:
"Updated screenshots, general editing"
Modified: trunk/jsf/docs/userguide/en-US/Visual_Web_Tools.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/Visual_Web_Tools.xml 2011-03-22 21:24:52 UTC (rev 29949)
+++ trunk/jsf/docs/userguide/en-US/Visual_Web_Tools.xml 2011-03-22 22:14:13 UTC (rev 29950)
@@ -14,7 +14,7 @@
</chapterinfo>
<title>Visual Web Tools</title>
<para>
- This guide covers the usage of Visual Web Tools in JBoss Developer Studio and JBoss Tools. The difference between these products is that JBoss Tools are just a set of Eclipse plugins where JBoss Developer Studio adds the following functionality:
+ This guide covers the usage of Visual Web Tools in JBoss Developer Studio and JBoss Tools. The difference between these products is that JBoss Tools are just a set of Eclipse plugins, where JBoss Developer Studio adds the following functionality:
</para>
<itemizedlist>
@@ -38,7 +38,7 @@
<listitem>
<para>
- 3rd party plugins bundled and configured
+ Third party plugins bundled and configured
</para>
</listitem>
Modified: trunk/jsf/docs/userguide/en-US/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/editors.xml 2011-03-22 21:24:52 UTC (rev 29949)
+++ trunk/jsf/docs/userguide/en-US/editors.xml 2011-03-22 22:14:13 UTC (rev 29950)
@@ -12,13 +12,13 @@
</chapterinfo>
<title>Editors</title>
<para>
- In the JSF Tools Reference Guide and Struts Tools Reference Guide you may have read about the Graphical Editors for JSF and Struts configuration files, Tiles Files, and Struts Validation Files. All these editors have OpenOn (see <xref linkend="OpenOnSelection4Hyperlinknavigation"/>) and Code Assist (see <xref linkend="CodeAssistAndDynamicCodeAssist42BasedOnProjectData"/>) features, which are described in more detail in this document. In addition, this document will cover the Visual Page Editor (see <xref linkend="visual_page"/>), which provides combined visual and source editing of Web pages, as well as many more editors (see <xref linkend="more_editors"/>) for different types of files.
+ In the JSF Tools Reference Guide and Struts Tools Reference Guide you may have read about the Graphical Editors for JSF and Struts configuration files, Tiles Files, and Struts Validation Files. All these editors have OpenOn (see <xref linkend="OpenOnSelection4Hyperlinknavigation"/>) and Code Assist (see <xref linkend="CodeAssistAndDynamicCodeAssist42BasedOnProjectData"/>) features, which are described in more detail in this document. In addition, this document will cover the Visual Page Editor (see <xref linkend="visual_page"/>), which provides combined visual and source editing of Web pages, as well as a number of additional editors (see <xref linkend="more_editors"/>) for different types of files.
</para>
<section id="editors_features">
<title>Editors Features</title>
<para>
- JBoss Developer Studio has powerful editing features that help you easily navigate within your application and make use of content and code assist no matter what type of project file (<filename>.jsp</filename>, <filename>.xhtml</filename>, <filename>.xml</filename>, <filename>.css</filename> etc.) you are working on.
+ JBoss Developer Studio has powerful editing features that help you easily navigate within your application and make use of content and code assist no matter what type of project file (<filename>JSP</filename>, <filename>XHTML</filename>, <filename>XML</filename>, <filename>CSS</filename> etc.) you are working on.
</para>
<para>
@@ -48,7 +48,7 @@
<section id="OpenOnSelection4Hyperlinknavigation">
<title>OpenOn</title>
<para>
- OpenOn lets you easily link directly from one resource to another in your project without using the <guilabel>Package Explorer</guilabel> view (project tree). With OpenOn, you can simply use <keycap>F3</keycap> or <keycombo><keycap>Ctrl</keycap><keycap>Click</keycap></keycombo> on a reference to another file and the file will be opened.
+ OpenOn lets you easily link directly from one resource to another in your project without using the <guilabel>Package Explorer</guilabel> view (i.e. the project tree). With OpenOn, you can simply use <keycap>F3</keycap> or <keycombo><keycap>Ctrl</keycap><keycap>Click</keycap></keycombo> on a reference to another file and the file will be opened.
</para>
<para>
@@ -90,7 +90,7 @@
<section id="XMLFiles232">
<title>XML Files</title>
<para>
- Press and hold down the <keycap>Ctrl</keycap> key. As you move the mouse cursor over different file references in the file, they are displayed with an underline. In this state these file references effectively become links, and when they are clicked the appropriate file will be opened in its own editor.
+ When editing an XML file press and hold down the <keycap>Ctrl</keycap> key. As you move the mouse cursor over different file references in the file, they are displayed with an underline. In this state these file references effectively become links, and when they are clicked the appropriate file will be opened in its own editor.
</para>
<para>
@@ -280,7 +280,7 @@
</figure>
<para>
- OpenOn is also implemented for css classes added by a complex link.
+ OpenOn is also implemented for CSS classes added by a complex link.
</para>
<figure>
@@ -619,7 +619,7 @@
<section id="ContentAssistForXMLJSPAndJSFConfigurationFiles865">
<title>Content Assist for XML, JSP and JSF configuration files</title>
<para>
- At any point when working with any <filename>XML</filename>, <filename>JSP</filename> and <filename>JSF</filename> configuration files Content Assist is available to help you. Simply press <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo> to see what options are available.
+ Content Assist is available to help you at any point when working with any <filename>XML</filename>, <filename>JSP</filename> and <filename>JSF</filename> configuration files. Simply press <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo> to see what options are available.
</para>
<para>
@@ -649,7 +649,7 @@
</figure>
<para>
- Content Assist for other <filename>JSF</filename> <filename>XML</filename> project files ( <filename>web.xml</filename> shown):
+ Content Assist for other <filename>JSF</filename> <filename>XML</filename> project files (<filename>web.xml</filename> shown):
</para>
<figure>
@@ -665,7 +665,7 @@
<section id="ContentAssistforCompositeComponents">
<title>Content Assist for Composite Components</title>
<para>
- Content assist functionality is also available for composite components. The image below shows content assist used with a composite component file <filename>loginPanel.xhtml</filename> within a JSF 1.2 project with facelets.
+ Content assist functionality is also available for composite components. The image below shows content assist used with a composite component file named <filename>loginPanel.xhtml</filename> within a JSF 1.2 project with facelets.
</para>
<figure>
@@ -717,7 +717,7 @@
</itemizedlist>
<para>
- The figure below shows how to insert a message from a Properties file. You simply put the cursor inside the <code>value</code> attribute and press <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo>. JBoss Developer Studio will scan your project and display a list of possible values that can be inserted.
+ The figure below demonstrates how to insert a message from a Properties file. You simply put the cursor inside the <code>value</code> attribute and press <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo>. JBoss Developer Studio will scan your project and display a list of possible values that can be inserted.
</para>
<figure>
@@ -730,11 +730,11 @@
</figure>
<para>
- In the following screenshot we are inserting a Managed bean attribute value. Again, by simply clicking <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo>, JBoss Developer Studio will show a list of all possible values that can be inserted.
+ In the following screenshot we are inserting a Managed bean attribute value. Again, by simply pressing <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo>, JBoss Developer Studio will show a list of all possible values that can be inserted.
</para>
<para>
- Once you select a Managed bean, it will show you a list of all available attributes for the selected Managed bean (<code>userBean</code>).
+ Once you select a Managed bean, it will show you a list of all available attributes for the selected Managed bean.
</para>
<figure>
@@ -773,7 +773,7 @@
</figure>
<para>
- Moreover Code Assist is able to define Resource Bundles on template pages and provides the proposals on the client page.
+ Code Assist is able to define Resource Bundles on template pages and provides the proposals on the client page.
</para>
<figure>
@@ -789,7 +789,7 @@
<section id="ContentAssistWithinJSFGraphicalEditor44">
<title>Content Assist within Tree JSF Editor</title>
<para>
- JBoss Developer Studio also provides Content Assist when working within the Tree JSF configuration editor. Just press <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo>.
+ JBoss Developer Studio also provides Content Assist when working within the <guilabel>Tree</guilabel> JSF configuration editor. Just press <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo>.
</para>
<figure>
@@ -930,7 +930,7 @@
<section id="ContentAssistForJSFTags96">
<title>Content Assist for JSF Tags</title>
<para>
- JBDS provides full code completion for JSF tags:
+ JBoss Developer Studio provides full code completion for JSF tags:
</para>
<figure>
@@ -1029,7 +1029,7 @@
<section id="ContentAssistForXHTMLPages">
<title>Content Assist for XHTML Pages</title>
<para>
- The code completion for the Seam components in a Seam project shows the proposals marked with Seam icon.
+ The code completion menu items for the Seam components in a Seam project shows the proposals marked with Seam icon.
</para>
<figure>
@@ -1042,7 +1042,7 @@
</figure>
<para>
- If <filename>XHTML</filename> file uses custom Facelets components, the Content Assist should also be available for them. For details, see <xref linkend="contentAssistForCustomFacelets"/> later in this guide.
+ If an <filename>XHTML</filename> file uses custom Facelets components, the Content Assist should also be available for them. For details, see <xref linkend="contentAssistForCustomFacelets"/> later in this guide.
</para>
</section>
@@ -1219,19 +1219,19 @@
</figure>
<para>
- It warns that some features of content assist probably will not work. To fix the problem and turn off the message box execute the following steps:
+ It warns that some features of content assist may not work. Use the following steps to fix the problem and turn off the message box:
</para>
<itemizedlist>
<listitem>
<para>
- Right click the project in the <guilabel>Package Explorer</guilabel> view.
+ Right click the project in the <guilabel>Package Explorer</guilabel> view
</para>
</listitem>
<listitem>
<para>
- Select <menuchoice> <guimenuitem> Configure </guimenuitem> <guimenuitem> Add JSF Capabilities </guimenuitem> </menuchoice> from the context menu.
+ Select <menuchoice> <guimenuitem> Configure </guimenuitem> <guimenuitem> Add JSF Capabilities </guimenuitem> </menuchoice> from the context menu
</para>
</listitem>
@@ -1281,7 +1281,7 @@
</figure>
<para>
- The JBoss Developer Studio TLD file editor is shown below in Tree view. At any point you can edit the source by switching to the Source view.
+ The JBoss Developer Studio TLD file editor is shown below in <guilabel>Tree</guilabel> view. At any point you can edit the source by switching to the <guilabel>Source</guilabel> view.
</para>
<figure>
@@ -1338,7 +1338,7 @@
</para>
<para>
- One more way to toggle between the various states of the split pane is using the shortcuts <keycombo><keycap>Shift</keycap><keycap>F6</keycap></keycombo> for maximizing or restoring the <guilabel>Source</guilabel> part and <keycombo><keycap>Shift</keycap><keycap>Alt</keycap><keycap>F6</keycap></keycombo> for maximizing or restoring the <guilabel>Visual</guilabel> part.
+ One more way to toggle between the various states of the split pane is using the <keycombo><keycap>Shift</keycap><keycap>F6</keycap></keycombo> keyboard shortcut for maximizing or restoring the <guilabel>Source</guilabel> part and <keycombo><keycap>Shift</keycap><keycap>Alt</keycap><keycap>F6</keycap></keycombo> for maximizing or restoring the <guilabel>Visual</guilabel> part.
</para>
<note>
@@ -1370,7 +1370,7 @@
</para>
<para>
- It is also possible to use the JBoss Tools Palette (see <xref linkend="palette"/>) to insert any tag from the list of tag libraries to the page you are editing with just a click or drag-and-drop.
+ It is also possible to use the <guilabel>JBoss Tools Palette</guilabel> (see <xref linkend="palette"/>) to insert any tag from the list of tag libraries into the page you are editing with just a click or by dragging-and-dropping.
</para>
<figure>
@@ -1516,11 +1516,11 @@
<section id="codefolding">
<title>Using Code Folding</title>
<para>
- The Visual Page Editor lets you collapse (hide) and expand (show) sections of your code to make it easier to navigate and read.
+ The Visual Page Editor lets you collapse and expand (or hide and show) sections of your code to make it easier to navigate and read.
</para>
<para>
- Code folding can be enabled by right-clicking on the left margin on the Source part of Visual Page Editor, selecting <guimenuitem>Folding</guimenuitem> and checking the <guilabel>Enable Folding</guilabel> checkbox or using the <keycombo><keycap>Ctrl</keycap><keycap>Numpad Divide</keycap></keycombo> shortcut.
+ Code folding can be enabled by right-clicking on the left margin on the <guilabel>Source</guilabel> part of Visual Page Editor, selecting <guimenuitem>Folding</guimenuitem>, and checking the <guilabel>Enable Folding</guilabel> checkbox or using the <keycombo><keycap>Ctrl</keycap><keycap>Numpad Divide</keycap></keycombo> shortcut.
</para>
<para>
@@ -1547,19 +1547,19 @@
</para>
<para>
- When the minus sing is clicked on the appropriate tag collapses and a plus sing (
+ When the minus sign is clicked on the appropriate tag collapses and a plus sign (
<inlinemediaobject>
<imageobject>
<imagedata fileref="images/visual_page/visual_page_23d.png"/>
</imageobject>
</inlinemediaobject>
- ) is displayed on the left margin as well as a gray rectangle two dots (
+ ) is displayed on the left margin as well as a gray rectangle with two dots (
<inlinemediaobject>
<imageobject>
<imagedata fileref="images/visual_page/visual_page_23e.png"/>
</imageobject>
</inlinemediaobject>
- ) appears after opening and closing tags.
+ ), which appears after opening and closing tags.
</para>
<figure>
@@ -1575,7 +1575,7 @@
<section id="JSPsyntaxvalidation84">
<title>JSP Syntax Validation</title>
<para>
- When working in JBoss Tools JSP editor you are constantly provided with feedback and contextual error checking as you type.
+ When working in the JBoss Tools JSP editor you are constantly provided with feedback and contextual error checking as you type.
</para>
</section>
@@ -1586,11 +1586,11 @@
</para>
<para>
- VPE templates also provide a support for various versions of tag libraries. It means that the Visual Page Editor takes control over those components which have different parameters or preview according to the framework version (like seam 1.2 and seam 2.0, or JSF 1.1 and JSF 1.2).
+ VPE templates also provides support for various versions of tag libraries, meaning that the Visual Page Editor takes control over those components which have different parameters or preview according to the framework version (like seam 1.2 and seam 2.0, or JSF 1.1 and JSF 1.2).
</para>
<para>
- For example, <code> <s:decorate> </code> element in seam has different parameters in versions 1.2 and 2.0 as well as <code> <h:outputLink> </code> JSF element has different preview in versions 1.1 and 1.2.
+ For example, the <code> <s:decorate> </code> element in Seam has different parameters in versions 1.2 and 2.0, and the <code> <h:outputLink> </code> JSF element has different preview in versions 1.1 and 1.2.
</para>
</section>
</section>
@@ -1598,19 +1598,19 @@
<section id="pages_styling">
<title>Pages Styling</title>
<para>
- Most web pages use the cascading style sheets (CSS) to control the way they look. With Visual Page Editor you can easily stylize your pages. In this section we are going to introduce you to a powerful mechanism that Visual Page Editor provides for a complete control over pages styling. More helpful information on work with CSS files can be found in <xref linkend="css_perspective"/>
+ Most web pages use the cascading style sheets (CSS) to control the way they look. With Visual Page Editor you can easily stylize your pages. In this section we are going to introduce you to a powerful mechanism that Visual Page Editor provides for complete control over a pages' styling. Additional information on working with CSS files can be found in <xref linkend="css_perspective"/>
</para>
<section id="inline_styling">
<title>Inline Style Editing</title>
<para>
- In the Visual part of the Visual Page Editor there is a graphical toolbar, use it to add inline styling to JSF and Struts tags on your page. The toolbar can be hidden with the help of the special button (
+ In the <guilabel>Visual</guilabel> part of the Visual Page Editor there is a graphical toolbar, which is used to add inline styling to JSF and Struts tags on your page. The toolbar can be hidden with the help of the special button (
<inlinemediaobject>
<imageobject>
<imagedata fileref="images/visual_page/formatting_bar_icon.png"/>
</imageobject>
</inlinemediaobject>
- ) on the VPE toolbar.
+ ) on the Visual Page Editor toolbar.
</para>
<figure>
@@ -1623,7 +1623,7 @@
</figure>
<para>
- For editing inline styles for DOM elements the Visual Page Editor provides the <guilabel>CSS Dialog</guilabel>. It can be called from <guilabel> style</guilabel> line in the <guilabel>Properties</guilabel> view for a currently selected element.
+ For editing inline styles for DOM elements, the Visual Page Editor provides the <guilabel>CSS Dialog</guilabel>. It can be called from the <guilabel> style</guilabel> line in the <guilabel>Properties</guilabel> view of a currently selected element.
</para>
<figure>
@@ -1636,7 +1636,7 @@
</figure>
<para id="css_dialog">
- <guilabel>CSS Style</guilabel> Dialog has several tabs where css properties for text, background, borders and others can be specified. A simple preview which is generated at the top of the <guilabel>CSS Style</guilabel> Dialog allows you to see the changes before you apply them.
+ The <guilabel>CSS Style</guilabel> dialog has several tabs where CSS properties for text, background, borders and others can be specified. A simple preview which is generated at the top of the <guilabel>CSS Style</guilabel> dialog allows you to see the changes before you apply them.
</para>
<figure>
@@ -1652,11 +1652,11 @@
<section id="external_stylesheets">
<title>External Stylesheets</title>
<para>
- The pages you are working with in the Visual Page Editor can use external stylesheets. The Visual Page Editor allows you to create new style classes in existing stylesheets and/or edit them as well. For these purposes <guilabel>Edit Style Class</guilabel> Dialog is provided.
+ The pages you are working with in the Visual Page Editor can use external stylesheets. The Visual Page Editor allows you to create new style classes in existing stylesheets, as well as edit them. The <guilabel>Edit Style Class</guilabel> dialog is provided for this purposes.
</para>
<para>
- Select the element for which you need to create or edit style class and press button next to <guilabel>styleClass</guilabel> field in <guilabel>Properties</guilabel> view.
+ Select the element for which you need to create or edit style class, and press button next to the <guilabel>styleClass</guilabel> field in the <guilabel>Properties</guilabel> view.
</para>
<figure>
@@ -1669,7 +1669,7 @@
</figure>
<para>
- It'll pick up the <guilabel>Edit Style Class</guilabel> Dialog which looks like on the figure below:
+ This will display the <guilabel>Edit Style Class</guilabel> dialog, which is shown in the image below:
</para>
<figure>
@@ -1682,7 +1682,7 @@
</figure>
<para>
- Choose a style class from the variants provided and click on the <guibutton>OK</guibutton> button to apply the changes.
+ Choose a style class from the variants provided, and click on the <guibutton>OK</guibutton> button to apply the changes.
</para>
<para>
@@ -1696,7 +1696,7 @@
</para>
<para>
- To create a new CSS class for the file click on the <guibutton>Add CSS Class</guibutton> button, write its name in the field appeared and click on the <guibutton>OK</guibutton> button:
+ To create a new CSS class for the file click on the <guibutton>Add CSS Class</guibutton> button, enter its name in the textbox, and click on the <guibutton>OK</guibutton> button:
</para>
<figure>
@@ -1709,7 +1709,7 @@
</figure>
<para>
- Then you can configure style settings switching between the tabs: <guilabel>Text/Font</guilabel>, <guilabel>Background</guilabel>, <guilabel>Boxes</guilabel>, <guilabel>Property Sheet</guilabel>. The list of already existing classes with names beginning with the symbols printed will be displayed on standard <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo> key combination. To add existing styling to the chosen element just point to the necessary one. Each time you select any class it is displayed in the <guilabel>Preview</guilabel> tab. Click on the <guibutton>Apply</guibutton> button will apply the changes without closing the window.
+ Then you can configure style settings by switching between the tabs: <guilabel>Text/Font</guilabel>, <guilabel>Background</guilabel>, <guilabel>Boxes</guilabel>, <guilabel>Property Sheet</guilabel>. The list of existing classes with names beginning with the symbols printed will be displayed by using the standard <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo> key combination. To add an existing style to the chosen element just point to the necessary one. Each time you select any class it is displayed in the <guilabel>Preview</guilabel> tab. Click on the <guibutton>Apply</guibutton> button to apply the changes without closing the window.
</para>
<figure>
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29949 - trunk/jsf/docs/userguide/en-US/images/editors_features.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-03-22 17:24:52 -0400 (Tue, 22 Mar 2011)
New Revision: 29949
Modified:
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_12.png
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_13.png
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_14.png
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_14_a.png
Log:
"Updated screenshots"
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_12.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_13.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_14.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_14_a.png
===================================================================
(Binary files differ)
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29948 - in trunk/jsf/docs/userguide/en-US: images/editors_features and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-03-22 17:13:25 -0400 (Tue, 22 Mar 2011)
New Revision: 29948
Modified:
trunk/jsf/docs/userguide/en-US/editors.xml
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_10.png
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_11.png
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_11a.png
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_8d.png
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_9.png
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_ca_composite_component.png
Log:
"Updated screenshots"
Modified: trunk/jsf/docs/userguide/en-US/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/editors.xml 2011-03-22 20:55:35 UTC (rev 29947)
+++ trunk/jsf/docs/userguide/en-US/editors.xml 2011-03-22 21:13:25 UTC (rev 29948)
@@ -665,7 +665,7 @@
<section id="ContentAssistforCompositeComponents">
<title>Content Assist for Composite Components</title>
<para>
- Content assist functionality is also available for composite components. The image below shows content assist used with a composite component file <filename> tag.xhtml </filename> within a JSF 1.2 project with facelets.
+ Content assist functionality is also available for composite components. The image below shows content assist used with a composite component file <filename>loginPanel.xhtml</filename> within a JSF 1.2 project with facelets.
</para>
<figure>
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_10.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_11.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_11a.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_8d.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_9.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_ca_composite_component.png
===================================================================
(Binary files differ)
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29947 - trunk/jsf/docs/userguide/en-US/images/editors_features.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-03-22 16:55:35 -0400 (Tue, 22 Mar 2011)
New Revision: 29947
Modified:
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_38.png
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_39.png
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_openon_el.png
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_openon_jsf2_components.png
Log:
"Updated screenshots"
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_38.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_39.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_openon_el.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_openon_jsf2_components.png
===================================================================
(Binary files differ)
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29946 - in trunk/as: plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-03-22 15:27:14 -0400 (Tue, 22 Mar 2011)
New Revision: 29946
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/IOUtil.java
Log:
JBIDE-7514 jboss 7 support tests and cleanup
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-03-22 19:04:23 UTC (rev 29945)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-03-22 19:27:14 UTC (rev 29946)
@@ -33,7 +33,10 @@
public class WTPZippedPublisher implements IJBossServerPublisher {
private int moduleState = IServer.PUBLISH_STATE_NONE;
+
public boolean accepts(String method, IServer server, IModule[] module) {
+ if( module == null || (publishMethodSpecific() && !method.equals(getTargetedPublishMethodId())))
+ return false;
IDeployableServer ds = ServerConverter.getDeployableServer(server);
IModule lastMod = (module == null || module.length == 0 ) ? null : module[module.length -1];
if( getPublishMethod().equals(method) && lastMod == null)
@@ -43,6 +46,14 @@
&& ds != null && ds.zipsWTPDeployments();
}
+ protected boolean publishMethodSpecific() {
+ return true;
+ }
+
+ protected String getTargetedPublishMethodId() {
+ return getPublishMethod();
+ }
+
protected String getPublishMethod() {
return LocalPublishMethod.LOCAL_PUBLISH_METHOD;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2011-03-22 19:04:23 UTC (rev 29945)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2011-03-22 19:27:14 UTC (rev 29946)
@@ -25,10 +25,8 @@
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.services.files.IFileService;
import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
-import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.publishers.AbstractPublishMethod;
-import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBoss6Server;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
@@ -182,15 +180,6 @@
return null;
}
- public static IPath findModuleFolderWithDefault(IModule module, IDeployableServer server, IPath startingPath) {
- IModule[] moduleTree = new IModule[]{module};
- String folder = PublishUtil.getDeployRootFolder(
- moduleTree, server, startingPath.toString(),
- IJBossToolingConstants.LOCAL_DEPLOYMENT_LOC);
- return PublishUtil.getDeployPath(moduleTree, folder).removeLastSegments(1);
- }
-
-
public IPublishCopyCallbackHandler getCallbackHandler(IPath path, IServer server) {
return new RSERemotePublishHandler(path, this);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java 2011-03-22 19:04:23 UTC (rev 29945)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java 2011-03-22 19:27:14 UTC (rev 29946)
@@ -16,9 +16,9 @@
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
+import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
/**
@@ -26,8 +26,8 @@
*/
public class RSEZippedFolderPublisher extends RSEZippedJSTPublisher {
public boolean accepts(String method, IServer server, IModule[] module) {
- if( !RSEPublishMethod.RSE_ID.equals(method))
- return false;
+ if( !LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method))
+ return true;
IDeployableServer ds = ServerConverter.getDeployableServer(server);
if( module != null && module.length > 0
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-03-22 19:04:23 UTC (rev 29945)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-03-22 19:27:14 UTC (rev 29946)
@@ -17,15 +17,19 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.rse.services.clientserver.messages.SystemElementNotFoundException;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.model.IModuleFile;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
+import org.eclipse.wst.server.core.util.ModuleFile;
import org.jboss.ide.eclipse.archives.webtools.modules.WTPZippedPublisher;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
+import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
@@ -34,7 +38,6 @@
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
/**
* This class is in charge of RSE zipped publishing for flexible projects.
@@ -42,11 +45,16 @@
* by uploading the file after building it in a temporary directory
*/
public class RSEZippedJSTPublisher extends WTPZippedPublisher {
-
- protected String getPublishMethod() {
- return RSEPublishMethod.RSE_ID;
+ public boolean accepts(String method, IServer server, IModule[] module) {
+ if( !LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method))
+ return super.accepts(method, server, module);
+ return false;
}
+ protected boolean publishMethodSpecific() {
+ return false; // can publish all method types
+ }
+
/**
* Here we put the deployment first in a temporary remote deploy folder
* Then during the publishModule call, we'll also upload it to remote machine
@@ -86,10 +94,7 @@
IDeployableServer server2 = ServerConverter.getDeployableServer(server);
String remoteTempDeployRoot = getDeployRoot(module, ServerConverter.getDeployableServer(server));
IPath sourcePath = PublishUtil.getDeployPath(module, remoteTempDeployRoot);
- IModule lastMod = module[module.length-1];
- RSEPublishMethod method2 = (RSEPublishMethod)method;
- IPath destFolder = RSEPublishMethod.findModuleFolderWithDefault(lastMod, server2, method2.getRemoteRootFolder());
- //IPath tempDestFolder = RSEPublishMethod.findModuleFolderWithDefault(lastMod, server2, method2.getRemoteTemporaryFolder());
+ IPath destFolder = PublishUtil.getDeployPath(method, module, server2);
String name = sourcePath.lastSegment();
IStatus result = null;
@@ -120,11 +125,14 @@
private IStatus remoteFullPublish(IPath sourcePath,
IPath destFolder, String name, IProgressMonitor monitor) {
// Now transfer the file to RSE
- RSEPublishMethod method2 = (RSEPublishMethod)method;
try {
removeRemoteDeploymentFolder(sourcePath, destFolder, name, new NullProgressMonitor());
- method2.getFileService().upload(sourcePath.toFile(), destFolder.toString(), name, true, null, null,
- AbstractServerToolsPublisher.getSubMon(monitor, 150));
+ IModuleFile mf = new ModuleFile(sourcePath.toFile(), name, new Path("/"));
+ method.getCallbackHandler(destFolder, server).copyFile(mf, new Path(name),
+ AbstractServerToolsPublisher.getSubMon(monitor, 150)
+ );
+// method2.getFileService().upload(sourcePath.toFile(), destFolder.toString(), name, true, null, null,
+// AbstractServerToolsPublisher.getSubMon(monitor, 150));
if( JBoss7Server.supportsJBoss7Deployment(server))
JBoss7JSTPublisher.addDoDeployMarkerFile(method, ServerConverter.getDeployableServer(server), module, monitor);
} catch( SystemMessageException sme ) {
@@ -154,9 +162,8 @@
private IStatus removeRemoteDeploymentFolder(IPath sourcePath,
IPath destFolder, String name, IProgressMonitor monitor) throws SystemMessageException, CoreException {
- // Now transfer the file to RSE
- RSEPublishMethod method2 = (RSEPublishMethod)method;
- method2.getFileService().delete(destFolder.toString(), name, monitor);
+ // Now delete the file from RSE
+ method.getCallbackHandler(destFolder, server).deleteResource(new Path(name), monitor);
return Status.OK_STATUS;
}
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java 2011-03-22 19:04:23 UTC (rev 29945)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java 2011-03-22 19:27:14 UTC (rev 29946)
@@ -1,43 +1,24 @@
package org.jboss.ide.eclipse.as.test.publishing.v2;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
-import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.test.ASTest;
import org.jboss.ide.eclipse.as.test.publishing.AbstractDeploymentTest;
import org.jboss.ide.eclipse.as.test.util.IOUtil;
@@ -45,32 +26,22 @@
import org.jboss.ide.eclipse.as.test.util.wtp.JavaEEFacetConstants;
import org.jboss.ide.eclipse.as.test.util.wtp.OperationTestCase;
import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil;
-import org.jboss.ide.eclipse.as.test.util.wtp.ProjectUtility;
-public class JSTZippedDeploymentTester extends TestCase {
+public class JSTZippedDeploymentTester extends AbstractJSTDeploymentTester {
- IProject project;
- IServer server;
- final String MODULE_NAME = "newModule";
- final String CONTENT_DIR = "contentDirS";
- final String TEXT_FILE = "test.txt";
- final IPath CONTENT_TEXT_FILE = new Path(CONTENT_DIR).append(TEXT_FILE);
public void setUp() throws Exception {
project = createProject();
server = ServerRuntimeUtils.createMockDeployOnlyServer();
+ setZipFlag();
+ }
+
+ private void setZipFlag() throws IOException, CoreException {
IServerWorkingCopy wc = server.createWorkingCopy();
ServerAttributeHelper helper = new ServerAttributeHelper(server, wc);
helper.setAttribute(IDeployableServer.ZIP_DEPLOYMENTS_PREF, true);
server = wc.save(true, new NullProgressMonitor());
}
- public void tearDown() throws Exception {
- ServerRuntimeUtils.deleteAllServers();
- ServerRuntimeUtils.deleteAllRuntimes();
- ProjectUtility.deleteAllProjects();
- ASTest.clearStateLocation();
- }
-
protected IProject createProject() throws Exception {
IDataModel dm = ProjectCreationUtil.getEARDataModel(MODULE_NAME, CONTENT_DIR, null, null, JavaEEFacetConstants.EAR_5, false);
OperationTestCase.runAndVerify(dm);
@@ -91,27 +62,7 @@
assertTrue(publisher.getClass().getName().contains("WTPZippedPublisher"));
}
- protected void setContents(IFile file, int val) throws IOException , CoreException{
- IOUtil.setContents(file, "" + val);
- }
-
- protected void assertContents(IFile file, int val) throws IOException, CoreException {
- assertContents(file, "" + val);
- }
-
- protected void assertContents(IFile file, String val) throws IOException, CoreException {
- assertEquals(val, IOUtil.getContents(file));
- }
-
- protected void assertContents(File file, int val) throws IOException, CoreException {
- assertContents(file, "" + val);
- }
-
- protected void assertContents(File file, String val) throws IOException, CoreException {
- assertEquals(val, IOUtil.getContents(file));
- }
-
- public void testMain() throws CoreException, IOException {
+ private IModule findModule() {
IModule[] mods = ServerUtil.getModules(project);
IModule mod = null;
// find hte right module ugh
@@ -120,6 +71,12 @@
mod = mods[i];
}
assertNotNull(mod);
+ return mod;
+ }
+
+
+ public void testZippedDeploymentLocal() throws CoreException, IOException {
+ IModule mod = findModule();
IModule[] module = new IModule[] { mod };
verifyJSTZippedPublisher(module);
server = ServerRuntimeUtils.addModule(server, mod);
@@ -142,4 +99,33 @@
ServerRuntimeUtils.publish(server);
assertFalse(zipped.toFile().exists());
}
+
+ public void testZippedDeploymentMock() throws CoreException, IOException {
+ server = ServerRuntimeUtils.useMockPublishMethod(server);
+ MockPublishMethod.HANDLER.reset();
+ IModule mod = findModule();
+ testZippedDeploymentMock(mod,1,1);
+ }
+
+ public void testZippedDeploymentMockAS7() throws CoreException, IOException {
+ // Same as without previous AS versions, as the server can tell when
+ // a zipped file is done being transfered or not
+ server = ServerRuntimeUtils.createMockJBoss7Server();
+ server = ServerRuntimeUtils.useMockPublishMethod(server);
+ MockPublishMethod.HANDLER.reset();
+ IModule mod = findModule();
+ testZippedDeploymentMock(mod,1,1);
+ }
+
+ private void testZippedDeploymentMock(IModule mod, int pubCount, int removeCount) throws IOException, CoreException {
+ server = ServerRuntimeUtils.addModule(server, mod);
+ ServerRuntimeUtils.publish(server);
+ int changed = MockPublishMethod.HANDLER.getChanged().length;
+ MockPublishMethod.HANDLER.reset();
+
+ server = ServerRuntimeUtils.removeModule(server, mod);
+ ServerRuntimeUtils.publish(server);
+ changed = MockPublishMethod.HANDLER.getRemoved().length;
+ int x = 1;
+ }
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/IOUtil.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/IOUtil.java 2011-03-22 19:04:23 UTC (rev 29945)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/IOUtil.java 2011-03-22 19:27:14 UTC (rev 29946)
@@ -87,15 +87,20 @@
int count;
byte data[] = new byte[BUFFER];
// write the files to the disk
- toLoc.append(entry.getName()).toFile().getParentFile().mkdirs();
- if( !toLoc.append(entry.getName()).toFile().exists()) {
- FileOutputStream fos = new FileOutputStream(toLoc.append(entry.getName()).toOSString());
- dest = new BufferedOutputStream(fos, BUFFER);
- while ((count = zis.read(data, 0, BUFFER)) != -1) {
- dest.write(data, 0, count);
+ if( entry.isDirectory() ) {
+ toLoc.append(entry.getName()).toFile().mkdirs();
+ } else {
+ toLoc.append(entry.getName()).toFile().getParentFile().mkdirs();
+ if( !toLoc.append(entry.getName()).toFile().exists()) {
+ String out = toLoc.append(entry.getName()).toOSString();
+ FileOutputStream fos = new FileOutputStream(out);
+ dest = new BufferedOutputStream(fos, BUFFER);
+ while ((count = zis.read(data, 0, BUFFER)) != -1) {
+ dest.write(data, 0, count);
+ }
+ dest.flush();
+ dest.close();
}
- dest.flush();
- dest.close();
}
}
zis.close();
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29945 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-03-22 15:04:23 -0400 (Tue, 22 Mar 2011)
New Revision: 29945
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithDialog.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken1.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken2.qfxresult
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithSelectionWizard.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8201
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-03-22 18:30:48 UTC (rev 29944)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-03-22 19:04:23 UTC (rev 29945)
@@ -169,8 +169,8 @@
IBean bean = iter.next();
if(field != null){
return new IMarkerResolution[] {
- new MakeFieldProtectedMarkerResolution(field, file)//,
- //new MakeBeanScopedDependentMarkerResolution(bean, file)
+ new MakeFieldProtectedMarkerResolution(field, file),
+ new MakeBeanScopedDependentMarkerResolution(bean, file)
};
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-03-22 18:30:48 UTC (rev 29944)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-03-22 19:04:23 UTC (rev 29945)
@@ -11,15 +11,29 @@
package org.jboss.tools.cdi.ui.marker;
import java.text.MessageFormat;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
-import org.eclipse.jdt.core.IField;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jdt.core.IBuffer;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IImportContainer;
+import org.eclipse.jdt.core.IImportDeclaration;
import org.eclipse.jdt.core.IType;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMarkerResolution2;
+import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IScopeDeclaration;
import org.jboss.tools.cdi.ui.CDIUIMessages;
+import org.jboss.tools.cdi.ui.CDIUIPlugin;
+import org.jboss.tools.common.EclipseUtil;
/**
* @author Daniel Azarov
@@ -42,8 +56,82 @@
@Override
public void run(IMarker marker) {
+ IAnnotation originalAnnotation = getScopeAnnotation();
+ try{
+ ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
+ ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
+
+ MarkerResolutionUtils.addImport(CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME, compilationUnit);
+
+ IAnnotation workingCopyAnnotation = getWorkingCopyAnnotation(originalAnnotation, compilationUnit);
+
+ if(workingCopyAnnotation != null){
+ String shortName = MarkerResolutionUtils.getShortName(CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME);
+
+ IBuffer buffer = compilationUnit.getBuffer();
+
+ buffer.replace(workingCopyAnnotation.getSourceRange().getOffset(), workingCopyAnnotation.getSourceRange().getLength(), MarkerResolutionUtils.AT+shortName);
+
+ synchronized(compilationUnit) {
+ compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null);
+ }
+
+ // delete import
+ String qualifiedName = getFullyQualifiedName();
+ IImportDeclaration importDeclaration = compilationUnit.getImport(qualifiedName);
+ IImportContainer importContainer = compilationUnit.getImportContainer();
+ if(importDeclaration != null && importContainer != null){
+ int importSize = importContainer.getSourceRange().getOffset()+importContainer.getSourceRange().getLength();
+ String text = buffer.getText(importSize, buffer.getLength()-importSize);
+ if(checkImport(text, originalAnnotation.getElementName()))
+ importDeclaration.delete(false, new NullProgressMonitor());
+ }
+ }
+
+ compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
+ compilationUnit.discardWorkingCopy();
+ }catch(CoreException ex){
+ CDIUIPlugin.getDefault().logError(ex);
+ }
+
}
+
+ private boolean checkImport(String text, String shortName){
+ Pattern p = Pattern.compile(".*\\W"+shortName+"\\W.*",Pattern.DOTALL); //$NON-NLS-1$ //$NON-NLS-2$
+ Matcher m = p.matcher(text);
+ return !m.matches();
+ }
+
+ private IAnnotation getWorkingCopyAnnotation(IAnnotation annotation, ICompilationUnit compilationUnit){
+ IType type = compilationUnit.getType(bean.getBeanClass().getElementName());
+ if(type != null){
+ return type.getAnnotation(annotation.getElementName());
+ }
+ return null;
+ }
+
+ private IAnnotation getScopeAnnotation(){
+ Set<IScopeDeclaration> scopDeclarations = bean.getScopeDeclarations();
+ Iterator<IScopeDeclaration> iter = scopDeclarations.iterator();
+ while(iter.hasNext()){
+ IScopeDeclaration declaration = iter.next();
+ return declaration.getDeclaration();
+ }
+ return null;
+ }
+
+ private String getFullyQualifiedName(){
+ Set<IScopeDeclaration> scopDeclarations = bean.getScopeDeclarations();
+ Iterator<IScopeDeclaration> iter = scopDeclarations.iterator();
+ while(iter.hasNext()){
+ IScopeDeclaration declaration = iter.next();
+ return declaration.getScope().getSourceType().getFullyQualifiedName();
+ }
+ return null;
+
+ }
+
@Override
public String getDescription() {
return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2011-03-22 18:30:48 UTC (rev 29944)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2011-03-22 19:04:23 UTC (rev 29945)
@@ -32,7 +32,7 @@
/**
* @author Daniel Azarov
*/
-public class MakeFieldProtectedMarkerResolution implements IMarkerResolution2{
+public class MakeFieldProtectedMarkerResolution implements IMarkerResolution2, TestableResolutionWithDialog{
private static final String PUBLIC = "public"; //$NON-NLS-1$
private static final String PROTECTED = "protected"; //$NON-NLS-1$
@@ -53,10 +53,21 @@
@Override
public void run(IMarker marker) {
- Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- boolean cont = MessageDialog.openQuestion(shell, CDIUIMessages.QUESTION, CDIUIMessages.DECREASING_FIELD_VISIBILITY_MAY_CAUSE_COMPILATION_PROBLEMS);
- if(!cont)
- return;
+ internal_run(marker, false);
+ }
+
+ @Override
+ public void runForTest(IMarker marker) {
+ internal_run(marker, true);
+ }
+
+ private void internal_run(IMarker marker, boolean test){
+ if(!test){
+ Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+ boolean cont = MessageDialog.openQuestion(shell, CDIUIMessages.QUESTION, CDIUIMessages.DECREASING_FIELD_VISIBILITY_MAY_CAUSE_COMPILATION_PROBLEMS);
+ if(!cont)
+ return;
+ }
try{
ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
@@ -89,5 +100,4 @@
public Image getImage() {
return null;
}
-
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-03-22 18:30:48 UTC (rev 29944)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-03-22 19:04:23 UTC (rev 29945)
@@ -34,7 +34,7 @@
/**
* @author Daniel Azarov
*/
-public class MakeInjectedPointUnambiguousMarkerResolution implements IMarkerResolution2, TestableResolutionWithSelectionWizard {
+public class MakeInjectedPointUnambiguousMarkerResolution implements IMarkerResolution2, TestableResolutionWithDialog {
private String label;
private IInjectionPoint injectionPoint;
private List<IBean> beans;
@@ -51,7 +51,7 @@
return label;
}
- public void selectFirstElementAndRun(IMarker marker){
+ public void runForTest(IMarker marker){
internal_run(marker, true);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-03-22 18:30:48 UTC (rev 29944)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-03-22 19:04:23 UTC (rev 29945)
@@ -31,7 +31,7 @@
/**
* @author Daniel Azarov
*/
-public class SelectBeanMarkerResolution implements IMarkerResolution2, TestableResolutionWithSelectionWizard {
+public class SelectBeanMarkerResolution implements IMarkerResolution2, TestableResolutionWithDialog {
private String label;
private IInjectionPoint injectionPoint;
private List<IBean> beans;
@@ -46,7 +46,7 @@
return label;
}
- public void selectFirstElementAndRun(IMarker marker){
+ public void runForTest(IMarker marker){
internal_run(marker, true);
}
Copied: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithDialog.java (from rev 29933, trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithSelectionWizard.java)
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithDialog.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithDialog.java 2011-03-22 19:04:23 UTC (rev 29945)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.cdi.ui.marker;
+
+import org.eclipse.core.resources.IMarker;
+
+/**
+ * @author Daniel Azarov
+ */
+public interface TestableResolutionWithDialog {
+ public void runForTest(IMarker marker);
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithDialog.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithSelectionWizard.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithSelectionWizard.java 2011-03-22 18:30:48 UTC (rev 29944)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithSelectionWizard.java 2011-03-22 19:04:23 UTC (rev 29945)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.cdi.ui.marker;
-
-import org.eclipse.core.resources.IMarker;
-
-/**
- * @author Daniel Azarov
- */
-public interface TestableResolutionWithSelectionWizard {
- public void selectFirstElementAndRun(IMarker marker);
-}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken.java 2011-03-22 19:04:23 UTC (rev 29945)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.context.RequestScoped;
+
+@RequestScoped
+class Leopard_Broken
+{
+
+ public String name = "pete";
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken1.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken1.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken1.qfxresult 2011-03-22 19:04:23 UTC (rev 29945)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.context.RequestScoped;
+
+@RequestScoped
+class Leopard_Broken
+{
+
+ protected String name = "pete";
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken2.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken2.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Leopard_Broken2.qfxresult 2011-03-22 19:04:23 UTC (rev 29945)
@@ -0,0 +1,27 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.context.Dependent;
+
+@Dependent
+class Leopard_Broken
+{
+
+ public String name = "pete";
+
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-03-22 18:30:48 UTC (rev 29944)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-03-22 19:04:23 UTC (rev 29945)
@@ -36,13 +36,15 @@
import org.jboss.tools.cdi.ui.marker.AddSerializableInterfaceMarkerResolution;
import org.jboss.tools.cdi.ui.marker.DeleteAllDisposerDuplicantMarkerResolution;
import org.jboss.tools.cdi.ui.marker.DeleteAllInjectedConstructorsMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.MakeBeanScopedDependentMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.MakeFieldProtectedMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeFieldStaticMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeInjectedPointUnambiguousMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeMethodBusinessMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeMethodPublicMarkerResolution;
import org.jboss.tools.cdi.ui.marker.SelectBeanMarkerResolution;
import org.jboss.tools.cdi.ui.marker.TestableResolutionWithRefactoringProcessor;
-import org.jboss.tools.cdi.ui.marker.TestableResolutionWithSelectionWizard;
+import org.jboss.tools.cdi.ui.marker.TestableResolutionWithDialog;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.test.util.JobUtils;
@@ -120,8 +122,8 @@
}
rootChange.perform(new NullProgressMonitor());
- }else if(resolution instanceof TestableResolutionWithSelectionWizard){
- ((TestableResolutionWithSelectionWizard)resolution).selectFirstElementAndRun(marker);
+ }else if(resolution instanceof TestableResolutionWithDialog){
+ ((TestableResolutionWithDialog)resolution).runForTest(marker);
}else{
resolution.run(marker);
}
@@ -536,4 +538,32 @@
AddSerializableInterfaceMarkerResolution.class);
}
+ public void testMakeFieldProtectedResolution() throws CoreException {
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Leopard_Broken.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Leopard_Broken1.qfxresult"
+ },
+ MARKER_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD_ID,
+ MakeFieldProtectedMarkerResolution.class);
+ }
+
+ public void testMakeBeanScopedDependentResolution() throws CoreException {
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Leopard_Broken.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Leopard_Broken2.qfxresult"
+ },
+ MARKER_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD_ID,
+ MakeBeanScopedDependentMarkerResolution.class);
+ }
+
}
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29944 - branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-22 14:30:48 -0400 (Tue, 22 Mar 2011)
New Revision: 29944
Modified:
branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
JBIDE-8569
https://issues.jboss.org/browse/JBIDE-8569
Modified: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2011-03-22 18:29:41 UTC (rev 29943)
+++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2011-03-22 18:30:48 UTC (rev 29944)
@@ -1379,7 +1379,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="pre=true;category=general"
name="classification" xmlname="classification"/>
- <XModelAttribute PROPERTIES="pre=true;category=general"
+ <XModelAttribute
+ PROPERTIES="pre=true;category=general;valueFilter=org.jboss.tools.esb.ui.editor.attribute.MessageStoreClassValueFilter"
name="message store class" xmlname="message-store-class">
<Editor name="AccessibleJava"/>
</XModelAttribute>
@@ -1420,7 +1421,7 @@
default="org.jboss.soa.esb.actions.MessagePersister" name="class" xmlname="class">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=general;save=always;pre=true"
+ <XModelAttribute PROPERTIES="category=general;save=always;pre=true;valueFilter=org.jboss.tools.esb.ui.editor.attribute.MessageStoreClassValueFilter"
name="message store class" xmlname="message-store-class">
<Editor name="AccessibleJava"/>
</XModelAttribute>
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29943 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-22 14:29:41 -0400 (Tue, 22 Mar 2011)
New Revision: 29943
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
Log:
JBIDE-8569
https://issues.jboss.org/browse/JBIDE-8569
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2011-03-22 18:05:26 UTC (rev 29942)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2011-03-22 18:29:41 UTC (rev 29943)
@@ -1379,7 +1379,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="pre=true;category=general"
name="classification" xmlname="classification"/>
- <XModelAttribute PROPERTIES="pre=true;category=general"
+ <XModelAttribute
+ PROPERTIES="pre=true;category=general;valueFilter=org.jboss.tools.esb.ui.editor.attribute.MessageStoreClassValueFilter"
name="message store class" xmlname="message-store-class">
<Editor name="AccessibleJava"/>
</XModelAttribute>
@@ -1420,7 +1421,7 @@
default="org.jboss.soa.esb.actions.MessagePersister" name="class" xmlname="class">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=general;save=always;pre=true"
+ <XModelAttribute PROPERTIES="category=general;save=always;pre=true;valueFilter=org.jboss.tools.esb.ui.editor.attribute.MessageStoreClassValueFilter"
name="message store class" xmlname="message-store-class">
<Editor name="AccessibleJava"/>
</XModelAttribute>
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r29942 - branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-22 14:05:26 -0400 (Tue, 22 Mar 2011)
New Revision: 29942
Modified:
branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/ActionClassValueFilter.java
Log:
JBIDE-8569
https://issues.jboss.org/browse/JBIDE-8569
Modified: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/ActionClassValueFilter.java
===================================================================
--- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/ActionClassValueFilter.java 2011-03-22 18:03:10 UTC (rev 29941)
+++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/ActionClassValueFilter.java 2011-03-22 18:05:26 UTC (rev 29942)
@@ -36,12 +36,7 @@
static String AbstractActionPipelineProcessor = "org.jboss.soa.esb.actions.AbstractActionPipelineProcessor";
public boolean accept(String value) {
- if(value.startsWith("java.")
- || value.startsWith("javax.")
- || value.startsWith("com.sun.")
- || value.startsWith("sun.")
- || value.startsWith("org.apache.")
- ) {
+ if(ValueFilterHelper.isNotESBPackage(value)) {
return false;
}
boolean b = value.startsWith("org.jboss.soa.esb.actions.")
@@ -74,12 +69,7 @@
public boolean init(XModelObject context, XAttribute attribute) {
project = EclipseResourceUtil.getProject(context);
- try {
- IJavaProject jp = EclipseResourceUtil.getJavaProject(project);
- return jp != null && (EclipseJavaUtil.findType(jp, AbstractActionLifecycle) != null);
- } catch (JavaModelException e) {
- return false;
- }
+ return ValueFilterHelper.isInClassPath(project, AbstractActionLifecycle);
}
}
13 years, 10 months
- 1
- 0