August 2009 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r17000 - workspace/rstryker and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-06 21:11:49 -0400 (Thu, 06 Aug 2009) New Revision: 17000 Added: workspace/rstryker/org.jboss.ide.eclipse.as.wtp.override.ui/ Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/ Log: moving the UI plugin into my secret workspace as I believe it will be in WTP and not in our stuff Copied: workspace/rstryker/org.jboss.ide.eclipse.as.wtp.override.ui (from rev 16999, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui)

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r16999 - branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-06 20:16:28 -0400 (Thu, 06 Aug 2009) New Revision: 16999 Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java Log: JBIDE-4489 Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2009-08-07 00:14:56 UTC (rev 16998) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2009-08-07 00:16:28 UTC (rev 16999) @@ -251,6 +251,7 @@ if ((first instanceof XPathResultNode || first instanceof XPathFileResult) || (first instanceof XPathQuery && ((XPathQuery) first) .getResults().length == 1)) { + selectedNode = first; menu.add(editFileAction); } } @@ -276,4 +277,4 @@ return null; } -} \ No newline at end of file +}

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r16998 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-06 20:14:56 -0400 (Thu, 06 Aug 2009) New Revision: 16998 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java Log: JBIDE-4489 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2009-08-06 21:32:16 UTC (rev 16997) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2009-08-07 00:14:56 UTC (rev 16998) @@ -250,6 +250,7 @@ if ((first instanceof XPathResultNode || first instanceof XPathFileResult) || (first instanceof XPathQuery && ((XPathQuery) first) .getResults().length == 1)) { + selectedNode = first; menu.add(editFileAction); } }

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r16997 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-06 17:32:16 -0400 (Thu, 06 Aug 2009) New Revision: 16997 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-4726 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-08-06 20:17:16 UTC (rev 16996) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-08-06 21:32:16 UTC (rev 16997) @@ -60,6 +60,7 @@ public static String rwf_nameTextBlank; public static String rwf_homeDirBlank; public static String rwf_NoVMSelected; + public static String rwf_jre6NotFound; public static String swf_Title; public static String swf_RuntimeInformation; public static String swf_AuthorizationDescription; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-08-06 20:17:16 UTC (rev 16996) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-08-06 21:32:16 UTC (rev 16997) @@ -19,6 +19,7 @@ rwf_nameTextBlank=The name field must not be blank rwf_homeDirBlank=The directory field must not be blank rwf_NoVMSelected=No VM selected +rwf_jre6NotFound=No Java 6 runtime environment found J2EEModuleExportOperation_DestinationFileIsDirectoryError=The specified file: {0} exists and is a directory J2EEModuleExportOperation_ErrorExportingArchive=Error Exporting {0} JBAS_version=JBoss Application Server {0} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2009-08-06 21:32:16 UTC (rev 16997) @@ -0,0 +1,64 @@ +/** + * JBoss by Red Hat + * Copyright 2006-2009, Red Hat Middleware, LLC, and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * +* This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ide.eclipse.as.ui.wizards; + +import java.util.ArrayList; + +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.IVMInstall2; +import org.eclipse.jdt.launching.IVMInstallType; +import org.eclipse.jdt.launching.JavaRuntime; +import org.jboss.ide.eclipse.as.ui.Messages; + +public class JBossRuntimeJava6WizardFragment extends JBossRuntimeWizardFragment { + + public JBossRuntimeJava6WizardFragment() { + } + + protected boolean shouldIncludeDefaultJRE() { + return false; + } + + protected ArrayList<IVMInstall> getValidJREs() { + ArrayList<IVMInstall> valid = new ArrayList<IVMInstall>(); + IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes(); + int size = vmInstallTypes.length; + for (int i = 0; i < size; i++) { + IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls(); + int size2 = vmInstalls.length; + for (int j = 0; j < size2; j++) { + if( vmInstalls[j] instanceof IVMInstall2 ) { + String version = ((IVMInstall2)vmInstalls[j]).getJavaVersion(); + if( version.startsWith("1.6.")) + valid.add(vmInstalls[j]); + } + } + } + return valid; + } + + protected String getErrorString() { + if( !shouldIncludeDefaultJRE() && getValidJREs().size() == 0 ) + return Messages.rwf_jre6NotFound; + return super.getErrorString(); + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-06 20:17:16 UTC (rev 16996) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-06 21:32:16 UTC (rev 16997) @@ -363,8 +363,9 @@ jreCombo = new Combo(jreComposite, SWT.DROP_DOWN | SWT.READ_ONLY); jreCombo.setItems(jreNames); - jreCombo.select(defaultVMIndex); - + if( defaultVMIndex != -1 ) + jreCombo.select(defaultVMIndex); + jreButton = new Button(jreComposite, SWT.NONE); jreButton.setText(Messages.wf_JRELabel); @@ -588,7 +589,7 @@ handle.setMessage(error, IMessageProvider.ERROR); } - private String getErrorString() { + protected String getErrorString() { if (nameText == null) { // not yet initialized. no errors return null; @@ -690,31 +691,41 @@ // JRE methods protected void updateJREs() { // get all installed JVMs - installedJREs = new ArrayList<IVMInstall>(); + installedJREs = getValidJREs(); + // get names + int size = installedJREs.size(); + size = shouldIncludeDefaultJRE() ? size+1 : size; + int index = 0; + jreNames = new String[size]; + if( shouldIncludeDefaultJRE()) + jreNames[index++] = "Default JRE"; //$NON-NLS-1$ + + for (int i = 0; i < installedJREs.size(); i++) { + IVMInstall vmInstall = installedJREs.get(i); + jreNames[index++] = vmInstall.getName(); + } + defaultVMIndex = shouldIncludeDefaultJRE() ? 0 : + jreNames.length > 0 ? 0 : -1; + } + + protected boolean shouldIncludeDefaultJRE() { + return true; + } + + protected ArrayList<IVMInstall> getValidJREs() { + ArrayList<IVMInstall> valid = new ArrayList<IVMInstall>(); IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes(); int size = vmInstallTypes.length; for (int i = 0; i < size; i++) { IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls(); int size2 = vmInstalls.length; for (int j = 0; j < size2; j++) { - installedJREs.add(vmInstalls[j]); + valid.add(vmInstalls[j]); } } - - // get names - size = installedJREs.size(); - jreNames = new String[size+1]; - jreNames[0] = "Default JRE"; //$NON-NLS-1$ - for (int i = 0; i < size; i++) { - IVMInstall vmInstall = installedJREs.get(i); - jreNames[i+1] = vmInstall.getName(); - } - - //selectedVM = JavaRuntime.getDefaultVMInstall(); - //defaultVMIndex = installedJREs.indexOf(selectedVM); - defaultVMIndex = 0; + return valid; } - + // WST API methods public void enter() { beenEntered = true; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-08-06 20:17:16 UTC (rev 16996) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-08-06 21:32:16 UTC (rev 16997) @@ -30,9 +30,14 @@ point="org.eclipse.wst.server.ui.wizardFragments"> <fragment class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeWizardFragment" - typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50" - id="org.jboss.ide.eclipse.as.ui.jboss32RuntimeWizardFragmentragment"/> + typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43" + id="org.jboss.ide.eclipse.as.ui.JBossRuntimeWizardFragment"/> +  <fragment + class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeJava6WizardFragment" + typeIds="org.jboss.ide.eclipse.as.runtime.eap.50" + id="org.jboss.ide.eclipse.as.ui.JBossRuntimeJava6WizardFragment"/> + <fragment class="org.jboss.ide.eclipse.as.ui.wizards.JBossServerWizardFragment" id="org.jboss.ide.eclipse.as.ui.jbossServerWizardFragment" typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50"/>

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r16996 - trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2009-08-06 16:17:16 -0400 (Thu, 06 Aug 2009) New Revision: 16996 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/project/facet/JSFPortletFacetInstallPage.java Log: https://jira.jboss.org/jira/browse/JBDS-807 "New" dialog breaks after selecting different Seam configuration Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/project/facet/JSFPortletFacetInstallPage.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/project/facet/JSFPortletFacetInstallPage.java 2009-08-06 20:16:12 UTC (rev 16995) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/project/facet/JSFPortletFacetInstallPage.java 2009-08-06 20:17:16 UTC (rev 16996) @@ -412,6 +412,9 @@ } org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime = fpwc.getPrimaryRuntime(); + if (facetRuntime == null) { + return false; + } IRuntime runtime = PortletCoreActivator.getRuntime(facetRuntime); IJBossServerRuntime jbossRuntime = (IJBossServerRuntime)runtime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor()); if (jbossRuntime != null) {

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r16995 - branches/jbosstools-3.0.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2009-08-06 16:16:12 -0400 (Thu, 06 Aug 2009) New Revision: 16995 Modified: branches/jbosstools-3.0.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/project/facet/JSFPortletFacetInstallPage.java Log: https://jira.jboss.org/jira/browse/JBDS-807 "New" dialog breaks after selecting different Seam configuration Modified: branches/jbosstools-3.0.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/project/facet/JSFPortletFacetInstallPage.java =================================================================== --- branches/jbosstools-3.0.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/project/facet/JSFPortletFacetInstallPage.java 2009-08-06 17:35:17 UTC (rev 16994) +++ branches/jbosstools-3.0.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/project/facet/JSFPortletFacetInstallPage.java 2009-08-06 20:16:12 UTC (rev 16995) @@ -412,6 +412,9 @@ } org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime = fpwc.getPrimaryRuntime(); + if (facetRuntime == null) { + return false; + } IRuntime runtime = PortletCoreActivator.getRuntime(facetRuntime); IJBossServerRuntime jbossRuntime = (IJBossServerRuntime)runtime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor()); if (jbossRuntime != null) {

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r16994 - trunk/smooks/docs/reference/en/images/config_page.

by jbosstools-commits＠lists.jboss.org

Author: chukhutsina Date: 2009-08-06 13:35:17 -0400 (Thu, 06 Aug 2009) New Revision: 16994 Added: trunk/smooks/docs/reference/en/images/config_page/config_page6.png trunk/smooks/docs/reference/en/images/config_page/config_page7.png trunk/smooks/docs/reference/en/images/config_page/config_page8.png trunk/smooks/docs/reference/en/images/config_page/config_page9.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-793 -Added the section "file selection" to Doc - Smooks; checked the screens.</p> </body></html> Added: trunk/smooks/docs/reference/en/images/config_page/config_page6.png =================================================================== (Binary files differ) Property changes on: trunk/smooks/docs/reference/en/images/config_page/config_page6.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/docs/reference/en/images/config_page/config_page7.png =================================================================== (Binary files differ) Property changes on: trunk/smooks/docs/reference/en/images/config_page/config_page7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/docs/reference/en/images/config_page/config_page8.png =================================================================== (Binary files differ) Property changes on: trunk/smooks/docs/reference/en/images/config_page/config_page8.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/docs/reference/en/images/config_page/config_page9.png =================================================================== (Binary files differ) Property changes on: trunk/smooks/docs/reference/en/images/config_page/config_page9.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r16993 - trunk/smooks/docs/reference/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: chukhutsina Date: 2009-08-06 13:33:58 -0400 (Thu, 06 Aug 2009) New Revision: 16993 Modified: trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.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-793 -Added the section "file selection" to Doc - Smooks; checked the screens.</p> </body></html> Modified: trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.xml =================================================================== --- trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.xml 2009-08-06 16:39:18 UTC (rev 16992) +++ trunk/smooks/docs/reference/en/modules/smooksformeditor_configurationpage.xml 2009-08-06 17:33:58 UTC (rev 16993) @@ -129,11 +129,61 @@ <para>Left click the added item and to the left of <emphasis> <property>Message Filtering Resources Import Smooks Configuration </property></emphasis> section should appear. Click the <emphasis> <property>Browse</property> - </emphasis> button and select the file you want to import. </para> + </emphasis> button and select the file you want to import(see <link linkend="file_selection">File selection</link> section). </para> <para>Click <emphasis> <property>Save</property></emphasis> and the <code><import></code> tag with the corresponding file path as a <emphasis> <property>file</property></emphasis> property will be added to the <emphasis> <property>smooks-config.xml</property></emphasis>.</para> + </section > + <section id="file_selection"> + <title>File selection</title> + <para>Some attributes in Smooks elements should store path to a file as a value + (e.g. attribute <emphasis><property>"mappingModel"</property></emphasis> of the element <emphasis><property>"edi:reader"</property></emphasis>). + You can see a Browse button near the fields, that set such a value to the attribute + (e.g. <emphasis><property>"Mapping Model"</property></emphasis> field set a value to the <emphasis><property>"mappingModel"</property></emphasis> attribute). + </para> + <figure> + <title>EDI:Reader element</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/config_page/config_page6.png" scale="90"/> + </imageobject> + </mediaobject> + </figure> + <para> + When you click <emphasis><property>Browse</property></emphasis>, the dialog prompts you click one of two buttons: + <emphasis><property>Browse File System</property></emphasis> and <emphasis><property>Browse WorkSpace</property></emphasis>. + </para> + <figure> + <title>Browse dialog</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/config_page/config_page7.png" scale="90"/> + </imageobject> + </mediaobject> + </figure> + <para>Using the buttons you can locate the file you need. If you click <emphasis> + <property>Browse File System</property></emphasis> button you specify the path of, or browse to, a file system directory. + </para> + <figure> + <title>Browse file system</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/config_page/config_page8.png" scale="90"/> + </imageobject> + </mediaobject> + </figure> + <para> + If you click <emphasis><property>Browse WorkSpace</property></emphasis> button, you specify the path of, or browse to, a workspace relative working directory. + </para> + <figure> + <title>Browse Workspace</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/config_page/config_page9.png" scale="90"/> + </imageobject> + </mediaobject> + </figure> </section> <!--<section id="configurationpage_datedecoder"> <title>Date Decoder Detail Page</title>

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r16992 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: toolbar and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2009-08-06 12:39:18 -0400 (Thu, 06 Aug 2009) New Revision: 16992 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ComboFormatController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java Log: issue JBIDE-4075: Make Text Formatting toolbar expanded https://jira.jboss.org/jira/browse/JBIDE-4075 - now the toolbar has a chevron with a drop-down menu Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-08-06 15:58:09 UTC (rev 16991) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-08-06 16:39:18 UTC (rev 16992) @@ -301,15 +301,15 @@ @Override public void createPartControl(final Composite parent) { //Setting Layout for the parent Composite - parent.setLayout(new FillLayout()); +// parent.setLayout(new FillLayout()); /* * https://jira.jboss.org/jira/browse/JBIDE-4062 * Creating scrollable eclipse element. */ - ScrolledComposite sc = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); - sc.setLayout(new FillLayout()); - Composite composite = new Composite(sc, SWT.NATIVE); +// ScrolledComposite sc = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); +// sc.setLayout(new FillLayout()); +// Composite composite = new Composite(parent, SWT.NATIVE); GridLayout layout = new GridLayout(2,false); layout.marginHeight = 0; @@ -317,12 +317,13 @@ layout.verticalSpacing = 2; layout.horizontalSpacing = 2; layout.marginBottom = 0; - composite.setLayout(layout); - composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + parent.setLayout(layout); +// composite.setLayout(layout); +// composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); // Editors and Toolbar composite - Composite cmpEdTl = new Composite(composite, SWT.NONE); + Composite cmpEdTl = new Composite(parent, SWT.NONE); GridLayout layoutEdTl = new GridLayout(1, false); layoutEdTl.verticalSpacing = 0; layoutEdTl.marginHeight = 0; @@ -467,11 +468,11 @@ * https://jira.jboss.org/jira/browse/JBIDE-4062 * Computing elements sizes to set up scroll bars. */ - Point totalSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT); - sc.setContent(composite); - sc.setExpandHorizontal(true); - sc.setExpandVertical(true); - sc.setMinSize(totalSize); +// Point totalSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT); +// sc.setContent(composite); +// sc.setExpandHorizontal(true); +// sc.setExpandVertical(true); +// sc.setMinSize(totalSize); } /** Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java 2009-08-06 15:58:09 UTC (rev 16991) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/SplitToolBar.java 2009-08-06 16:39:18 UTC (rev 16992) @@ -10,29 +10,136 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.toolbar; +import java.util.Arrays; +import java.util.List; + import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.events.ShellAdapter; +import org.eclipse.swt.events.ShellEvent; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.layout.RowData; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.CoolBar; +import org.eclipse.swt.widgets.CoolItem; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.ToolBar; +import org.eclipse.swt.widgets.ToolItem; +import org.eclipse.swt.widgets.Widget; /** * @author Erick * Created on 14.07.2005 + * @author yradtsevich + * * @see IVpeToolBar * This class create a toolBar and store all his item in the array of IItems * @see IItems */ public abstract class SplitToolBar implements IVpeToolBar { - public abstract IItems[] createItems(ToolBar bar); + protected CoolBar coolBar; + public abstract void createItems(ToolBar bar); public void createToolBarControl(Composite parent) { final Composite comp = new Composite(parent, SWT.NONE); comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + comp.setLayout(new GridLayout()); + coolBar = new CoolBar(comp, SWT.FLAT | SWT.WRAP); + coolBar.setLayoutData(new GridData(GridData.FILL_BOTH)); - final ToolBar horBar = new ToolBar(comp, SWT.FLAT); - createItems(horBar); + final ToolBar toolBar = new ToolBar(coolBar, SWT.FLAT | SWT.WRAP); + createItems(toolBar); + CoolItem coolItem = new CoolItem(coolBar, SWT.DROP_DOWN); + coolItem.setControl(toolBar); + Point size = toolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT); + Point coolSize = coolItem.computeSize(size.x, size.y); + coolItem.setSize(coolSize); + coolItem.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + if (event.detail == SWT.ARROW) { + CoolItem item = (CoolItem) event.widget; + Rectangle itemBounds = item.getBounds(); + Point pt = coolBar.toDisplay(new Point(itemBounds.x, + itemBounds.y)); + itemBounds.x = pt.x; + itemBounds.y = pt.y; + ToolBar bar = (ToolBar) item.getControl(); + ToolItem[] tools = bar.getItems(); + + int i = 0; + while (i < tools.length) { + Rectangle toolBounds = tools[i].getBounds(); + pt = bar.toDisplay(new Point(toolBounds.x, toolBounds.y)); + toolBounds.x = pt.x; + toolBounds.y = pt.y; + + /* + * Figure out the visible portion of the tool by looking + * at the intersection of the tool bounds with the cool + * item bounds. + */ + Rectangle intersection = itemBounds + .intersection(toolBounds); + + /* + * If the tool is not completely within the cool item + * bounds, then it is partially hidden, and all + * remaining tools are completely hidden. + */ + if (!intersection.equals(toolBounds)) + break; + i++; + } + + /* + * Create a menu with items for each of the completely + * hidden buttons. + */ + final Shell floatingShell = new Shell(coolBar.getShell(), + SWT.ON_TOP); + floatingShell.setLayout(new GridLayout()); + final ToolBar floatingBar = new ToolBar(floatingShell, + SWT.FLAT | SWT.WRAP); + SelectionListener selectionListener = new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + floatingShell.dispose(); + } + }; + for (int j = i; j < tools.length; j++) { + cloneToolItem(floatingBar, tools[j], selectionListener); + } + + /* + * Drop down the menu below the chevron, with the left edges + * aligned. + */ + pt = coolBar.toDisplay(new Point(event.x, event.y)); + floatingShell.pack(); + arrange(floatingShell, pt); + floatingShell.setVisible(true); + floatingShell.setFocus(); + floatingShell.addShellListener(new ShellAdapter() { + public void shellDeactivated(ShellEvent e) { + e.widget.dispose(); + } + }); + } + } + }); + coolBar.pack(); +// coolBar.layout(); + // final Button button = new Button(parent, SWT.FLAT|SWT.PUSH); // button.setImage(ImageDescriptor.createFromFile(MozillaEditor.class, "icons/arrow_more.gif").createImage()); // button.setVisible(false); @@ -86,7 +193,7 @@ // } // } // }); - horBar.pack(true); + toolBar.pack(true); } // public Menu setMenu(Composite cmp, Button btn){ @@ -123,4 +230,116 @@ // } // return menu; // } -} \ No newline at end of file + + /** + * Creates a copy of {@code item} in the {@code destBar} and + * adds given {@code selectionListener} to the created control. + */ + protected void cloneToolItem(ToolBar destBar, ToolItem item, + SelectionListener selectionListener) { + int style = item.getStyle(); + + if ((style & SWT.SEPARATOR) != 0) { + Control control = item.getControl(); + if (control instanceof Combo) { + Combo combo = (Combo) control; + Combo copiedCombo = createComboToolItem(destBar, combo.getStyle(), + combo.getToolTipText(), + Arrays.asList(combo.getItems()), + combo.getSelectionIndex()); + copiedCombo.setEnabled(combo.getEnabled()); + copiedCombo.setVisible(combo.getVisible()); + copySelectionListeners(combo, copiedCombo); + copiedCombo.addSelectionListener(selectionListener); + } + } else { + ToolItem copiedItem = createToolItem(destBar, item.getStyle(), + item.getImage(), item.getToolTipText()); + copiedItem.setEnabled(item.getEnabled()); + copiedItem.setSelection(item.getSelection()); + copySelectionListeners(item, copiedItem); + copiedItem.addSelectionListener(selectionListener); + } + } + + /** + * Copies all selection listeners from {@code src} to {@code dest}. + */ + protected void copySelectionListeners(Widget src, Widget dest) { + Listener[] listeners = src.getListeners(SWT.Selection); + for (Listener listener : listeners) { + dest.addListener(SWT.Selection, listener); + } + } + + /** + * Creates and returns new {@code ToolItem} in the + * {@code bar}. + */ + protected ToolItem createToolItem(ToolBar bar, int style, + Image image, String toolTipText) { + ToolItem item = null; + item = new ToolItem(bar, style); + item.setImage(image); + item.setToolTipText(toolTipText); + + return item; + } + + /** + * Creates and returns new {@code Combo} in the + * {@code bar}. + */ + protected Combo createComboToolItem(ToolBar bar, int style, + String toolTipText, List<String> comboItems, int selectionIndex) { + Combo combo = createCombo(bar, style, comboItems); + ToolItem sep = new ToolItem(bar, SWT.SEPARATOR); + sep.setWidth(combo.getSize().x); + combo.setToolTipText(toolTipText); + combo.select(selectionIndex); + sep.setControl(combo); + + return combo; + } + + protected Combo createCombo(Composite parent, int style, + List<String> comboItems) { + Combo combo = new Combo(parent, style); + combo.setLayoutData(new RowData()); + combo.setItems(comboItems.toArray(new String[comboItems.size()])); + combo.pack(); + return combo; + } + + /** + * Arranges {@code control} on the display near the {@code point}. + */ + private void arrange(Control control, Point point) { + Point size = control.getSize(); + Rectangle bounds = new Rectangle(point.x, point.y, size.x, size.y); + control.setBounds(arrange(bounds, control.getDisplay().getBounds())); + } + + /** + * Returns the nearest {@code Rectangle} to the given {@code bounds}, + * which is fully placed in the {@code clientArea}. + */ + private Rectangle arrange(Rectangle bounds, Rectangle clientArea) { + Rectangle result = new Rectangle(bounds.x, bounds.y, + bounds.width, bounds.height); + if (result.x + result.width > clientArea.x + clientArea.width) { + result.x = clientArea.x + clientArea.width - result.width; + } + if (result.x < clientArea.x) { + result.x = clientArea.x; + } + if (result.y + result.height > clientArea.y + clientArea.height) { + result.y = clientArea.y + clientArea.height - result.height; + } + if (result.y < clientArea.y) { + result.y = clientArea.y; + } + + return result; + } +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.java 2009-08-06 15:58:09 UTC (rev 16991) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/VpeToolBarManager.java 2009-08-06 16:39:18 UTC (rev 16992) @@ -17,14 +17,16 @@ import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.jboss.tools.vpe.VpePlugin; -import org.jboss.tools.vpe.editor.util.Constants; import org.jboss.tools.vpe.messages.VpeUIMessages; /** @@ -48,7 +50,7 @@ public Composite createToolBarComposite(Composite parent) { splitter = new Splitter(parent, SWT.NONE) { - // if there is not visual children then return Point(0,0) + // if there are no visual children then return Point(0,0) public Point computeSize(int hint, int hint2, boolean changed) { int countVisibleChild = 0; @@ -63,16 +65,24 @@ return super.computeSize(hint, hint2, changed); } }; - + splitter.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); return splitter; } public void addToolBar(IVpeToolBar bar) { Composite cmpToolBar = new Composite(splitter, SWT.NONE); + splitter.getParent().setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE)); + splitter.getParent().setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE)); + FormData data = new FormData(); + data.left = new FormAttachment(0); + data.right = new FormAttachment(100); + data.top = new FormAttachment(0); + + cmpToolBar.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); GridLayout layoutTl = new GridLayout(2, false); layoutTl.marginBottom = 0; - layoutTl.marginHeight = 2; + layoutTl.marginHeight = 0; layoutTl.marginWidth = 0; layoutTl.verticalSpacing = 0; layoutTl.horizontalSpacing = 0; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java 2009-08-06 15:58:09 UTC (rev 16991) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java 2009-08-06 16:39:18 UTC (rev 16992) @@ -73,8 +73,8 @@ * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ public void handleEvent(Event event) { - selectionIndex = comboBlockFormat.getSelectionIndex(); - selectionText = comboBlockFormat.getText(); + selectionIndex = ((Combo)event.widget).getSelectionIndex(); + selectionText = ((Combo)event.widget).getText(); tagName = (String) TEXTS.get(selectionText); if (tagName == null) { tagName = "normal"; //$NON-NLS-1$ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java 2009-08-06 15:58:09 UTC (rev 16991) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java 2009-08-06 16:39:18 UTC (rev 16992) @@ -40,9 +40,8 @@ * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ public void handleEvent(Event event) { - Shell shell = new Shell(Display.getCurrent()); - shell.setLocation(shell.getDisplay().getBounds().width / 2 - 111, shell.getDisplay().getBounds().height / 2 - 162); - ColorDialog cd = new ColorDialog(shell, SWT.APPLICATION_MODAL); + ColorDialog cd = new ColorDialog(toolItem.getParent().getShell(), + SWT.APPLICATION_MODAL); cd.setText(getColorDialogTitle()); cd.setRGB(new RGB(255, 255, 255)); RGB newColor = cd.open(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ComboFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ComboFormatController.java 2009-08-06 15:58:09 UTC (rev 16991) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ComboFormatController.java 2009-08-06 16:39:18 UTC (rev 16992) @@ -36,8 +36,8 @@ } public void handleEvent(Event event) { - selectionIndex = comboBlockFormat.getSelectionIndex(); - selectionText = comboBlockFormat.getText(); + selectionIndex = ((Combo)event.widget).getSelectionIndex(); + selectionText = ((Combo)event.widget).getText(); super.handleEvent(event); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java 2009-08-06 15:58:09 UTC (rev 16991) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java 2009-08-06 16:39:18 UTC (rev 16992) @@ -12,27 +12,32 @@ import java.awt.GraphicsEnvironment; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; -import org.eclipse.swt.layout.RowData; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; -import org.jboss.tools.vpe.editor.toolbar.IItems; import org.jboss.tools.vpe.editor.toolbar.SplitToolBar; import org.jboss.tools.vpe.messages.VpeUIMessages; /** - * @author Erick + * The Text Formatting toolbar class. + * + * @author Erick. * Created on 14.07.2005 - * The Text Formatting toolbar class. + * + * @author yradtsevich */ public class TextFormattingToolBar extends SplitToolBar { @@ -42,10 +47,13 @@ private static String[] FONT_ARRAY = { "Arial", "Courier New", "Times New Roman", //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ "Comic Sans", "MS Serif", "Tahoma", "Verdana" }; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ - - private Composite composite; + private ToolBar toolBar; + private ToolBar floatingBar; private FormatControllerManager formatControllerManager; + private List<Image> imagesList = new ArrayList<Image>(); + + public TextFormattingToolBar(FormatControllerManager formatControllerManager) { this.formatControllerManager = formatControllerManager; } @@ -58,117 +66,106 @@ return ID; } - private ToolItem createToolItem(ToolBar parent, int type, String image, String toolTipText) { - ToolItem item = new ToolItem(parent, type); - item.setImage(ImageDescriptor.createFromFile(MozillaEditor.class, image).createImage()); - item.setToolTipText(toolTipText); - - // add dispose listener - item.addDisposeListener(new DisposeListener() { + public Composite getComposite(){ + return toolBar; + } + public void createItems(ToolBar parent) { +// ArrayList<ToolItemDescriptor> itemDescriptors +// = new ArrayList<ToolItemDescriptor>(); + this.toolBar = parent; + toolBar.addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - // dispose tollitem's image - ((ToolItem) e.widget).getImage().dispose(); - + for (Image image : imagesList) { + image.dispose(); + } + imagesList.clear(); } }); - return item; - } - - public Composite getComposite(){ - return composite; - } - - public IItems[] createItems(ToolBar horBar) { - ArrayList itemDescriptors = new ArrayList(); - - ToolItem sep = new ToolItem(horBar, SWT.SEPARATOR); - Combo comboBlockFormat = new Combo(horBar, SWT.READ_ONLY); - comboBlockFormat.add("Normal"); //$NON-NLS-1$ -// comboBlockFormat.add("Formatted"); - comboBlockFormat.add("Address"); //$NON-NLS-1$ + /* If a separator comes first in a ToolBar, it can not + * be hidden. An empty separator is created to ensure + * that any ToolItem can be hidden. */ + ToolItem emptySeparator = new ToolItem(toolBar, SWT.SEPARATOR); + Label emptyLabel = new Label(toolBar, SWT.NONE); + emptySeparator.setControl(emptyLabel); + emptySeparator.setWidth(1); + + List<String> blockFormatItems = new ArrayList<String>(); + blockFormatItems.add("Normal"); //$NON-NLS-1$ + blockFormatItems.add("Address"); //$NON-NLS-1$ +// blockFormatItems.add("Numbered List"); +// blockFormatItems.add("Bulleted List"); +// blockFormatItems.add("Directory List"); for (int i = 1; i < 7; i++) { - comboBlockFormat.add("Heading " + i); //$NON-NLS-1$ + blockFormatItems.add("Heading " + i); //$NON-NLS-1$ } -// comboBlockFormat.add("Numbered List"); -// comboBlockFormat.add("Bulleted List"); -// comboBlockFormat.add("Directory List"); - comboBlockFormat.setToolTipText(VpeUIMessages.BLOCK_FORMAT); - comboBlockFormat.select(0); - comboBlockFormat.pack(); - comboBlockFormat.setLayoutData(new RowData()); + Combo comboBlockFormat = createComboToolItem(toolBar, SWT.READ_ONLY, + VpeUIMessages.BLOCK_FORMAT, blockFormatItems, 0); comboBlockFormat.addListener(SWT.Selection, new BlockFormatController(formatControllerManager, comboBlockFormat)); - sep.setWidth(comboBlockFormat.getSize().x); - sep.setControl(comboBlockFormat); - itemDescriptors.add(new ToolItemDescriptor(sep, false, null, false)); +// itemDescriptors.add(new ToolItemDescriptor(sep, false, null, false)); - sep = new ToolItem(horBar, SWT.SEPARATOR); - - Combo comboFont = new Combo(horBar, SWT.READ_ONLY); - String[] font = null; + List<String> fonts = new ArrayList<String>(); + fonts.add(NORMAL_FONT); try { - font = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames(); + fonts.addAll(Arrays.asList( + GraphicsEnvironment.getLocalGraphicsEnvironment() + .getAvailableFontFamilyNames())); } catch (Error ex) { VpePlugin.getPluginLog().logWarning(ex); - font = FONT_ARRAY; + fonts.addAll(Arrays.asList(FONT_ARRAY)); } - comboFont.setItems(font); - comboFont.add(NORMAL_FONT, 0); - comboFont.select(0); - comboFont.pack(); - comboFont.setToolTipText(VpeUIMessages.FONT_NAME); + Combo comboFont = createComboToolItem(toolBar, SWT.READ_ONLY, VpeUIMessages.FONT_NAME, fonts, 0); comboFont.addListener(SWT.Selection, new FontNameFormatController(formatControllerManager, comboFont, NORMAL_FONT)); - sep.setWidth(comboFont.getSize().x); - sep.setControl(comboFont); - itemDescriptors.add(new ToolItemDescriptor(sep, false, null, false)); +// itemDescriptors.add(new ToolItemDescriptor(sep, false, null, false)); - sep = new ToolItem(horBar, SWT.SEPARATOR); - Combo comboFontSize = new Combo(horBar, SWT.DROP_DOWN|SWT.COLOR_LIST_BACKGROUND ); + List<String> fontSizes = new ArrayList<String>(); + fontSizes.add(NORMAL_FONT); for (int i = 1; i < 8; i++) { - comboFontSize.add("" + i); //$NON-NLS-1$ + fontSizes.add(Integer.toString(i)); //$NON-NLS-1$ } - comboFontSize.add(NORMAL_FONT, 0); - comboFontSize.setToolTipText(VpeUIMessages.FONT_SIZE); - comboFontSize.select(2); - comboFontSize.pack(); + Combo comboFontSize = createComboToolItem(toolBar, + SWT.DROP_DOWN | SWT.COLOR_LIST_BACKGROUND, + VpeUIMessages.FONT_SIZE, fontSizes, 2); comboFontSize.addListener(SWT.Selection, new FontSizeFormatController(formatControllerManager, comboFontSize)); - sep.setWidth(comboFontSize.getSize().x); - sep.setControl(comboFontSize); - itemDescriptors.add(new ToolItemDescriptor(sep, false, null, false)); +// itemDescriptors.add(new ToolItemDescriptor(sep, false, null, false)); - sep = new ToolItem(horBar, SWT.SEPARATOR); - itemDescriptors.add(new ToolItemDescriptor(sep, false, null, false)); +// itemDescriptors.add(new ToolItemDescriptor(sep, false, null, false)); - ToolItem item = createToolItem(horBar, SWT.CHECK, "icons/bold.gif", VpeUIMessages.BOLD); //$NON-NLS-1$ + ToolItem item = createToolItem(toolBar, SWT.CHECK, + createImage("icons/bold.gif"), VpeUIMessages.BOLD);//$NON-NLS-1$ Listener listener = new BoldFormatController(formatControllerManager, item); item.addListener(SWT.Selection, listener); - itemDescriptors.add(new ToolItemDescriptor(item, true, listener, true)); +// itemDescriptors.add(new ToolItemDescriptor(item, true, listener, true)); - item = createToolItem(horBar, SWT.CHECK, "icons/italic.gif", VpeUIMessages.ITALIC); //$NON-NLS-1$ + item = createToolItem(toolBar, SWT.CHECK, + createImage("icons/italic.gif"), //$NON-NLS-1$ + VpeUIMessages.ITALIC); listener = new ItalicFormatController(formatControllerManager, item); item.addListener(SWT.Selection, listener); - itemDescriptors.add(new ToolItemDescriptor(item, true, listener, true)); +// itemDescriptors.add(new ToolItemDescriptor(item, true, listener, true)); - item = createToolItem(horBar, SWT.CHECK, "icons/uderline.gif", VpeUIMessages.UNDERLINE); //$NON-NLS-1$ + item = createToolItem(toolBar, SWT.CHECK, + createImage("icons/uderline.gif"), VpeUIMessages.UNDERLINE); //$NON-NLS-1$ listener = new UnderlineFormatController(formatControllerManager, item); item.addListener(SWT.Selection, listener); - itemDescriptors.add(new ToolItemDescriptor(item, true, listener, true)); +// itemDescriptors.add(new ToolItemDescriptor(item, true, listener, true)); - sep = new ToolItem(horBar, SWT.SEPARATOR); - itemDescriptors.add(new ToolItemDescriptor(sep, false, null, true)); +// itemDescriptors.add(new ToolItemDescriptor(sep, false, null, true)); - item = createToolItem(horBar, SWT.PUSH, "icons/background.gif", VpeUIMessages.BACKGROUND_COLOR); //$NON-NLS-1$ + item = createToolItem(toolBar, SWT.CHECK, + createImage("icons/background.gif"), VpeUIMessages.BACKGROUND_COLOR); //$NON-NLS-1$ listener = new BackgroundColorFormatController(formatControllerManager, item); item.addListener(SWT.Selection, listener); - itemDescriptors.add(new ToolItemDescriptor(item, true, listener, true)); +// itemDescriptors.add(new ToolItemDescriptor(item, true, listener, true)); - item = createToolItem(horBar, SWT.PUSH, "icons/foreground.gif", VpeUIMessages.FOREGROUND_COLOR); //$NON-NLS-1$ + item = createToolItem(toolBar, SWT.CHECK, + createImage("icons/foreground.gif"), VpeUIMessages.FOREGROUND_COLOR); //$NON-NLS-1$ listener = new ForegroundColorFormatController(formatControllerManager, item); item.addListener(SWT.Selection, listener); - itemDescriptors.add(new ToolItemDescriptor(item, true, listener, true)); +// itemDescriptors.add(new ToolItemDescriptor(item, true, listener, true)); // sep = new ToolItem(horBar, SWT.SEPARATOR); // @@ -191,7 +188,15 @@ // // item = createToolItem(horBar, SWT.PUSH, "icons/numbering.gif", VpeToolbarFormatMessages.getInstance().getString(NUMBERING_KEY)); // item.addListener(SWT.Selection, new NumberingFormatController(formatControllerManager, item)); + +// return (IItems[])itemDescriptors.toArray(new IItems[itemDescriptors.size()]); + } + + private Image createImage(String path) { + Image image = ImageDescriptor.createFromFile(MozillaEditor.class, path) + .createImage(); + imagesList.add(image); - return (IItems[])itemDescriptors.toArray(new IItems[itemDescriptors.size()]); + return image; } } \ No newline at end of file

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r16991 - in workspace/yzhishko: org.jboss.tools.seam.ui.bot.test and 43 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2009-08-06 11:58:09 -0400 (Thu, 06 Aug 2009) New Revision: 16991 Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.classpath workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.settings/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.settings/org.eclipse.jdt.core.prefs workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/META-INF/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/jbossEAPRuntime.properties workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/Activator.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/TestControl.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateActions.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateConversations.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateEntities.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateForms.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateProjectWizard.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateSeamRuntimes.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateServerRuntimes.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/DeleteSeamProjects.class workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/projectProperties.properties workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam12Settings.properties workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam21Settings.properties workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam2fpSettings.properties workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/build.properties workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/jbossEAPRuntime.properties workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/projectProperties.properties workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam12Settings.properties workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam21Settings.properties workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam2fpSettings.properties workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/Activator.java workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateConversations.java workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateEntities.java workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateProjectWizard.java workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamRuntimes.java workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateServerRuntimes.java workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/DeleteSeamProjects.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.classpath workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.project workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.settings/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.settings/org.eclipse.jdt.core.prefs workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/META-INF/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/META-INF/MANIFEST.MF workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/jbossEAPRuntime.properties workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/Activator.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/SmokeTestLauncher.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/TestControl.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/TestLauncher.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateActions.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateConversations.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateEntities.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateForms.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateJSFProjects.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreatePagesFiles.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamProjects.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamRuntimes.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateServerRuntimes.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateStrutsProjects.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/DeleteJSFProjects.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/DeleteSeamProjects.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/DeleteStrutsProjects.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/RemoveJSFCapabilities.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/RemoveStrutsCapabilities.class workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/projectProperties.properties workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam12Settings.properties workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam21Settings.properties workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam2fpSettings.properties workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/build.properties workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/jbossEAPRuntime.properties workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/projectProperties.properties workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam12Settings.properties workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam21Settings.properties workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam2fpSettings.properties workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/Activator.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/SmokeTestLauncher.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/TestControl.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/TestLauncher.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateActions.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateConversations.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateEntities.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateForms.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateJSFProjects.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreatePagesFiles.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamProjects.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamRuntimes.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateServerRuntimes.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateStrutsProjects.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteJSFProjects.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteSeamProjects.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteStrutsProjects.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/RemoveJSFCapabilities.java workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/RemoveStrutsCapabilities.java Log: Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.classpath =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.classpath (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.classpath 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="resources"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.project 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.seam.ui.bot.test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/.settings/org.eclipse.jdt.core.prefs 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,8 @@ +#Thu Jun 18 13:29:27 EEST 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,21 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: SWTBotTests +Bundle-SymbolicName: org.jboss.tools.seam.ui.bot.test +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.jboss.tools.seam.ui.bot.test.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.jboss.tools.ui.bot.test;bundle-version="1.0.0", + org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0", + org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0", + org.eclipse.swtbot.eclipse.spy;bundle-version="2.0.0", + org.eclipse.swtbot.eclipse.ui;bundle-version="2.0.0", + org.eclipse.swtbot.junit4_x;bundle-version="2.0.0", + org.eclipse.swtbot.swt.finder;bundle-version="2.0.0", + org.junit4;bundle-version="4.5.0", + org.apache.log4j;bundle-version="1.2.13" +Eclipse-RegisterBuddy: org.apache.log4j +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: junit.framework Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/jbossEAPRuntime.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/jbossEAPRuntime.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/jbossEAPRuntime.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,5 @@ +runtimeGroup=JBoss Enterprise Middleware +runtimeItem=JBoss Enterprise Application Platform 4.3 +runtimeName=jboss-eap Runtime +runtimePath=D\:\\EclipseJBDS\\jboss-eap\\jboss-as +serverName=jboss-eap \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/Activator.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/Activator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/TestControl.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/TestControl.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateActions.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateActions.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateConversations.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateConversations.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateEntities.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateEntities.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateForms.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateForms.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateProjectWizard.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateProjectWizard.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateSeamRuntimes.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateSeamRuntimes.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateServerRuntimes.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/CreateServerRuntimes.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/DeleteSeamProjects.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/org/jboss/tools/seam/ui/bot/test/create/DeleteSeamProjects.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/projectProperties.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/projectProperties.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/projectProperties.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +connName=DefaultDS +jbossServerView=JBoss Server View + + Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam12Settings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam12Settings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam12Settings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 1.2.AP +seamRuntimePath=D\:\\EclipseJBDS\\jboss-eap\\seam +testProjectName=seamTest12 +configName=Dynamic Web Project with Seam 1.2 Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam21Settings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam21Settings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam21Settings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 2.1.1.GA +seamRuntimePath=D\:\\EclipseJBDS\\jboss-seam-2.1.1.GA +testProjectName=seamTest21 +configName=Dynamic Web Project with Seam 2.1 (technology preview) Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam2fpSettings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam2fpSettings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/bin/seam2fpSettings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 2FP +seamRuntimePath=D\:\\EclipseJBDS\\jboss-eap\\seamfp +testProjectName=seamTest2fp +configName=Dynamic Web Project with Seam 2.0 Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/build.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/build.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/build.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +source.. = src/,resources/ +output.. = bin/ +bin.includes = META-INF/,\ + . Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/jbossEAPRuntime.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/jbossEAPRuntime.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/jbossEAPRuntime.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,5 @@ +runtimeGroup=JBoss Enterprise Middleware +runtimeItem=JBoss Enterprise Application Platform 4.3 +runtimeName=jboss-eap Runtime +runtimePath=D\:\\EclipseJBDS\\jboss-eap\\jboss-as +serverName=jboss-eap \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/projectProperties.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/projectProperties.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/projectProperties.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +connName=DefaultDS +jbossServerView=JBoss Server View + + Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam12Settings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam12Settings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam12Settings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 1.2.AP +seamRuntimePath=D\:\\EclipseJBDS\\jboss-eap\\seam +testProjectName=seamTest12 +configName=Dynamic Web Project with Seam 1.2 Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam21Settings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam21Settings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam21Settings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 2.1.1.GA +seamRuntimePath=D\:\\EclipseJBDS\\jboss-seam-2.1.1.GA +testProjectName=seamTest21 +configName=Dynamic Web Project with Seam 2.1 (technology preview) Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam2fpSettings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam2fpSettings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/resources/seam2fpSettings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 2FP +seamRuntimePath=D\:\\EclipseJBDS\\jboss-eap\\seamfp +testProjectName=seamTest2fp +configName=Dynamic Web Project with Seam 2.0 Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/Activator.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/Activator.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/Activator.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,50 @@ +package org.jboss.tools.seam.ui.bot.test; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.seam.ui.bot.test"; + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamTestLauncher.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,35 @@ +package org.jboss.tools.seam.ui.bot.test; + +import org.eclipse.swtbot.swt.finder.SWTBotTestCase; +import org.jboss.tools.seam.ui.bot.test.create.CreateSeamRuntimes; +import org.jboss.tools.seam.ui.bot.test.create.CreateSeamProjects; +import org.jboss.tools.seam.ui.bot.test.create.CreateForms; +import org.jboss.tools.seam.ui.bot.test.create.CreateActions; +import org.jboss.tools.seam.ui.bot.test.create.CreateConversations; +import org.jboss.tools.seam.ui.bot.test.create.CreateEntities; +import org.jboss.tools.seam.ui.bot.test.create.DeleteSeamProjects; + +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; + + + +/** + * + * This is a swtbot testcase for an eclipse application. + * + */ +public class SeamTestLauncher extends SWTBotTestCase{ + public static Test suite(){ + TestSuite suite = new TestSuite("Seam tests"); + suite.addTestSuite(CreateSeamRuntimes.class); + suite.addTestSuite(CreateSeamProjects.class); + suite.addTestSuite(CreateForms.class); + suite.addTestSuite(CreateActions.class); + suite.addTestSuite(CreateConversations.class); + suite.addTestSuite(CreateEntities.class); + suite.addTestSuite(DeleteSeamProjects.class); + return new TestSetup(suite); + } +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,267 @@ +package org.jboss.tools.seam.ui.bot.test; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import org.eclipse.core.runtime.Platform; +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.JBTSWTBotTestCase; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public abstract class TestControl extends JBTSWTBotTestCase{ + +/*Properties here:*/ + + protected static Properties projectProperties; + protected static Properties jbossEAPRuntime; + protected static Properties seam12Settings; + protected static Properties seam2fpSettings; + protected static Properties seam21Settings; + + private static String PROJECT_PROPERTIES = "projectProperties.properties"; + private static String EAP_RUNTIME = "jbossEAPRuntime.properties"; + private static String SEAM_SET_12 = "seam12Settings.properties"; + private static String SEAM_SET_2FP = "seam2fpSettings.properties"; + private static String SEAM_SET_21 = "seam21Settings.properties"; + + + public static String JBOSS_EAP_HOME; + public static String SEAM_12_SETTINGS_HOME; + public static String SEAM_21_SETTINGS_HOME; + public static String SEAM_2FP_SETTINGS_HOME; + + static { + try { + InputStream is = Platform.getBundle(Activator.PLUGIN_ID).getResource(PROJECT_PROPERTIES).openStream(); + projectProperties = new Properties(); + projectProperties.load(is); + } catch (IOException e) { + fail("Can't load properties from " + PROJECT_PROPERTIES + " file"); + } + catch (IllegalStateException e) { + fail("Property file " + PROJECT_PROPERTIES + " was not found"); + } + try { + InputStream is = Platform.getBundle(Activator.PLUGIN_ID).getResource(EAP_RUNTIME).openStream(); + jbossEAPRuntime = new Properties(); + jbossEAPRuntime.load(is); + } catch (IOException e) { + fail("Can't load properties from " + EAP_RUNTIME + " file"); + } + catch (IllegalStateException e) { + fail("Property file " + EAP_RUNTIME + " was not found"); + } + try { + InputStream is = Platform.getBundle(Activator.PLUGIN_ID).getResource(SEAM_SET_12).openStream(); + seam12Settings = new Properties(); + seam12Settings.load(is); + } catch (IOException e) { + fail("Can't load properties from " + SEAM_SET_12 + " file"); + } + catch (IllegalStateException e) { + fail("Property file " + SEAM_SET_12 + " was not found"); + } + try { + InputStream is = Platform.getBundle(Activator.PLUGIN_ID).getResource(SEAM_SET_2FP).openStream(); + seam2fpSettings = new Properties(); + seam2fpSettings.load(is); + } catch (IOException e) { + fail("Can't load properties from " + SEAM_SET_2FP + " file"); + } + catch (IllegalStateException e) { + fail("Property file " + SEAM_SET_2FP + " was not found"); + } + try { + InputStream is = Platform.getBundle(Activator.PLUGIN_ID).getResource(SEAM_SET_21).openStream(); + seam21Settings = new Properties(); + seam21Settings.load(is); + } catch (IOException e) { + fail("Can't load properties from " + SEAM_SET_21 + " file"); + } + catch (IllegalStateException e) { + fail("Property file " + SEAM_SET_21 + " was not found"); + } + JBOSS_EAP_HOME = System.getProperty("jbosstools.test.jboss.home.eap",jbossEAPRuntime.getProperty("runtimePath")); + SEAM_12_SETTINGS_HOME = System.getProperty("jbosstools.test.seam.home.1.2",seam12Settings.getProperty("seamRuntimePath")); + SEAM_21_SETTINGS_HOME = System.getProperty("jbosstools.test.seam.home.2.1",seam21Settings.getProperty("seamRuntimePath")); + SEAM_2FP_SETTINGS_HOME = System.getProperty("jbosstools.test.seam.home.2.fp",seam2fpSettings.getProperty("seamRuntimePath")); + } + + + + +/*Pre-launch operations here:*/ + + @Override + protected void activePerspective() { + if (!bot.perspectiveByLabel("Seam").isActive()) { + bot.perspectiveByLabel("Seam").activate(); + } + + } + + /*protected void setUp() throws Exception { + super.setUp(); + bot.viewByTitle(projectProperties.getProperty("jbossServerView")).setFocus(); + SWTBot innerBot = bot.viewByTitle(projectProperties.getProperty("jbossServerView")).bot(); + SWTBotTree tree = innerBot.tree(); + try { + tree.getTreeItem(jbossEAPRuntime.getProperty("serverName")+" [Stopped]"); + } catch (WidgetNotFoundException e) { + createServerRuntime(jbossEAPRuntime); + } + }*/ + +/*Predefined methods here:*/ + +public static String TYPE_WAR = "WAR"; +public static String TYPE_EAR = "EAR"; + +/**Checks for independent tests run. Under Construction. */ + protected void creationCheck(Integer mode, Properties serverType, + Properties runtimeSet, String seamHome, String unitType, String type){ + if (mode > 1) { + bot.viewByTitle(projectProperties.getProperty("jbossServerView")).setFocus(); + SWTBot innerBot = bot.viewByTitle(projectProperties.getProperty("jbossServerView")).bot(); + SWTBotTree tree = innerBot.tree(); + try { + tree.getTreeItem(jbossEAPRuntime.getProperty("serverName")+" [Stopped]"); + } catch (WidgetNotFoundException e) { + createServerRuntime(jbossEAPRuntime); + } + } + if (mode > 2) { + + try { + + } catch (WidgetNotFoundException e) { + createSeamRuntime(runtimeSet, seamHome); + } + } + if (mode > 3) { + + try { + + } catch (WidgetNotFoundException e) { + createSeamProject(runtimeSet, serverType, type); + } + } + if (mode > 4) { + + try { + + } catch (WidgetNotFoundException e) { + createSeamUnit(unitType, runtimeSet, type); + } + } + + } + +/**Creates any Server Runtime + Server. */ + protected void createServerRuntime(Properties serverType){ + bot.menu("File").menu("New").menu("Other...").click(); + SWTBotTree tree = bot.tree(); + tree.expandNode("Server").select("Server"); + bot.button("Next >").click(); + SWTBotTree tree2 = bot.tree(); + tree2.expandNode(serverType.getProperty("runtimeGroup")).select(serverType.getProperty("runtimeItem")); + bot.textWithLabel("Server name:").setText(serverType.getProperty("serverName")); + bot.button("Next >").click(); + bot.textWithLabel("Name").setText(serverType.getProperty("runtimeName")); + bot.textWithLabel("Home Directory").setText(serverType.getProperty("runtimePath")); + bot.button("Finish").click(); + } + +/** Creates any Seam runtime. */ + protected void createSeamRuntime(Properties runtimeSet, String homeFolder){ + bot.menu("Window").menu("Preferences").click(); + SWTBotTree tree = bot.tree(); + delay(); + tree.expandNode("JBoss Tools").expandNode("Web").select("Seam"); + bot.button("Add").click(); + bot.textWithLabel("Home Folder:").setText(homeFolder); + /*bot.textWithLabel("Home Folder:").setText(runtimeSet.getProperty("seamRuntimePath"));*/ + bot.textWithLabel("Name:").setText(runtimeSet.getProperty("seamRuntimeName")); + bot.button("Finish").click(); + bot.button("OK").click(); + } + +/**Creates any Seam project. */ + protected void createSeamProject(Properties runtimeSet, Properties serverType, + String type ){ + bot.menu("File").menu("New").menu("Seam Web Project").click(); + bot.textWithLabel("Project name:").setText(runtimeSet.getProperty("testProjectName")+ type); + bot.comboBoxInGroup("Target runtime").setSelection(serverType.getProperty("runtimeName")); + bot.comboBoxInGroup("Target Server").setSelection(serverType.getProperty("serverName")); + bot.comboBoxInGroup("Configuration").setSelection(runtimeSet.getProperty("configName")); + bot.button("Next >").click(); + bot.button("Next >").click(); + bot.button("Next >").click(); + bot.button("Next >").click(); + bot.comboBoxWithLabel("Seam Runtime:").setSelection(runtimeSet.getProperty("seamRuntimeName")); + bot.radio(type).click(); + bot.comboBoxWithLabel("Connection profile:").setSelection(projectProperties.getProperty("connName")); + bot.button("Finish").click(); + } + +/**Creates any Seam Action, Form etc. */ + protected void createSeamUnit(String unitType, + Properties runtimeSet, String type){ + bot.menu("File").menu("New").menu("Seam " +unitType).click(); + bot.textWithLabel("Seam Project:").setText(runtimeSet.getProperty("testProjectName")+ type); + if ("Entity".equals(unitType)) { + bot.textWithLabel("Seam entity class name:").setText("seam"+unitType); + } else { + bot.textWithLabel("Seam component name:").setText("seam"+unitType); + } + bot.button("Finish").click(); + delay(); + } + +/**Deletes any Seam project. */ + protected void deleteSeamProject(Properties runtimeSet, String type){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + if ("WAR".equals(type)) { + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type).contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type+"-test").contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + } else { + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type).contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type+"-ear").contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type+"-ejb").contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type+"-test").contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + } + } + + +/**Builder job delay. Ugly delay script here right now. */ + protected void timeStop(){ + bot.sleep(38000); + /*boolean check = true; + bot.menu("Window").menu("Show View").menu("Other...").click(); + bot.tree().expandNode("General").expandNode("Progress").select(); + bot.viewByTitle("Progress").setFocus(); + SWTBot progressBot = bot.viewByTitle("Progress").bot(); + while (check = true) { + bot.sleep(1000); + bot.viewByTitle("Progress").setFocus(); + SWTBotTree proTree = progressBot.tree(); + check = proTree.hasItems(); + }*/ + } + +} Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,33 @@ +package org.jboss.tools.seam.ui.bot.test.create; + +import org.jboss.tools.seam.ui.bot.test.TestControl; + +public class CreateActions extends TestControl{ + + private static String TEST_TYPE = "Action"; + + public void testCreateActionFor12war(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_WAR); + } + +/* public void testCreateActionFor12ear(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_EAR); + } + + public void testCreateActionFor2fpwar(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_WAR); + } + + public void testCreateActionFor2fpear(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_EAR); + } + + public void testCreateActionFor21war(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_WAR); + } + + public void testCreateActionFor21ear(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_EAR); + }*/ +} + \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateConversations.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateConversations.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateConversations.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,33 @@ +package org.jboss.tools.seam.ui.bot.test.create; + +import org.jboss.tools.seam.ui.bot.test.TestControl; + +public class CreateConversations extends TestControl{ + + private static String TEST_TYPE = "Conversation"; + + public void testCreateConversationFor12war(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_WAR); + } + +/* public void testCreateConversationFor12ear(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_EAR); + } + + public void testCreateConversationFor2fpwar(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_WAR); + } + + public void testCreateConversationFor2fpear(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_EAR); + } + + public void testCreateConversationFor21war(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_WAR); + } + + public void testCreateConversationFor21ear(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_EAR); + }*/ +} + \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateEntities.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateEntities.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateEntities.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,39 @@ +package org.jboss.tools.seam.ui.bot.test.create; + +import org.jboss.tools.seam.ui.bot.test.TestControl; + +public class CreateEntities extends TestControl{ + + private static String TEST_TYPE = "Entity"; + + public void testCreateEntityFor12war(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_WAR); + waitForJobs(); + } + +/* public void testCreateEntityFor12ear(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_EAR); + waitForJobs(); + } + + public void testCreateEntityFor2fpwar(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_WAR); + waitForJobs(); + } + + public void testCreateEntityFor2fpear(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_EAR); + waitForJobs(); + } + + public void testCreateEntityFor21war(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_WAR); + waitForJobs(); + } + + public void testCreateEntityFor21ear(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_EAR); + waitForJobs(); + }*/ +} + \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,33 @@ +package org.jboss.tools.seam.ui.bot.test.create; + +import org.jboss.tools.seam.ui.bot.test.TestControl; + +public class CreateForms extends TestControl{ + + private static String TEST_TYPE = "Form"; + + public void testCreateFormFor12war(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_WAR); + } + +/* public void testCreateFormFor12ear(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_EAR); + } + + public void testCreateFormFor2fpwar(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_WAR); + } + + public void testCreateFormFor2fpear(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_EAR); + } + + public void testCreateFormFor21war(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_WAR); + } + + public void testCreateFormFor21ear(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_EAR); + }*/ +} + \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateProjectWizard.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateProjectWizard.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateProjectWizard.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,5 @@ +package org.jboss.tools.seam.ui.bot.test.create; + +public class CreateProjectWizard { + +} Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,37 @@ +package org.jboss.tools.seam.ui.bot.test.create; + +import org.jboss.tools.seam.ui.bot.test.TestControl; + +public class CreateSeamProjects extends TestControl{ + + public void testCreateSeamProject12war(){ + createSeamProject(seam12Settings, jbossEAPRuntime, TYPE_WAR); + waitForJobs(); + } + +/* public void testCreateSeamProject12ear(){ + createSeamProject(seam12Settings, jbossEAPRuntime, TYPE_EAR); + waitForJobs(); + } + + public void testCreateSeamProject2fpwar(){ + createSeamProject(seam2fpSettings, jbossEAPRuntime, TYPE_WAR); + waitForJobs(); + } + + public void testCreateSeamProject2fpear(){ + createSeamProject(seam2fpSettings, jbossEAPRuntime, TYPE_EAR); + waitForJobs(); + } + + public void testCreateSeamProject21war(){ + createSeamProject(seam21Settings, jbossEAPRuntime, TYPE_WAR); + waitForJobs(); + } + + public void testCreateSeamProject21ear(){ + createSeamProject(seam21Settings, jbossEAPRuntime, TYPE_EAR); + waitForJobs(); + }*/ + +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamRuntimes.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamRuntimes.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamRuntimes.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,18 @@ +package org.jboss.tools.seam.ui.bot.test.create; + +import org.jboss.tools.seam.ui.bot.test.TestControl; + +public class CreateSeamRuntimes extends TestControl{ + + public void testCreateSeamRuntime12(){ + createSeamRuntime(seam12Settings, SEAM_12_SETTINGS_HOME); + } + + public void testCreateSeamRuntime2fp(){ + createSeamRuntime(seam2fpSettings, SEAM_2FP_SETTINGS_HOME); + } + + public void testCreateSeamRuntime21(){ + createSeamRuntime(seam21Settings, SEAM_21_SETTINGS_HOME); + } +} Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateServerRuntimes.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateServerRuntimes.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateServerRuntimes.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,10 @@ +package org.jboss.tools.seam.ui.bot.test.create; + +import org.jboss.tools.seam.ui.bot.test.TestControl; + +public class CreateServerRuntimes extends TestControl{ + + public void testCreateEAPServerRuntime(){ + createServerRuntime(jbossEAPRuntime); + } +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/DeleteSeamProjects.java =================================================================== --- workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/DeleteSeamProjects.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/DeleteSeamProjects.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,31 @@ +package org.jboss.tools.seam.ui.bot.test.create; + +import org.jboss.tools.seam.ui.bot.test.TestControl; + +public class DeleteSeamProjects extends TestControl{ + + public void testDeleteSeamProject12war(){ + deleteSeamProject(seam12Settings, TYPE_WAR); + } + +/* public void testDeleteSeamProject12ear(){ + deleteSeamProject(seam12Settings, TYPE_EAR); + } + + public void testDeleteSeamProject2fpwar(){ + deleteSeamProject(seam2fpSettings, TYPE_WAR); + } + + public void testDeleteSeamProject2fpear(){ + deleteSeamProject(seam2fpSettings, TYPE_EAR); + } + + public void testDeleteSeamProject21war(){ + deleteSeamProject(seam21Settings, TYPE_WAR); + } + + public void testDeleteSeamProject21ear(){ + deleteSeamProject(seam21Settings, TYPE_EAR); + }*/ + +} Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.classpath =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.classpath (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.classpath 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="resources"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.project =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.project (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.project 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.smoke.ui.bot.test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/.settings/org.eclipse.jdt.core.prefs 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,8 @@ +#Tue Jun 30 15:22:59 EEST 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/META-INF/MANIFEST.MF (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/META-INF/MANIFEST.MF 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,21 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: SWTBotTests +Bundle-SymbolicName: org.jboss.tools.smoke.ui.bot.test +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.jboss.tools.smoke.ui.bot.test.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.jboss.tools.ui.bot.test;bundle-version="1.0.0", + org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0", + org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0", + org.eclipse.swtbot.eclipse.spy;bundle-version="2.0.0", + org.eclipse.swtbot.eclipse.ui;bundle-version="2.0.0", + org.eclipse.swtbot.junit4_x;bundle-version="2.0.0", + org.eclipse.swtbot.swt.finder;bundle-version="2.0.0", + org.junit4;bundle-version="4.5.0", + org.apache.log4j;bundle-version="1.2.13" +Eclipse-RegisterBuddy: org.apache.log4j +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: junit.framework Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/jbossEAPRuntime.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/jbossEAPRuntime.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/jbossEAPRuntime.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,5 @@ +runtimeGroup=JBoss Enterprise Middleware +runtimeItem=JBoss Enterprise Application Platform 4.3 +runtimeName=jboss-eap Runtime +runtimePath=D\:\\EclipseJBDS\\jboss-eap\\jboss-as +serverName=jboss-eap \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/Activator.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/Activator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/SmokeTestLauncher.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/SmokeTestLauncher.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/TestControl.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/TestControl.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/TestLauncher.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/TestLauncher.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateActions.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateActions.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateConversations.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateConversations.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateEntities.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateEntities.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateForms.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateForms.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateJSFProjects.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateJSFProjects.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreatePagesFiles.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreatePagesFiles.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamProjects.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamProjects.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamRuntimes.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamRuntimes.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateServerRuntimes.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateServerRuntimes.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateStrutsProjects.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/CreateStrutsProjects.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/DeleteJSFProjects.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/DeleteJSFProjects.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/DeleteSeamProjects.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/DeleteSeamProjects.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/DeleteStrutsProjects.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/DeleteStrutsProjects.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/RemoveJSFCapabilities.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/RemoveJSFCapabilities.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/RemoveStrutsCapabilities.class =================================================================== (Binary files differ) Property changes on: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/org/jboss/tools/smoke/ui/bot/test/create/RemoveStrutsCapabilities.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/projectProperties.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/projectProperties.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/projectProperties.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,16 @@ +connName=DefaultDS +jbossServerView=JBoss Server View +JSFProjectName1.1=testJSF11 +JSFProjectName1.2=testJSF12 +JSFProjectName1.2F=testJSF12F +JSF1.1=JSF 1.1.02 - Reference Implementation +JSF1.2=JSF 1.2 +JSF1.2F=JSF 1.2 with Facelets +JSF1.1KickName=JSFKickStartWithoutLibs +JSF1.2KickName=JSFKickStartWithoutLibs +JSF1.2FKickName=FaceletsKickStartWithoutLibs +Struts1.1=Struts 1.1 +Struts1.2=Struts 1.2 +StrutsProjectName1.1=testStruts11 +StrutsProjectName1.2=testStruts12 + Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam12Settings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam12Settings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam12Settings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 1.2.AP +seamRuntimePath=D\:\\EclipseJBDS\\jboss-eap\\seam +testProjectName=seamTest12 +configName=Dynamic Web Project with Seam 1.2 Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam21Settings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam21Settings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam21Settings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 2.1.1.GA +seamRuntimePath=D\:\\EclipseJBDS\\jboss-seam-2.1.1.GA +testProjectName=seamTest21 +configName=Dynamic Web Project with Seam 2.1 (technology preview) Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam2fpSettings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam2fpSettings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/bin/seam2fpSettings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 2FP +seamRuntimePath=D\:\\EclipseJBDS\\jboss-eap\\seamfp +testProjectName=seamTest2fp +configName=Dynamic Web Project with Seam 2.0 Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/build.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/build.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/build.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +source.. = src/,resources/ +output.. = bin/ +bin.includes = META-INF/,\ + . Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/jbossEAPRuntime.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/jbossEAPRuntime.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/jbossEAPRuntime.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,5 @@ +runtimeGroup=JBoss Enterprise Middleware +runtimeItem=JBoss Enterprise Application Platform 4.3 +runtimeName=jboss-eap Runtime +runtimePath=D\:\\EclipseJBDS\\jboss-eap\\jboss-as +serverName=jboss-eap \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/projectProperties.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/projectProperties.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/projectProperties.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,16 @@ +connName=DefaultDS +jbossServerView=JBoss Server View +JSFProjectName1.1=testJSF11 +JSFProjectName1.2=testJSF12 +JSFProjectName1.2F=testJSF12F +JSF1.1=JSF 1.1.02 - Reference Implementation +JSF1.2=JSF 1.2 +JSF1.2F=JSF 1.2 with Facelets +JSF1.1KickName=JSFKickStartWithoutLibs +JSF1.2KickName=JSFKickStartWithoutLibs +JSF1.2FKickName=FaceletsKickStartWithoutLibs +Struts1.1=Struts 1.1 +Struts1.2=Struts 1.2 +StrutsProjectName1.1=testStruts11 +StrutsProjectName1.2=testStruts12 + Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam12Settings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam12Settings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam12Settings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 1.2.AP +seamRuntimePath=D\:\\EclipseJBDS\\jboss-eap\\seam +testProjectName=seamTest12 +configName=Dynamic Web Project with Seam 1.2 Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam21Settings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam21Settings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam21Settings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 2.1.1.GA +seamRuntimePath=D\:\\EclipseJBDS\\jboss-seam-2.1.1.GA +testProjectName=seamTest21 +configName=Dynamic Web Project with Seam 2.1 (technology preview) Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam2fpSettings.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam2fpSettings.properties (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/resources/seam2fpSettings.properties 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,4 @@ +seamRuntimeName=Seam 2FP +seamRuntimePath=D\:\\EclipseJBDS\\jboss-eap\\seamfp +testProjectName=seamTest2fp +configName=Dynamic Web Project with Seam 2.0 Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/Activator.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/Activator.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/Activator.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,50 @@ +package org.jboss.tools.smoke.ui.bot.test; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.smoke.ui.bot.test"; + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/SmokeTestLauncher.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/SmokeTestLauncher.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/SmokeTestLauncher.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,49 @@ +package org.jboss.tools.smoke.ui.bot.test; + +import org.eclipse.swtbot.swt.finder.SWTBotTestCase; +import org.jboss.tools.smoke.ui.bot.test.create.CreateSeamRuntimes; +import org.jboss.tools.smoke.ui.bot.test.create.CreateSeamProjects; +import org.jboss.tools.smoke.ui.bot.test.create.CreateJSFProjects; +import org.jboss.tools.smoke.ui.bot.test.create.CreateStrutsProjects; +import org.jboss.tools.smoke.ui.bot.test.create.CreateForms; +import org.jboss.tools.smoke.ui.bot.test.create.CreateActions; +import org.jboss.tools.smoke.ui.bot.test.create.CreateConversations; +import org.jboss.tools.smoke.ui.bot.test.create.CreateEntities; +import org.jboss.tools.smoke.ui.bot.test.create.CreatePagesFiles; +import org.jboss.tools.smoke.ui.bot.test.create.RemoveJSFCapabilities; +import org.jboss.tools.smoke.ui.bot.test.create.RemoveStrutsCapabilities; +import org.jboss.tools.smoke.ui.bot.test.create.DeleteSeamProjects; +import org.jboss.tools.smoke.ui.bot.test.create.DeleteJSFProjects; +import org.jboss.tools.smoke.ui.bot.test.create.DeleteStrutsProjects; + +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; + + + +/** + * + * This is a swtbot testcase for an eclipse application. + * + */ +public class SmokeTestLauncher extends SWTBotTestCase{ + public static Test suite(){ + TestSuite suite = new TestSuite("Smoke tests"); + suite.addTestSuite(CreateSeamRuntimes.class); + suite.addTestSuite(CreateSeamProjects.class); + suite.addTestSuite(CreateJSFProjects.class); + suite.addTestSuite(CreateStrutsProjects.class); + suite.addTestSuite(CreateForms.class); + suite.addTestSuite(CreateActions.class); + suite.addTestSuite(CreateConversations.class); + suite.addTestSuite(CreateEntities.class); + suite.addTestSuite(CreatePagesFiles.class); + suite.addTestSuite(RemoveJSFCapabilities.class); + suite.addTestSuite(RemoveStrutsCapabilities.class); + suite.addTestSuite(DeleteSeamProjects.class); + suite.addTestSuite(DeleteJSFProjects.class); + suite.addTestSuite(DeleteStrutsProjects.class); + return new TestSetup(suite); + } +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/TestControl.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/TestControl.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/TestControl.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,314 @@ +package org.jboss.tools.smoke.ui.bot.test; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import org.eclipse.core.runtime.Platform; +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.JBTSWTBotTestCase; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public abstract class TestControl extends JBTSWTBotTestCase{ + +/*Properties here:*/ + + protected static Properties projectProperties; + protected static Properties jbossEAPRuntime; + protected static Properties seam12Settings; + protected static Properties seam2fpSettings; + protected static Properties seam21Settings; + + private static String PROJECT_PROPERTIES = "projectProperties.properties"; + private static String EAP_RUNTIME = "jbossEAPRuntime.properties"; + private static String SEAM_SET_12 = "seam12Settings.properties"; + private static String SEAM_SET_2FP = "seam2fpSettings.properties"; + private static String SEAM_SET_21 = "seam21Settings.properties"; + + public static String JBOSS_EAP_HOME; + public static String SEAM_12_SETTINGS_HOME; + public static String SEAM_21_SETTINGS_HOME; + public static String SEAM_2FP_SETTINGS_HOME; + + static { + try { + InputStream is = Platform.getBundle(Activator.PLUGIN_ID).getResource(PROJECT_PROPERTIES).openStream(); + projectProperties = new Properties(); + projectProperties.load(is); + } catch (IOException e) { + fail("Can't load properties from " + PROJECT_PROPERTIES + " file"); + } + catch (IllegalStateException e) { + fail("Property file " + PROJECT_PROPERTIES + " was not found"); + } + try { + InputStream is = Platform.getBundle(Activator.PLUGIN_ID).getResource(EAP_RUNTIME).openStream(); + jbossEAPRuntime = new Properties(); + jbossEAPRuntime.load(is); + } catch (IOException e) { + fail("Can't load properties from " + EAP_RUNTIME + " file"); + } + catch (IllegalStateException e) { + fail("Property file " + EAP_RUNTIME + " was not found"); + } + try { + InputStream is = Platform.getBundle(Activator.PLUGIN_ID).getResource(SEAM_SET_12).openStream(); + seam12Settings = new Properties(); + seam12Settings.load(is); + } catch (IOException e) { + fail("Can't load properties from " + SEAM_SET_12 + " file"); + } + catch (IllegalStateException e) { + fail("Property file " + SEAM_SET_12 + " was not found"); + } + try { + InputStream is = Platform.getBundle(Activator.PLUGIN_ID).getResource(SEAM_SET_2FP).openStream(); + seam2fpSettings = new Properties(); + seam2fpSettings.load(is); + } catch (IOException e) { + fail("Can't load properties from " + SEAM_SET_2FP + " file"); + } + catch (IllegalStateException e) { + fail("Property file " + SEAM_SET_2FP + " was not found"); + } + try { + InputStream is = Platform.getBundle(Activator.PLUGIN_ID).getResource(SEAM_SET_21).openStream(); + seam21Settings = new Properties(); + seam21Settings.load(is); + } catch (IOException e) { + fail("Can't load properties from " + SEAM_SET_21 + " file"); + } + catch (IllegalStateException e) { + fail("Property file " + SEAM_SET_21 + " was not found"); + } + JBOSS_EAP_HOME = System.getProperty("jbosstools.test.jboss.home.eap",jbossEAPRuntime.getProperty("runtimePath")); + SEAM_12_SETTINGS_HOME = System.getProperty("jbosstools.test.seam.home.1.2",seam12Settings.getProperty("seamRuntimePath")); + SEAM_21_SETTINGS_HOME = System.getProperty("jbosstools.test.seam.home.2.1",seam21Settings.getProperty("seamRuntimePath")); + SEAM_2FP_SETTINGS_HOME = System.getProperty("jbosstools.test.seam.home.2.fp",seam2fpSettings.getProperty("seamRuntimePath")); + } + + + + +/*Pre-launch operations here:*/ + + @Override + protected void activePerspective() { + if (!bot.perspectiveByLabel("Seam").isActive()) { + bot.perspectiveByLabel("Seam").activate(); + } + + } + + /*protected void setUp() throws Exception { + super.setUp(); + bot.viewByTitle(projectProperties.getProperty("jbossServerView")).setFocus(); + SWTBot innerBot = bot.viewByTitle(projectProperties.getProperty("jbossServerView")).bot(); + SWTBotTree tree = innerBot.tree(); + try { + tree.getTreeItem(jbossEAPRuntime.getProperty("serverName")+" [Stopped]"); + } catch (WidgetNotFoundException e) { + createServerRuntime(jbossEAPRuntime); + } + }*/ + +/*Predefined methods here:*/ + +public static String TYPE_WAR = "WAR"; +public static String TYPE_EAR = "EAR"; + +/**Checks for independent tests run. Under Construction. */ + protected void creationCheck(Integer mode, Properties serverType, + Properties runtimeSet, String seamHome, String unitType, String type){ + if (mode > 1) { + bot.viewByTitle(projectProperties.getProperty("jbossServerView")).setFocus(); + SWTBot innerBot = bot.viewByTitle(projectProperties.getProperty("jbossServerView")).bot(); + SWTBotTree tree = innerBot.tree(); + try { + tree.getTreeItem(jbossEAPRuntime.getProperty("serverName")+" [Stopped]"); + } catch (WidgetNotFoundException e) { + createServerRuntime(jbossEAPRuntime); + } + } + if (mode > 2) { + + try { + + } catch (WidgetNotFoundException e) { + createSeamRuntime(runtimeSet, seamHome); + } + } + if (mode > 3) { + + try { + + } catch (WidgetNotFoundException e) { + createSeamProject(runtimeSet, serverType, type); + } + } + if (mode > 4) { + + try { + + } catch (WidgetNotFoundException e) { + createSeamUnit(unitType, runtimeSet, type); + } + } + + } + +/**Creates any Server Runtime + Server. */ + protected void createServerRuntime(Properties serverType){ + bot.menu("File").menu("New").menu("Other...").click(); + SWTBotTree tree = bot.tree(); + tree.expandNode("Server").select("Server"); + bot.button("Next >").click(); + SWTBotTree tree2 = bot.tree(); + tree2.expandNode(serverType.getProperty("runtimeGroup")).select(serverType.getProperty("runtimeItem")); + bot.textWithLabel("Server name:").setText(serverType.getProperty("serverName")); + bot.button("Next >").click(); + bot.textWithLabel("Name").setText(serverType.getProperty("runtimeName")); + bot.textWithLabel("Home Directory").setText(serverType.getProperty("runtimePath")); + bot.button("Finish").click(); + } + +/** Creates any Seam runtime. */ + protected void createSeamRuntime(Properties runtimeSet, String homeFolder){ + bot.menu("Window").menu("Preferences").click(); + SWTBotTree tree = bot.tree(); + delay(); + tree.expandNode("JBoss Tools").expandNode("Web").select("Seam"); + bot.button("Add").click(); + bot.textWithLabel("Home Folder:").setText(homeFolder); + /*bot.textWithLabel("Home Folder:").setText(runtimeSet.getProperty("seamRuntimePath"));*/ + bot.textWithLabel("Name:").setText(runtimeSet.getProperty("seamRuntimeName")); + bot.button("Finish").click(); + bot.button("OK").click(); + } + +/**Creates any Seam project. */ + protected void createSeamProject(Properties runtimeSet, Properties serverType, + String type ){ + bot.menu("File").menu("New").menu("Seam Web Project").click(); + bot.textWithLabel("Project name:").setText(runtimeSet.getProperty("testProjectName")+ type); + bot.comboBoxInGroup("Target runtime").setSelection(serverType.getProperty("runtimeName")); + bot.comboBoxInGroup("Target Server").setSelection(serverType.getProperty("serverName")); + bot.comboBoxInGroup("Configuration").setSelection(runtimeSet.getProperty("configName")); + bot.button("Next >").click(); + bot.button("Next >").click(); + bot.button("Next >").click(); + bot.button("Next >").click(); + bot.comboBoxWithLabel("Seam Runtime:").setSelection(runtimeSet.getProperty("seamRuntimeName")); + bot.radio(type).click(); + bot.comboBoxWithLabel("Connection profile:").setSelection(projectProperties.getProperty("connName")); + bot.button("Finish").click(); + } + +/**Creates any Seam Action, Form etc. */ + protected void createSeamUnit(String unitType, + Properties runtimeSet, String type){ + bot.menu("File").menu("New").menu("Seam " +unitType).click(); + bot.textWithLabel("Seam Project:").setText(runtimeSet.getProperty("testProjectName")+ type); + if ("Entity".equals(unitType)) { + bot.textWithLabel("Seam entity class name:").setText("seam"+unitType); + } else { + bot.textWithLabel("Seam component name:").setText("seam"+unitType); + } + bot.button("Finish").click(); + delay(); + } + +/**Deletes any Seam project. */ + protected void deleteSeamProject(Properties runtimeSet, String type){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + if ("WAR".equals(type)) { + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type).contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type+"-test").contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + } else { + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type).contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type+"-ear").contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type+"-ejb").contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + tree.getTreeItem(runtimeSet.getProperty("testProjectName")+ type+"-test").contextMenu("Delete").click(); + bot.button("OK").click(); + bot.sleep(1000); + } + } +/**Creates any JSF project. */ + protected void createJSFProject(String jsfProjectName, String jsfEnvName, String jsfKickStart) { + bot.menu("File").menu("New").menu("Other...").click(); + bot.tree().expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); + bot.button("Next >").click(); + bot.textWithLabel("Project Name*").setText(jsfProjectName); + bot.comboBoxWithLabel("JSF Environment*").setSelection(jsfEnvName); + bot.comboBoxWithLabel("Template*").setSelection(jsfKickStart); + bot.button("Next >").click(); + bot.comboBoxWithLabel("Runtime*").setSelection(jbossEAPRuntime.getProperty("runtimeName")); + /*bot.checkBox(jbossEAPRuntime.getProperty("serverName")).deselect();*/ + bot.button("Finish").click(); + try {bot.button("No").click();} + catch (Exception e) {} + } + +/**Creates any Struts project. */ + protected void createStrutsProject(String strutsProjectName, String strutsEnvName) { + bot.menu("File").menu("New").menu("Other...").click(); + bot.tree().expandNode("JBoss Tools Web").expandNode("Struts").select("Struts Project"); + bot.button("Next >").click(); + bot.textWithLabel("Project Name*").setText(strutsProjectName); + bot.comboBoxWithLabel("Struts Environment*").setSelection(strutsEnvName); + bot.comboBoxWithLabel("Template*").setSelection("KickStart"); + bot.button("Next >").click(); + bot.comboBoxWithLabel("Runtime*").setSelection(jbossEAPRuntime.getProperty("runtimeName")); + /*bot.checkBox(jbossEAPRuntime.getProperty("serverName")).deselect();*/ + bot.button("Finish").click(); + try {bot.button("No").click();} + catch (Exception e) {} + } + +/**Creates any file. */ + protected void createPageFile(String fileType, String fileFolder) { + bot.menu("File").menu("New").menu("Other...").click(); + bot.tree().expandNode("JBoss Tools Web").select(fileType+" File"); + bot.button("Next >").click(); + bot.textWithLabel("Folder*").setText("/"+fileFolder); + bot.textWithLabel("Name*").setText("test"+fileType); + bot.button("Finish").click(); + } + +/**Editor opening check. */ + protected void checkEditor(String editorType) { + try {bot.editorByTitle(editorType).close();} + catch (Exception e) { + fail("Editor didn't open.");} + } + +/**Builder job delay. Ugly delay script here right now. */ + protected void timeStop(){ + bot.sleep(38000); + /*boolean check = true; + bot.menu("Window").menu("Show View").menu("Other...").click(); + bot.tree().expandNode("General").expandNode("Progress").select(); + bot.viewByTitle("Progress").setFocus(); + SWTBot progressBot = bot.viewByTitle("Progress").bot(); + while (check = true) { + bot.sleep(1000); + bot.viewByTitle("Progress").setFocus(); + SWTBotTree proTree = progressBot.tree(); + check = proTree.hasItems(); + }*/ + } + + +} Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/TestLauncher.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/TestLauncher.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/TestLauncher.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,49 @@ +package org.jboss.tools.smoke.ui.bot.test; + +import org.eclipse.swtbot.swt.finder.SWTBotTestCase; +import org.jboss.tools.smoke.ui.bot.test.create.CreateSeamRuntimes; +import org.jboss.tools.smoke.ui.bot.test.create.CreateSeamProjects; +import org.jboss.tools.smoke.ui.bot.test.create.CreateJSFProjects; +import org.jboss.tools.smoke.ui.bot.test.create.CreateStrutsProjects; +import org.jboss.tools.smoke.ui.bot.test.create.CreateForms; +import org.jboss.tools.smoke.ui.bot.test.create.CreateActions; +import org.jboss.tools.smoke.ui.bot.test.create.CreateConversations; +import org.jboss.tools.smoke.ui.bot.test.create.CreateEntities; +import org.jboss.tools.smoke.ui.bot.test.create.CreatePagesFiles; +import org.jboss.tools.smoke.ui.bot.test.create.RemoveJSFCapabilities; +import org.jboss.tools.smoke.ui.bot.test.create.RemoveStrutsCapabilities; +import org.jboss.tools.smoke.ui.bot.test.create.DeleteSeamProjects; +import org.jboss.tools.smoke.ui.bot.test.create.DeleteJSFProjects; +import org.jboss.tools.smoke.ui.bot.test.create.DeleteStrutsProjects; + +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; + + + +/** + * + * This is a debug launcher, don't use it. + * + */ +public class TestLauncher extends SWTBotTestCase{ + public static Test suite(){ + TestSuite suite = new TestSuite("Test Launch"); +// suite.addTestSuite(CreateSeamRuntimes.class); +// suite.addTestSuite(CreateSeamProjects.class); + suite.addTestSuite(CreateJSFProjects.class); + suite.addTestSuite(CreateStrutsProjects.class); +// suite.addTestSuite(CreateForms.class); +// suite.addTestSuite(CreateActions.class); +// suite.addTestSuite(CreateConversations.class); +// suite.addTestSuite(CreateEntities.class); + suite.addTestSuite(CreatePagesFiles.class); +// suite.addTestSuite(RemoveJSFCapabilities.class); +// suite.addTestSuite(RemoveStrutsCapabilities.class); +// suite.addTestSuite(DeleteSeamProjects.class); +// suite.addTestSuite(DeleteJSFProjects.class); +// suite.addTestSuite(DeleteStrutsProjects.class); + return new TestSetup(suite); + } +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateActions.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateActions.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateActions.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,33 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.jboss.tools.smoke.ui.bot.test.TestControl; + +public class CreateActions extends TestControl{ + + private static String TEST_TYPE = "Action"; + + public void testCreateActionFor12war(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_WAR); + } + + public void testCreateActionFor12ear(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_EAR); + } + + public void testCreateActionFor2fpwar(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_WAR); + } + + public void testCreateActionFor2fpear(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_EAR); + } + + public void testCreateActionFor21war(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_WAR); + } + + public void testCreateActionFor21ear(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_EAR); + } +} + \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateConversations.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateConversations.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateConversations.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,33 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.jboss.tools.smoke.ui.bot.test.TestControl; + +public class CreateConversations extends TestControl{ + + private static String TEST_TYPE = "Conversation"; + + public void testCreateConversationFor12war(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_WAR); + } + + public void testCreateConversationFor12ear(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_EAR); + } + + public void testCreateConversationFor2fpwar(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_WAR); + } + + public void testCreateConversationFor2fpear(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_EAR); + } + + public void testCreateConversationFor21war(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_WAR); + } + + public void testCreateConversationFor21ear(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_EAR); + } +} + \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateEntities.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateEntities.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateEntities.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,39 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.jboss.tools.smoke.ui.bot.test.TestControl; + +public class CreateEntities extends TestControl{ + + private static String TEST_TYPE = "Entity"; + + public void testCreateEntityFor12war(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_WAR); + waitForJobs(); + } + + public void testCreateEntityFor12ear(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_EAR); + waitForJobs(); + } + + public void testCreateEntityFor2fpwar(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_WAR); + waitForJobs(); + } + + public void testCreateEntityFor2fpear(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_EAR); + waitForJobs(); + } + + public void testCreateEntityFor21war(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_WAR); + waitForJobs(); + } + + public void testCreateEntityFor21ear(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_EAR); + waitForJobs(); + } +} + \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateForms.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateForms.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateForms.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,33 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.jboss.tools.smoke.ui.bot.test.TestControl; + +public class CreateForms extends TestControl{ + + private static String TEST_TYPE = "Form"; + + public void testCreateFormFor12war(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_WAR); + } + + public void testCreateFormFor12ear(){ + createSeamUnit(TEST_TYPE, seam12Settings, TYPE_EAR); + } + + public void testCreateFormFor2fpwar(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_WAR); + } + + public void testCreateFormFor2fpear(){ + createSeamUnit(TEST_TYPE, seam2fpSettings, TYPE_EAR); + } + + public void testCreateFormFor21war(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_WAR); + } + + public void testCreateFormFor21ear(){ + createSeamUnit(TEST_TYPE, seam21Settings, TYPE_EAR); + } +} + \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateJSFProjects.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateJSFProjects.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateJSFProjects.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,34 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.jboss.tools.smoke.ui.bot.test.TestControl; + +public class CreateJSFProjects extends TestControl{ + + public void testCreateJSFProject11(){ + createJSFProject( + projectProperties.getProperty("JSFProjectName1.1"), + projectProperties.getProperty("JSF1.1"), + projectProperties.getProperty("JSF1.1KickName") + ); + waitForJobs(); + } + + public void testCreateJSFProject12(){ + createJSFProject( + projectProperties.getProperty("JSFProjectName1.2"), + projectProperties.getProperty("JSF1.2"), + projectProperties.getProperty("JSF1.2KickName") + ); + waitForJobs(); + } + + public void testCreateJSFProject12Facelet(){ + createJSFProject( + projectProperties.getProperty("JSFProjectName1.2F"), + projectProperties.getProperty("JSF1.2F"), + projectProperties.getProperty("JSF1.2FKickName") + ); + waitForJobs(); + } + +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreatePagesFiles.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreatePagesFiles.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreatePagesFiles.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,41 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.jboss.tools.smoke.ui.bot.test.TestControl; + +public class CreatePagesFiles extends TestControl{ + + private static String JSP_TYPE = "JSP"; + private static String XHTML_TYPE = "XHTML"; + private static String JSP_EXT = ".jsp"; + private static String XHTML_EXT = ".xhtml"; + + public void testCreateJSPPage11(){ + createPageFile(JSP_TYPE, projectProperties.getProperty("JSFProjectName1.1")); + checkEditor("test"+ JSP_TYPE + JSP_EXT); + } + + public void testCreateJSPPage12(){ + createPageFile(JSP_TYPE, projectProperties.getProperty("JSFProjectName1.2")); + checkEditor("test"+ JSP_TYPE + JSP_EXT); + } + + public void testCreateJSPPage12Facelet(){ + createPageFile(JSP_TYPE, projectProperties.getProperty("JSFProjectName1.2F")); + checkEditor("test"+ JSP_TYPE + JSP_EXT); + } + + public void testCreateXHTMLPage11(){ + createPageFile(XHTML_TYPE, projectProperties.getProperty("JSFProjectName1.1")); + checkEditor("test"+ XHTML_TYPE + XHTML_EXT); + } + + public void testCreateXHTMLPage12(){ + createPageFile(XHTML_TYPE, projectProperties.getProperty("JSFProjectName1.2")); + checkEditor("test"+ XHTML_TYPE + XHTML_EXT); + } + + public void testCreateXHTMLPage12Facelet(){ + createPageFile(XHTML_TYPE, projectProperties.getProperty("JSFProjectName1.2F")); + checkEditor("test"+ XHTML_TYPE + XHTML_EXT); + } +} Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamProjects.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamProjects.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamProjects.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,37 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.jboss.tools.smoke.ui.bot.test.TestControl; + +public class CreateSeamProjects extends TestControl{ + + public void testCreateSeamProject12war(){ + createSeamProject(seam12Settings, jbossEAPRuntime, TYPE_WAR); + waitForJobs(); + } + + public void testCreateSeamProject12ear(){ + createSeamProject(seam12Settings, jbossEAPRuntime, TYPE_EAR); + waitForJobs(); + } + + public void testCreateSeamProject2fpwar(){ + createSeamProject(seam2fpSettings, jbossEAPRuntime, TYPE_WAR); + waitForJobs(); + } + + public void testCreateSeamProject2fpear(){ + createSeamProject(seam2fpSettings, jbossEAPRuntime, TYPE_EAR); + waitForJobs(); + } + + public void testCreateSeamProject21war(){ + createSeamProject(seam21Settings, jbossEAPRuntime, TYPE_WAR); + waitForJobs(); + } + + public void testCreateSeamProject21ear(){ + createSeamProject(seam21Settings, jbossEAPRuntime, TYPE_EAR); + waitForJobs(); + } + +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamRuntimes.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamRuntimes.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateSeamRuntimes.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,18 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.jboss.tools.smoke.ui.bot.test.TestControl; + +public class CreateSeamRuntimes extends TestControl{ + + public void testCreateSeamRuntime12(){ + createSeamRuntime(seam12Settings, SEAM_12_SETTINGS_HOME); + } + + public void testCreateSeamRuntime2fp(){ + createSeamRuntime(seam2fpSettings, SEAM_2FP_SETTINGS_HOME); + } + + public void testCreateSeamRuntime21(){ + createSeamRuntime(seam21Settings, SEAM_21_SETTINGS_HOME); + } +} Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateServerRuntimes.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateServerRuntimes.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateServerRuntimes.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,10 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.jboss.tools.smoke.ui.bot.test.TestControl; + +public class CreateServerRuntimes extends TestControl{ + + public void testCreateEAPServerRuntime(){ + createServerRuntime(jbossEAPRuntime); + } +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateStrutsProjects.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateStrutsProjects.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/CreateStrutsProjects.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,23 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.jboss.tools.smoke.ui.bot.test.TestControl; + +public class CreateStrutsProjects extends TestControl{ + + public void testCreateStrutsProject11(){ + createStrutsProject( + projectProperties.getProperty("StrutsProjectName1.1"), + projectProperties.getProperty("Struts1.1") + ); + waitForJobs(); + } + + public void testCreateStrutsProject12(){ + createStrutsProject( + projectProperties.getProperty("StrutsProjectName1.2"), + projectProperties.getProperty("Struts1.2") + ); + waitForJobs(); + } + +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteJSFProjects.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteJSFProjects.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteJSFProjects.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,31 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.smoke.ui.bot.test.TestControl; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public class DeleteJSFProjects extends TestControl{ + + public void testDeleteJSF11(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.getTreeItem(projectProperties.getProperty("JSFProjectName1.1")).contextMenu("Delete").click(); + bot.button("OK").click(); + } + + public void testDeleteJSF12(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.getTreeItem(projectProperties.getProperty("JSFProjectName1.2")).contextMenu("Delete").click(); + bot.button("OK").click(); + } + + public void testDeleteJSF12Facelet(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.getTreeItem(projectProperties.getProperty("JSFProjectName1.2F")).contextMenu("Delete").click(); + bot.button("OK").click(); + } + +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteSeamProjects.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteSeamProjects.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteSeamProjects.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,31 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.jboss.tools.smoke.ui.bot.test.TestControl; + +public class DeleteSeamProjects extends TestControl{ + + public void testDeleteSeamProject12war(){ + deleteSeamProject(seam12Settings, TYPE_WAR); + } + + public void testDeleteSeamProject12ear(){ + deleteSeamProject(seam12Settings, TYPE_EAR); + } + + public void testDeleteSeamProject2fpwar(){ + deleteSeamProject(seam2fpSettings, TYPE_WAR); + } + + public void testDeleteSeamProject2fpear(){ + deleteSeamProject(seam2fpSettings, TYPE_EAR); + } + + public void testDeleteSeamProject21war(){ + deleteSeamProject(seam21Settings, TYPE_WAR); + } + + public void testDeleteSeamProject21ear(){ + deleteSeamProject(seam21Settings, TYPE_EAR); + } + +} Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteStrutsProjects.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteStrutsProjects.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/DeleteStrutsProjects.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,24 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.smoke.ui.bot.test.TestControl; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public class DeleteStrutsProjects extends TestControl{ + + public void testDeleteStruts11(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.getTreeItem(projectProperties.getProperty("StrutsProjectName1.1")).contextMenu("Delete").click(); + bot.button("OK").click(); + } + + public void testDeleteStruts12(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.getTreeItem(projectProperties.getProperty("StrutsProjectName1.2")).contextMenu("Delete").click(); + bot.button("OK").click(); + } + +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/RemoveJSFCapabilities.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/RemoveJSFCapabilities.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/RemoveJSFCapabilities.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,37 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.smoke.ui.bot.test.TestControl; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public class RemoveJSFCapabilities extends TestControl{ + + public void testRemoveJSF11(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.getTreeItem( + projectProperties.getProperty("JSFProjectName1.1")) + .contextMenu("JBoss Tools").contextMenu("Remove JSF Capabilities"); + bot.button("OK").click(); + } + + public void testRemoveJSF12(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.getTreeItem( + projectProperties.getProperty("JSFProjectName1.2")) + .contextMenu("JBoss Tools").contextMenu("Remove JSF Capabilities"); + bot.button("OK").click(); + } + + public void testRemoveJSF12Facelet(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.getTreeItem( + projectProperties.getProperty("JSFProjectName1.2F")) + .contextMenu("JBoss Tools").contextMenu("Remove JSF Capabilities"); + bot.button("OK").click(); + } + +} \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/RemoveStrutsCapabilities.java =================================================================== --- workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/RemoveStrutsCapabilities.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.smoke.ui.bot.test/src/org/jboss/tools/smoke/ui/bot/test/create/RemoveStrutsCapabilities.java 2009-08-06 15:58:09 UTC (rev 16991) @@ -0,0 +1,28 @@ +package org.jboss.tools.smoke.ui.bot.test.create; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.smoke.ui.bot.test.TestControl; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public class RemoveStrutsCapabilities extends TestControl{ + + public void testRemoveStruts11(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.getTreeItem( + projectProperties.getProperty("StrutsProjectName1.1")) + .contextMenu("JBoss Tools").contextMenu("Remove Struts Capabilities"); + bot.button("OK").click(); + } + + public void testRemoveStruts12(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.getTreeItem( + projectProperties.getProperty("StrutsProjectName1.2")) + .contextMenu("JBoss Tools").contextMenu("Remove Struts Capabilities"); + bot.button("OK").click(); + } + +} \ No newline at end of file

16 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2009