JBoss Tools SVN: r39789 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-03-23 05:07:26 -0400 (Fri, 23 Mar 2012)
New Revision: 39789
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml
Log:
Increased timeout
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-03-23 09:05:19 UTC (rev 39788)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-03-23 09:07:26 UTC (rev 39789)
@@ -30,8 +30,8 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
- <surefire.timeout>1800</surefire.timeout>
- <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+ <surefire.timeout>3600</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
<testSuite>org.jboss.tools.portlet.ui.bot.test</testSuite>
<testClass>${test.class}</testClass>
<skip>${swtbot.test.skip}</skip>
12 years, 3 months
JBoss Tools SVN: r39788 - branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-03-23 05:05:19 -0400 (Fri, 23 Mar 2012)
New Revision: 39788
Removed:
branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/LICENSE.txt
branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/README.txt
branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/bin/
branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/copyright.txt
branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/jboss-modules.jar
branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/modules/
Log:
JBIDE-11249: Forge is not recognizing/enabling right features in all projects generated by archetypes
-> remove Forge 1.0.0.Final runtime
Deleted: branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/LICENSE.txt
===================================================================
--- branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/LICENSE.txt 2012-03-23 07:09:38 UTC (rev 39787)
+++ branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/LICENSE.txt 2012-03-23 09:05:19 UTC (rev 39788)
@@ -1,189 +0,0 @@
-JBoss, Home of Professional Open Source.
-Copyright (c) 2011, Red Hat, Inc., and individual contributors
-as indicated by the @author tags. See the copyright.txt file 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.
-
-Note that some thirdparty components have different terms which are
-located in the docs/licenses directory.
-
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
Deleted: branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/README.txt
===================================================================
--- branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/README.txt 2012-03-23 07:09:38 UTC (rev 39787)
+++ branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/README.txt 2012-03-23 09:05:19 UTC (rev 39788)
@@ -1,11 +0,0 @@
- _____
- | ___|__ _ __ __ _ ___
- | |_ / _ \| `__/ _` |/ _ \ \\
- | _| (_) | | | (_| | __/ //
- |_| \___/|_| \__, |\___|
- |___/
-
-Welcome to JBoss Forge
-http://jboss.org/forge
-
-Go to above link for Documentations, Plugins, and Additional Information
\ No newline at end of file
Deleted: branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/copyright.txt
===================================================================
--- branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/copyright.txt 2012-03-23 07:09:38 UTC (rev 39787)
+++ branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/copyright.txt 2012-03-23 09:05:19 UTC (rev 39788)
@@ -1 +0,0 @@
-Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
\ No newline at end of file
Deleted: branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.runtime/jboss-modules.jar
===================================================================
(Binary files differ)
12 years, 3 months
JBoss Tools SVN: r39787 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-23 03:09:38 -0400 (Fri, 23 Mar 2012)
New Revision: 39787
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-11387
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2012-03-22 23:59:44 UTC (rev 39786)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2012-03-23 07:09:38 UTC (rev 39787)
@@ -851,7 +851,7 @@
version="6.0"/>
<facet id="wst.web" version="1.0,1.2,1.3,1.4"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5,3.0"/>
- <facet id="jst.java" version="5.0,6.0"/>
+ <facet id="jst.java" version="5.0,6.0,1.7"/>
<facet id="jst.utility" version="1.0"/>
<facet id="jst.connector" version="1.0,1.5,1.6"/>
<facet id="jst.ejb" version="2.0,2.1,3.0,3.1"/>
12 years, 3 months
JBoss Tools SVN: r39786 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-03-22 19:59:44 -0400 (Thu, 22 Mar 2012)
New Revision: 39786
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseUIUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-11385 Invalid thread access in CDICoreValidator
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseUIUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseUIUtil.java 2012-03-22 23:37:30 UTC (rev 39785)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseUIUtil.java 2012-03-22 23:59:44 UTC (rev 39786)
@@ -14,6 +14,7 @@
import java.util.Set;
import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
@@ -21,35 +22,58 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.ITextEditor;
+import org.jboss.tools.common.CommonPlugin;
/**
* @author Alexey Kazakov
*/
public class EclipseUIUtil {
+ private static class SafeRunnableForActivePage extends SafeRunnable {
+
+ public ITextEditor activeEditor;
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.core.runtime.ISafeRunnable#run()
+ */
+ @Override
+ public void run() throws Exception {
+ IWorkbenchWindow window = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow();
+ if (window != null) {
+ IWorkbenchPage page = window.getActivePage();
+ if (page != null) {
+ IEditorPart editor = page.getActiveEditor();
+ if (editor instanceof IEditorWrapper) {
+ editor = ((IEditorWrapper) editor).getEditor();
+ }
+ if (editor instanceof ITextEditor) {
+ activeEditor = (ITextEditor) editor;
+ } else {
+ activeEditor = editor == null ? null : (ITextEditor)editor.getAdapter(ITextEditor.class);
+ }
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.util.SafeRunnable#handleException(java.lang.Throwable)
+ */
+ @Override
+ public void handleException(Throwable e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ }
+
/**
* Returns the active text editor.
- *
* @return
*/
public static ITextEditor getActiveEditor() {
- IWorkbenchWindow window = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow();
- if (window != null) {
- IWorkbenchPage page = window.getActivePage();
- if (page != null) {
- IEditorPart editor = page.getActiveEditor();
- if (editor instanceof IEditorWrapper) {
- editor = ((IEditorWrapper) editor).getEditor();
- }
- if (editor instanceof ITextEditor) {
- return (ITextEditor) editor;
- } else {
- return editor == null ? null : (ITextEditor)editor.getAdapter(ITextEditor.class);
- }
- }
- }
- return null;
+ SafeRunnableForActivePage sr = new SafeRunnableForActivePage();
+ SafeRunnable.run(sr);
+ return sr.activeEditor;
}
/**
@@ -74,23 +98,37 @@
}
/**
- * Returns all the modified but not saved files which are opened with all the editors.
+ * Returns all the modified but not saved files which are opened with all the editors.
* @return
*/
public static Set<IFile> getDirtyFiles() {
- Set<IFile> dirtyFiles = new HashSet<IFile>();
+ final Set<IFile> dirtyFiles = new HashSet<IFile>();
IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
for (IWorkbenchWindow window : windows) {
- IWorkbenchPage page = window.getActivePage();
+ final IWorkbenchPage page = window.getActivePage();
if (page != null) {
- IEditorPart[] editors = page.getDirtyEditors();
- for (IEditorPart editor : editors) {
- IEditorInput input = editor.getEditorInput();
- if(input instanceof IFileEditorInput) {
- IFile file = ((IFileEditorInput)input).getFile();
- dirtyFiles.add(file);
+ SafeRunnable sr = new SafeRunnable() {
+ @Override
+ public void run() throws Exception {
+ IEditorPart[] editors = page.getDirtyEditors();
+ for (IEditorPart editor : editors) {
+ IEditorInput input = editor.getEditorInput();
+ if(input instanceof IFileEditorInput) {
+ IFile file = ((IFileEditorInput)input).getFile();
+ dirtyFiles.add(file);
+ }
+ }
}
- }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.util.SafeRunnable#handleException(java.lang.Throwable)
+ */
+ @Override
+ public void handleException(Throwable e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ };
+ SafeRunnable.run(sr);
}
}
return dirtyFiles;
12 years, 3 months
JBoss Tools SVN: r39785 - trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-03-22 19:37:30 -0400 (Thu, 22 Mar 2012)
New Revision: 39785
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java
Log:
small fix in ResourceOpenOnTest
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java 2012-03-22 23:36:55 UTC (rev 39784)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ResourceOpenOnTest.java 2012-03-22 23:37:30 UTC (rev 39785)
@@ -40,20 +40,22 @@
packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
"cdi.seam", className);
- openOnUtil.openOnByOption(CDIConstants.RESOURCE_ANNOTATION, className, "Open Resource");
+ assertTrue(openOnUtil.openOnByOption(CDIConstants.RESOURCE_ANNOTATION,
+ className, "Open Resource"));
String destinationFile = getEd().getTitle();
assertTrue("ERROR: redirected to " + destinationFile,
destinationFile.equals(CDIConstants.BEANS_XML));
- editResourceUtil.moveFileInExplorerBase(projectExplorer, CDIConstants.BEANS_XML,
+ editResourceUtil.moveFileInExplorerBase(packageExplorer, CDIConstants.BEANS_XML,
getProjectName() + "/" + CDIConstants.WEBCONTENT + "/" + CDIConstants.WEB_INF,
getProjectName() + "/" + CDIConstants.WEBCONTENT + "/" + CDIConstants.META_INF);
LOGGER.info("bean.xml was moved to META-INF");
setEd(bot.swtBotEditorExtByTitle(className));
editResourceUtil.replaceInEditor("WEB", "META");
- openOnUtil.openOnByOption(CDIConstants.RESOURCE_ANNOTATION, className, "Open Resource");
+ assertTrue(openOnUtil.openOnByOption(CDIConstants.RESOURCE_ANNOTATION,
+ className, "Open Resource"));
destinationFile = getEd().getTitle();
assertTrue("ERROR: redirected to " + destinationFile,
12 years, 3 months
JBoss Tools SVN: r39784 - trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-03-22 19:36:55 -0400 (Thu, 22 Mar 2012)
New Revision: 39784
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java
Log:
Waiting for shell added
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java 2012-03-22 23:30:11 UTC (rev 39783)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/util/LibraryHelper.java 2012-03-22 23:36:55 UTC (rev 39784)
@@ -46,6 +46,8 @@
ContextMenuHelper.prepareTreeItemForContextMenu(tree);
new SWTBotMenu(ContextMenuHelper.getContextMenu(tree,CDIConstants.PROPERTIES,false)).click();
+ bot.waitForShell(IDELabel.Shell.PROPERTIES_FOR + " " + projectName);
+
bot.tree().expandNode(CDIConstants.JAVA_BUILD_PATH).select();
bot.tabItem(CDIConstants.LIBRARIES).activate();
12 years, 3 months
JBoss Tools SVN: r39783 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-03-22 19:30:11 -0400 (Thu, 22 Mar 2012)
New Revision: 39783
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/EditorResourceHelper.java
Log:
small fix
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/EditorResourceHelper.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/EditorResourceHelper.java 2012-03-22 23:29:00 UTC (rev 39782)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/EditorResourceHelper.java 2012-03-22 23:30:11 UTC (rev 39783)
@@ -167,10 +167,10 @@
explorerBase.selectTreeItem(file, sourceFolder.split("/"));
bot.menu(IDELabel.Menu.FILE).menu(IDELabel.Menu.MOVE).click();
- bot.waitForShell(IDELabel.Shell.MOVE_RESOURCES);
+ bot.waitForShell(IDELabel.Shell.MOVE);
- SWTBotTree tree = bot.tree();
- tree.collapseNode(sourceFolder.split("/")[0]);
+ SWTBotTree tree = bot.activeShell().bot().tree();
+ tree.collapseNode(destFolder.split("/")[0]);
TreeHelper.expandNode(bot, destFolder.split("/")).select();
12 years, 3 months
JBoss Tools SVN: r39782 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-03-22 19:29:00 -0400 (Thu, 22 Mar 2012)
New Revision: 39782
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Added shell 'Move'
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-03-22 23:14:53 UTC (rev 39781)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-03-22 23:29:00 UTC (rev 39782)
@@ -191,6 +191,7 @@
public static final String ADD_SVN_REPOSITORY = "Add SVN Repository";
public static final String REPOSITORY_LOCATION_PROPERTIES = "Repository Location Properties";
public static final String MOVE_RESOURCES = "Move Resources";
+ public static final String MOVE = "Move";
public static final String SECURE_STORAGE = "Secure Storage";
public static final String ADD_JSF_PROJECT_TEMPLATE = "Add JSF Project Template";
public static final String NEW_MANAGED_BEAN = "New Managed Bean";
12 years, 3 months
JBoss Tools SVN: r39781 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-03-22 19:14:53 -0400 (Thu, 22 Mar 2012)
New Revision: 39781
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/ConfigDefinitionContext.java
Log:
JBIDE-11386
https://issues.jboss.org/browse/JBIDE-11386
Fixed getting path from annotation declaration object; if annotation type is located in an external jar then getResource() returns null.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/ConfigDefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/ConfigDefinitionContext.java 2012-03-22 22:41:41 UTC (rev 39780)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/ConfigDefinitionContext.java 2012-03-22 23:14:53 UTC (rev 39781)
@@ -146,10 +146,14 @@
}
public void addAnnotation(String typeName, AnnotationDefinition def) {
- IPath path = def.getResource().getFullPath();
// root.clean(typeName);
annotations.put(typeName, def);
- ((DefinitionContext)root).addType(path, typeName, def);
+ IPath path = def.getResource() != null ? def.getResource().getFullPath()
+ : def.getType() != null ? def.getType().getPath()
+ : null;
+ if(path != null) {
+ ((DefinitionContext)root).addType(path, typeName, def);
+ }
}
public List<TypeDefinition> getTypeDefinitions() {
12 years, 3 months
JBoss Tools SVN: r39780 - trunk/documentation/guides/Update_Guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-03-22 18:41:41 -0400 (Thu, 22 Mar 2012)
New Revision: 39780
Modified:
trunk/documentation/guides/Update_Guide/en-US/Author_Group.xml
trunk/documentation/guides/Update_Guide/en-US/Book_Info.xml
trunk/documentation/guides/Update_Guide/en-US/Update.xml
Log:
updated for future releases
Modified: trunk/documentation/guides/Update_Guide/en-US/Author_Group.xml
===================================================================
--- trunk/documentation/guides/Update_Guide/en-US/Author_Group.xml 2012-03-22 19:45:52 UTC (rev 39779)
+++ trunk/documentation/guides/Update_Guide/en-US/Author_Group.xml 2012-03-22 22:41:41 UTC (rev 39780)
@@ -2,10 +2,10 @@
<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<authorgroup>
- <author>
+<!-- <author>
<firstname>Ben</firstname>
<surname>Clare</surname>
- </author>
+ </author> -->
<author>
<firstname>Isaac</firstname>
<surname>Rooskov</surname>
Modified: trunk/documentation/guides/Update_Guide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/Update_Guide/en-US/Book_Info.xml 2012-03-22 19:45:52 UTC (rev 39779)
+++ trunk/documentation/guides/Update_Guide/en-US/Book_Info.xml 2012-03-22 22:41:41 UTC (rev 39780)
@@ -3,14 +3,14 @@
]>
<bookinfo>
<title>Update Guide</title>
- <subtitle>Updating from 4.0 to 4.1.x</subtitle>
+ <subtitle>Updating from 5.0 to 5.1.x</subtitle>
<productname>JBoss Developer Studio</productname>
- <productnumber>4.1</productnumber>
- <edition>4.1.0</edition>
+ <productnumber>5.0</productnumber>
+ <edition>5.1.0</edition>
<pubsnumber>5</pubsnumber>
<abstract>
<para>
- The Update Guide explains how to upgrade from JBoss Developer Studio 4.0 to JBoss Developer Studio 4.1.x
+ The Update Guide explains how to upgrade from JBoss Developer Studio 5.0 to JBoss Developer Studio 5.1.x
</para>
</abstract>
<corpauthor>
Modified: trunk/documentation/guides/Update_Guide/en-US/Update.xml
===================================================================
--- trunk/documentation/guides/Update_Guide/en-US/Update.xml 2012-03-22 19:45:52 UTC (rev 39779)
+++ trunk/documentation/guides/Update_Guide/en-US/Update.xml 2012-03-22 22:41:41 UTC (rev 39780)
@@ -58,19 +58,19 @@
</listitem>
<listitem>
<para>
- Enter the <acronym>url</acronym> of the update site in the <guilabel>Location</guilabel> field. The user has the option of the following two options:
+ Enter the <acronym>url</acronym> of the update site in the <guilabel>Location</guilabel> field.<!-- The user has the option of the following two options: -->
</para>
<itemizedlist>
<listitem>
<para>
- https://devstudio.jboss.com/updates/3.0/
+ https://devstudio.jboss.com/updates/5.0/
</para>
</listitem>
- <listitem>
+ <!-- <listitem>
<para>
http://devstudio.jboss.com/updates/3.0/
</para>
- </listitem>
+ </listitem> -->
</itemizedlist>
<figure id="figure-Add-Site_01">
<title>Add Site Dialog</title>
12 years, 3 months