JBoss Tools SVN: r44360 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-10-08 11:12:45 -0400 (Mon, 08 Oct 2012)
New Revision: 44360
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java
Log:
Still looking for the cause of the failure on Mac/SOA tests
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-08 13:36:01 UTC (rev 44359)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-08 15:12:45 UTC (rev 44360)
@@ -127,17 +127,18 @@
//assertTrue(String.format("Example project name changed, have '%s', expected '%s'",hasProjName,getProjectNames()[0]),hasProjName.equals(getProjectNames()[0]));
int projSize = getProjectSize(wiz.textWithLabel(JBossToolsProjectExamples.TEXT_PROJECT_SIZE).getText());
wiz.button(IDELabel.Button.FINISH).click();
-
+
+ SWTBotShell shell = bot.shell("Downloading...");
+ shell.activate();
+ bot.waitUntil(shellCloses(shell),Timing.time(projSize*20*1000));
+ util.waitForNonIgnoredJobs(Timing.time20S());
+
/* ldimaggi - Oct 8, 2012 */
if ( (SWTJBTExt.isRunningOnMacOs()) && (configuredState.getServer().type.equals("SOA")) ){
- log.info("Running on a MAC - need to set wait for Downloading... shell");
+ log.info("Running on a MAC - need to set wait for New Project Example shell");
bot.sleep(30000l);
}
-
- SWTBotShell shell = bot.shell("Downloading...");
- shell.activate();
- bot.waitUntil(shellCloses(shell),Timing.time(projSize*20*1000));
- util.waitForNonIgnoredJobs(Timing.time20S());
+
bot.waitForShell("New Project Example");
bot.shell("New Project Example").bot().button(IDELabel.Button.FINISH).click();
12 years, 3 months
JBoss Tools SVN: r44359 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-10-08 09:36:01 -0400 (Mon, 08 Oct 2012)
New Revision: 44359
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java
Log:
Trying to resolve SOA test issue on Mac OS - added sleep statement to enable Downloading shell to appear
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-08 11:58:30 UTC (rev 44358)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-08 13:36:01 UTC (rev 44359)
@@ -127,6 +127,13 @@
//assertTrue(String.format("Example project name changed, have '%s', expected '%s'",hasProjName,getProjectNames()[0]),hasProjName.equals(getProjectNames()[0]));
int projSize = getProjectSize(wiz.textWithLabel(JBossToolsProjectExamples.TEXT_PROJECT_SIZE).getText());
wiz.button(IDELabel.Button.FINISH).click();
+
+ /* ldimaggi - Oct 8, 2012 */
+ if ( (SWTJBTExt.isRunningOnMacOs()) && (configuredState.getServer().type.equals("SOA")) ){
+ log.info("Running on a MAC - need to set wait for Downloading... shell");
+ bot.sleep(30000l);
+ }
+
SWTBotShell shell = bot.shell("Downloading...");
shell.activate();
bot.waitUntil(shellCloses(shell),Timing.time(projSize*20*1000));
12 years, 3 months
JBoss Tools SVN: r44358 - trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences.
by jbosstools-commits＠lists.jboss.org
Author: psuchy
Date: 2012-10-08 07:58:30 -0400 (Mon, 08 Oct 2012)
New Revision: 44358
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java
Log:
Test debugging on jenkins (windows)
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java 2012-10-08 10:18:57 UTC (rev 44357)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java 2012-10-08 11:58:30 UTC (rev 44358)
@@ -11,8 +11,15 @@
import org.jboss.reddeer.eclipse.jface.preference.PreferencePage;
import org.jboss.reddeer.swt.api.Table;
+import org.jboss.reddeer.swt.condition.JobIsRunning;
+import org.jboss.reddeer.swt.condition.WaitCondition;
+import org.jboss.reddeer.swt.exception.WidgetNotAvailableException;
import org.jboss.reddeer.swt.impl.button.PushButton;
+import org.jboss.reddeer.swt.impl.label.DefaultLabel;
import org.jboss.reddeer.swt.impl.table.DefaultTable;
+import org.jboss.reddeer.swt.wait.TimePeriod;
+import org.jboss.reddeer.swt.wait.WaitUntil;
+import org.jboss.reddeer.swt.wait.WaitWhile;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime;
public class SeamPreferencesDialog extends PreferencePage {
@@ -42,6 +49,8 @@
int runtimesNumber = table.rowCount();
for (int i = 0; i < runtimesNumber; i++){
table.select(0);
+ new WaitWhile(new JobIsRunning());
+ new WaitUntil(new RemoveButtonEnabled(),TimePeriod.LONG);
new PushButton("Remove").click();
try {
@@ -61,4 +70,21 @@
open();
}
}
+ private static class RemoveButtonEnabled implements WaitCondition {
+
+ @Override
+ public boolean test() {
+ try {
+ PushButton removeButton = new PushButton("Remove");
+ return removeButton.isEnabled();
+ } catch (WidgetNotAvailableException e){
+ return false;
+ }
+ }
+
+ @Override
+ public String description() {
+ return "The runtime search has not finished in the specified amount of time";
+ }
+ }
}
12 years, 3 months
JBoss Tools SVN: r44357 - trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-10-08 06:18:57 -0400 (Mon, 08 Oct 2012)
New Revision: 44357
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java
Log:
DeployingArchive tests fixed because "Server" postfix was added to server name
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java 2012-10-08 09:45:22 UTC (rev 44356)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/DeployingArchiveTest.java 2012-10-08 10:18:57 UTC (rev 44357)
@@ -161,7 +161,7 @@
ArchivePublishSettingsDialog dialog = getDialog(publishContextMenu,
view, explorer, returnDialog, archivePath);
- dialog.selectServers(configuredState.getServer().name);
+ dialog.selectServers(configuredState.getServer().name + " Server");
if (alwaysPublish) dialog.checkAlwaysPublish();
if (autodeploy) dialog.checkAutoDeploy();
dialog.finish();
12 years, 3 months
JBoss Tools SVN: r44356 - trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences.
by jbosstools-commits＠lists.jboss.org
Author: psuchy
Date: 2012-10-08 05:45:22 -0400 (Mon, 08 Oct 2012)
New Revision: 44356
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java
Log:
Test debugging on jenkins (windows)
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java 2012-10-08 09:40:38 UTC (rev 44355)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java 2012-10-08 09:45:22 UTC (rev 44356)
@@ -2,22 +2,19 @@
import java.awt.AWTException;
import java.awt.Dimension;
-import java.awt.MouseInfo;
import java.awt.Robot;
import java.awt.Toolkit;
-import java.awt.Window;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
+
import org.jboss.reddeer.eclipse.jface.preference.PreferencePage;
import org.jboss.reddeer.swt.api.Table;
import org.jboss.reddeer.swt.impl.button.PushButton;
import org.jboss.reddeer.swt.impl.table.DefaultTable;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime;
-import sun.awt.X11.Screen;
-
public class SeamPreferencesDialog extends PreferencePage {
public SeamPreferencesDialog(){
12 years, 3 months
JBoss Tools SVN: r44355 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test: dialog/preferences and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: psuchy
Date: 2012-10-08 05:40:38 -0400 (Mon, 08 Oct 2012)
New Revision: 44355
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp5/DetectEPP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/OperateServerTemplate.java
Log:
Test debugging on jenkins (windows)
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp5/DetectEPP5.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp5/DetectEPP5.java 2012-10-06 20:03:34 UTC (rev 44354)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp5/DetectEPP5.java 2012-10-08 09:40:38 UTC (rev 44355)
@@ -27,7 +27,7 @@
Runtime seam = new Runtime();
seam.setName("seam");
seam.setType("SEAM");
- seam.setVersion("2.2.4.EAP5");
+ seam.setVersion("2.2.5.EAP5");
seam.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()) + "/seam");
return Arrays.asList(server, seam);
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java 2012-10-06 20:03:34 UTC (rev 44354)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SeamPreferencesDialog.java 2012-10-08 09:40:38 UTC (rev 44355)
@@ -1,17 +1,23 @@
package org.jboss.tools.runtime.as.ui.bot.test.dialog.preferences;
import java.awt.AWTException;
+import java.awt.Dimension;
+import java.awt.MouseInfo;
import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.Window;
import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
-
import org.jboss.reddeer.eclipse.jface.preference.PreferencePage;
import org.jboss.reddeer.swt.api.Table;
import org.jboss.reddeer.swt.impl.button.PushButton;
import org.jboss.reddeer.swt.impl.table.DefaultTable;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime;
+import sun.awt.X11.Screen;
+
public class SeamPreferencesDialog extends PreferencePage {
public SeamPreferencesDialog(){
@@ -44,6 +50,11 @@
try {
Robot robot = new Robot();
robot.setAutoWaitForIdle(true);
+ Toolkit tools = Toolkit.getDefaultToolkit();
+ Dimension dim = tools.getScreenSize();
+ robot.mouseMove(((int)dim.getWidth())/2,((int)dim.getHeight()/2 - 60));
+ robot.mousePress(MouseEvent.BUTTON1_MASK);
+ robot.mouseRelease(MouseEvent.BUTTON1_MASK);
robot.keyPress(KeyEvent.VK_ENTER);
robot.keyRelease(KeyEvent.VK_ENTER);
} catch (AWTException e) {
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/OperateServerTemplate.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/OperateServerTemplate.java 2012-10-06 20:03:34 UTC (rev 44354)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/OperateServerTemplate.java 2012-10-08 09:40:38 UTC (rev 44355)
@@ -58,7 +58,7 @@
protected void assertNoException(String message) {
ConsoleView console = new ConsoleView();
- assertThat(message, console.getConsoleText(), not(containsString("Exception")));
+ assertThat(message, console.getConsoleText(), not(containsString("Exception in thread")));
}
protected void assertServerState(String message, String state) {
12 years, 3 months
JBoss Tools SVN: r44354 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-10-06 16:03:34 -0400 (Sat, 06 Oct 2012)
New Revision: 44354
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditorContributor.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java
Log:
JBIDE-12809 - Memory leaks in JBoss Central editor
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2012-10-06 15:18:47 UTC (rev 44353)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2012-10-06 20:03:34 UTC (rev 44354)
@@ -159,6 +159,7 @@
private ToolBarManager newsToolBarManager;
private ToolBarManager blogsToolBarManager;
private Action blogsWarning;
+ private ToolBarManager tutorialsToolBarManager;
public GettingStartedPage(FormEditor editor) {
super(editor, ID, "Getting Started");
@@ -484,25 +485,25 @@
headerComposite.setLayout(rowLayout);
headerComposite.setBackground(null);
- ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT | SWT.HORIZONTAL);
- toolBarManager.createControl(headerComposite);
+ tutorialsToolBarManager = new ToolBarManager(SWT.FLAT | SWT.HORIZONTAL);
+ tutorialsToolBarManager.createControl(headerComposite);
CommandContributionItem item = JBossCentralActivator.createContributionItem(getSite(), "org.jboss.tools.central.newProjectExamplesWizard");
- toolBarManager.add(item);
+ tutorialsToolBarManager.add(item);
item = JBossCentralActivator.createContributionItem(getSite(), "org.jboss.tools.runtime.preferences");
- toolBarManager.add(item);
+ tutorialsToolBarManager.add(item);
item = JBossCentralActivator.createContributionItem(getSite(), "org.jboss.tools.wtp.runtime.preferences");
- toolBarManager.add(item);
+ tutorialsToolBarManager.add(item);
item = JBossCentralActivator.createContributionItem(getSite(), "org.jboss.tools.central.refreshJBossTutorials");
- toolBarManager.add(item);
+ tutorialsToolBarManager.add(item);
//Action action = new DownloadRuntimeAction("Download and Install JBoss AS 7.0.1", JBossCentralActivator.imageDescriptorFromPlugin(JBossCentralActivator.PLUGIN_ID, "/icons/jbossas7.png"), "org.jboss.tools.runtime.core.as.701");
//toolBarManager.add(action);
- toolBarManager.update(true);
+ tutorialsToolBarManager.update(true);
section.setTextClient(headerComposite);
}
@@ -750,8 +751,22 @@
@Override
public void dispose() {
- newWizardDropDownAction.dispose();
- newWizardDropDownAction = null;
+ if (newWizardDropDownAction != null) {
+ newWizardDropDownAction.dispose();
+ newWizardDropDownAction = null;
+ }
+ if (newsToolBarManager != null) {
+ newsToolBarManager.dispose();
+ newsToolBarManager = null;
+ }
+ if (blogsToolBarManager != null) {
+ blogsToolBarManager.dispose();
+ blogsToolBarManager = null;
+ }
+ if (tutorialsToolBarManager != null) {
+ tutorialsToolBarManager.dispose();
+ tutorialsToolBarManager = null;
+ }
if (refreshBlogsJobChangeListener != null) {
RefreshBlogsJob.INSTANCE.removeJobChangeListener(refreshBlogsJobChangeListener);
refreshBlogsJobChangeListener = null;
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java 2012-10-06 15:18:47 UTC (rev 44353)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java 2012-10-06 20:03:34 UTC (rev 44354)
@@ -24,6 +24,7 @@
import org.eclipse.jface.action.ControlContribution;
import org.eclipse.jface.action.GroupMarker;
import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.ToolBarManager;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.TextViewer;
import org.eclipse.swt.SWT;
@@ -38,9 +39,9 @@
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
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.widgets.Composite;
@@ -96,6 +97,8 @@
}
public void dispose() {
+ gettingStartedPage = null;
+ softwarePage = null;
if (headerImage != null) {
headerImage.dispose();
headerImage = null;
@@ -116,6 +119,9 @@
} catch (InterruptedException e) {
// ignore
}
+
+ getSite().setSelectionProvider(null);
+
super.dispose();
}
@@ -186,7 +192,7 @@
form.setImage(getHeaderImage());
getToolkit().decorateFormHeading(form.getForm());
- IToolBarManager toolbar = form.getToolBarManager();
+ final IToolBarManager toolbar = form.getToolBarManager();
ControlContribution searchControl = new ControlContribution("Search") {
@Override
protected Control createControl(Composite parent) {
@@ -204,6 +210,18 @@
}
toolbar.update(true);
+ form.addDisposeListener(new DisposeListener() {
+
+ @Override
+ public void widgetDisposed(DisposeEvent e) {
+ if (toolbar instanceof ToolBarManager) {
+ ((ToolBarManager)toolbar).dispose();
+ } else {
+ toolbar.removeAll();
+ }
+ form.removeDisposeListener(this);
+ }
+ });
form.layout(true, true);
}
@@ -240,7 +258,7 @@
searchControl.setLayoutData(gd);
searchControl.setBackground(null);
getToolkit().adapt(searchControl);
- searchControl.addSelectionListener(new SelectionAdapter() {
+ final SelectionListener searchControlListener = new SelectionAdapter() {
@Override
public void widgetDefaultSelected(SelectionEvent e) {
@@ -284,8 +302,16 @@
}
}
+ };
+ searchControl.addSelectionListener(searchControlListener);
+ searchControl.addDisposeListener(new DisposeListener() {
+
+ @Override
+ public void widgetDisposed(DisposeEvent e) {
+ searchControl.removeSelectionListener(searchControlListener);
+ searchControl.removeDisposeListener(this);
+ }
});
-
final Menu menu = new Menu(menuLink);
final MenuItem searchCommunityPortal = new MenuItem(menu, SWT.CHECK);
searchCommunityPortal
@@ -300,7 +326,7 @@
} else {
searchCommunity.setSelection(true);
}
- searchCommunity.addSelectionListener(new SelectionAdapter() {
+ final SelectionListener searchCommunityListener = new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -310,9 +336,18 @@
.setInitialMessage(JBossCentralActivator.SEARCH_THE_COMMUNITY);
}
+ };
+ searchCommunity.addSelectionListener(searchCommunityListener);
+ searchCommunity.addDisposeListener(new DisposeListener() {
+
+ @Override
+ public void widgetDisposed(DisposeEvent e) {
+ searchCommunity.removeSelectionListener(searchCommunityListener);
+ searchCommunity.removeDisposeListener(this);
+ }
});
- searchCommunityPortal.addSelectionListener(new SelectionAdapter() {
+ final SelectionListener searchCommunityPortalListener = new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -322,8 +357,17 @@
.setInitialMessage(JBossCentralActivator.SEARCH_RED_HAT_CUSTOMER_PORTAL);
}
+ };
+ searchCommunityPortal.addSelectionListener(searchCommunityPortalListener);
+
+ searchCommunityPortal.addDisposeListener(new DisposeListener() {
+
+ @Override
+ public void widgetDisposed(DisposeEvent e) {
+ searchCommunityPortal.removeSelectionListener(searchCommunityPortalListener);
+ searchCommunityPortal.removeDisposeListener(this);
+ }
});
-
menuLink.addMouseListener(new MouseListener() {
@Override
@@ -341,6 +385,14 @@
}
});
+ searchComposite.addDisposeListener(new DisposeListener() {
+
+ @Override
+ public void widgetDisposed(DisposeEvent e) {
+ menu.dispose();
+ searchComposite.removeDisposeListener(this);
+ }
+ });
return searchComposite;
}
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditorContributor.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditorContributor.java 2012-10-06 15:18:47 UTC (rev 44353)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditorContributor.java 2012-10-06 20:03:34 UTC (rev 44354)
@@ -17,6 +17,7 @@
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.ide.IDEActionFactory;
+import org.eclipse.ui.internal.EditorActionBars;
import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.ITextEditorActionConstants;
@@ -32,6 +33,15 @@
public JBossCentralEditorContributor() {
super();
}
+ @Override
+ public void dispose() {
+ IActionBars bars = getActionBars();
+ if (bars instanceof EditorActionBars) {
+ ((EditorActionBars) bars).setEditorContributor(null);
+ }
+
+ super.dispose();
+ }
/**
* Returns the action registed with the given text editor.
* @return IAction or null if editor is null.
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java 2012-10-06 15:18:47 UTC (rev 44353)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java 2012-10-06 20:03:34 UTC (rev 44354)
@@ -80,6 +80,8 @@
private InstallAction installAction;
private Button installButton;
+
+ private ToolBarManager toolBarManager;
public SoftwarePage(FormEditor editor) {
super(editor, ID, "Software/Update");
@@ -231,7 +233,7 @@
headerComposite.setLayout(rowLayout);
headerComposite.setBackground(null);
- ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT | SWT.HORIZONTAL);
+ toolBarManager = new ToolBarManager(SWT.FLAT | SWT.HORIZONTAL);
toolBarManager.createControl(headerComposite);
installAction = new InstallAction();
@@ -308,6 +310,10 @@
RefreshDiscoveryJob.INSTANCE.removeJobChangeListener(refreshJobChangeListener);
refreshJobChangeListener = null;
}
+ if (toolBarManager != null) {
+ toolBarManager.dispose();
+ toolBarManager = null;
+ }
super.dispose();
}
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java 2012-10-06 15:18:47 UTC (rev 44353)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java 2012-10-06 20:03:34 UTC (rev 44354)
@@ -467,7 +467,7 @@
CURRENT_TOOLTIP = shell;
control.getShell().addListener(SWT.Deactivate, shellListener);
- control.getShell().addDisposeListener(new DisposeListener() {
+ control.addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e) {
12 years, 3 months
JBoss Tools SVN: r44352 - in trunk/download.jboss.org/jbosstools/updates/requirements/findbugs: 2.0.2.20121005 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-06 11:16:21 -0400 (Sat, 06 Oct 2012)
New Revision: 44352
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2...
trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2...
trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2...
trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2...
Log:
new site builder for 2.0.2.20121005 because findbugs uses ant to build, not PDE or Tycho
Added: trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2... 2012-10-06 15:16:21 UTC (rev 44352)
@@ -0,0 +1,4 @@
+plugins/
+features/
+artifacts.*
+content.*
Added: trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2... 2012-10-06 15:16:21 UTC (rev 44352)
@@ -0,0 +1,30 @@
+<html>
+<head>
+<title>JBoss Tools Build Requirements - Findbugs Eclipse plugin 2.0.2.20121005</title>
+<style>
+@import url("../../web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<img src="https://www.jboss.org/dms/tools/images/tools-banner.png" />
+
+<h2 class="title">JBoss Tools Build Requirements - Findbugs Eclipse plugin 2.0.2.20121005</h2>
+<h3>Findbugs 2.0.2.20121005</h3>
+FindBugs 2.0.2.20121005 is available under the Lesser Gnu Public License (LGPL).
+<ul>
+<li>Sources can be found here at sourceforge.net: <a class="link" href="http://code.google.com/p/findbugs/source/browse/#svn%2Ftrunk">FindBugs Sources</a></li>
+<li>Original binary can be found at sourceforge.net: <a class="link" href="http://findbugs.sourceforge.net/downloads.html">FindBugs Downloads</a></li>
+</ul>
+<h3>Producing this P2 site</h3>
+The original site for Findbugs plugin is not fully p2-enabled, and then cannot be well consumed by Tycho, since it contains "Partial IU". See this <a href="https://issues.jboss.org/browse/JBIDE-11994">JBoss Tools ticket</a> for details. Then here is the process to create manually this full-p2 site and consume it with Tycho:
+<ol>
+ <li>Get a recent Eclipse IDE with PDE installed</li>
+ <li>Install Findbugs plugins into it, using the legacy site: <a class="link" href="http://findbugs.sourceforge.net/downloads.html">http://findbugs.sourceforge.net/downloads.html</a> </li>
+ <li>Grab this <a href="site.xml">site.xml</a> file and import it into your IDE</li>
+ <li>Right-click on it > Plug-in Tools > Build Site</li>
+ <li>Upload the newly created site to this location</li>
+</ol>
+<h2>See also</h2>
+Looking to download JBoss Tools? See <a class="link" href="http://www.jboss.org/tools/download">JBoss Tools Downloads</a>. See also <a href="http://www.jboss.org/tools/download/installation">Installation methods</a>.
+</body>
+</html>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.2... 2012-10-06 15:16:21 UTC (rev 44352)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/edu.umd.cs.findbugs.plugin.eclipse_2.0.2.20121005.jar" id="edu.umd.cs.findbugs.plugin.eclipse" version="2.0.2.20121005">
+ <category name="Findbugs"/>
+ </feature>
+ <category-def name="Findbugs" label="Findbugs"/>
+</site>
12 years, 3 months
JBoss Tools SVN: r44351 - in trunk/common/tests/org.jboss.tools.common.ui.test: src/org/jboss/tools/common/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-10-05 19:55:34 -0400 (Fri, 05 Oct 2012)
New Revision: 44351
Added:
trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/src/test/ListProvider.java
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/RegisterServiceProviderDialogTest.java
Modified:
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/CommonUITestSuite.java
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java
Log:
JBIDE-12793
https://issues.jboss.org/browse/JBIDE-12793
Test is added.
Added: trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/src/test/ListProvider.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/src/test/ListProvider.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/src/test/ListProvider.java 2012-10-05 23:55:34 UTC (rev 44351)
@@ -0,0 +1,7 @@
+package test;
+
+import java.util.ArrayList;
+
+public class ListProvider extends ArrayList<String> {
+
+}
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.ui.test/projects/Test/src/test/ListProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/CommonUITestSuite.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/CommonUITestSuite.java 2012-10-05 23:54:17 UTC (rev 44350)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/CommonUITestSuite.java 2012-10-05 23:55:34 UTC (rev 44351)
@@ -19,7 +19,8 @@
@Suite.SuiteClasses({
StringsPreferenceValueTest.class,
JBossPerspectiveTest.class,
- NewServiceProviderWizardTest.class
+ NewServiceProviderWizardTest.class,
+ RegisterServiceProviderDialogTest.class
})
/**
* @author André Dietisheim
Modified: trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java 2012-10-05 23:54:17 UTC (rev 44350)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/NewServiceProviderWizardTest.java 2012-10-05 23:55:34 UTC (rev 44351)
@@ -20,6 +20,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragment;
@@ -45,11 +46,12 @@
*
*/
public class NewServiceProviderWizardTest extends TestCase {
-
static String PACK_NAME = "test";
static String EXISTING_PACK_NAME = "org.jboss.jsr299.tck.tests.jbt.validation.target";
static String EXISTING_INTERCEPTOR_BINDING_NAME = "InterceptorBindingWTypeTarget"; // @Inherited @Target({TYPE})
static String SERVICE_NAME = "MyService";
+
+ IProject project;
static class WizardContext {
NewElementWizard wizard;
@@ -161,10 +163,17 @@
public void setUp() {
try {
- IProject p = ResourcesUtils.importProject("org.jboss.tools.common.ui.test", "projects/Test");
- System.out.println(p);
+ project = ResourcesUtils.importProject("org.jboss.tools.common.ui.test", "projects/Test");
} catch (Exception e) {
fail();
}
}
+
+ public void tearDown() {
+ try {
+ project.delete(true, new NullProgressMonitor());
+ } catch (Exception e) {
+ fail();
+ }
+ }
}
\ No newline at end of file
Added: trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/RegisterServiceProviderDialogTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/RegisterServiceProviderDialogTest.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/RegisterServiceProviderDialogTest.java 2012-10-05 23:55:34 UTC (rev 44351)
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.ui;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.common.ui.wizard.service.RegisterAsServiceDialog;
+import org.jboss.tools.common.ui.wizard.service.RegisterServiceUtil;
+import org.jboss.tools.common.util.EclipseJavaUtil;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class RegisterServiceProviderDialogTest extends TestCase {
+ static String SERVICE_NAME = "test.ListProvider";
+ IProject project;
+
+ static class WizardContext {
+ IJavaProject jp;
+ RegisterAsServiceDialog dialog;
+ String typeName;
+ IType type;
+
+ public void init(String typeName) throws CoreException {
+ this.typeName = typeName;
+ IProject tck = ResourcesPlugin.getWorkspace().getRoot().getProject("Test");
+ jp = EclipseUtil.getJavaProject(tck);
+ type = EclipseJavaUtil.findType(jp, typeName);
+ dialog = new RegisterAsServiceDialog(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), type);
+ dialog.setBlockOnOpen(false);
+ dialog.open();
+ }
+
+ public void close() {
+ dialog.close();
+ }
+ }
+
+ public void testRegisterAsService() throws Exception {
+ WizardContext context = new WizardContext();
+ context.init(SERVICE_NAME);
+
+ try {
+ RegisterAsServiceDialog dialog = context.dialog;
+
+ dialog.setServiceType("java.util.ArrayList");
+ assertEquals(CommonUIMessages.REGISTER_AS_SERVICE_NON_ABSTRACT_MESSAGE, dialog.getMessage());
+
+ dialog.setServiceType("java.util.List");
+ assertEquals(CommonUIMessages.REGISTER_AS_SERVICE_MESSAGE, dialog.getMessage());
+ dialog.okPressed();
+ String result = dialog.getResult();
+ try {
+ RegisterServiceUtil.registerService(context.type, result);
+ } catch (CoreException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
+ assertEquals("java.util.List", result);
+
+ assertTrue(RegisterServiceUtil.isServiceRegistered(project, SERVICE_NAME, result));
+
+ } finally {
+ context.close();
+ }
+
+ //2. Repeat and check same service type.
+ context = new WizardContext();
+ context.init(SERVICE_NAME);
+ try {
+ RegisterAsServiceDialog dialog = context.dialog;
+ dialog.setServiceType("java.util.List");
+ assertEquals(CommonUIMessages.REGISTER_AS_SERVICE_ALREADY_REGISTERED_MESSAGE, dialog.getErrorMessage());
+
+ dialog.setServiceType("java.util.AbstractList");
+ assertNull(dialog.getErrorMessage());
+ assertEquals(CommonUIMessages.REGISTER_AS_SERVICE_MESSAGE, dialog.getMessage());
+ } finally {
+ context.close();
+ }
+ }
+
+ public void setUp() {
+ try {
+ project = ResourcesUtils.importProject("org.jboss.tools.common.ui.test", "projects/Test");
+ } catch (Exception e) {
+ fail();
+ }
+ }
+
+ public void tearDown() {
+ try {
+ project.delete(true, new NullProgressMonitor());
+ } catch (Exception e) {
+ fail();
+ }
+ }
+}
Property changes on: trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/RegisterServiceProviderDialogTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 3 months
