JBoss Tools SVN: r17220 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-08-21 09:08:48 -0400 (Fri, 21 Aug 2009)
New Revision: 17220
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/AbstractWebProjectTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4798
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/AbstractWebProjectTemplate.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/AbstractWebProjectTemplate.java 2009-08-21 13:05:13 UTC (rev 17219)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/AbstractWebProjectTemplate.java 2009-08-21 13:08:48 UTC (rev 17220)
@@ -198,8 +198,11 @@
public void removePageTemplate(String name) {
File dir = new File(getPageTemplatesLocation());
- dir = new File(dir, getNatureDir());
File target = new File(dir, name);
+ if(!target.isFile()) {
+ dir = new File(dir, getNatureDir());
+ }
+ target = new File(dir, name);
if(target.isFile()) {
if(!confirm(NLS.bind(WebUIMessages.YOU_WANT_TO_DELETE_PAGE_TEMPLATE,name))) return;
target.delete();
16 years, 4 months
JBoss Tools SVN: r17219 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-08-21 09:05:13 -0400 (Fri, 21 Aug 2009)
New Revision: 17219
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/AbstractPagesPreferencesPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4797
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/AbstractPagesPreferencesPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/AbstractPagesPreferencesPage.java 2009-08-21 12:54:34 UTC (rev 17218)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/AbstractPagesPreferencesPage.java 2009-08-21 13:05:13 UTC (rev 17219)
@@ -158,7 +158,8 @@
String nameNewItem = helper.addPageTemplate();
boolean cancel = false;
pages = helper.getPageTemplateList();
- listPages.setItems(pages);
+ pageLabels = initLabels(pages, defaultPage);
+ listPages.setItems(pageLabels);
if (nameNewItem != null) {
int ind = listPages.indexOf(nameNewItem);
listPages.select(ind);
@@ -187,7 +188,8 @@
String namePage = listPages.getItem(indexDel);
helper.removePageTemplate(namePage);
pages = helper.getPageTemplateList();
- listPages.setItems(pages);
+ pageLabels = initLabels(pages, defaultPage);
+ listPages.setItems(pageLabels);
}
removeButton.setEnabled(false);
16 years, 4 months
JBoss Tools SVN: r17218 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2009-08-21 08:54:34 -0400 (Fri, 21 Aug 2009)
New Revision: 17218
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
Log:
JBIDE-1460:
https://jira.jboss.org/jira/browse/JBIDE-1460
- JUnit fixed
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml 2009-08-21 12:46:46 UTC (rev 17217)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml 2009-08-21 12:54:34 UTC (rev 17218)
@@ -7,7 +7,7 @@
<h:form>
<rich:tree style="width:300px" switchType="ajax" stateAdvisor="#{treeDemoStateAdvisor}">
- <rich:recursiveTreeNodesAdaptor roots="#{fileSystemBean.sourceRoots}" var="item" nodes="#{item.nodes}" />
+ <rich:recursiveTreeNodesAdaptor id="treeNodes" roots="#{fileSystemBean.sourceRoots}" var="item" nodes="#{item.nodes}" />
</rich:tree>
</h:form>
</ui:composition>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml.xml 2009-08-21 12:54:34 UTC (rev 17218)
@@ -0,0 +1,23 @@
+<tests>
+ <test id="treeNodes">
+ <DIV>
+ <TABLE>
+ <TBODY>
+ <TR>
+ <TD>
+ <IMG/>
+ </TD>
+ <TD>
+ <IMG/>
+ </TD>
+ <TD>
+ <SPAN>
+ #{item.nodes}
+ </SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2009-08-21 12:46:46 UTC (rev 17217)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2009-08-21 12:54:34 UTC (rev 17218)
@@ -10,81 +10,32 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.vpe.editor.util.HTML;
-import org.jboss.tools.vpe.ui.test.TestUtil;
-import org.jboss.tools.vpe.ui.test.VpeTest;
-import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
+import org.jboss.tools.vpe.ui.test.ComponentContentTest;
/**
* Test JBIDE-1460
*
* @author dsakovich(a)exadel.com
+ * @author yradtsevich
*
*/
-public class JBIDE1460Test extends VpeTest {
-
- private static final String TEST_PAGE_NAME = "JBIDE/1460/JBIDE-1460.xhtml"; //$NON-NLS-1$
-
+public class JBIDE1460Test extends ComponentContentTest {
public JBIDE1460Test(String name) {
- super(name);
+ super(name);
}
// test method for JBIDE 1460
public void testJBIDE_1460() throws Throwable {
- // wait
- TestUtil.waitForJobs();
- // set exception
- setException(null);
+ performContentTest( "JBIDE/1460/JBIDE-1460.xhtml"); //$NON-NLS-1$
+ }
- // get test page path
- IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
- JsfAllTests.IMPORT_PROJECT_NAME);
-
- assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME//$NON-NLS-1$
- + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
-
- IEditorInput input = new FileEditorInput(file);
-
- assertNotNull("Editor input is null", input); //$NON-NLS-1$
- // open and get editor
- JSPMultiPageEditor part = openEditor(input);
-
- // get dom document
- nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
- nsIDOMElement element = document.getDocumentElement();
-
- // check that element is not null
- assertNotNull(element);
-
- // get root node
- nsIDOMNode node = (nsIDOMNode) element
- .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
-
- List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>();
-
- // find "span" elements
- TestUtil.findElementsByName(node, elements, HTML.TAG_SPAN);
-
- assertEquals(3, elements.size());
-
- nsIDOMNode span = elements.get(0);
-
- nsIDOMNode text = span.getFirstChild();
- assertEquals(text.getNodeValue().trim(), "#{item.nodes}"); //$NON-NLS-1$
-
- if (getException() != null) {
- throw getException();
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.ui.test.ComponentContentTest#getTestProjectName()
+ */
+ @Override
+ protected String getTestProjectName() {
+ return JsfAllTests.IMPORT_PROJECT_NAME;
}
- }
}
16 years, 4 months
JBoss Tools SVN: r17217 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits@lists.jboss.org
Author: chukhutsina
Date: 2009-08-21 08:46:46 -0400 (Fri, 21 Aug 2009)
New Revision: 17217
Added:
trunk/jsf/docs/userguide/en/modules/css_perspective.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-825 - JBoss CSS Editing Perspective was described in Doc - VisualWebTools:new chapter CSS Editing Perspective was created. </p>
</body></html>
Added: trunk/jsf/docs/userguide/en/modules/css_perspective.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/css_perspective.xml (rev 0)
+++ trunk/jsf/docs/userguide/en/modules/css_perspective.xml 2009-08-21 12:46:46 UTC (rev 17217)
@@ -0,0 +1,226 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<chapter id="css_perspective" xreflabel="css_perspective">
+ <?dbhtml filename="css_perspective.html"?>
+ <chapterinfo>
+ <keywordset>
+ <keyword>CSS Editing Perspective</keyword>
+ <keyword>css</keyword>
+ <keyword>html</keyword>
+ </keywordset>
+ </chapterinfo>
+ <title>CSS Editing Perspective</title>
+ <para>The CSS Editing Perspective combines a set of views which allow you to see the structure of
+ your css files,edit them and see the results.
+ To use this perspective you need to choose <emphasis><property>Window >Open Perspective> CSS Editing </property></emphasis>
+ .All of the views are fully synchronized with each other:the changes being made in one view are reflected in othes at once.</para>
+ <para>In CSS Editing Perspective you can change your css file in three ways:</para>
+ <itemizedlist>
+ <listitem>
+ <para>directly in your CSS Editor
+ </para>
+ </listitem>
+ <listitem>
+ <para>using <link linkend="CSSPropertiesView">CSS Properties view</link>
+ </para>
+ </listitem>
+ <listitem>
+ <para>using <link linkend="PropertiesView">Properties view</link>
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <figure>
+ <title>CSS Editing Perspective</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <section id="OutlineView">
+ <?dbhtml filename="OutlineView.html"?>
+ <title>Outline view</title>
+ <para>Using this view you can easily skip between the selectors described in the source files,
+ see the list of properties in any selector just by clicking the triangle near it.
+ </para>
+
+ <figure>
+ <title>Outline view</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor1.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>You can use the Source viewer with the Outline view to navigate around the file.
+ To do this you should just left click the selector or property you want and it will be automatically highlighted in the source code:
+ </para>
+ <figure>
+ <title>Navigating around the file</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+
+
+ <section id="PropertiesView">
+ <?dbhtml filename="PropertiesView.html"?>
+ <title>Properties view</title>
+ <para>Properties view provides a full list of properties of a chosen selector.
+ The properties are divided into logic groups for better navigation.
+ </para>
+
+ <figure>
+ <title>Properties view</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor3.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>With the help of Properties view you have also the possibility to edit the css file by adding/editing/removing properties in the selector.
+ Left click the "<emphasis><property>Value</property></emphasis>" field near the property you want to edit and write the changes in the text field.
+ </para>
+
+ <figure>
+ <title>Updating css using Properties view</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor4.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ </section>
+ <section id="CSSPropertiesView">
+ <?dbhtml filename="CSSPropertiesView.html"?>
+ <title>CSS Properties view </title>
+ <para>CSS Properties view has five tabs:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para><link linkend="text_font">Text/Font</link>
+ </para>
+ </listitem>
+ <listitem>
+ <para><link linkend="background">Background</link></para>
+ </listitem>
+ <listitem>
+ <para><link linkend="boxes">Boxes</link></para>
+ </listitem>
+ <listitem>
+ <para><link linkend="property_sheet">Property Sheet</link></para>
+ </listitem>
+ <listitem>
+ <para><link linkend="edited_properties">Edited Properties</link></para>
+ </listitem>
+ </itemizedlist>
+
+ <itemizedlist>
+ <listitem>
+ <para id="text_font">CSS Text/Font properties define the appearance of text,its font family, boldness, size, and the style.
+ </para>
+ <figure>
+ <title>Text/Font tab</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor5.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>For example, to define the "<emphasis><property>font-family</property></emphasis>" property you should click <emphasis><property>Choose font family</property></emphasis> button( <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor7.png"/>
+ </imageobject>
+ </inlinemediaobject>) near <emphasis><property>Font Family</property></emphasis> text field
+ and select the fonts you want to use from the list.</para>
+ <figure>
+ <title>CSS Text/Font tab</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor6.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ When you click <emphasis><property>Ok</property></emphasis> the chosen fonts should appear in <emphasis><property>Font Family</property></emphasis> text field and in the sourse css file.
+ To define other properties in CSS <emphasis><property>Text/Font</property></emphasis> tab you should just click button near the
+ corresponding field you want and select the appropriate option in the list.
+ Or if you are absolutely sure of the property's value to use you can just write it in the text field.
+ </para>
+
+ </listitem>
+ <listitem><para id="background">
+ You should use CSS background properties and <emphasis><property>Background</property></emphasis> tab to define the background effects of an element.
+
+ </para>
+ <para id="boxes"><emphasis><property>Boxes</property></emphasis> tab is used to define CSS border properties and the box model.
+ The CSS border properties allow you to specify the style and color of an element's border.
+ </para>
+ <para>As well as in Text/Font tab, it's also possible to define the property in two ways:</para>
+ <itemizedlist>
+ <listitem><para>clicking <inlinemediaobject> <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor8.png"/>
+ </imageobject></inlinemediaobject>and choosing it from the list of options:
+ <figure>
+ <title>Defining the property</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor9.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </para>
+ </listitem>
+ <listitem>
+ <para> writing the property in the appropriate text field
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem><para id="property_sheet"><emphasis><property>Property Sheet</property></emphasis> tab contains the categorized list of properties.
+ Like in <link linkend="PropertiesView">Properties view</link> it's possible to edit the properties values.</para>
+ <figure>
+ <title>Property Sheet tab</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor10.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </listitem>
+ <listitem>
+ <para id="edited_properties"><emphasis><property>Edited Properties</property></emphasis> tab contains only the properties,defined in the selector.</para>
+ <figure>
+ <title>Property Sheet tab</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor11.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>It's also possible to edit the properties in the tab.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+ <section id="CSSPreview">
+ <?dbhtml filename="CSSPropertiesView.html"?>
+ <title>CSS Preview</title>
+ <para>Using CSS Preview you can see how a selector affects any text.</para>
+ <figure>
+ <title>Property Sheet tab</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/css_perspective/cssEditor12.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>The preview is also edited by double click.You can write instead the default text any text you want,including html tags.</para>
+ </section>
+
+</chapter>
+
16 years, 4 months
JBoss Tools SVN: r17216 - trunk/jsf/docs/userguide/en/images/editors_features.
by jbosstools-commits@lists.jboss.org
Author: chukhutsina
Date: 2009-08-21 08:30:51 -0400 (Fri, 21 Aug 2009)
New Revision: 17216
Modified:
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_5.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_6.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_7.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8.png
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-720 -Screens of VPE were updated.</p>
</body></html>
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_5.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_6.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_7.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_8.png
===================================================================
(Binary files differ)
16 years, 4 months
JBoss Tools SVN: r17215 - in trunk: vpe/plugins/org.jboss.tools.vpe.resref and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2009-08-21 08:06:55 -0400 (Fri, 21 Aug 2009)
New Revision: 17215
Removed:
trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/BaseAddReferenceSupport.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeAddReferenceSupport.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCSSFileValidator.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCSSReferenceSupport.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeELReferenceSupport.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeElVariableValidator.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeTaglibReferenceSupport.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeTaglibValidator.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4547, old classes of the VpeResourcesDialog were removed, plugin.xml was corrected, "Help" button was removed.
Deleted: trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/BaseAddReferenceSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/BaseAddReferenceSupport.java 2009-08-21 12:04:33 UTC (rev 17214)
+++ trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/BaseAddReferenceSupport.java 2009-08-21 12:06:55 UTC (rev 17215)
@@ -1,123 +0,0 @@
-package org.jboss.tools.common.resref.ui;
-
-import java.util.Properties;
-
-import org.eclipse.core.resources.IFile;
-import org.jboss.tools.common.meta.action.XActionInvoker;
-import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
-import org.jboss.tools.common.meta.constraint.XAttributeConstraintL;
-import org.jboss.tools.common.model.XModel;
-import org.jboss.tools.common.model.XModelException;
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.options.PreferenceModelUtilities;
-import org.jboss.tools.common.resref.core.ResourceReference;
-
-public abstract class BaseAddReferenceSupport extends SpecialWizardSupport {
-
- public static boolean add(IFile file, ResourceReference css, ResourceReference[] list, String entity) {
- return run(file, css, list, "CreateActions.AddItem", entity); //$NON-NLS-1$
- }
-
- public static boolean edit(IFile file, ResourceReference css, ResourceReference[] list,
- String entity) {
- return run(file, css, list, "EditActions.EditItem", entity); //$NON-NLS-1$
- }
-
- private static boolean run(IFile file, ResourceReference css, ResourceReference[] list,
- String action, String entity) {
- XModel model = PreferenceModelUtilities.getPreferenceModel();
- XModelObject object = model.createModelObject(entity, null);
- object.setAttributeValue("location", css.getLocation()); //$NON-NLS-1$
- if(object.getAttributeValue("prefix") != null) { //$NON-NLS-1$
- object.setAttributeValue("prefix", css.getProperties()); //$NON-NLS-1$
- }
- Properties p = new Properties();
- p.put("resourceReference", css); //$NON-NLS-1$
- p.put("scope",Integer.valueOf(css.getScope())); //$NON-NLS-1$
- p.put("list", list); //$NON-NLS-1$
- if(file != null) p.put("file", file); //$NON-NLS-1$
- XActionInvoker.invoke(action, object, p);
- boolean ok = "true".equals(p.getProperty("okPressed")); //$NON-NLS-1$ //$NON-NLS-2$
- if(ok) {
- css.setLocation(object.getAttributeValue("location")); //$NON-NLS-1$
- Integer scope = (Integer)p.get("scope"); //$NON-NLS-1$
-
- css.setScope(scope.intValue());
- if(css.isGlobal()){
- css.setScope(ResourceReference.GLOBAL_SCOPE);
- }
- String properties = object.getAttributeValue("prefix"); //$NON-NLS-1$
- if(properties != null) css.setProperties(properties);
- }
- return ok;
- }
-
- protected IFile file = null;
- String initialLocation;
- String initialPrefix;
- ResourceReference[] list;
- String[] scopeNames;
-
- public BaseAddReferenceSupport() {
- super();
- }
-
- protected void reset() {
- initialLocation = getTarget().getAttributeValue("location"); //$NON-NLS-1$
- setAttributeValue(0, "location", initialLocation); //$NON-NLS-1$
- initialPrefix = getTarget().getAttributeValue("prefix"); //$NON-NLS-1$
- if(initialPrefix != null) {
- setAttributeValue(0, "prefix", initialPrefix); //$NON-NLS-1$
- }
- if(getTarget().getModelEntity().getAttribute("scope") != null) { //$NON-NLS-1$
- final XAttributeConstraintL scopeAttribute = ((XAttributeConstraintL) getTarget().getModelEntity().getAttribute("scope") //$NON-NLS-1$
- .getConstraint());
- if (scopeAttribute != null) {
- scopeNames = scopeAttribute.getValues();
- }
- } else {
- //just in case. should not happen
- scopeNames = ResourceReference.SCOPE_NAMES;
- }
- int scopeIndex = ((Integer)getProperties().get("scope")).intValue(); //$NON-NLS-1$
-
- if(scopeIndex == 1 && scopeNames.length == 1){
- scopeIndex = 0;
- }else if(scopeIndex > scopeNames.length){
- scopeIndex = scopeNames.length -1;
- }
- String scope = scopeNames[scopeIndex];
- setAttributeValue(0, "scope", scope); //$NON-NLS-1$
- list = (ResourceReference[])getProperties().get("list"); //$NON-NLS-1$
- file = (IFile)getProperties().get("file"); //$NON-NLS-1$
- }
-
- public void action(String name) throws XModelException {
- if(OK.equals(name) || FINISH.equals(name)) {
- execute();
- setFinished(true);
- getProperties().setProperty("okPressed", "true"); //$NON-NLS-1$ //$NON-NLS-2$
- } else if(CANCEL.equals(name)) {
- setFinished(true);
- }
- }
-
- protected void execute() throws XModelException {
- Properties p0 = extractStepData(0);
- getTarget().setAttributeValue("location", p0.getProperty("location")); //$NON-NLS-1$ //$NON-NLS-2$
- if(p0.containsKey("prefix")) { //$NON-NLS-1$
- getTarget().setAttributeValue("prefix", p0.getProperty("prefix")); //$NON-NLS-1$ //$NON-NLS-2$
- }
- int scope = getSelectedScope(p0);
- getProperties().put("scope", Integer.valueOf(scope)); //$NON-NLS-1$
- }
-
- public int getSelectedScope(Properties p0) {
- String scopeName = p0.getProperty("scope"); //$NON-NLS-1$
- for (int i = 0; i < scopeNames.length; i++) {
- if(scopeNames[i].equals(scopeName)) return i;
- }
- return 0;
- }
-
-}
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/plugin.xml 2009-08-21 12:04:33 UTC (rev 17214)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/plugin.xml 2009-08-21 12:06:55 UTC (rev 17215)
@@ -1,14 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<plugin>
- <extension point="org.jboss.tools.common.model.classes">
- <xclass id="org.jboss.tools.vpe.resref.core.VpeAddReferenceSupport"
- class="org.jboss.tools.vpe.resref.core.VpeAddReferenceSupport"/>
- <xclass id="org.jboss.tools.vpe.resref.core.VpeELReferenceSupport"
- class="org.jboss.tools.vpe.resref.core.VpeELReferenceSupport"/>
- <xclass id="org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport"
- class="org.jboss.tools.vpe.resref.core.VpeCSSReferenceSupport"/>
- <xclass id="org.jboss.tools.vpe.resref.core.VpeTaglibReferenceSupport"
- class="org.jboss.tools.vpe.resref.core.VpeTaglibReferenceSupport"/>
- </extension>
+
</plugin>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java 2009-08-21 12:04:33 UTC (rev 17214)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java 2009-08-21 12:06:55 UTC (rev 17215)
@@ -28,8 +28,9 @@
public ReferenceWizard(Object fileLocation, String windowTitle) {
super();
this.fileLocation = fileLocation;
+ setWindowTitle(windowTitle);
+ setHelpAvailable(false);
createPage();
- setWindowTitle(windowTitle);
}
public void createPageControls(Composite pageContainer, Object fileLocation) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java 2009-08-21 12:04:33 UTC (rev 17214)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardDialog.java 2009-08-21 12:06:55 UTC (rev 17215)
@@ -22,21 +22,19 @@
public ReferenceWizardDialog(Shell parentShell, ReferenceWizard newWizard, ResourceReference resref) {
super(parentShell, newWizard);
this.resref = resref;
+ setHelpAvailable(false);
}
-
- @Override
- protected void constrainShellSize() {
- super.constrainShellSize();
- }
@Override
public int open() {
/*
- * Get Resouce Reference dialog.
+ * Get Resource Reference wizard.
*/
ReferenceWizard wizard = (ReferenceWizard) getWizard();
+
/*
- * Read values from resref when editing.
+ * Read values from resref when editing
+ * and send it to the wizard.
*/
wizard.setResref(resref);
@@ -44,12 +42,15 @@
* Open the dialog
*/
int returnCode = super.open();
+
/*
- * If Finish pressed - store new values in the resref.
+ * If Finish pressed - store new values in the resref
+ * and than it'll be saved in the appropriate ResourceReferenceComposite
*/
if (Dialog.OK == returnCode) {
resref = wizard.getResref();
}
+
return returnCode;
}
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeAddReferenceSupport.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeAddReferenceSupport.java 2009-08-21 12:04:33 UTC (rev 17214)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeAddReferenceSupport.java 2009-08-21 12:06:55 UTC (rev 17215)
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.resref.core;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.jboss.tools.common.model.XModel;
-import org.jboss.tools.common.model.project.IModelNature;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.resref.ui.BaseAddReferenceSupport;
-import org.jboss.tools.jst.web.project.WebProject;
-import org.jboss.tools.jst.web.tld.TaglibMapping;
-
-public class VpeAddReferenceSupport extends BaseAddReferenceSupport {
-
- void setURIList() {
- if(file == null) return;
- if(getEntityData()[0].getModelEntity().getName().startsWith("VPETLD")) { //$NON-NLS-1$
- Set set = new TreeSet();
- IModelNature n = EclipseResourceUtil.getModelNature(file.getProject());
- if(n == null) return;
- XModel model = n.getModel();
- TaglibMapping taglibs = WebProject.getInstance(model).getTaglibMapping();
- Map map = taglibs.getTaglibObjects();
- Iterator it = map.keySet().iterator();
- while(it.hasNext()) {
- String s = it.next().toString();
- set.add(taglibs.resolveURI(s));
- }
- String[] uris = (String[])set.toArray(new String[0]);
- setValueList(0, "location", uris); //$NON-NLS-1$
- }
- }
-
-}
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCSSFileValidator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCSSFileValidator.java 2009-08-21 12:04:33 UTC (rev 17214)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCSSFileValidator.java 2009-08-21 12:06:55 UTC (rev 17215)
@@ -1,53 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2007 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.vpe.resref.core;
-
-import java.io.File;
-import java.util.Properties;
-
-import org.eclipse.osgi.util.NLS;
-import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator;
-import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
-import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
-
-/**
- * @author mareshkau
- *
- */
-public class VpeCSSFileValidator extends DefaultWizardDataValidator {
-
- /**
- *
- * @param support
- * @param step
- */
- public VpeCSSFileValidator(SpecialWizardSupport support, int step) {
- super.setSupport(support, step);
- }
- /* (non-Javadoc)
- * @see org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator#validate(java.util.Properties)
- */
- @Override
- public void validate(Properties data) {
-
- super.validate(data);
-
- if( (getErrorMessage()!=null) ||
- (getWarningMessage()!=null)) {
- return;
- }
- String location = (String) data.get("location"); //$NON-NLS-1$
- if(!new File(location).isFile()) {
- message = NLS.bind(WebUIMessages.FILE_DOESNOT_EXIST,location);
- }
-
- }
-}
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCSSReferenceSupport.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCSSReferenceSupport.java 2009-08-21 12:04:33 UTC (rev 17214)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCSSReferenceSupport.java 2009-08-21 12:06:55 UTC (rev 17215)
@@ -1,34 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2007 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.vpe.resref.core;
-
-import org.jboss.tools.common.meta.action.impl.WizardDataValidator;
-
-/**
- * @author mareshkau
- *
- */
-public class VpeCSSReferenceSupport extends VpeAddReferenceSupport{
-
- private WizardDataValidator wizardDataValidator;
- /* (non-Javadoc)
- * @see org.jboss.tools.common.meta.action.impl.SpecialWizardSupport#getValidator(int)
- */
- @Override
- public WizardDataValidator getValidator(int step) {
- if(this.wizardDataValidator==null) {
-
- this.wizardDataValidator = new VpeCSSFileValidator(this, step);
- }
- return this.wizardDataValidator;
- }
-
-}
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeELReferenceSupport.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeELReferenceSupport.java 2009-08-21 12:04:33 UTC (rev 17214)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeELReferenceSupport.java 2009-08-21 12:06:55 UTC (rev 17215)
@@ -1,31 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2007-2008 Red Hat, Inc.
-* Distributed under license by Red Hat, Inc. All rights reserved.
-* This program is made available under the terms of the
-* Eclipse Public License v1.0 which accompanies this distribution,
-* and is available at http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributor:
-* Red Hat, Inc. - initial API and implementation
-******************************************************************************/
-package org.jboss.tools.vpe.resref.core;
-
-import org.jboss.tools.common.meta.action.impl.WizardDataValidator;
-import org.jboss.tools.common.resref.core.ResourceReference;
-
-/**
- * @author mareshkau
- *
- */
-public class VpeELReferenceSupport extends VpeAddReferenceSupport {
- /* (non-Javadoc)
- * @see org.jboss.tools.common.meta.action.impl.SpecialWizardSupport#getValidator(int)
- */
- @Override
- public WizardDataValidator getValidator(int step) {
- ResourceReference[] currentReferenceList = (ResourceReference[])p.get("list"); //$NON-NLS-1$
- ResourceReference editingReference = (ResourceReference)p.get("resourceReference"); //$NON-NLS-1$
- return new VpeElVariableValidator(this, getStepId(), currentReferenceList, editingReference);
- }
-
-}
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeElVariableValidator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeElVariableValidator.java 2009-08-21 12:04:33 UTC (rev 17214)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeElVariableValidator.java 2009-08-21 12:06:55 UTC (rev 17215)
@@ -1,82 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2007-2008 Red Hat, Inc.
-* Distributed under license by Red Hat, Inc. All rights reserved.
-* This program is made available under the terms of the
-* Eclipse Public License v1.0 which accompanies this distribution,
-* and is available at http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributor:
-* Red Hat, Inc. - initial API and implementation
-******************************************************************************/
-package org.jboss.tools.vpe.resref.core;
-
-import java.util.Properties;
-
-import org.jboss.tools.common.el.core.model.ELModel;
-import org.jboss.tools.common.el.core.parser.ELParser;
-import org.jboss.tools.common.el.core.parser.ELParserUtil;
-import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator;
-import org.jboss.tools.common.resref.core.ResourceReference;
-import org.jboss.tools.common.resref.ui.BaseAddReferenceSupport;
-
-/**
- * @author mareshkau
- *
- */
-public class VpeElVariableValidator extends DefaultWizardDataValidator {
- private ResourceReference[] currentReferenceList;
- private ResourceReference editingReference;
-
- /**
- *
- * @param support
- * @param step
- * @param resourceReferences
- * @param editingReference
- */
- public VpeElVariableValidator(BaseAddReferenceSupport support, int step, ResourceReference[] currentReferenceList, ResourceReference editingReference) {
- super.setSupport(support, step);
- this.currentReferenceList = currentReferenceList;
- this.editingReference = editingReference;
- }
-
- /* (non-Javadoc)
- * @see org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator#validate(java.util.Properties)
- */
- @Override
- public void validate(Properties data) {
-
- super.validate(data);
- if( (getErrorMessage()!=null) ||
- (getWarningMessage()!=null)) {
- return;
- }
- String location = (String) data.get("location"); //$NON-NLS-1$
- ELParser elParser = ELParserUtil.getDefaultFactory().createParser();
- ELModel model = elParser.parse("#{"+location+'}'); //$NON-NLS-1$
- if(model == null || model.getSyntaxErrors().size()>0) {
- message = Messages.INVALID_EL_EXPRESSION;
- } else {
- // yradtsevich: JBIDE-3576: EL expression overriding
- // check if there is no another EL reference in the same scope with the same name
-
- int selectedScope = ((BaseAddReferenceSupport)support).getSelectedScope(data);
-
- /* XXX yradtsevich: BaseAddReferenceSupport.getSelectedScope(...) returns an
- * incorrect scope if the scope is global. So we need to fix it. */
- if (editingReference.isGlobal()) {
- selectedScope = ResourceReference.GLOBAL_SCOPE;
- }
-
- for (ResourceReference listItemReference : currentReferenceList) {
- if (editingReference != listItemReference
- && listItemReference.getScope() == selectedScope
- && location.equals(listItemReference.getLocation())) {
- message = Messages.EL_EXPRESSION_ALREADY_EXISTS;
- break;
- }
- }
- }
- }
-
-}
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeTaglibReferenceSupport.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeTaglibReferenceSupport.java 2009-08-21 12:04:33 UTC (rev 17214)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeTaglibReferenceSupport.java 2009-08-21 12:06:55 UTC (rev 17215)
@@ -1,36 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2007 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.vpe.resref.core;
-
-import org.jboss.tools.common.meta.action.impl.WizardDataValidator;
-
-/**
- * @author mareshkau
- *
- */
-public class VpeTaglibReferenceSupport extends VpeAddReferenceSupport {
-
- private WizardDataValidator wizardDataValidator;
-
- /* (non-Javadoc)
- * @see org.jboss.tools.common.meta.action.impl.SpecialWizardSupport#getValidator(int)
- */
- @Override
- public WizardDataValidator getValidator(int step) {
-
- if(this.wizardDataValidator == null) {
-
- wizardDataValidator = new VpeTaglibValidator(this, step);
- }
-
- return this.wizardDataValidator;
- }
-}
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeTaglibValidator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeTaglibValidator.java 2009-08-21 12:04:33 UTC (rev 17214)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeTaglibValidator.java 2009-08-21 12:06:55 UTC (rev 17215)
@@ -1,61 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2007 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.vpe.resref.core;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Properties;
-
-import org.eclipse.osgi.util.NLS;
-import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator;
-import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
-import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
-
-/**
- * @author mareshkau
- *
- */
-public class VpeTaglibValidator extends DefaultWizardDataValidator {
-
- /**
- *
- * @param support
- * @param step
- */
- public VpeTaglibValidator(SpecialWizardSupport support, int step) {
- super.setSupport(support, step);
- }
- /* (non-Javadoc)
- * @see org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator#validate(java.util.Properties)
- */
- @Override
- public void validate(Properties data) {
- super.validate(data);
- if( (getErrorMessage()!=null) ||
- (getWarningMessage()!=null)) {
- return;
- }
- String uriStr = (String) data.get("location"); //$NON-NLS-1$
- String prefix = (String) data.get("prefix");//$NON-NLS-1$
- String nameStrt = "[A-Za-z_]|[^\\x00-\\x7F]"; //$NON-NLS-1$
- String nameChar = "[A-Za-z0-9_.-]|[^\\x00-\\x7F]"; //$NON-NLS-1$
- String name = '(' + nameStrt + ')'+'(' + nameChar + ")*"; //$NON-NLS-1$
-
- try {
- new URI(uriStr);
- }catch (URISyntaxException ex) {
- message = NLS.bind(WebUIMessages.INCORRECT_URI,uriStr);
- }
- if((prefix!=null)&&(!prefix.matches(name))){
- message = NLS.bind(WebUIMessages.INCORRECT_PREFIX,prefix);
- }
- }
-}
16 years, 4 months
JBoss Tools SVN: r17214 - in trunk/hibernatetools: plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties and 8 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2009-08-21 08:04:33 -0400 (Fri, 21 Aug 2009)
New Revision: 17214
Added:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertiesConstants.java
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumn.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntity.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ContentAssistTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4803
project rebuild updated
added option to disable using naming strategy
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -103,6 +103,7 @@
public static String HibernatePropertyPage_enable_hibernate3_support;
public static String HibernatePropertyPage_open_url;
public static String HibernatePropertyPage_unable_open_webbrowser_for_url;
+ public static String HibernatePropertyPage_use_naming_strategy;
//
public static String AutoResizeTableLayout_unknown_column_layout_data;
public static String ClassLoaderHelper_could_not_determine_physical_location_for;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-08-21 12:04:33 UTC (rev 17214)
@@ -96,6 +96,7 @@
HibernatePropertyPage_enable_hibernate3_support=Enable Hibernate 3 support
HibernatePropertyPage_open_url=Open URL
HibernatePropertyPage_unable_open_webbrowser_for_url=Unable to open webbrowser for url:
+HibernatePropertyPage_use_naming_strategy=Use NamingStrategy for validation.
AutoResizeTableLayout_unknown_column_layout_data=Unknown column layout data
ClassLoaderHelper_could_not_determine_physical_location_for=Could not determine physical location for
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertiesConstants.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertiesConstants.java (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertiesConstants.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.hibernate.eclipse.console.properties;
+
+import org.hibernate.eclipse.nature.HibernateNature;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class HibernatePropertiesConstants {
+
+ public static final String HIBERNATE_NATURE = HibernateNature.ID;
+
+ public static final String NAMING_STRATEGY_ENABLED = "namingStrategy.enabled"; //$NON-NLS-1$
+
+ public static final String DEFAULT_CONFIGURATION = "default.configuration"; //$NON-NLS-1$
+
+ public static final String HIBERNATE3_ENABLED = "hibernate3.enabled"; //$NON-NLS-1$
+
+ public static final String HIBERNATE_CONSOLE_NODE = "org.hibernate.eclipse.console"; //$NON-NLS-1$
+
+ public static final String HIBERNATE_JPA_PLATFORM_ID = "hibernate"; //$NON-NLS-1$
+
+}
Property changes on: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertiesConstants.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -21,18 +21,29 @@
*/
package org.hibernate.eclipse.console.properties;
+import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jpt.core.JpaProject;
+import org.eclipse.jpt.core.internal.JpaModelManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -55,6 +66,7 @@
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.EclipseImages;
import org.hibernate.eclipse.console.utils.ProjectUtils;
+import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
public class HibernatePropertyPage extends PropertyPage {
@@ -64,6 +76,12 @@
private Button enableHibernate;
private Combo selectedConfiguration;
+
+ private Button enableNamingStrategy;
+
+ private Label nsSeparator;
+
+ private boolean initNamingStrategy;
/**
@@ -99,9 +117,6 @@
enableSettings(selection);
}
});
-
-
-
}
private void createLogoButtons(Composite composite) {
@@ -159,12 +174,13 @@
return retu.toString();
}
- private void addSeparator(Composite parent) {
+ private Label addSeparator(Composite parent) {
Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
GridData gridData = new GridData();
gridData.horizontalAlignment = GridData.FILL;
gridData.grabExcessHorizontalSpace = true;
separator.setLayoutData(gridData);
+ return separator;
}
private void addSecondSection(Composite parent) {
@@ -187,8 +203,15 @@
}
settings = new Control[] { ownerLabel, selectedConfiguration };
-
}
+
+ private void addThirdSection(Composite parent) {
+ Composite settingsPart = createDefaultComposite(parent,2);
+
+ enableNamingStrategy = new Button(settingsPart, SWT.CHECK);
+ enableNamingStrategy.setText(HibernateConsoleMessages.HibernatePropertyPage_use_naming_strategy);
+ enableNamingStrategy.setSelection(initNamingStrategy);
+ }
/**
* @see PreferencePage#createContents(Composite)
@@ -203,8 +226,11 @@
addFirstSection(composite);
addSeparator(composite);
- addSecondSection(composite);
+ addSecondSection(composite);
addSeparator(composite);
+ addThirdSection(composite);
+ nsSeparator = addSeparator(composite);
+
addLogoSection(composite);
loadValues();
enableSettings(enableHibernate.getSelection() );
@@ -230,6 +256,11 @@
enableHibernate.setSelection(false);
selectedConfiguration.setText(""); //$NON-NLS-1$
}
+
+ private boolean isHibernateJpaProject(){
+ JpaProject jpaProject = (JpaProject) getProject().getAdapter(JpaProject.class);
+ return (jpaProject != null) && (jpaProject.getJpaPlatform().getId().equals(HibernatePropertiesConstants.HIBERNATE_JPA_PLATFORM_ID));
+ }
private IProject getProject() {
IAdaptable adaptable= getElement();
@@ -242,27 +273,89 @@
return null;
}
+ @Override
+ public void setVisible(boolean visible) {
+ //loadValues();
+ nsSeparator.setVisible(isHibernateJpaProject());
+ enableNamingStrategy.setVisible(isHibernateJpaProject());
+ super.setVisible(visible);
+ }
public void loadValues() {
IProject project = getProject();
IScopeContext scope = new ProjectScope(project);
- Preferences node = scope.getNode("org.hibernate.eclipse.console"); //$NON-NLS-1$
+ Preferences node = scope.getNode(HibernatePropertiesConstants.HIBERNATE_CONSOLE_NODE);
if(node!=null) {
- enableHibernate.setSelection(node.getBoolean("hibernate3.enabled", false) ); //$NON-NLS-1$
- String cfg = node.get("default.configuration", project.getName() ); //$NON-NLS-1$
+ enableHibernate.setSelection(node.getBoolean(HibernatePropertiesConstants.HIBERNATE3_ENABLED, false) );
+ String cfg = node.get(HibernatePropertiesConstants.DEFAULT_CONFIGURATION, project.getName() );
ConsoleConfiguration configuration = KnownConfigurations.getInstance().find(cfg);
if(configuration==null) {
selectedConfiguration.setText(""); //$NON-NLS-1$
} else {
selectedConfiguration.setText(cfg);
}
+ initNamingStrategy = node.getBoolean(HibernatePropertiesConstants.NAMING_STRATEGY_ENABLED, true);
+ enableNamingStrategy.setSelection(initNamingStrategy);
}
+ }
+
+ protected boolean saveNamigStrategyChanges(){
+ if (initNamingStrategy == enableNamingStrategy.getSelection()) return true;
+ IScopeContext scope = new ProjectScope(getProject());
+ Preferences node = scope.getNode(HibernatePropertiesConstants.HIBERNATE_CONSOLE_NODE);
+
+ if(node!=null) {
+ node.putBoolean(HibernatePropertiesConstants.NAMING_STRATEGY_ENABLED, enableNamingStrategy.getSelection() );
+ try {
+ node.flush();
+ final IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ @SuppressWarnings("restriction")
+ public void run(IProgressMonitor monitor)
+ throws CoreException {
+ JpaModelManager.instance().rebuildJpaProject(getProject());
+ getProject().build(IncrementalProjectBuilder.FULL_BUILD, monitor);
+ }
+ };
+
+ IRunnableWithProgress op = new IRunnableWithProgress() {
+ public void run(IProgressMonitor monitor)
+ throws InvocationTargetException, InterruptedException {
+ try {
+ IWorkspace ws = ResourcesPlugin.getWorkspace();
+ ws.run(wr, ws.getRoot(), IWorkspace.AVOID_UPDATE, monitor);
+ }
+ catch(CoreException e) {
+ throw new InvocationTargetException(e);
+ }
+ }
+ };
+
+ try {
+ new ProgressMonitorDialog(getShell()).run(true, false, op);
+ }
+ catch (InterruptedException e) {
+ return false;
+ }
+ catch (InvocationTargetException e) {
+ final Throwable te = e.getTargetException();
+ throw new RuntimeException(te);
+ }
+ return true;
+ } catch (BackingStoreException e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.ProjectUtils_could_not_save_changes_to_preferences, e);
+ return false;
+ }
+ } else {
+ return false;
+ }
}
+
public boolean performOk() {
- ProjectUtils.toggleHibernateOnProject( getProject(), enableHibernate.getSelection(), selectedConfiguration.getText() );
+ ProjectUtils.toggleHibernateOnProject( getProject(), enableHibernate.getSelection(), selectedConfiguration.getText());
+ saveNamigStrategyChanges();
return true;
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -67,6 +67,7 @@
import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
+import org.hibernate.eclipse.console.properties.HibernatePropertiesConstants;
import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants;
import org.hibernate.util.StringHelper;
import org.osgi.service.prefs.BackingStoreException;
@@ -83,11 +84,11 @@
public static boolean toggleHibernateOnProject(IProject project, boolean enable,String defaultConsoleName) {
IScopeContext scope = new ProjectScope(project);
- Preferences node = scope.getNode("org.hibernate.eclipse.console"); //$NON-NLS-1$
+ Preferences node = scope.getNode(HibernatePropertiesConstants.HIBERNATE_CONSOLE_NODE);
if(node!=null) {
- node.putBoolean("hibernate3.enabled", enable ); //$NON-NLS-1$
- node.put("default.configuration", defaultConsoleName ); //$NON-NLS-1$
+ node.putBoolean(HibernatePropertiesConstants.HIBERNATE3_ENABLED, enable );
+ node.put(HibernatePropertiesConstants.DEFAULT_CONFIGURATION, defaultConsoleName );
try {
node.flush();
} catch (BackingStoreException e) {
@@ -100,9 +101,9 @@
try {
if(enable) {
- return ProjectUtils.addProjectNature(project, "org.hibernate.eclipse.console.hibernateNature", new NullProgressMonitor() ); //$NON-NLS-1$
+ return ProjectUtils.addProjectNature(project, HibernatePropertiesConstants.HIBERNATE_NATURE, new NullProgressMonitor() );
} else {
- return ProjectUtils.removeProjectNature(project, "org.hibernate.eclipse.console.hibernateNature", new NullProgressMonitor() ); //$NON-NLS-1$
+ return ProjectUtils.removeProjectNature(project, HibernatePropertiesConstants.HIBERNATE_NATURE, new NullProgressMonitor() );
}
} catch(CoreException ce) {
HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.ProjectUtils_could_not_activate_hibernate_nature_on_project + project.getName(), ce);
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -50,6 +50,7 @@
import org.hibernate.eclipse.builder.HibernateBuilder;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
+import org.hibernate.eclipse.console.properties.HibernatePropertiesConstants;
import org.hibernate.mapping.Table;
import org.osgi.service.prefs.Preferences;
@@ -106,10 +107,10 @@
IJavaProject prj = JavaCore.create(project);
IScopeContext scope = new ProjectScope(prj.getProject() );
- Preferences node = scope.getNode("org.hibernate.eclipse.console"); //$NON-NLS-1$
+ Preferences node = scope.getNode(HibernatePropertiesConstants.HIBERNATE_CONSOLE_NODE);
if(node!=null) {
- String cfg = node.get("default.configuration", prj.getProject().getName() ); //$NON-NLS-1$
+ String cfg = node.get(HibernatePropertiesConstants.DEFAULT_CONFIGURATION, prj.getProject().getName() );
return cfg;
} else {
return null;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -20,6 +20,7 @@
import org.hibernate.cfg.NamingStrategy;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
+import org.hibernate.eclipse.console.properties.HibernatePropertiesConstants;
import org.osgi.service.prefs.Preferences;
/**
@@ -29,6 +30,8 @@
@SuppressWarnings("restriction")
public class HibernateJpaProject extends AbstractJpaProject {
+ private Boolean cachedNamingStrategyEnable;
+
public HibernateJpaProject(JpaProject.Config config) throws CoreException {
super(config);
@@ -50,11 +53,26 @@
public String getDefaultConsoleConfigurationName(){
IScopeContext scope = new ProjectScope(getProject());
- Preferences node = scope.getNode("org.hibernate.eclipse.console"); //$NON-NLS-1$
+ Preferences node = scope.getNode(HibernatePropertiesConstants.HIBERNATE_CONSOLE_NODE);
if(node!=null) {
- return node.get("default.configuration", getName() ); //$NON-NLS-1$
+ return node.get(HibernatePropertiesConstants.DEFAULT_CONFIGURATION, getName() );
}
return null;
}
+
+ public boolean isNamingStrategyEnabled(){
+ // as this flag cannot be changed without cleaning up and
+ // rebuilding ( == creating new instance) of jpa project we cache it
+ if (cachedNamingStrategyEnable == null){
+ IScopeContext scope = new ProjectScope(getProject());
+ Preferences node = scope.getNode(HibernatePropertiesConstants.HIBERNATE_CONSOLE_NODE);
+ if(node!=null) {
+ cachedNamingStrategyEnable = node.getBoolean(HibernatePropertiesConstants.NAMING_STRATEGY_ENABLED, true );
+ } else {
+ cachedNamingStrategyEnable = true;
+ }
+ }
+ return cachedNamingStrategyEnable;
+ }
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -10,11 +10,18 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.core.internal;
+import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
import org.eclipse.jpt.core.JpaProject;
@@ -104,7 +111,8 @@
if (jpaProject instanceof HibernateJpaProject) {
String ccName = ((HibernateJpaProject)jpaProject).getDefaultConsoleConfigurationName();
if (ccfg.getName().equals(ccName)){
- jpaProject.getJavaProject().getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
+ rebuildJpaProject(jpaProject.getJavaProject().getProject());
+ //jpaProject.getJavaProject().getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
}
}
}
@@ -133,5 +141,27 @@
}
});
}
-
+
+ private void rebuildJpaProject(final IProject project){
+ try {
+ final IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+ public void run(IProgressMonitor monitor)
+ throws CoreException {
+ JpaModelManager.instance().rebuildJpaProject(project);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
+ }
+ };
+
+ try {
+ IWorkspace ws = ResourcesPlugin.getWorkspace();
+ ws.run(wr, ws.getRoot(), IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
+ } catch(CoreException e) {
+ throw new InvocationTargetException(e);
+ }
+ } catch (InvocationTargetException e) {
+ final Throwable te = e.getTargetException();
+ throw new RuntimeException(te);
+ }
+ }
+
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -15,7 +15,6 @@
import org.eclipse.jpt.core.context.JoinColumn;
import org.eclipse.jpt.core.context.RelationshipMapping;
import org.eclipse.jpt.core.internal.context.MappingTools;
-import org.eclipse.jpt.db.Database;
import org.eclipse.jpt.db.Table;
import org.eclipse.wst.validation.internal.core.Message;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
@@ -48,8 +47,10 @@
if (targetTableName == null) {
return null;
}
- NamingStrategy ns =((HibernateJpaProject)targetEntity.getJpaProject()).getNamingStrategy();
- if (ns != null){
+
+ HibernateJpaProject hibernateJpaProject = (HibernateJpaProject)targetEntity.getJpaProject();
+ NamingStrategy ns = hibernateJpaProject.getNamingStrategy();
+ if (ns != null && hibernateJpaProject.isNamingStrategyEnabled()){
try{
String name = ns.collectionTableName(relationshipMapping.getEntity().getPersistentType().getName(),
owningTableName, targetEntity.getPersistentType().getName(), targetTableName, relationshipMapping.getName());
@@ -78,8 +79,9 @@
if (targetTable == null) {
return null;
}
- NamingStrategy ns = ((HibernateJpaProject)targetEntity.getJpaProject()).getNamingStrategy();
- if (ns != null){
+ HibernateJpaProject hibernateJpaProject = (HibernateJpaProject)targetEntity.getJpaProject();
+ NamingStrategy ns = hibernateJpaProject.getNamingStrategy();
+ if (ns != null && hibernateJpaProject.isNamingStrategyEnabled()){
try {
String name = ns.collectionTableName(relationshipMapping.getEntity().getPersistentType().getName(),
owningTable.getName(), targetEntity.getPersistentType().getName(), targetTable.getName(), relationshipMapping.getName());
@@ -115,8 +117,9 @@
// Column targetColumn = joinColumn.getTargetPrimaryKeyDbColumn();
String targetColumnName = joinColumn.getReferencedColumnName();
- NamingStrategy ns = ((HibernateJpaProject)targetEntity.getJpaProject()).getNamingStrategy();
- if (ns != null){
+ HibernateJpaProject hibernateJpaProject = (HibernateJpaProject)targetEntity.getJpaProject();
+ NamingStrategy ns = hibernateJpaProject.getNamingStrategy();
+ if (ns != null && hibernateJpaProject.isNamingStrategyEnabled()){
String logicalTargetColumnName = null;
try {
if (targetColumnName != null || prefix != null){
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumn.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumn.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumn.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -26,7 +26,7 @@
@Override
protected String buildDefaultName() {
NamingStrategy ns = getJpaProject().getNamingStrategy();
- if (ns != null && super.buildDefaultName() != null){
+ if ( getJpaProject().isNamingStrategyEnabled() && ns != null && super.buildDefaultName() != null){
try {
return ns.propertyToColumnName(super.buildDefaultName());
} catch (Exception e) {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -471,7 +471,7 @@
protected String getResourceDefaultName() {
NamingStrategy ns = getJpaProject().getNamingStrategy();
- if (ns != null){
+ if (getJpaProject().isNamingStrategyEnabled() && ns != null){
try {
return ns.classToTableName(javaResourcePersistentType.getQualifiedName());
} catch (Exception e) {
@@ -522,8 +522,9 @@
return null;
}
Entity parentEntity = HibernateJavaEntityImpl.this.getParentEntity();
- NamingStrategy ns = HibernateJavaEntityImpl.this.getJpaProject().getNamingStrategy();
- if (ns != null) {
+ HibernateJpaProject hibernateJpaProject = HibernateJavaEntityImpl.this.getJpaProject();
+ NamingStrategy ns = hibernateJpaProject.getNamingStrategy();
+ if (hibernateJpaProject.isNamingStrategyEnabled() && ns != null) {
try {
String name = ns.joinKeyColumnName(parentEntity.getPrimaryKeyColumnName(),
parentEntity.getPrimaryTableName());
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMapping.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -42,7 +42,7 @@
@Override
public String getDefaultColumnName() {
NamingStrategy ns = getJpaProject().getNamingStrategy();
- if (ns != null) {
+ if (getJpaProject().isNamingStrategyEnabled() && ns != null) {
try {
return ns.propertyToColumnName(getName());
} catch (Exception e) {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntity.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntity.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntity.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -105,7 +105,7 @@
}
Entity parentEntity = HibernateOrmEntity.this.getParentEntity();
NamingStrategy ns = HibernateOrmEntity.this.getJpaProject().getNamingStrategy();
- if (ns != null){
+ if (getJpaProject().isNamingStrategyEnabled() && ns != null){
try {
String name = ns.joinKeyColumnName(parentEntity.getPrimaryKeyColumnName(),
parentEntity.getPrimaryTableName());
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -41,7 +41,7 @@
@Override
public String getDefaultColumnName() {
NamingStrategy namingStrategy = getJpaProject().getNamingStrategy();
- if (namingStrategy != null && getName() != null){
+ if (getJpaProject().isNamingStrategyEnabled() && namingStrategy != null && getName() != null){
try {
return namingStrategy.propertyToColumnName(getName());
} catch (Exception e) {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -42,7 +42,7 @@
filename.setText("schema.ddl"); //$NON-NLS-1$
filename.setDialogFieldListener(fieldlistener);
filename.doFillIntoGrid(container, numColumns);
- }
+ }
protected void dialogChanged() {
setErrorMessage(null);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -27,7 +27,7 @@
* @author Dmitry Geraskov
*
*/
-
+
@SuppressWarnings("restriction")
public class GenerateEntitiesWizardPage extends GenerateInitWizardPage {
@@ -39,18 +39,22 @@
public GenerateEntitiesWizardPage(HibernateJpaProject jpaProject) {
super(jpaProject);
}
-
- /* (non-Javadoc)
- * @see org.jboss.tools.hibernate.jpt.ui.wizard.GenerateInitWizardPage#createChildControls(org.eclipse.swt.widgets.Composite)
- */
+
@Override
protected void createChildControls(Composite container) {
packageName = new StringDialogField();
packageName.setDialogFieldListener(fieldlistener);
packageName.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_package);
- packageName.doFillIntoGrid(container, numColumns);
+ packageName.doFillIntoGrid(container, numColumns);
}
+ @Override
+ public void createControl(Composite parent) {
+ super.createControl(parent);
+ if (!"".equals(getOutputDir())){//$NON-NLS-1$
+ packageName.setFocus();
+ }
+ }
protected void dialogChanged() {
setErrorMessage(null);
@@ -69,25 +73,25 @@
} else {
setWarningMessage(NewWizardMessages.NewTypeWizardPage_warning_DefaultPackageDiscouraged);
}
-
+
String msg = PathHelper.checkDirectory(getOutputDir(), HibernateConsoleMessages.CodeGenerationSettingsTab_output_directory, false);
-
+
if (msg!=null) {
setErrorMessage( msg );
setPageComplete( false );
return;
}
-
+
super.dialogChanged();
}
-
+
private static IStatus validatePackageName(String text, JpaProject project) {
if (project == null || !project.getJavaProject().exists()) {
return JavaConventions.validatePackageName(text, JavaCore.VERSION_1_3, JavaCore.VERSION_1_3);
}
return JavaConventionsUtil.validatePackageName(text, project.getJavaProject());
}
-
+
public String getPackageName(){
return packageName.getText();
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ContentAssistTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ContentAssistTest.java 2009-08-21 12:02:04 UTC (rev 17213)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ContentAssistTest.java 2009-08-21 12:04:33 UTC (rev 17214)
@@ -5,6 +5,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jdt.core.IJavaProject;
+import org.hibernate.eclipse.console.properties.HibernatePropertiesConstants;
import org.hibernate.eclipse.console.utils.ProjectUtils;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
@@ -21,14 +22,14 @@
IScopeContext scope = new ProjectScope(prj.getProject() );
- Preferences node = scope.getNode("org.hibernate.eclipse.console"); //$NON-NLS-1$
+ Preferences node = scope.getNode(HibernatePropertiesConstants.HIBERNATE_CONSOLE_NODE);
- node.putBoolean("hibernate3.enabled", true ); //$NON-NLS-1$
- node.put("default.configuration", "testcfg" ); //$NON-NLS-1$ //$NON-NLS-2$
+ node.putBoolean(HibernatePropertiesConstants.HIBERNATE3_ENABLED, true );
+ node.put(HibernatePropertiesConstants.DEFAULT_CONFIGURATION, "testcfg" ); //$NON-NLS-1$
node.flush();
- ProjectUtils.addProjectNature(prj.getProject(), "org.hibernate.eclipse.console.hibernateNature", new NullProgressMonitor() ); //$NON-NLS-1$
- ProjectUtils.removeProjectNature(prj.getProject(), "org.hibernate.eclipse.console.hibernateNature", new NullProgressMonitor() ); //$NON-NLS-1$
+ ProjectUtils.addProjectNature(prj.getProject(), HibernatePropertiesConstants.HIBERNATE_NATURE, new NullProgressMonitor() );
+ ProjectUtils.removeProjectNature(prj.getProject(), HibernatePropertiesConstants.HIBERNATE_NATURE, new NullProgressMonitor() );
}
}
\ No newline at end of file
16 years, 4 months
JBoss Tools SVN: r17213 - in workspace/yzhishko: org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test and 5 other directories.
by jbosstools-commits@lists.jboss.org
Author: yzhishko
Date: 2009-08-21 08:02:04 -0400 (Fri, 21 Aug 2009)
New Revision: 17213
Added:
workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/log4j.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java
Removed:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/AlwaysHideSelectionBarWithoutPromptTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BorderForUnknownTagsTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ChangeEditorTabForTheFirstOpenPageTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTagsTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowSelectionTagBarTest.java
Modified:
workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Messages.java
workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/messages.properties
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java
Log:
Fixed NLS messages. Some tests were updated. Create logging for Seam tests.
Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/log4j.xml
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/log4j.xml (rev 0)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/log4j.xml 2009-08-21 12:02:04 UTC (rev 17213)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
+ debug="false">
+
+ <appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern"
+ value="%d{dd MMM yyyy HH:mm:ss.SSS} - %25t - %-5p - %30c{1} - (%C{1}.java:%L) - %m%n" />
+ </layout>
+ </appender>
+
+ <appender name="fileAppender" class="org.apache.log4j.FileAppender">
+ <param name="File" value="/tmp/debug.log" />
+ <param name="Append" value="false" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern"
+ value="%d{dd MMM yyyy HH:mm:ss.SSS} - %25t - %-5p - %30c{1} - (%C{1}.java:%L) - %m%n" />
+ </layout>
+ </appender>
+
+ <appender name="asyncAppender" class="org.apache.log4j.AsyncAppender">
+ <!-- appender-ref ref="consoleAppender" / -->
+ <appender-ref ref="fileAppender" />
+ </appender>
+
+ <!-- don't log matchers, this is very high amount of chatter -->
+ <category name="org.eclipse.swtbot.swt.finder.matchers">
+ <priority value="OFF" />
+ </category>
+
+ <!--
+ don't log widget notification events, this is moderately high chatter
+ -->
+ <category name="org.eclipse.swtbot.swt.finder.widgets">
+ <priority value="OFF" />
+ </category>
+
+ <!-- don't log finders, this is moderate chatter -->
+ <category name="org.eclipse.swtbot.swt.finder.finders">
+ <priority value="DEBUG" />
+ </category>
+
+ <category name="org.eclipse.swtbot.swt.finder.keyboard">
+ <!-- set to a value higher than debug to turn on. -->
+ <priority value="DEBUG" />
+ </category>
+
+ <category name="org.eclipse.swtbot">
+ <priority value="ALL" />
+ </category>
+
+ <root>
+ <priority value="INFO" />
+ <appender-ref ref="consoleAppender" />
+ <appender-ref ref="fileAppender" />
+ </root>
+
+</log4j:configuration>
\ No newline at end of file
Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-08-21 10:52:38 UTC (rev 17212)
+++ workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -205,6 +205,12 @@
protected void waitForJobs(){
delay();
while (!Job.getJobManager().isIdle()) {
+ Job[] jobs = Job.getJobManager().find(null);
+ for (Job job : jobs) {
+ if ("Updating indexes".equals(job.getName())) {
+ job.cancel();
+ }
+ }
delay();
}
}
Modified: workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Messages.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Messages.java 2009-08-21 10:52:38 UTC (rev 17212)
+++ workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/Messages.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -11,6 +11,7 @@
public static String JBossRuntimeStartup_JBoss_Application_Server_4_0;
public static String JBossRuntimeStartup_JBoss_Application_Server_4_2;
public static String JBossRuntimeStartup_JBoss_Application_Server_5_0;
+ public static String JBossRuntimeStartup_JBoss_Application_Server_5_1;
public static String JBossRuntimeStartup_JBoss_EAP_Server_4_3;
public static String JBossRuntimeStartup_Runtime;
public static String JBossRuntimeStartup_The_JBoss_AS_Hypersonic_embedded_database;
Modified: workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/messages.properties
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/messages.properties 2009-08-21 10:52:38 UTC (rev 17212)
+++ workspace/yzhishko/org.jboss.tools.ui.runtime.bot.test/src/org/jboss/tools/ui/runtime/bot/test/messages.properties 2009-08-21 12:02:04 UTC (rev 17213)
@@ -1,6 +1,6 @@
JBossRuntimeStartup_Cannot_create_new_JBoss_Server=Can''t create new JBoss Server
-JBossRuntimeStartup_Cannott_create_new_DTP_Connection_Profile=Can''t create new DTP Connection Profile for JBoss AS Hypersonic embedded database
-JBossRuntimeStartup_Cannott_create_new_HSQL_DB_Driver=Can''t create new HSQL DB Driver.
+JBossRuntimeStartup_Cannot_create_new_DTP_Connection_Profile=Can''t create new DTP Connection Profile for JBoss AS Hypersonic embedded database
+JBossRuntimeStartup_Cannot_create_new_HSQL_DB_Driver=Can''t create new HSQL DB Driver.
JBossRuntimeStartup_JBoss_Application_Server_3_2=JBoss Application Server 3.2
JBossRuntimeStartup_JBoss_Application_Server_4_0=JBoss Application Server 4.0
JBossRuntimeStartup_JBoss_Application_Server_4_2=JBoss Application Server 4.2
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java 2009-08-21 10:52:38 UTC (rev 17212)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -4,15 +4,15 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.swtbot.swt.finder.SWTBotTestCase;
-import org.jboss.tools.vpe.ui.bot.test.editor.AlwaysHideSelectionBarWithoutPromptTest;
import org.jboss.tools.vpe.ui.bot.test.editor.BlockCommentTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.BorderForUnknownTagsTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.ChangeEditorTabForTheFirstOpenPageTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.ShowNonVisualTagsTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.ShowResourceBundlesUsageasELexpressionsTest;
-import org.jboss.tools.vpe.ui.bot.test.editor.ShowSelectionTagBarTest;
import org.jboss.tools.vpe.ui.bot.test.editor.ToggleCommentTest;
import org.jboss.tools.vpe.ui.bot.test.editor.VerificationOfNameSpacesTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.preferences.AlwaysHideSelectionBarWithoutPromptTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.preferences.BorderForUnknownTagsTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ChangeEditorTabForTheFirstOpenPageTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowNonVisualTagsTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowResourceBundlesUsageasELexpressionsTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowSelectionTagBarTest;
import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4306Test;
import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4556Test;
import org.jboss.tools.vpe.ui.bot.test.palette.CancelTagLibDefenitionTest;
Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/AlwaysHideSelectionBarWithoutPromptTest.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/AlwaysHideSelectionBarWithoutPromptTest.java 2009-08-21 10:52:38 UTC (rev 17212)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/AlwaysHideSelectionBarWithoutPromptTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -1,168 +0,0 @@
-package org.jboss.tools.vpe.ui.bot.test.editor;
-
-import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.ui.bot.test.WidgetVariables;
-import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
-
-public class AlwaysHideSelectionBarWithoutPromptTest extends VPEAutoTestCase{
-
- public void testAlwaysHideSelectionBarWithoutPrompt(){
-
- //Test open page
-
- openPage();
-
- //Test default Selection values
-
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- SWTBotCheckBox checkBox = bot.checkBox("Show Selection Tag Bar");
- if (!checkBox.isChecked()) {
- checkBox.click();
- }
- checkBox = bot.checkBox("Always Hide Selection Bar Without Prompt");
- if (checkBox.isChecked()) {
- checkBox.click();
- }
- bot.button("OK").click();
-
- //Test Hide Selection Bar
-
- selectSelection();
- selectPrompt();
- waitForJobs();
- checkIsHide();
-
- //Test Hide selection after reopen
-
- closePage();
- openPage();
- checkIsHide();
-
- //Test Show Selection Bar
-
- selectSelection();
- waitForJobs();
- checkIsShow();
-
- //Test Show Selection Bar after reopen
-
- closePage();
- openPage();
- checkIsShow();
-
- //Test Hide Selection Bar button without confirm
-
- bot.toolbarButtonWithTooltip("Hide Selection Bar").click();
- checkIsHide();
-
- //Test Hide selection after reopen
-
- closePage();
- openPage();
- checkIsHide();
-
- //Test Show Selection Bar from dialog
-
- selectSelection();
- waitForJobs();
- checkIsShow();
-
- //Test Show Selection Bar after reopen
-
- closePage();
- openPage();
- checkIsShow();
-
- }
-
- @Override
- protected void closeUnuseDialogs() {
- try {
- bot.shell("Preferences (Filtered)").close();
- } catch (WidgetNotFoundException e) {
- }
- }
-
- @Override
- protected boolean isUnuseDialogOpened() {
- boolean isOpened = false;
- try {
- bot.shell("Preferences (Filtered)").activate();
- isOpened = true;
- } catch (WidgetNotFoundException e) {
- }
- return isOpened;
- }
-
- private void closePage(){
- bot.editorByTitle(TEST_PAGE).close();
- }
-
- private void openPage(){
- SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
- SWTBotTree tree = innerBot.tree();
- tree.expandNode(projectProperties.getProperty("JSFProjectName"))
- .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick();
- }
-
- private void checkIsHide(){
- WidgetNotFoundException exception = null;
- try {
- bot.toolbarButtonWithTooltip("Hide Selection Bar");
- } catch (WidgetNotFoundException e) {
- exception = e;
- }
- assertNotNull(exception);
- }
-
- private void checkIsShow(){
- WidgetNotFoundException exception = null;
- try {
- bot.toolbarButtonWithTooltip("Hide Selection Bar");
- } catch (WidgetNotFoundException e) {
- exception = e;
- }
- assertNull(exception);
- }
-
- @Override
- protected void tearDown() throws Exception {
-
- //Restore page state after tests
-
- try {
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- SWTBotCheckBox checkBox = bot.checkBox("Show Selection Tag Bar");
- if (!checkBox.isChecked()) {
- checkBox.click();
- }
- checkBox = bot.checkBox("Always Hide Selection Bar Without Prompt");
- if (checkBox.isChecked()) {
- checkBox.click();
- }
- bot.button("OK").click();
- } catch (WidgetNotFoundException e) {
- }
- super.tearDown();
- }
-
- private void selectSelection(){
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- bot.checkBox("Show Selection Tag Bar").click();
- bot.button("OK").click();
- }
-
- private void selectPrompt(){
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- bot.checkBox("Always Hide Selection Bar Without Prompt").click();
- bot.button("OK").click();
- }
-
-}
Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BorderForUnknownTagsTest.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BorderForUnknownTagsTest.java 2009-08-21 10:52:38 UTC (rev 17212)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BorderForUnknownTagsTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -1,120 +0,0 @@
-package org.jboss.tools.vpe.ui.bot.test.editor;
-
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
-import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.ui.bot.test.WidgetVariables;
-import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
-
-public class BorderForUnknownTagsTest extends VPEAutoTestCase{
-
- private static String textEditor;
- private static SWTBotEclipseEditor editor;
-
- public void testBorderForUnknownTags() throws Throwable{
-
- //Test open page
-
- SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
- SWTBotTree tree = innerBot.tree();
- tree.expandNode(projectProperties.getProperty("JSFProjectName"))
- .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick();
-
- editor = bot.editorByTitle(TEST_PAGE).toTextEditor();
- textEditor = editor.getText();
-
- //Test insert unknown tag
-
- editor.navigateTo(12, 52);
- editor.insertText("<tagunknown></tagunknown>");
-
- //Test default Show Border value
-
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- SWTBotCheckBox checkBox = bot.checkBox("Show Border for Unknown Tags");
- if (!checkBox.isChecked()) {
- checkBox.click();
- }
- bot.button("OK").click();
-
- //Test check VPE content
-
- checkVPE("ShowBorderForUnknownTag.xml");
-
- //Test hide border for unknown tag
-
- selectBorder();
- checkVPE("HideBorderForUnknownTag.xml");
-
- //Test restore previous state
-
- selectBorder();
- checkVPE("ShowBorderForUnknownTag.xml");
-
- }
-
- @Override
- protected void closeUnuseDialogs() {
- try {
- bot.shell("Preferences (Filtered)").close();
- } catch (WidgetNotFoundException e) {
- }
- }
-
- @Override
- protected boolean isUnuseDialogOpened() {
- boolean isOpened = false;
- try {
- bot.shell("Preferences (Filtered)").activate();
- isOpened = true;
- } catch (WidgetNotFoundException e) {
- }
- return isOpened;
- }
-
- private void checkVPE(String testPage) throws Throwable{
- editor.selectLine(9);
- if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) {
- editor.insertText("<body id=\"bodyId\">");
- }
- editor.save();
- waitForJobs();
- performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
- }
-
- private void selectBorder(){
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- bot.checkBox("Show Border for Unknown Tags").click();
- bot.button("OK").click();
- }
-
- @Override
- protected void tearDown() throws Exception {
-
- //Restore page state before tests
-
- try {
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- SWTBotCheckBox checkBox = bot.checkBox("Show Border for Unknown Tags");
- if (!checkBox.isChecked()) {
- checkBox.click();
- }
- bot.button("OK").click();
- } catch (WidgetNotFoundException e) {
- }
- editor.setFocus();
- bot.menu("Edit").menu("Select All").click();
- bot.menu("Edit").menu("Delete").click();
- editor.setText(textEditor);
- editor.save();
- waitForJobs();
- editor.close();
- super.tearDown();
- }
-
-}
Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ChangeEditorTabForTheFirstOpenPageTest.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ChangeEditorTabForTheFirstOpenPageTest.java 2009-08-21 10:52:38 UTC (rev 17212)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ChangeEditorTabForTheFirstOpenPageTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -1,7 +0,0 @@
-package org.jboss.tools.vpe.ui.bot.test.editor;
-
-import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4306Test;
-
-public class ChangeEditorTabForTheFirstOpenPageTest extends JBIDE4306Test{
-
-}
Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTagsTest.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTagsTest.java 2009-08-21 10:52:38 UTC (rev 17212)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTagsTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -1,101 +0,0 @@
-package org.jboss.tools.vpe.ui.bot.test.editor;
-
-import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.ui.bot.test.WidgetVariables;
-import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
-
-public class ShowNonVisualTagsTest extends VPEAutoTestCase{
-
- public void testShowNonVisualTags() throws Throwable{
-
- //Test open page
-
- openPage();
-
- //Test set default Show Tag value
-
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- SWTBotCheckBox checkBox = bot.checkBox("Show Non-Visual Tags");
- if (checkBox.isChecked()) {
- checkBox.click();
- }
- bot.button("OK").click();
- checkVPE("DumpedTestPage.xml");
-
- //Test Show Non-Visual Tags
-
- selectShowNonVisual();
- closePage();
- openPage();
- checkVPE("ShowNonVisualTags.xml");
-
- //Test Hide Non-Visual Tags
- selectShowNonVisual();
- closePage();
- openPage();
- checkVPE("DumpedTestPage.xml");
-
- }
-
- private void checkVPE(String testPage) throws Throwable{
- waitForJobs();
- performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
- }
-
- @Override
- protected void closeUnuseDialogs() {
- try {
- bot.shell("Preferences (Filtered)").close();
- } catch (WidgetNotFoundException e) {
- }
- }
-
- @Override
- protected boolean isUnuseDialogOpened() {
- boolean isOpened = false;
- try {
- bot.shell("Preferences (Filtered)").activate();
- isOpened = true;
- } catch (WidgetNotFoundException e) {
- }
- return isOpened;
- }
-
- @Override
- protected void tearDown() throws Exception {
- try {
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- SWTBotCheckBox checkBox = bot.checkBox("Show Non-Visual Tags");
- if (checkBox.isChecked()) {
- checkBox.click();
- }
- bot.button("OK").click();
- } catch (WidgetNotFoundException e) {
- }
- super.tearDown();
- }
-
- private void closePage(){
- bot.editorByTitle(TEST_PAGE).close();
- }
-
- private void openPage(){
- SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
- SWTBotTree tree = innerBot.tree();
- tree.expandNode(projectProperties.getProperty("JSFProjectName"))
- .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick();
- }
-
- private void selectShowNonVisual(){
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- bot.checkBox("Show Non-Visual Tags").click();
- bot.button("OK").click();
- }
-
-}
Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java 2009-08-21 10:52:38 UTC (rev 17212)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -1,111 +0,0 @@
-package org.jboss.tools.vpe.ui.bot.test.editor;
-
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
-import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.ui.bot.test.WidgetVariables;
-import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
-
-public class ShowResourceBundlesUsageasELexpressionsTest extends VPEAutoTestCase{
-
- private static String textEditor;
- private static SWTBotEclipseEditor editor;
-
- public void testShowResourceBundlesUsageasELexpressions() throws Throwable{
-
- //Test open page
-
- SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
- SWTBotTree tree = innerBot.tree();
- tree.expandNode(projectProperties.getProperty("JSFProjectName"))
- .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick();
-
- editor = bot.editorByTitle(TEST_PAGE).toTextEditor();
- textEditor = editor.getText();
-
- //Test default Show Border value
-
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- SWTBotCheckBox checkBox = bot.checkBox("Show Resource Bundles Usage as EL Expressions");
- if (checkBox.isChecked()) {
- checkBox.click();
- }
- bot.button("OK").click();
-
- //Test check VPE content with resource bundles
-
- selectELExpressions();
- checkVPE("ShowResourceBundlesUsageasELExpressions.xml");
-
- //Test check VPE content without resource bundles
-
- selectELExpressions();
- checkVPE("HideResourceBundlesUsageasELExpressions.xml");
-
- }
-
- @Override
- protected void closeUnuseDialogs() {
- try {
- bot.shell("Preferences (Filtered)").close();
- } catch (WidgetNotFoundException e) {
- }
- }
-
- @Override
- protected boolean isUnuseDialogOpened() {
- boolean isOpened = false;
- try {
- bot.shell("Preferences (Filtered)").activate();
- isOpened = true;
- } catch (WidgetNotFoundException e) {
- }
- return isOpened;
- }
-
- @Override
- protected void tearDown() throws Exception {
-
- //Restore page state before tests
-
- try {
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- SWTBotCheckBox checkBox = bot.checkBox("Show Resource Bundles Usage as EL Expressions");
- if (checkBox.isChecked()) {
- checkBox.click();
- }
- bot.button("OK").click();
- } catch (WidgetNotFoundException e) {
- }
- editor.setFocus();
- bot.menu("Edit").menu("Select All").click();
- bot.menu("Edit").menu("Delete").click();
- editor.setText(textEditor);
- editor.save();
- waitForJobs();
- editor.close();
- super.tearDown();
- }
-
- private void checkVPE(String testPage) throws Throwable{
- editor.selectLine(9);
- if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) {
- editor.insertText("<body id=\"bodyId\">");
- }
- editor.save();
- waitForJobs();
- performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
- }
-
- private void selectELExpressions(){
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- bot.checkBox("Show Resource Bundles Usage as EL Expressions").click();
- bot.button("OK").click();
- }
-
-}
Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowSelectionTagBarTest.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowSelectionTagBarTest.java 2009-08-21 10:52:38 UTC (rev 17212)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowSelectionTagBarTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -1,159 +0,0 @@
-package org.jboss.tools.vpe.ui.bot.test.editor;
-
-import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.ui.bot.test.WidgetVariables;
-import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
-
-public class ShowSelectionTagBarTest extends VPEAutoTestCase{
-
- public void testShowSelectionTagBar(){
-
- //Test open page
-
- openPage();
-
- //Test default Selection values
-
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- SWTBotCheckBox checkBox = bot.checkBox("Show Selection Tag Bar");
- if (!checkBox.isChecked()) {
- checkBox.click();
- }
- checkBox = bot.checkBox("Always Hide Selection Bar Without Prompt");
- if (checkBox.isChecked()) {
- checkBox.click();
- }
- bot.button("OK").click();
-
- //Test Hide Selection Bar
-
- selectSelection();
- checkIsHide();
-
- //Test Hide selection after reopen
-
- closePage();
- openPage();
- checkIsHide();
-
- //Test Show Selection Bar
-
- selectSelection();
- checkIsShow();
-
- //Test Show Selection Bar after reopen
-
- closePage();
- openPage();
- checkIsShow();
-
- //Test Hide Selection Bar button with confirm
-
- bot.toolbarButtonWithTooltip("Hide Selection Bar").click();
- bot.shell("Confirm hide selection bar").activate();
- bot.button("OK").click();
- checkIsHide();
-
- //Test Hide selection after reopen
-
- closePage();
- openPage();
- checkIsHide();
-
- //Test Show Selection Bar from dialog
-
- selectSelection();
- checkIsShow();
-
- //Test Show Selection Bar after reopen
-
- closePage();
- openPage();
- checkIsShow();
-
- }
-
- @Override
- protected void closeUnuseDialogs() {
- try {
- bot.shell("Preferences (Filtered)").close();
- } catch (WidgetNotFoundException e) {
- }
- }
-
- @Override
- protected boolean isUnuseDialogOpened() {
- boolean isOpened = false;
- try {
- bot.shell("Preferences (Filtered)").activate();
- isOpened = true;
- } catch (WidgetNotFoundException e) {
- }
- return isOpened;
- }
-
- @Override
- protected void tearDown() throws Exception {
-
- //Restore page state before tests
-
- try {
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- SWTBotCheckBox checkBox = bot.checkBox("Show Selection Tag Bar");
- if (!checkBox.isChecked()) {
- checkBox.click();
- }
- checkBox = bot.checkBox("Always Hide Selection Bar Without Prompt");
- if (checkBox.isChecked()) {
- checkBox.click();
- }
- bot.button("OK").click();
- } catch (WidgetNotFoundException e) {
- }
- super.tearDown();
- }
-
- private void selectSelection(){
- bot.toolbarButtonWithTooltip("Preferences").click();
- bot.shell("Preferences (Filtered)").activate();
- bot.checkBox("Show Selection Tag Bar").click();
- bot.button("OK").click();
- }
-
- private void closePage(){
- bot.editorByTitle(TEST_PAGE).close();
- }
-
- private void openPage(){
- SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
- SWTBotTree tree = innerBot.tree();
- tree.expandNode(projectProperties.getProperty("JSFProjectName"))
- .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick();
- }
-
- private void checkIsHide(){
- WidgetNotFoundException exception = null;
- try {
- bot.toolbarButtonWithTooltip("Hide Selection Bar");
- } catch (WidgetNotFoundException e) {
- exception = e;
- }
- assertNotNull(exception);
- }
-
- private void checkIsShow(){
- WidgetNotFoundException exception = null;
- try {
- bot.toolbarButtonWithTooltip("Hide Selection Bar");
- } catch (WidgetNotFoundException e) {
- exception = e;
- }
- assertNull(exception);
- }
-
-}
Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/AlwaysHideSelectionBarWithoutPromptTest.java)
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -0,0 +1,134 @@
+package org.jboss.tools.vpe.ui.bot.test.editor.preferences;
+
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+
+public class AlwaysHideSelectionBarWithoutPromptTest extends PreferencesTestCase{
+
+ public void testAlwaysHideSelectionBarWithoutPrompt(){
+
+ //Test open page
+
+ openPage();
+
+ //Test default Selection values
+
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ SWTBotCheckBox checkBox = bot.checkBox("Show Selection Tag Bar");
+ if (!checkBox.isChecked()) {
+ checkBox.click();
+ }
+ checkBox = bot.checkBox("Always Hide Selection Bar Without Prompt");
+ if (checkBox.isChecked()) {
+ checkBox.click();
+ }
+ bot.button("OK").click();
+
+ //Test Hide Selection Bar
+
+ selectSelection();
+ selectPrompt();
+ waitForJobs();
+ checkIsHide();
+
+ //Test Hide selection after reopen
+
+ closePage();
+ openPage();
+ checkIsHide();
+
+ //Test Show Selection Bar
+
+ selectSelection();
+ waitForJobs();
+ checkIsShow();
+
+ //Test Show Selection Bar after reopen
+
+ closePage();
+ openPage();
+ checkIsShow();
+
+ //Test Hide Selection Bar button without confirm
+
+ bot.toolbarButtonWithTooltip("Hide Selection Bar").click();
+ checkIsHide();
+
+ //Test Hide selection after reopen
+
+ closePage();
+ openPage();
+ checkIsHide();
+
+ //Test Show Selection Bar from dialog
+
+ selectSelection();
+ waitForJobs();
+ checkIsShow();
+
+ //Test Show Selection Bar after reopen
+
+ closePage();
+ openPage();
+ checkIsShow();
+
+ }
+
+ private void checkIsHide(){
+ WidgetNotFoundException exception = null;
+ try {
+ bot.toolbarButtonWithTooltip("Hide Selection Bar");
+ } catch (WidgetNotFoundException e) {
+ exception = e;
+ }
+ assertNotNull(exception);
+ }
+
+ private void checkIsShow(){
+ WidgetNotFoundException exception = null;
+ try {
+ bot.toolbarButtonWithTooltip("Hide Selection Bar");
+ } catch (WidgetNotFoundException e) {
+ exception = e;
+ }
+ assertNull(exception);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+
+ //Restore page state after tests
+
+ try {
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ SWTBotCheckBox checkBox = bot.checkBox("Show Selection Tag Bar");
+ if (!checkBox.isChecked()) {
+ checkBox.click();
+ }
+ checkBox = bot.checkBox("Always Hide Selection Bar Without Prompt");
+ if (checkBox.isChecked()) {
+ checkBox.click();
+ }
+ bot.button("OK").click();
+ } catch (WidgetNotFoundException e) {
+ }
+ super.tearDown();
+ }
+
+ private void selectSelection(){
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ bot.checkBox("Show Selection Tag Bar").click();
+ bot.button("OK").click();
+ }
+
+ private void selectPrompt(){
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ bot.checkBox("Always Hide Selection Bar Without Prompt").click();
+ bot.button("OK").click();
+ }
+
+}
Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BorderForUnknownTagsTest.java)
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -0,0 +1,100 @@
+package org.jboss.tools.vpe.ui.bot.test.editor.preferences;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
+
+public class BorderForUnknownTagsTest extends PreferencesTestCase{
+
+ private static String textEditor;
+ private static SWTBotEclipseEditor editor;
+
+ public void testBorderForUnknownTags() throws Throwable{
+
+ //Test open page
+
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
+ SWTBotTree tree = innerBot.tree();
+ tree.expandNode(projectProperties.getProperty("JSFProjectName"))
+ .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick();
+
+ editor = bot.editorByTitle(TEST_PAGE).toTextEditor();
+ textEditor = editor.getText();
+
+ //Test insert unknown tag
+
+ editor.navigateTo(12, 52);
+ editor.insertText("<tagunknown></tagunknown>");
+
+ //Test default Show Border value
+
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ SWTBotCheckBox checkBox = bot.checkBox("Show Border for Unknown Tags");
+ if (!checkBox.isChecked()) {
+ checkBox.click();
+ }
+ bot.button("OK").click();
+
+ //Test check VPE content
+
+ checkVPE("ShowBorderForUnknownTag.xml");
+
+ //Test hide border for unknown tag
+
+ selectBorder();
+ checkVPE("HideBorderForUnknownTag.xml");
+
+ //Test restore previous state
+
+ selectBorder();
+ checkVPE("ShowBorderForUnknownTag.xml");
+
+ }
+
+ private void checkVPE(String testPage) throws Throwable{
+ editor.selectLine(9);
+ if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) {
+ editor.insertText("<body id=\"bodyId\">");
+ }
+ editor.save();
+ waitForJobs();
+ performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
+ }
+
+ private void selectBorder(){
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ bot.checkBox("Show Border for Unknown Tags").click();
+ bot.button("OK").click();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+
+ //Restore page state before tests
+
+ try {
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ SWTBotCheckBox checkBox = bot.checkBox("Show Border for Unknown Tags");
+ if (!checkBox.isChecked()) {
+ checkBox.click();
+ }
+ bot.button("OK").click();
+ } catch (WidgetNotFoundException e) {
+ }
+ editor.setFocus();
+ bot.menu("Edit").menu("Select All").click();
+ bot.menu("Edit").menu("Delete").click();
+ editor.setText(textEditor);
+ editor.save();
+ waitForJobs();
+ editor.close();
+ super.tearDown();
+ }
+
+}
Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ChangeEditorTabForTheFirstOpenPageTest.java)
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -0,0 +1,7 @@
+package org.jboss.tools.vpe.ui.bot.test.editor.preferences;
+
+import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4306Test;
+
+public class ChangeEditorTabForTheFirstOpenPageTest extends JBIDE4306Test{
+
+}
Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -0,0 +1,41 @@
+package org.jboss.tools.vpe.ui.bot.test.editor.preferences;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
+import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
+
+public class PreferencesTestCase extends VPEAutoTestCase{
+
+ @Override
+ protected void closeUnuseDialogs() {
+ try {
+ bot.shell("Preferences (Filtered)").close();
+ } catch (WidgetNotFoundException e) {
+ }
+ }
+
+ @Override
+ protected boolean isUnuseDialogOpened() {
+ boolean isOpened = false;
+ try {
+ bot.shell("Preferences (Filtered)").activate();
+ isOpened = true;
+ } catch (WidgetNotFoundException e) {
+ }
+ return isOpened;
+ }
+
+ void closePage(){
+ bot.editorByTitle(TEST_PAGE).close();
+ }
+
+ void openPage(){
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
+ SWTBotTree tree = innerBot.tree();
+ tree.expandNode(projectProperties.getProperty("JSFProjectName"))
+ .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick();
+ }
+
+}
Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTagsTest.java)
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -0,0 +1,67 @@
+package org.jboss.tools.vpe.ui.bot.test.editor.preferences;
+
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+
+public class ShowNonVisualTagsTest extends PreferencesTestCase{
+
+ public void testShowNonVisualTags() throws Throwable{
+
+ //Test open page
+
+ openPage();
+
+ //Test set default Show Tag value
+
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ SWTBotCheckBox checkBox = bot.checkBox("Show Non-Visual Tags");
+ if (checkBox.isChecked()) {
+ checkBox.click();
+ }
+ bot.button("OK").click();
+ checkVPE("DumpedTestPage.xml");
+
+ //Test Show Non-Visual Tags
+
+ selectShowNonVisual();
+ closePage();
+ openPage();
+ checkVPE("ShowNonVisualTags.xml");
+
+ //Test Hide Non-Visual Tags
+ selectShowNonVisual();
+ closePage();
+ openPage();
+ checkVPE("DumpedTestPage.xml");
+
+ }
+
+ private void checkVPE(String testPage) throws Throwable{
+ waitForJobs();
+ performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ try {
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ SWTBotCheckBox checkBox = bot.checkBox("Show Non-Visual Tags");
+ if (checkBox.isChecked()) {
+ checkBox.click();
+ }
+ bot.button("OK").click();
+ } catch (WidgetNotFoundException e) {
+ }
+ super.tearDown();
+ }
+
+ private void selectShowNonVisual(){
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ bot.checkBox("Show Non-Visual Tags").click();
+ bot.button("OK").click();
+ }
+
+}
Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java)
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -0,0 +1,85 @@
+package org.jboss.tools.vpe.ui.bot.test.editor.preferences;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+
+public class ShowResourceBundlesUsageasELexpressionsTest extends PreferencesTestCase{
+
+ private static String textEditor;
+ private static SWTBotEclipseEditor editor;
+
+ public void testShowResourceBundlesUsageasELexpressions() throws Throwable{
+
+ //Test open page
+
+ openPage();
+
+ editor = bot.editorByTitle(TEST_PAGE).toTextEditor();
+ textEditor = editor.getText();
+
+ //Test default Show Border value
+
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ SWTBotCheckBox checkBox = bot.checkBox("Show Resource Bundles Usage as EL Expressions");
+ if (checkBox.isChecked()) {
+ checkBox.click();
+ }
+ bot.button("OK").click();
+
+ //Test check VPE content with resource bundles
+
+ selectELExpressions();
+ checkVPE("ShowResourceBundlesUsageasELExpressions.xml");
+
+ //Test check VPE content without resource bundles
+
+ selectELExpressions();
+ checkVPE("HideResourceBundlesUsageasELExpressions.xml");
+
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+
+ //Restore page state before tests
+
+ try {
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ SWTBotCheckBox checkBox = bot.checkBox("Show Resource Bundles Usage as EL Expressions");
+ if (checkBox.isChecked()) {
+ checkBox.click();
+ }
+ bot.button("OK").click();
+ } catch (WidgetNotFoundException e) {
+ }
+ editor.setFocus();
+ bot.menu("Edit").menu("Select All").click();
+ bot.menu("Edit").menu("Delete").click();
+ editor.setText(textEditor);
+ editor.save();
+ waitForJobs();
+ editor.close();
+ super.tearDown();
+ }
+
+ private void checkVPE(String testPage) throws Throwable{
+ editor.selectLine(9);
+ if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) {
+ editor.insertText("<body id=\"bodyId\">");
+ }
+ editor.save();
+ waitForJobs();
+ performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
+ }
+
+ private void selectELExpressions(){
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ bot.checkBox("Show Resource Bundles Usage as EL Expressions").click();
+ bot.button("OK").click();
+ }
+
+}
Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowSelectionTagBarTest.java)
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -0,0 +1,125 @@
+package org.jboss.tools.vpe.ui.bot.test.editor.preferences;
+
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+
+public class ShowSelectionTagBarTest extends PreferencesTestCase{
+
+ public void testShowSelectionTagBar(){
+
+ //Test open page
+
+ openPage();
+
+ //Test default Selection values
+
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ SWTBotCheckBox checkBox = bot.checkBox("Show Selection Tag Bar");
+ if (!checkBox.isChecked()) {
+ checkBox.click();
+ }
+ checkBox = bot.checkBox("Always Hide Selection Bar Without Prompt");
+ if (checkBox.isChecked()) {
+ checkBox.click();
+ }
+ bot.button("OK").click();
+
+ //Test Hide Selection Bar
+
+ selectSelection();
+ checkIsHide();
+
+ //Test Hide selection after reopen
+
+ closePage();
+ openPage();
+ checkIsHide();
+
+ //Test Show Selection Bar
+
+ selectSelection();
+ checkIsShow();
+
+ //Test Show Selection Bar after reopen
+
+ closePage();
+ openPage();
+ checkIsShow();
+
+ //Test Hide Selection Bar button with confirm
+
+ bot.toolbarButtonWithTooltip("Hide Selection Bar").click();
+ bot.shell("Confirm hide selection bar").activate();
+ bot.button("OK").click();
+ checkIsHide();
+
+ //Test Hide selection after reopen
+
+ closePage();
+ openPage();
+ checkIsHide();
+
+ //Test Show Selection Bar from dialog
+
+ selectSelection();
+ checkIsShow();
+
+ //Test Show Selection Bar after reopen
+
+ closePage();
+ openPage();
+ checkIsShow();
+
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+
+ //Restore page state before tests
+
+ try {
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ SWTBotCheckBox checkBox = bot.checkBox("Show Selection Tag Bar");
+ if (!checkBox.isChecked()) {
+ checkBox.click();
+ }
+ checkBox = bot.checkBox("Always Hide Selection Bar Without Prompt");
+ if (checkBox.isChecked()) {
+ checkBox.click();
+ }
+ bot.button("OK").click();
+ } catch (WidgetNotFoundException e) {
+ }
+ super.tearDown();
+ }
+
+ private void selectSelection(){
+ bot.toolbarButtonWithTooltip("Preferences").click();
+ bot.shell("Preferences (Filtered)").activate();
+ bot.checkBox("Show Selection Tag Bar").click();
+ bot.button("OK").click();
+ }
+
+ private void checkIsHide(){
+ WidgetNotFoundException exception = null;
+ try {
+ bot.toolbarButtonWithTooltip("Hide Selection Bar");
+ } catch (WidgetNotFoundException e) {
+ exception = e;
+ }
+ assertNotNull(exception);
+ }
+
+ private void checkIsShow(){
+ WidgetNotFoundException exception = null;
+ try {
+ bot.toolbarButtonWithTooltip("Hide Selection Bar");
+ } catch (WidgetNotFoundException e) {
+ exception = e;
+ }
+ assertNull(exception);
+ }
+
+}
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java 2009-08-21 10:52:38 UTC (rev 17212)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java 2009-08-21 12:02:04 UTC (rev 17213)
@@ -4,9 +4,9 @@
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.jboss.tools.ui.bot.test.WidgetVariables;
-import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
+import org.jboss.tools.vpe.ui.bot.test.editor.preferences.PreferencesTestCase;
-public class JBIDE4306Test extends VPEAutoTestCase{
+public class JBIDE4306Test extends PreferencesTestCase{
public void testJBIDE4306(){
@@ -49,24 +49,5 @@
bot.button("OK").click();
bot.editorByTitle(TEST_PAGE).close();
}
-
- @Override
- protected void closeUnuseDialogs() {
- try {
- bot.shell("Preferences (Filtered)").close();
- } catch (WidgetNotFoundException e) {
- }
- }
-
- @Override
- protected boolean isUnuseDialogOpened() {
- boolean isOpened = false;
- try {
- bot.shell("Preferences (Filtered)").activate();
- isOpened = true;
- } catch (WidgetNotFoundException e) {
- }
- return isOpened;
- }
}
16 years, 4 months
JBoss Tools SVN: r17212 - in trunk: maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2009-08-21 06:52:38 -0400 (Fri, 21 Aug 2009)
New Revision: 17212
Modified:
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4736 Add m2eclipse project-configurator for Seam projects
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-08-21 10:44:28 UTC (rev 17211)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-08-21 10:52:38 UTC (rev 17212)
@@ -80,7 +80,11 @@
public static final String CONFIGURE_SEAM_RUNTIME = "configureSeamRuntime"; //$NON-NLS-1$
public static final boolean CONFIGURE_SEAM_RUNTIME_VALUE = true;
+
+ public static final String CONFIGURE_SEAM_ARTIFACTS = "configureSeamArtifacts"; //$NON-NLS-1$
+ public static final boolean CONFIGURE_SEAM_ARTIFACTS_VALUE = true;
+
// The shared instance
private static MavenSeamActivator plugin;
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2009-08-21 10:44:28 UTC (rev 17211)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2009-08-21 10:52:38 UTC (rev 17212)
@@ -1,6 +1,7 @@
package org.jboss.tools.maven.seam.configurators;
import java.io.File;
+import java.util.ArrayList;
import java.util.List;
import org.apache.maven.model.Dependency;
@@ -9,15 +10,24 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
@@ -37,6 +47,7 @@
import org.jboss.tools.seam.core.project.facet.SeamVersion;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider;
+import org.jboss.tools.seam.ui.wizard.SeamWizardUtils;
import org.maven.ide.eclipse.MavenPlugin;
import org.maven.ide.eclipse.core.IMavenConstants;
import org.maven.ide.eclipse.project.IMavenProjectFacade;
@@ -92,6 +103,12 @@
}
+ private boolean isSeamSettingChangedByUser(IProject project) {
+ IEclipsePreferences projectPreferences = SeamCorePlugin.getSeamPreferences(project);
+ boolean seamSettingsChangedByUser = projectPreferences.getBoolean(ISeamFacetDataModelProperties.SEAM_SETTINGS_CHANGED_BY_USER, false);
+ return seamSettingsChangedByUser;
+ }
+
private void configureInternal(MavenProject mavenProject,IProject project,
IProgressMonitor monitor) throws CoreException {
IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore();
@@ -99,6 +116,13 @@
if (!configureSeam) {
return;
}
+ if (isSeamSettingChangedByUser(project)) {
+ return;
+ }
+ IProject rootSeamProject = SeamWizardUtils.getRootSeamProject(project);
+ if (rootSeamProject != null && isSeamSettingChangedByUser(rootSeamProject)) {
+ return;
+ }
String packaging = mavenProject.getPackaging();
String seamVersion = getSeamVersion(mavenProject);
if (seamVersion != null) {
@@ -107,10 +131,10 @@
if (earProjects.length > 0) {
deploying = "ear"; //$NON-NLS-1$
}
- IDataModel model = createSeamDataModel(deploying, seamVersion);
- final IFacetedProject fproj = ProjectFacetsManager.create(project);
+ final IFacetedProject fproj = ProjectFacetsManager.create(project);
if ("war".equals(packaging)) { //$NON-NLS-1$
- installWarFacets(fproj,model,seamVersion, monitor);
+ IDataModel model = createSeamDataModel(deploying, seamVersion, project);
+ installWarFacets(fproj, model, seamVersion, monitor);
} else if ("ear".equals(packaging)) { //$NON-NLS-1$
installEarFacets(fproj, monitor);
installM2Facet(fproj, monitor);
@@ -122,7 +146,45 @@
prefs.put(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,ISeamFacetDataModelProperties.DEPLOY_AS_EAR);
storeSettings(webProject);
}
+ IProject ejbProject = getReferencingSeamEJBProject(project);
+ if (ejbProject != null) {
+ prefs.put(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, ejbProject.getName());
+ IJavaProject javaProject = JavaCore.create(ejbProject);
+ boolean configureSeamArtifacts = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS);
+ if (configureSeamArtifacts) {
+ if (javaProject != null && javaProject.isOpen()) {
+ try {
+ IClasspathEntry[] entries = javaProject.getRawClasspath();
+ for (int i = 0; i < entries.length; i++) {
+ IClasspathEntry entry = entries[i];
+ if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
+ String sourceFolder = entry.getPath().toString();
+ prefs.put(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER, sourceFolder);
+ prefs.put(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER, sourceFolder);
+ break;
+ }
+ }
+ } catch (JavaModelException e) {
+ MavenSeamActivator.log(e);
+ }
+ }
+ IPackageFragment[] packageFragments = javaProject.getPackageFragments();
+ for (int i = 0; i < packageFragments.length; i++) {
+ IPackageFragment pf = packageFragments[i];
+ if (pf != null && pf.getKind() == IPackageFragmentRoot.K_SOURCE && !pf.isDefaultPackage()) {
+ if (pf.hasSubpackages() && !pf.hasChildren()) {
+ continue;
+ }
+ String packageName = pf.getElementName();
+ prefs.put(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, packageName);
+ prefs.put(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, packageName);
+ }
+ }
+ }
+ }
+ storeSettings(webProject);
}
+
} else if ("ejb".equals(packaging)) { //$NON-NLS-1$
installM2Facet(fproj,monitor);
installEjbFacets(fproj, monitor);
@@ -136,6 +198,18 @@
}
}
+ private String getViewFolder(IProject project) {
+ IVirtualComponent com = ComponentCore.createComponent(project);
+ String viewFolder = null;
+ if(com!=null) {
+ IVirtualFolder webRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
+ if(webRootFolder!=null) {
+ viewFolder = webRootFolder.getUnderlyingFolder().getFullPath().toString();
+ }
+ }
+ return viewFolder;
+ }
+
@Override
protected void mavenProjectChanged(MavenProjectChangedEvent event,
IProgressMonitor monitor) throws CoreException {
@@ -195,9 +269,31 @@
if (!fproj.hasProjectFacet(seamFacet)) {
IProjectFacetVersion seamFacetVersion = getSeamFacetVersion(seamVersion);
fproj.installProjectFacet(seamFacetVersion, model, monitor);
+ } else {
+ String deploying = model.getStringProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS);
+ if (deploying != null && deploying.equals(ISeamFacetDataModelProperties.DEPLOY_AS_WAR)) {
+ IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore();
+ boolean configureSeamArtifacts = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS);
+ if (!configureSeamArtifacts) {
+ return;
+ }
+ IEclipsePreferences prefs = SeamCorePlugin.getSeamPreferences(fproj.getProject());
+ setModelProperty(model, prefs,ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER);
+ setModelProperty(model, prefs,ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER);
+ setModelProperty(model, prefs,ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME);
+ setModelProperty(model, prefs,ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME);
+ setModelProperty(model, prefs,ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER);
+ }
}
}
+ private void setModelProperty(IDataModel model, IEclipsePreferences prefs, String property) {
+ String value = model.getStringProperty(property);
+ if (value != null && value.trim().length() > 0) {
+ prefs.put(property, value);
+ }
+ }
+
private void installJSFFacet(IFacetedProject fproj, IProgressMonitor monitor)
throws CoreException {
if (!fproj.hasProjectFacet(jsfFacet)) {
@@ -208,9 +304,11 @@
private void storeSettings(IProject project) {
IScopeContext projectScope = new ProjectScope(project);
IEclipsePreferences prefs = projectScope.getNode(SeamCorePlugin.PLUGIN_ID);
- prefs.put(ISeamFacetDataModelProperties.SEAM_SETTINGS_VERSION,
+ String version = prefs.get(ISeamFacetDataModelProperties.SEAM_SETTINGS_VERSION, null);
+ if (version == null) {
+ prefs.put(ISeamFacetDataModelProperties.SEAM_SETTINGS_VERSION,
ISeamFacetDataModelProperties.SEAM_SETTINGS_VERSION_1_1);
-
+ }
try {
prefs.flush();
} catch (BackingStoreException e) {
@@ -281,6 +379,43 @@
return null;
}
+ private IProject getReferencingSeamEJBProject(IProject earProject)
+ throws CoreException {
+ IVirtualComponent component = ComponentCore.createComponent(earProject);
+ if (component != null) {
+ IVirtualReference[] references = component.getReferences();
+ for (int i = 0; i < references.length; i++) {
+ IVirtualComponent refComponent = references[i]
+ .getReferencedComponent();
+ IProject refProject = refComponent.getProject();
+ if (JavaEEProjectUtilities.isEJBProject(refProject)) {
+ if (refProject.hasNature(IMavenConstants.NATURE_ID)) {
+ IFile pom = refProject
+ .getFile(IMavenConstants.POM_FILE_NAME);
+ if (pom.exists()) {
+ MavenProjectManager projectManager = MavenPlugin
+ .getDefault().getMavenProjectManager();
+ IMavenProjectFacade facade = projectManager.create(
+ pom, true, null);
+ if (facade != null) {
+ MavenProject mavenProject = facade
+ .getMavenProject(null);
+ if (mavenProject != null) {
+ String version = getSeamVersion(mavenProject);
+ if (version != null) {
+ return refProject;
+ }
+ }
+ }
+ }
+
+ }
+ }
+ }
+ }
+ return null;
+ }
+
private String getSeamVersion(MavenProject mavenProject) {
List<Dependency> dependencies = mavenProject.getDependencies();
Dependency seamDependency = null;
@@ -301,7 +436,7 @@
return null;
}
- private IDataModel createSeamDataModel(String deployType, String seamVersion) {
+ private IDataModel createSeamDataModel(String deployType, String seamVersion, IProject project) {
IDataModel config = (IDataModel) new SeamFacetInstallDataModelProvider().create();
String seamRuntimeName = getSeamRuntimeName(seamVersion);
if (seamRuntimeName != null) {
@@ -310,11 +445,67 @@
config.setBooleanProperty(ISeamFacetDataModelProperties.DB_ALREADY_EXISTS, true);
config.setBooleanProperty(ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY, false);
config.setStringProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, deployType);
- //config.setStringProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, "org.session.beans");
- //config.setStringProperty(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "org.entity.beans");
- //config.setStringProperty(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "org.test.beans");
config.setBooleanProperty(ISeamFacetDataModelProperties.CONFIGURE_DEFAULT_SEAM_RUNTIME, false);
config.setBooleanProperty(ISeamFacetDataModelProperties.CONFIGURE_WAR_PROJECT, false);
+ IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore();
+ boolean configureSeamArtifacts = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS);
+ if (!configureSeamArtifacts) {
+ return config;
+ }
+ String viewFolder = getViewFolder(project);
+ if (viewFolder != null) {
+ config.setStringProperty(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, viewFolder);
+ }
+ IJavaProject javaProject = JavaCore.create(project);
+ List<IPath> sourcePaths = new ArrayList<IPath>();
+ if (javaProject != null && javaProject.isOpen()) {
+ try {
+ IClasspathEntry[] entries = javaProject.getRawClasspath();
+ for (int i = 0; i < entries.length; i++) {
+ IClasspathEntry entry = entries[i];
+ if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
+ sourcePaths.add(entry.getPath());
+ }
+ }
+ } catch (JavaModelException e) {
+ MavenSeamActivator.log(e);
+ }
+ if (sourcePaths.size() > 0) {
+ IPath actionSourceFolder = null;
+ IPath modelSourceFolder = null;
+ for (IPath sourcePath:sourcePaths) {
+ if (sourcePath.toString().contains("hot")) { //$NON-NLS-1$
+ actionSourceFolder = sourcePath;
+ } else {
+ modelSourceFolder = sourcePath;
+ }
+ }
+ if (actionSourceFolder == null) {
+ actionSourceFolder = modelSourceFolder;
+ }
+ if (modelSourceFolder == null) {
+ modelSourceFolder = actionSourceFolder;
+ }
+ String modelSourceFolderStr = modelSourceFolder.toString();
+ config.setStringProperty(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER, modelSourceFolderStr);
+ String actionSourceFolderStr = actionSourceFolder.toString();
+ config.setStringProperty(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER, actionSourceFolderStr);
+ }
+ try {
+ IPackageFragment[] packageFragments = javaProject.getPackageFragments();
+ for (int i = 0; i < packageFragments.length; i++) {
+ IPackageFragment pf = packageFragments[i];
+ if (pf != null && pf.getKind() == IPackageFragmentRoot.K_SOURCE && !pf.isDefaultPackage()) {
+ String packageName = pf.getElementName();
+ config.setStringProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, packageName);
+ config.setStringProperty(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, packageName);
+ }
+ }
+ } catch (JavaModelException e) {
+ MavenSeamActivator.log(e);
+ }
+ }
+ //config.setStringProperty(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "org.test.beans");
//config.setStringProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, "noop-connection");
//config.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH, new String[] { "noop-driver.jar" });
return config;
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java 2009-08-21 10:44:28 UTC (rev 17211)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java 2009-08-21 10:52:38 UTC (rev 17212)
@@ -19,6 +19,7 @@
private Button configureSeamButton;
private Button configureSeamRuntimeButton;
+ private Button configureSeamArtifactsButton;
@Override
protected Control createContents(Composite parent) {
@@ -40,11 +41,18 @@
configureSeamRuntimeButton.setSelection(configureSeamRuntime);
configureSeamRuntimeButton.setEnabled(configureSeam);
+ configureSeamArtifactsButton = new Button(composite,SWT.CHECK);
+ configureSeamArtifactsButton.setText("Configure Seam Artifacts (view folder, model source folder, package ...)");
+ boolean configureSeamArtifacts = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS);
+ configureSeamArtifactsButton.setSelection(configureSeamArtifacts);
+ configureSeamArtifactsButton.setEnabled(configureSeam);
+
configureSeamButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
configureSeamRuntimeButton.setEnabled(configureSeamButton.getSelection());
+ configureSeamArtifactsButton.setEnabled(configureSeamButton.getSelection());
}
});
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java 2009-08-21 10:44:28 UTC (rev 17211)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java 2009-08-21 10:52:38 UTC (rev 17212)
@@ -19,6 +19,9 @@
node.putBoolean(
MavenSeamActivator.CONFIGURE_SEAM_RUNTIME,
MavenSeamActivator.CONFIGURE_SEAM_RUNTIME_VALUE);
+ node.putBoolean(
+ MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS,
+ MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS_VALUE);
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java 2009-08-21 10:44:28 UTC (rev 17211)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java 2009-08-21 10:52:38 UTC (rev 17212)
@@ -297,4 +297,6 @@
String CONFIGURE_DEFAULT_SEAM_RUNTIME = "configure.default.seam.runtime"; //$NON-NLS-1$
String CONFIGURE_WAR_PROJECT = "configure.war.project"; //$NON-NLS-1$
+
+ String SEAM_SETTINGS_CHANGED_BY_USER = "seam.settings.changed.by.user"; //$NON-NLS-1$
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2009-08-21 10:44:28 UTC (rev 17211)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2009-08-21 10:52:38 UTC (rev 17212)
@@ -765,6 +765,13 @@
if (isSeamSupported()) {
addSeamSupport(project);
addSeamSupport(warProject);
+ if (warProject != null) {
+ IEclipsePreferences prefs = SeamCorePlugin.getSeamPreferences(warProject);
+ prefs.putBoolean(ISeamFacetDataModelProperties.SEAM_SETTINGS_CHANGED_BY_USER, true);
+ } else {
+ IEclipsePreferences prefs = SeamCorePlugin.getSeamPreferences(project);
+ prefs.putBoolean(ISeamFacetDataModelProperties.SEAM_SETTINGS_CHANGED_BY_USER, true);
+ }
storeSettings();
} else {
removeSeamSupport();
16 years, 4 months
JBoss Tools SVN: r17211 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2009-08-21 06:44:28 -0400 (Fri, 21 Aug 2009)
New Revision: 17211
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3875
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-08-21 10:44:07 UTC (rev 17210)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-08-21 10:44:28 UTC (rev 17211)
@@ -21,6 +21,7 @@
import org.jboss.tools.jst.web.kb.taglib.IAttribute;
import org.jboss.tools.jst.web.kb.taglib.IComponent;
import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibrary;
+import org.jboss.tools.jst.web.kb.taglib.IFacesConfigTagLibrary;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
/**
@@ -54,6 +55,9 @@
if (!isQueryForELProposals(query, context)) {
ITagLibrary[] libs = context.getLibraries();
for (int i = 0; libs != null && i < libs.length; i++) {
+ if(libs[i] instanceof IFacesConfigTagLibrary) {
+ continue;
+ }
TextProposal[] libProposals = libs[i].getProposals(query, context);
for (int j = 0; libProposals != null && j < libProposals.length; j++) {
proposals.add(libProposals[j]);
@@ -122,6 +126,9 @@
ArrayList<IComponent> components = new ArrayList<IComponent>();
ITagLibrary[] libs = context.getLibraries();
for (int i = 0; i < libs.length; i++) {
+ if(libs[i] instanceof IFacesConfigTagLibrary) {
+ continue;
+ }
IComponent[] libComponents = libs[i].getComponents(query, context);
for (int j = 0; j < libComponents.length; j++) {
if(includeComponentExtensions || !libComponents[j].isExtended()) {
16 years, 4 months