JBoss Tools SVN: r21345 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-04-08 10:09:46 -0400 (Thu, 08 Apr 2010)
New Revision: 21345
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java
Log:
JBIDE-6068
Fixed
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2010-04-08 14:09:20 UTC (rev 21344)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2010-04-08 14:09:46 UTC (rev 21345)
@@ -513,6 +513,9 @@
Text t = (Text) e.getSource();
beanID = t.getText();
updateWizardPageStatus();
+ if(javaBeanModel != null){
+ javaBeanModel.setName(beanID);
+ }
}
});
14 years, 9 months
JBoss Tools SVN: r21344 - branches/modular_build/modeshape/releng/psfs.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-08 10:09:20 -0400 (Thu, 08 Apr 2010)
New Revision: 21344
Modified:
branches/modular_build/modeshape/releng/psfs/project.subclipse.psf
branches/modular_build/modeshape/releng/psfs/project.subversive.psf
Log:
add test.sdk feature to support both athena and tycho
Modified: branches/modular_build/modeshape/releng/psfs/project.subclipse.psf
===================================================================
--- branches/modular_build/modeshape/releng/psfs/project.subclipse.psf 2010-04-08 14:08:07 UTC (rev 21343)
+++ branches/modular_build/modeshape/releng/psfs/project.subclipse.psf 2010-04-08 14:09:20 UTC (rev 21344)
@@ -4,6 +4,7 @@
<!-- !*** Generated with org.eclipse.dash.common.releng/tools/scripts/buildAllHelper.xml#dir2svnmap task -->
<project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/mo..."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/mo..."/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/mo..."/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/mo..."/>
<project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/mo..."/>
Modified: branches/modular_build/modeshape/releng/psfs/project.subversive.psf
===================================================================
--- branches/modular_build/modeshape/releng/psfs/project.subversive.psf 2010-04-08 14:08:07 UTC (rev 21343)
+++ branches/modular_build/modeshape/releng/psfs/project.subversive.psf 2010-04-08 14:09:20 UTC (rev 21344)
@@ -4,6 +4,7 @@
<!-- !*** Generated with org.eclipse.dash.common.releng/tools/scripts/buildAllHelper.xml#dir2svnmap task -->
<project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/mo..."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/mo..."/>
<project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/mo..."/>
<project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/mo..."/>
<project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/mo..."/>
14 years, 9 months
JBoss Tools SVN: r21343 - branches/modular_build/modeshape/releng/maps.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-08 10:08:07 -0400 (Thu, 08 Apr 2010)
New Revision: 21343
Modified:
branches/modular_build/modeshape/releng/maps/project.map
Log:
add test.sdk feature to support both athena and tycho
Modified: branches/modular_build/modeshape/releng/maps/project.map
===================================================================
--- branches/modular_build/modeshape/releng/maps/project.map 2010-04-08 13:59:26 UTC (rev 21342)
+++ branches/modular_build/modeshape/releng/maps/project.map 2010-04-08 14:08:07 UTC (rev 21343)
@@ -1,5 +1,6 @@
!*** Generated with org.eclipse.dash.common.releng/tools/scripts/buildAllHelper.xml#dir2svnmap task
feature@org.jboss.tools.modeshape.rest.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.feature
+feature@org.jboss.tools.modeshape.rest.test.sdk.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.test.sdk.feature
feature@org.jboss.tools.modeshape.rest.test.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.test.feature
plugin@org.jboss.tools.modeshape.rest=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/modular_build/modeshape/plugins/org.jboss.tools.modeshape.rest
plugin@org.jboss.tools.modeshape.rest.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test
14 years, 9 months
JBoss Tools SVN: r21342 - workspace/dart/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-04-08 09:59:26 -0400 (Thu, 08 Apr 2010)
New Revision: 21342
Modified:
workspace/dart/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/test/AbstractSmooksUIBotTest.java
Log:
Modified: workspace/dart/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/test/AbstractSmooksUIBotTest.java
===================================================================
--- workspace/dart/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/test/AbstractSmooksUIBotTest.java 2010-04-08 13:12:21 UTC (rev 21341)
+++ workspace/dart/org.jboss.tools.smooks.ui.bot.test/src/org/jboss/tools/smooks/ui/bot/test/AbstractSmooksUIBotTest.java 2010-04-08 13:59:26 UTC (rev 21342)
@@ -489,7 +489,7 @@
projects[0] = ResourcesPlugin.getWorkspace().getRoot().getProject(fpn);
projects[0].create(null);
projects[0].open(null);
- JobUtils.waitForIdle(IMPORT_DELAY);
+// JobUtils.waitForIdle(IMPORT_DELAY);
IOverwriteQuery overwrite = new IOverwriteQuery() {
public String queryOverwrite(String pathString) {
@@ -516,7 +516,7 @@
importOp.setContext(bot.getDisplay().getActiveShell());
// run import
importOp.run(null);
- JobUtils.waitForIdle(IMPORT_DELAY);
+// JobUtils.waitForIdle(IMPORT_DELAY);
ResourcesUtils.setBuildAutomatically(state);
} catch (InvocationTargetException ite) {
14 years, 9 months
JBoss Tools SVN: r21341 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-04-08 09:12:21 -0400 (Thu, 08 Apr 2010)
New Revision: 21341
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-6127
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/plugin.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/plugin.xml 2010-04-08 13:09:38 UTC (rev 21340)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/plugin.xml 2010-04-08 13:12:21 UTC (rev 21341)
@@ -4,8 +4,8 @@
<extension
point="org.jboss.tools.vpe.ui.tests">
<tests
- name="JBPMAllTests"
- testSuite="org.jboss.tools.jsf.vpe.jbpm.test.JBPMAllTests">
+ name="JbpmVisualAllTests"
+ testSuite="org.jboss.tools.jsf.vpe.jbpm.test.JbpmVisualAllTests">
</tests>
<testProject
name="jBPMTestProject"
14 years, 9 months
JBoss Tools SVN: r21340 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-04-08 09:09:38 -0400 (Thu, 08 Apr 2010)
New Revision: 21340
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JbpmVisualAllTests.java
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMAllTests.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMComponentsTest.java
Log:
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMAllTests.java 2010-04-08 12:43:37 UTC (rev 21339)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMAllTests.java 2010-04-08 13:09:38 UTC (rev 21340)
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jsf.vpe.jbpm.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.jboss.tools.vpe.ui.test.VpeTestSetup;
-
-/**
- *
- * @author yzhishko
- *
- */
-
-public class JBPMAllTests {
-
- public static final String JBPM_TEST_PROJECT = "jBPMTestProject"; //$NON-NLS-1$
-
- public static Test suite(){
- TestSuite suite = new TestSuite("Tests for Vpe jBPM components"); //$NON-NLS-1$
- suite.addTestSuite(JBPMComponentsTest.class);
- return new VpeTestSetup(suite);
- }
-
-}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMComponentsTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMComponentsTest.java 2010-04-08 12:43:37 UTC (rev 21339)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMComponentsTest.java 2010-04-08 13:09:38 UTC (rev 21340)
@@ -43,7 +43,7 @@
@Override
protected String getTestProjectName() {
- return JBPMAllTests.JBPM_TEST_PROJECT;
+ return JbpmVisualAllTests.JBPM_TEST_PROJECT;
}
}
Copied: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JbpmVisualAllTests.java (from rev 21297, trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JBPMAllTests.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JbpmVisualAllTests.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/src/org/jboss/tools/jsf/vpe/jbpm/test/JbpmVisualAllTests.java 2010-04-08 13:09:38 UTC (rev 21340)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.jbpm.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.tools.vpe.ui.test.VpeTestSetup;
+
+/**
+ *
+ * @author yzhishko
+ *
+ */
+
+public class JbpmVisualAllTests {
+
+ public static final String JBPM_TEST_PROJECT = "jBPMTestProject"; //$NON-NLS-1$
+
+ public static Test suite(){
+ TestSuite suite = new TestSuite("Tests for Vpe jBPM components"); //$NON-NLS-1$
+ suite.addTestSuite(JBPMComponentsTest.class);
+ return new VpeTestSetup(suite);
+ }
+
+}
14 years, 9 months
JBoss Tools SVN: r21339 - in trunk/as/docs/reference/en-US/images: runtimes_servers and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-04-08 08:43:37 -0400 (Thu, 08 Apr 2010)
New Revision: 21339
Modified:
trunk/as/docs/reference/en-US/images/modules/modules_1.png
trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers_1.png
trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers_4.png
trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers_7.png
trunk/as/docs/reference/en-US/images/webtools/webtools_5.png
Log:
https://jira.jboss.org/jira/browse/JBDS-1143 Jboss AS docs mistakes
screenshots were updated
Modified: trunk/as/docs/reference/en-US/images/modules/modules_1.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers_1.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers_4.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers_7.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/webtools/webtools_5.png
===================================================================
(Binary files differ)
14 years, 9 months
JBoss Tools SVN: r21338 - in trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext: types and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-04-08 08:37:49 -0400 (Thu, 08 Apr 2010)
New Revision: 21338
Modified:
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/PackageExplorer.java
Log:
Added new methods for Drools SWTBot tests
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-04-08 12:26:40 UTC (rev 21337)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-04-08 12:37:49 UTC (rev 21338)
@@ -18,6 +18,7 @@
import java.util.Iterator;
import org.apache.log4j.Logger;
+import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.matchers.WidgetMatcherFactory;
@@ -26,6 +27,8 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
+import org.eclipse.swtbot.swt.finder.results.WidgetResult;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
@@ -92,17 +95,25 @@
* @param type
*/
public SWTBot showView(ViewType type) {
- SWTBotMenu menu1 = bot.menu(IDELabel.Menu.WINDOW);
- SWTBotMenu menu2 = menu1.menu(IDELabel.Menu.SHOW_VIEW);
- menu2.menu(IDELabel.Menu.OTHER).click();
+ return SWTEclipseExt.showView(bot, type);
+ }
+ /**
+ * Show view static version
+ *
+ * @param type
+ */
+ public static SWTBot showView(SWTBotExt bot,ViewType type) {
+ SWTBotMenu menu1 = bot.menu(IDELabel.Menu.WINDOW);
+ SWTBotMenu menu2 = menu1.menu(IDELabel.Menu.SHOW_VIEW);
+ menu2.menu(IDELabel.Menu.OTHER).click();
- bot.tree().expandNode(type.getGroupLabel()).expandNode(
- type.getViewLabel()).select();
- bot.button(IDELabel.Button.OK).click();
+ bot.tree().expandNode(type.getGroupLabel()).expandNode(
+ type.getViewLabel()).select();
+ bot.button(IDELabel.Button.OK).click();
- SWTBot viewBot = bot.viewByTitle(type.getViewLabel()).bot();
- return viewBot;
- }
+ SWTBot viewBot = bot.viewByTitle(type.getViewLabel()).bot();
+ return viewBot;
+ }
// ------------------------------------------------------------
// Perspective related methods
@@ -562,5 +573,91 @@
public void hideWarningIfDisplayed() {
SWTEclipseExt.hideWarningIfDisplayed(bot);
}
+ /**
+ * Returns true when projectName is present in Package Explorer
+ * @param projectName
+ * @return
+ */
+ public boolean isProjectInPackageExplorer(String projectName) {
+ return SWTEclipseExt.isProjectInPackageExplorer(bot,projectName);
+ }
+ /**
+ * Returns true when projectName is present in Package Explorer static version
+ * @param bot
+ * @param projectName
+ * @return
+ */
+ public static boolean isProjectInPackageExplorer(SWTBotExt bot,String projectName) {
+ boolean found = false;
+
+ SWTBot innerBot = SWTEclipseExt.showView(bot,ViewType.PACKAGE_EXPLORER);
+ SWTBotTree tree = innerBot.tree();
+ try {
+ tree.getTreeItem(projectName);
+ found = true;
+ } catch (WidgetNotFoundException e) {
+ }
+ return found;
+ }
+ /**
+ * Returns Tree Item with specified label and located on path
+ * @param tree
+ * @param treeItemText
+ * @param path
+ * @return
+ */
+ public static SWTBotTreeItem getTreeItemOnPath(SWTBotTree tree,String treeItemText, String[] path) {
+ SWTBotTreeItem parentTreeItem = null;
+ SWTBotTreeItem treeItem = null;
+ if (path != null && path.length > 0){
+ parentTreeItem = tree.expandNode(path[0]);
+ for (int index = 1 ; index < path.length ; index++){
+ parentTreeItem = parentTreeItem.expandNode(path[index]);
+ }
+ treeItem = parentTreeItem.getNode(treeItemText);
+ }
+ else{
+ treeItem = tree.getTreeItem(treeItemText);
+ }
+ return treeItem;
+ }
+ /**
+ * Choose Run As Java Application menu for specified Tree Item
+ * @param treeItem
+ */
+ public void runTreeItemAsJavaApplication(SWTBotTreeItem treeItem){
+ treeItem.select();
+ treeItem.click();
+ SWTEclipseExt.getMenuFromSubmenu(bot.menu(IDELabel.Menu.RUN).menu(IDELabel.Menu.RUN_AS),
+ IDELabel.Menu.RUN_AS_JAVA_APPLICATION).click();
+ System.out.println("stop");
+ }
+ /**
+ * Search for Menu Item with Run on Server substring within label
+ * @param subMenu
+ * @return
+ */
+ public static SWTBotMenu getMenuFromSubmenu(SWTBotMenu subMenu, String menuLabelTextToContain){
+ final SWTBotMenu subMenuToSearch = subMenu;
+ final String stringToSearchFor = menuLabelTextToContain;
+ final MenuItem menuItem = UIThreadRunnable
+ .syncExec(new WidgetResult<MenuItem>() {
+ public MenuItem run() {
+ int menuItemIndex = 0;
+ MenuItem menuItem = null;
+ final MenuItem[] menuItems = subMenuToSearch.widget.getMenu().getItems();
+ while (menuItem == null && menuItemIndex < menuItems.length){
+ if (menuItems[menuItemIndex].getText().indexOf(stringToSearchFor) > - 1){
+ menuItem = menuItems[menuItemIndex];
+ }
+ else{
+ menuItemIndex++;
+ }
+ }
+ return menuItem;
+ }
+ });
+ return new SWTBotMenu(menuItem);
+ }
}
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2010-04-08 12:26:40 UTC (rev 21337)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2010-04-08 12:37:49 UTC (rev 21338)
@@ -483,4 +483,22 @@
}
}
+ /**
+ * Delete directory from directoryLocation
+ * @param directoryLocation
+ */
+ public static void deleteDirectory(String directoryLocation){
+ File directory = new File (directoryLocation);
+ if (directory.exists()){
+ if (directory.isDirectory()){
+ for (File childFile :directory.listFiles()) {
+ SWTUtilExt.deleteDirectory(childFile.getAbsolutePath());
+ }
+ directory.delete();
+ }
+ else{
+ directory.delete();
+ }
+ }
+ }
}
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-04-08 12:26:40 UTC (rev 21337)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-04-08 12:37:49 UTC (rev 21338)
@@ -56,12 +56,12 @@
public static final String STRUTS_PROJECT = "Struts Project";
public static final String PREFERENCES = "Preferences";
public static final String JBT_REMOVE_STRUTS_CAPABILITIES = "Remove Struts Capabilities";
- public static final String ADD_STRUTS_CAPABILITIES = "Add Struts Capabilities...";
- public static final String WEB_PROJECT_JBT_STRUTS = "JBoss Tools Struts";
- public static final String RUN = "Run";
- public static final String RUN_ON_SERVER = "Run on Server";
- public static final String ADD_AND_REMOVE="Add and Remove...";
-
+ public static final String ADD_STRUTS_CAPABILITIES = "Add Struts Capabilities...";
+ public static final String WEB_PROJECT_JBT_STRUTS = "JBoss Tools Struts";
+ public static final String RUN = "Run";
+ public static final String RUN_ON_SERVER = "Run on Server";
+ public static final String ADD_AND_REMOVE="Add and Remove...";
+ public static final String RUN_AS_JAVA_APPLICATION="Java Application";
}
public class Button {
Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/PackageExplorer.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/PackageExplorer.java 2010-04-08 12:26:40 UTC (rev 21337)
+++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/PackageExplorer.java 2010-04-08 12:37:49 UTC (rev 21338)
@@ -1,9 +1,9 @@
package org.jboss.tools.ui.bot.ext.view;
import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
/**
@@ -21,4 +21,16 @@
viewBot.tree().expandNode(projectName).select();
}
+ /**
+ * Selects Tree Item within Package Explorer
+ * @param treeItemText
+ * @param path
+ * @return
+ */
+ public SWTBotTreeItem selectTreeItem(String treeItemText, String[] path) {
+ return SWTEclipseExt.getTreeItemOnPath(viewByTitle(IDELabel.View.PACKAGE_EXPLORER).bot().tree(),
+ treeItemText, path)
+ .select();
+ }
+
}
14 years, 9 months
JBoss Tools SVN: r21337 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-04-08 08:26:40 -0400 (Thu, 08 Apr 2010)
New Revision: 21337
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/JSPPaletteInsertHelper.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteDropCommand.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5963
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/JSPPaletteInsertHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/JSPPaletteInsertHelper.java 2010-04-08 07:59:45 UTC (rev 21336)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/JSPPaletteInsertHelper.java 2010-04-08 12:26:40 UTC (rev 21337)
@@ -32,6 +32,7 @@
String startText = texts[0];
if(startText != null && startText.startsWith("<%@ taglib")) { //$NON-NLS-1$
if(PaletteTaglibInserter.inserTaglibInXml(v.getDocument(), p)) {
+ texts[0] = "";
return;
}
} else {
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteDropCommand.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteDropCommand.java 2010-04-08 07:59:45 UTC (rev 21336)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteDropCommand.java 2010-04-08 12:26:40 UTC (rev 21337)
@@ -82,7 +82,7 @@
if(endText != null) properties.setProperty(PaletteInsertHelper.PROPOPERTY_END_TEXT, endText);
if(reformat != null) properties.setProperty(PaletteInsertHelper.PROPOPERTY_REFORMAT_BODY, reformat);
if(newLine != null) properties.setProperty(PaletteInsertHelper.PROPOPERTY_NEW_LINE, newLine);
- PaletteInsertHelper.getInstance().insertIntoEditor(
+ JSPPaletteInsertHelper.getInstance().insertIntoEditor(
getDefaultModel().getDropData().getSourceViewer(),
properties
);
14 years, 9 months
JBoss Tools SVN: r21336 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-04-08 03:59:45 -0400 (Thu, 08 Apr 2010)
New Revision: 21336
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationOverviewPage.java
Log:
JBIDE-6022
Fixed
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationOverviewPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationOverviewPage.java 2010-04-08 05:58:47 UTC (rev 21335)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationOverviewPage.java 2010-04-08 07:59:45 UTC (rev 21336)
@@ -341,7 +341,7 @@
toolkit.createLabel(globalParamComposite, Messages.SmooksConfigurationOverviewPage_SerializationLabel)
.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
gd = new GridData(SWT.FILL, SWT.NONE, true, false);
- defaultSerializationOnCheckbox = toolkit.createButton(globalParamComposite, "", SWT.CHECK); //$NON-NLS-1$
+ defaultSerializationOnCheckbox = toolkit.createButton(globalParamComposite, null, SWT.CHECK); //$NON-NLS-1$
defaultSerializationOnCheckbox.setLayoutData(gd);
initGlobalSettingControls();
14 years, 9 months