diff options
| author | Patrick Tasse | 2017-06-07 18:50:15 +0000 |
|---|---|---|
| committer | Patrick Tasse | 2017-06-07 20:23:09 +0000 |
| commit | 7e6c5c15c49e9a3b2578f82835fac566928deec1 (patch) | |
| tree | 17005e51d32e90f830d3fa98876510ba6403a773 | |
| parent | 091470009e20f710ab01a5f13ba722be71a86035 (diff) | |
| download | org.eclipse.swtbot-7e6c5c15c49e9a3b2578f82835fac566928deec1.tar.gz org.eclipse.swtbot-7e6c5c15c49e9a3b2578f82835fac566928deec1.tar.xz org.eclipse.swtbot-7e6c5c15c49e9a3b2578f82835fac566928deec1.zip | |
Fix new Java 1.6 warnings
Change-Id: I092126be35f1afacbefab003af845fefa8f13b06
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
212 files changed, 728 insertions, 18 deletions
diff --git a/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/NewEmptyEmfProject.java b/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/NewEmptyEmfProject.java index 7ffc7ac8..5a761948 100644 --- a/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/NewEmptyEmfProject.java +++ b/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/NewEmptyEmfProject.java @@ -31,10 +31,12 @@ public class NewEmptyEmfProject { SWTBotTree projectSelectionTree = bot.tree(); projectSelectionTree.expandNode("Eclipse Modeling Framework").expandNode("Empty EMF Project").select(); bot.waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "unable to select"; } + @Override public boolean test() throws Exception { return bot.button("Next >").isEnabled(); } diff --git a/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/OpenGefEditorAndCreateContentsExampleTest.java b/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/OpenGefEditorAndCreateContentsExampleTest.java index 291eb405..e7efbd31 100644 --- a/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/OpenGefEditorAndCreateContentsExampleTest.java +++ b/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/OpenGefEditorAndCreateContentsExampleTest.java @@ -98,6 +98,7 @@ public class OpenGefEditorAndCreateContentsExampleTest extends SWTBotGefTestCase LogicLabel label = (LogicLabel) editPart.getModel(); return label.getLabelContents().equals("Label"); } + @Override public void describeTo(Description description) { } }); diff --git a/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/unit/AllTests.java b/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/unit/AllTests.java index 570caac5..42f9a9b4 100644 --- a/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/unit/AllTests.java +++ b/examples/gef/org.eclipse.gef.examples.logic.test/src/org/eclipse/gef/examples/logic/test/unit/AllTests.java @@ -329,6 +329,7 @@ public class AllTests extends SWTBotGefTestCase implements LogicModeler { private void syncWithUIThread() { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { while (PlatformUI.getWorkbench().getDisplay().readAndDispatch()) { } diff --git a/examples/rcp/org.rcpmail/src/org/rcpmail/Application.java b/examples/rcp/org.rcpmail/src/org/rcpmail/Application.java index 61b206ae..f3738e37 100644 --- a/examples/rcp/org.rcpmail/src/org/rcpmail/Application.java +++ b/examples/rcp/org.rcpmail/src/org/rcpmail/Application.java @@ -24,6 +24,7 @@ public class Application implements IApplication { /* (non-Javadoc) * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext) */ + @Override public Object start(IApplicationContext context) { Display display = PlatformUI.createDisplay(); try { @@ -40,12 +41,14 @@ public class Application implements IApplication { /* (non-Javadoc) * @see org.eclipse.equinox.app.IApplication#stop() */ + @Override public void stop() { final IWorkbench workbench = PlatformUI.getWorkbench(); if (workbench == null) return; final Display display = workbench.getDisplay(); display.syncExec(new Runnable() { + @Override public void run() { if (!display.isDisposed()) workbench.close(); diff --git a/examples/rcp/org.rcpmail/src/org/rcpmail/NavigationView.java b/examples/rcp/org.rcpmail/src/org/rcpmail/NavigationView.java index a29f227f..9c870fc9 100644 --- a/examples/rcp/org.rcpmail/src/org/rcpmail/NavigationView.java +++ b/examples/rcp/org.rcpmail/src/org/rcpmail/NavigationView.java @@ -75,16 +75,20 @@ public class NavigationView extends ViewPart { class ViewContentProvider implements IStructuredContentProvider, ITreeContentProvider { + @Override public void inputChanged(Viewer v, Object oldInput, Object newInput) { } + @Override public void dispose() { } + @Override public Object[] getElements(Object parent) { return getChildren(parent); } + @Override public Object getParent(Object child) { if (child instanceof TreeObject) { return ((TreeObject)child).getParent(); @@ -92,6 +96,7 @@ public class NavigationView extends ViewPart { return null; } + @Override public Object[] getChildren(Object parent) { if (parent instanceof TreeParent) { return ((TreeParent)parent).getChildren(); @@ -99,6 +104,7 @@ public class NavigationView extends ViewPart { return new Object[0]; } + @Override public boolean hasChildren(Object parent) { if (parent instanceof TreeParent) return ((TreeParent)parent).hasChildren(); diff --git a/examples/rcp/org.rcpmail/src/org/rcpmail/Perspective.java b/examples/rcp/org.rcpmail/src/org/rcpmail/Perspective.java index 591ceaf6..7b0d45c7 100644 --- a/examples/rcp/org.rcpmail/src/org/rcpmail/Perspective.java +++ b/examples/rcp/org.rcpmail/src/org/rcpmail/Perspective.java @@ -16,6 +16,7 @@ import org.eclipse.ui.IPerspectiveFactory; public class Perspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { String editorArea = layout.getEditorArea(); layout.setEditorAreaVisible(false); diff --git a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/Activator.java b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/Activator.java index 74911f8c..096f8804 100644 --- a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/Activator.java +++ b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/Activator.java @@ -25,6 +25,7 @@ public class Activator implements BundleActivator { * (non-Javadoc) * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext bundleContext) throws Exception { Activator.context = bundleContext; } @@ -33,6 +34,7 @@ public class Activator implements BundleActivator { * (non-Javadoc) * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext bundleContext) throws Exception { Activator.context = null; } diff --git a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/finders/ContextMenuFinder.java b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/finders/ContextMenuFinder.java index fafe1e0e..43d4db2a 100644 --- a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/finders/ContextMenuFinder.java +++ b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/finders/ContextMenuFinder.java @@ -48,6 +48,7 @@ public class ContextMenuFinder extends MenuFinder { @Override
protected Menu menuBar(final Shell shell) {
return UIThreadRunnable.syncExec(display, new WidgetResult<Menu>() {
+ @Override
public Menu run() {
return control.getMenu();
}
diff --git a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/finders/MenuFinder.java b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/finders/MenuFinder.java index 65bf53aa..589f32eb 100644 --- a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/finders/MenuFinder.java +++ b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/finders/MenuFinder.java @@ -102,6 +102,7 @@ public class MenuFinder { */
protected Menu menuBar(final Shell shell) {
return UIThreadRunnable.syncExec(display, new WidgetResult<Menu>() {
+ @Override
public Menu run() {
return shell.getMenuBar();
}
@@ -120,6 +121,7 @@ public class MenuFinder { */
public List<MenuItem> findMenus(final Menu bar, final Matcher<MenuItem> matcher, final boolean recursive) {
return UIThreadRunnable.syncExec(display, new ListResult<MenuItem>() {
+ @Override
public List<MenuItem> run() {
return findMenusInternal(bar, matcher, recursive);
}
@@ -134,6 +136,7 @@ public class MenuFinder { */
protected Shell[] getShells() {
return UIThreadRunnable.syncExec(display, new ArrayResult<Shell>() {
+ @Override
public Shell[] run() {
return display.getShells();
}
diff --git a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPartId.java b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPartId.java index c3ab64bf..ea1db20b 100644 --- a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPartId.java +++ b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPartId.java @@ -41,6 +41,7 @@ public class WithPartId<T extends MPart> extends AbstractMatcher<T> { return false; } + @Override public void describeTo(final Description description) { description.appendText("with id '").appendDescriptionOf(idMatcher).appendText("'"); } diff --git a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPartName.java b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPartName.java index 30f62338..93b5534b 100644 --- a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPartName.java +++ b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPartName.java @@ -45,6 +45,7 @@ public class WithPartName<T extends MPart> extends AbstractMatcher<T> { return false; } + @Override public void describeTo(final Description description) { description.appendText("with name '").appendDescriptionOf(nameMatcher).appendText("'"); } diff --git a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPerspectiveId.java b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPerspectiveId.java index 9067c770..71ad15f5 100644 --- a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPerspectiveId.java +++ b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPerspectiveId.java @@ -44,6 +44,7 @@ public class WithPerspectiveId extends AbstractMatcher<MPerspective> { return false; } + @Override public void describeTo(final Description description) { description.appendText("with id '").appendDescriptionOf(idMatcher).appendText("'"); } diff --git a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPerspectiveLabel.java b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPerspectiveLabel.java index 7537e696..d2eefd5e 100644 --- a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPerspectiveLabel.java +++ b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/matchers/WithPerspectiveLabel.java @@ -44,6 +44,7 @@ public class WithPerspectiveLabel extends AbstractMatcher<MPerspective> { return false; } + @Override public void describeTo(final Description description) { description.appendText("with label '").appendDescriptionOf(labelMatcher).appendText("'"); } diff --git a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/waits/WaitForPart.java b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/waits/WaitForPart.java index ecc41086..042c2ee9 100644 --- a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/waits/WaitForPart.java +++ b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/waits/WaitForPart.java @@ -39,6 +39,7 @@ public class WaitForPart extends WaitForObjectCondition<MPart> { this.context = context; } + @Override public String getFailureMessage() { return "Could not find view matching: " + matcher; } diff --git a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/widgets/SWTBotView.java b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/widgets/SWTBotView.java index c4b475fc..e6aa7dde 100644 --- a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/widgets/SWTBotView.java +++ b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/widgets/SWTBotView.java @@ -75,6 +75,7 @@ public class SWTBotView { */ public List<SWTBotToolbarButton> getToolbarButtons() { return UIThreadRunnable.syncExec(new ListResult<SWTBotToolbarButton>() { + @Override public List<SWTBotToolbarButton> run() { final List<SWTBotToolbarButton> l = new ArrayList<SWTBotToolbarButton>(); @@ -213,6 +214,7 @@ public class SWTBotView { if (this.part.isDirty()) { // If the part is dirty, we don't want the blocking dialog to block the test thread. UIThreadRunnable.asyncExec(new VoidResult() { + @Override public void run() { SWTBotView.this.bot.closePart(SWTBotView.this.part); } diff --git a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/widgets/SWTWorkbenchBot.java b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/widgets/SWTWorkbenchBot.java index 308515b2..cb641b31 100644 --- a/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/widgets/SWTWorkbenchBot.java +++ b/org.eclipse.swtbot.e4.finder/src/org/eclipse/swtbot/e4/finder/widgets/SWTWorkbenchBot.java @@ -143,6 +143,7 @@ public class SWTWorkbenchBot extends SWTBot { final EPartService partService = context.get(EPartService.class); UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { partService.switchPerspective(perspective); } @@ -207,6 +208,7 @@ public class SWTWorkbenchBot extends SWTBot { public boolean isPartActive(final MPart part) { final EPartService partService = context.get(EPartService.class); return UIThreadRunnable.syncExec(new BoolResult() { + @Override public Boolean run() { return partService.getActivePart() == part; } @@ -247,6 +249,7 @@ public class SWTWorkbenchBot extends SWTBot { final EPartService partService = context.get(EPartService.class); UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { partService.showPart(part, PartState.ACTIVATE); } @@ -267,6 +270,7 @@ public class SWTWorkbenchBot extends SWTBot { final EPartService partService = context.get(EPartService.class); UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { // // If the part is dirty, ensure we don't lose any unsaved changes. @@ -308,9 +312,11 @@ public class SWTWorkbenchBot extends SWTBot { * follow the logic inside ApplicationPartServiceImpl. */ protected class IEclipseContextReady extends DefaultCondition { + @Override public boolean test() throws Exception { return context.getActiveChild() != null; } + @Override public String getFailureMessage() { return "The current context does not contain an active window as its activeChild()"; } diff --git a/org.eclipse.swtbot.eclipse.core/src/org/eclipse/swtbot/eclipse/core/UITestApplication.java b/org.eclipse.swtbot.eclipse.core/src/org/eclipse/swtbot/eclipse/core/UITestApplication.java index 59388d11..6b615090 100644 --- a/org.eclipse.swtbot.eclipse.core/src/org/eclipse/swtbot/eclipse/core/UITestApplication.java +++ b/org.eclipse.swtbot.eclipse.core/src/org/eclipse/swtbot/eclipse/core/UITestApplication.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * Ketan Padegaonkar - modification to run tests on non-ui thread - * Jérôme Joslet - Bug 460403 + * Jérôme Joslet - Bug 460403 *******************************************************************************/ package org.eclipse.swtbot.eclipse.core; @@ -29,7 +29,7 @@ import org.eclipse.ui.testing.TestableObject; * so that the tests run in a non-UI thread. * * @author Ketan Padegaonkar <KetanPadegaonkar [at] gmail [dot] com> - * @author Jérôme Joslet + * @author Jérôme Joslet * * @version $Id$ */ @@ -44,6 +44,7 @@ public class UITestApplication implements IApplication, ITestHarness { * (non-Javadoc) * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext) */ + @Override public Object start(IApplicationContext context) throws Exception { String[] args = (String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS); Object app = getApplication(args); @@ -63,6 +64,7 @@ public class UITestApplication implements IApplication, ITestHarness { * (non-Javadoc) * @see org.eclipse.equinox.app.IApplication#stop() */ + @Override public void stop() { if (fApplication != null) fApplication.stop(); @@ -112,6 +114,7 @@ public class UITestApplication implements IApplication, ITestHarness { * (non-Javadoc) * @see org.eclipse.ui.testing.ITestHarness#runTests() */ + @Override public void runTests() { fTestableObject.testingStarting(); RemotePluginTestRunner.main(Platform.getCommandLineArgs()); diff --git a/org.eclipse.swtbot.eclipse.dsl/src/org/eclipse/swtbot/eclipse/dsl/DefaultWorkbench.java b/org.eclipse.swtbot.eclipse.dsl/src/org/eclipse/swtbot/eclipse/dsl/DefaultWorkbench.java index 9082281a..cf4f0037 100644 --- a/org.eclipse.swtbot.eclipse.dsl/src/org/eclipse/swtbot/eclipse/dsl/DefaultWorkbench.java +++ b/org.eclipse.swtbot.eclipse.dsl/src/org/eclipse/swtbot/eclipse/dsl/DefaultWorkbench.java @@ -54,6 +54,7 @@ public class DefaultWorkbench extends Workbench { @Override public Workbench switchToPerspective(final String perspectiveName) { Boolean result = UIThreadRunnable.syncExec(new Result<Boolean>() { + @Override public Boolean run() { IPerspectiveDescriptor[] perspectives = perspectives(); for (IPerspectiveDescriptor perspective : perspectives) { @@ -69,6 +70,7 @@ public class DefaultWorkbench extends Workbench { return this; } String availablePerspectives = StringUtils.join(perspectives(), ", ", new StringConverter() { + @Override public String toString(Object object) { return ((IPerspectiveDescriptor) object).getLabel(); } @@ -81,6 +83,7 @@ public class DefaultWorkbench extends Workbench { @Override public Workbench resetPerspective() { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { activePage().resetPerspective(); } @@ -133,6 +136,7 @@ public class DefaultWorkbench extends Workbench { private IWorkbenchWindow getActiveWorkbenchWindow() { return UIThreadRunnable.syncExec(bot.getDisplay(), new Result<IWorkbenchWindow>() { + @Override public IWorkbenchWindow run() { return PlatformUI.getWorkbench().getActiveWorkbenchWindow(); } diff --git a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/data/internal/SWTBotTestContentProvider.java b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/data/internal/SWTBotTestContentProvider.java index 896ab611..dba7f7bd 100644 --- a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/data/internal/SWTBotTestContentProvider.java +++ b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/data/internal/SWTBotTestContentProvider.java @@ -63,10 +63,12 @@ public class SWTBotTestContentProvider implements IStructuredContentProvider { viewer.remove(item); } + @Override public Object[] getElements(Object inputElement) { return data.toArray(); } + @Override public void dispose() { if (data != null) data.clear(); @@ -75,6 +77,7 @@ public class SWTBotTestContentProvider implements IStructuredContentProvider { viewer = null; } + @Override @SuppressWarnings("unchecked") public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // This does not do any checking of the type before casting...This will diff --git a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/data/internal/SWTBotTestLabelProvider.java b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/data/internal/SWTBotTestLabelProvider.java index dce5055c..8d8fbcb2 100644 --- a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/data/internal/SWTBotTestLabelProvider.java +++ b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/data/internal/SWTBotTestLabelProvider.java @@ -25,6 +25,7 @@ public class SWTBotTestLabelProvider extends LabelProvider implements ITableLabe /** * No image provided. */ + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } @@ -32,6 +33,7 @@ public class SWTBotTestLabelProvider extends LabelProvider implements ITableLabe /** * Gets the text for the given element. */ + @Override public String getColumnText(Object element, int columnIndex) { return element.toString(); } diff --git a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/editors/MultiPageEditor.java b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/editors/MultiPageEditor.java index f6cd1445..9507d80c 100644 --- a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/editors/MultiPageEditor.java +++ b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/editors/MultiPageEditor.java @@ -213,9 +213,11 @@ public class MultiPageEditor extends MultiPageEditorPart implements IResourceCha /** * Closes all project files on project close. */ + @Override public void resourceChanged(final IResourceChangeEvent event) { if (event.getType() == IResourceChangeEvent.PRE_CLOSE) { Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { IWorkbenchPage[] pages = getSite().getWorkbenchWindow().getPages(); for (int i = 0; i < pages.length; i++) { diff --git a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/handler/SampleHandler.java b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/handler/SampleHandler.java index 246e11fb..737ad0de 100644 --- a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/handler/SampleHandler.java +++ b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/handler/SampleHandler.java @@ -33,6 +33,7 @@ public class SampleHandler extends AbstractHandler { /** * the command has been executed, so extract extract the needed information from the application context. */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); MessageDialog.openInformation(window.getShell(), "Simple Dialog", "Hello, Eclipse world"); diff --git a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/handler/SampleParameterizedHandler.java b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/handler/SampleParameterizedHandler.java index cc78262d..905008d9 100644 --- a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/handler/SampleParameterizedHandler.java +++ b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/handler/SampleParameterizedHandler.java @@ -34,6 +34,7 @@ public class SampleParameterizedHandler extends AbstractHandler { /** * the command has been executed, so extract extract the needed information from the application context. */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); MessageDialog.openInformation(window.getShell(), "Simple Dialog", "My parameters:" + event.getParameters().toString()); diff --git a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/perspectives/FormPerspective.java b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/perspectives/FormPerspective.java index d18e08f0..1651fb7a 100644 --- a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/perspectives/FormPerspective.java +++ b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/perspectives/FormPerspective.java @@ -6,6 +6,7 @@ import org.eclipse.ui.IPerspectiveFactory; public class FormPerspective implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { layout.addView(FinderTestIds.VIEW_ID_FORM_1, IPageLayout.LEFT, 0.2f, layout.getEditorArea()); layout.addView(FinderTestIds.VIEW_ID_FORM_2, IPageLayout.RIGHT, 0.2f, FinderTestIds.VIEW_ID_FORM_1); diff --git a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/views/SWTBotTestView.java b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/views/SWTBotTestView.java index ab7088da..b574056f 100644 --- a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/views/SWTBotTestView.java +++ b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/views/SWTBotTestView.java @@ -102,6 +102,7 @@ public class SWTBotTestView extends ViewPart { MenuManager menuMgr = new MenuManager("#PopupMenu"); menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { SWTBotTestView.this.fillContextMenu(manager); } @@ -124,6 +125,7 @@ public class SWTBotTestView extends ViewPart { manager.add(iRadioTypeAction); manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); manager.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { manager.remove(iDropDownTypeAction.getId()); manager.insertBefore(IWorkbenchActionConstants.MB_ADDITIONS, iDropDownTypeAction); @@ -205,6 +207,7 @@ public class SWTBotTestView extends ViewPart { Menu toolBarSubMenu = null; Menu viewSubMenu = null; boolean toolBarChecked = false; + @Override public void dispose() { if (toolBarSubMenu != null) { toolBarSubMenu.dispose(); @@ -216,6 +219,7 @@ public class SWTBotTestView extends ViewPart { } } + @Override public Menu getMenu(Control parent) { if (toolBarSubMenu != null) { toolBarSubMenu.dispose(); @@ -232,6 +236,7 @@ public class SWTBotTestView extends ViewPart { return toolBarSubMenu; } + @Override public Menu getMenu(Menu parent) { if (viewSubMenu != null) { viewSubMenu.dispose(); @@ -250,6 +255,7 @@ public class SWTBotTestView extends ViewPart { private void hookDoubleClickAction() { viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { doubleClickAction.run(); } diff --git a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/views/ViewActionWithId.java b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/views/ViewActionWithId.java index b65673b8..50fb7917 100644 --- a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/views/ViewActionWithId.java +++ b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/test/ui/views/ViewActionWithId.java @@ -26,6 +26,7 @@ public class ViewActionWithId extends ActionDelegate implements private IViewPart view; + @Override public void init(IViewPart view) { this.view = view; } diff --git a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotMultiPageEditorTest.java b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotMultiPageEditorTest.java index 34606311..cc7915c6 100644 --- a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotMultiPageEditorTest.java +++ b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotMultiPageEditorTest.java @@ -48,6 +48,7 @@ public class SWTBotMultiPageEditorTest extends AbstractSWTBotEclipseTest { testFile = File.createTempFile("multipage", ".mpe");
testFile.deleteOnExit();
UIThreadRunnable.syncExec(new VoidResult() {
+ @Override
public void run() {
try {
IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/DefaultWorkbench.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/DefaultWorkbench.java index a8da353b..9fd26515 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/DefaultWorkbench.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/DefaultWorkbench.java @@ -51,6 +51,7 @@ class DefaultWorkbench { DefaultWorkbench resetActivePerspective() { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { activePage().resetPerspective(); } @@ -98,6 +99,7 @@ class DefaultWorkbench { private IWorkbenchWindow getActiveWorkbenchWindow() { return UIThreadRunnable.syncExec(bot.getDisplay(), new Result<IWorkbenchWindow>() { + @Override public IWorkbenchWindow run() { return PlatformUI.getWorkbench().getActiveWorkbenchWindow(); } diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/SWTWorkbenchBot.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/SWTWorkbenchBot.java index a7c348ca..6fadff4a 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/SWTWorkbenchBot.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/SWTWorkbenchBot.java @@ -369,6 +369,7 @@ public class SWTWorkbenchBot extends SWTBot { public SWTBotPerspective defaultPerspective() { return syncExec(new Result<SWTBotPerspective>() { + @Override public SWTBotPerspective run() { IWorkbench workbench = PlatformUI.getWorkbench(); return perspectiveById(workbench.getPerspectiveRegistry().getDefaultPerspective()); diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/CommandFinder.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/CommandFinder.java index dfe8b659..7e30124d 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/CommandFinder.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/CommandFinder.java @@ -70,6 +70,7 @@ public class CommandFinder { public List<SWTBotCommand> findCommand(final ICommandService service, final Matcher<?> matcher) { return UIThreadRunnable.syncExec(new ListResult<SWTBotCommand>() { + @Override public List<SWTBotCommand> run() { List<SWTBotCommand> l = new ArrayList<SWTBotCommand>(); Command[] commands = service.getDefinedCommands(); diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/ViewMenuFinder.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/ViewMenuFinder.java index 66ddaedc..6cb85228 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/ViewMenuFinder.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/ViewMenuFinder.java @@ -70,6 +70,7 @@ public class ViewMenuFinder { public List<SWTBotViewMenu> findMenus(final IViewReference view, final Matcher<?> matcher, final boolean recursive) { return UIThreadRunnable.syncExec(new ListResult<SWTBotViewMenu>() { + @Override public List<SWTBotViewMenu> run() { List<SWTBotViewMenu> l = new ArrayList<SWTBotViewMenu>(); IViewPart viewPart = view.getView(false); diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/WorkbenchContentsFinder.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/WorkbenchContentsFinder.java index fe0b5439..cac2b3d5 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/WorkbenchContentsFinder.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/finders/WorkbenchContentsFinder.java @@ -42,6 +42,7 @@ public class WorkbenchContentsFinder { */ public IWorkbenchWindow activeWorkbenchWindow() { return syncExec(new Result<IWorkbenchWindow>() { + @Override public IWorkbenchWindow run() { return PlatformUI.getWorkbench().getActiveWorkbenchWindow(); } @@ -54,6 +55,7 @@ public class WorkbenchContentsFinder { */ public List<IEditorReference> findEditors(final Matcher<?> matcher) { return syncExec(SWTUtils.display(), new ListResult<IEditorReference>() { + @Override public List<IEditorReference> run() { return findEditorsInternal(matcher); } @@ -67,6 +69,7 @@ public class WorkbenchContentsFinder { */ public List<IViewReference> findViews(final Matcher<?> matcher) { return syncExec(SWTUtils.display(), new ListResult<IViewReference>() { + @Override public List<IViewReference> run() { return findViewsInternal(matcher); } @@ -79,6 +82,7 @@ public class WorkbenchContentsFinder { */ public List<IPerspectiveDescriptor> findPerspectives(final Matcher<?> matcher) { return syncExec(SWTUtils.display(), new ListResult<IPerspectiveDescriptor>() { + @Override public List<IPerspectiveDescriptor> run() { return findPerspectivesInternal(matcher); } @@ -126,6 +130,7 @@ public class WorkbenchContentsFinder { */ public IViewReference findActiveView() { return syncExec(new Result<IViewReference>() { + @Override public IViewReference run() { return findActiveViewInternal(); } @@ -144,6 +149,7 @@ public class WorkbenchContentsFinder { */ public IPerspectiveDescriptor findActivePerspective() { return syncExec(new Result<IPerspectiveDescriptor>() { + @Override public IPerspectiveDescriptor run() { return findActivePerspectiveInternal(); } @@ -155,6 +161,7 @@ public class WorkbenchContentsFinder { */ public IEditorReference findActiveEditor() { return syncExec(new Result<IEditorReference>() { + @Override public IEditorReference run() { return findActiveEditorInternal(); } diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPartId.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPartId.java index ae207f8f..810eb66d 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPartId.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPartId.java @@ -40,6 +40,7 @@ public class WithPartId<T extends IWorkbenchPartReference> extends AbstractMatch return false; } + @Override public void describeTo(Description description) { description.appendText("with id '").appendDescriptionOf(idMatcher).appendText("'"); } diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPartName.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPartName.java index 0efa33b2..93292e71 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPartName.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPartName.java @@ -48,6 +48,7 @@ public class WithPartName<T extends IWorkbenchPartReference> extends return false; } + @Override public void describeTo(Description description) { description.appendText("with name '").appendDescriptionOf(nameMatcher) .appendText("'"); diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPerspectiveId.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPerspectiveId.java index 55bce2e8..ddbec754 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPerspectiveId.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPerspectiveId.java @@ -43,6 +43,7 @@ public class WithPerspectiveId extends AbstractMatcher<IPerspectiveDescriptor> { return false; } + @Override public void describeTo(Description description) { description.appendText("with id '").appendDescriptionOf(idMatcher).appendText("'"); } diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPerspectiveLabel.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPerspectiveLabel.java index 8ef630d4..5f73d9bc 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPerspectiveLabel.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithPerspectiveLabel.java @@ -43,6 +43,7 @@ public class WithPerspectiveLabel extends AbstractMatcher<IPerspectiveDescriptor return false; } + @Override public void describeTo(Description description) { description.appendText("with label '").appendDescriptionOf(labelMatcher).appendText("'"); } diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithTitle.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithTitle.java index 35c98697..4983f729 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithTitle.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/matchers/WithTitle.java @@ -37,6 +37,7 @@ public class WithTitle<T extends IWorkbenchPartReference> extends return false; } + @Override public void describeTo(Description description) { description.appendText("with title '").appendDescriptionOf(titleMatcher) .appendText("'"); diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForEditor.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForEditor.java index 9ea5ea7c..9fe00ace 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForEditor.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForEditor.java @@ -39,6 +39,7 @@ public class WaitForEditor extends WaitForObjectCondition<IEditorReference> { super(matcher); } + @Override public String getFailureMessage() { return "Could not find editor matching: " + matcher; } @@ -46,6 +47,7 @@ public class WaitForEditor extends WaitForObjectCondition<IEditorReference> { @Override protected List<IEditorReference> findMatches() { return UIThreadRunnable.syncExec(SWTUtils.display(), new ListResult<IEditorReference>() { + @Override public List<IEditorReference> run() { return new WorkbenchContentsFinder().findEditors(matcher); } diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForJobs.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForJobs.java index 07343b62..cf30fdae 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForJobs.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForJobs.java @@ -37,15 +37,18 @@ public class WaitForJobs implements ICondition { this.mHumanReadableJobFamily = humanReadableJobFamily; } - public boolean test() throws Exception { + @Override + public boolean test() throws Exception { Job[] allJobs = Job.getJobManager().find(mFamily); return allJobs.length == 0; } - public void init(SWTBot bot) { + @Override + public void init(SWTBot bot) { } - public String getFailureMessage() { + @Override + public String getFailureMessage() { String errMsg = "Wait for jobs failed: "; if (mHumanReadableJobFamily != null) { return mHumanReadableJobFamily + " jobs are still running."; diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForView.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForView.java index bd199e25..4a69eee4 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForView.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForView.java @@ -37,6 +37,7 @@ public class WaitForView extends WaitForObjectCondition<IViewReference> { super(matcher); } + @Override public String getFailureMessage() { return "Could not find view matching: " + matcher; } diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForViewMenu.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForViewMenu.java index a7ee3953..3e8cd68f 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForViewMenu.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/waits/WaitForViewMenu.java @@ -58,6 +58,7 @@ public class WaitForViewMenu extends WaitForObjectCondition<Menu> { this.viewReference = viewReference; } + @Override public String getFailureMessage() { return "Could not find view menu for view: " + viewReference; //$NON-NLS-1$ } @@ -71,6 +72,7 @@ public class WaitForViewMenu extends WaitForObjectCondition<Menu> { return emptyList; } final ToolItem toolItem = UIThreadRunnable.syncExec(new WidgetResult<ToolItem>() { + @Override public ToolItem run() { String elementId = viewReference.getSecondaryId() == null ? viewReference.getId() : viewReference.getId() + ':' + viewReference.getSecondaryId(); @@ -81,11 +83,13 @@ public class WaitForViewMenu extends WaitForObjectCondition<Menu> { return emptyList; } UIThreadRunnable.asyncExec(new VoidResult() { + @Override public void run() { toolItem.notifyListeners(SWT.Selection, createEvent(toolItem)); } }); Menu viewMenu = UIThreadRunnable.syncExec(new WidgetResult<Menu>() { + @Override public Menu run() { IMenuManager viewMenuManager = viewPart.getViewSite().getActionBars().getMenuManager(); if (viewMenuManager instanceof MenuManager) { diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotCommand.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotCommand.java index 92855a79..cbbb9b84 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotCommand.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotCommand.java @@ -59,6 +59,7 @@ public class SWTBotCommand extends SWTBotViewMenu { menuClickResult = null; UIThreadRunnable.asyncExec(new VoidResult() { + @Override public void run() { try { menuClickResult = handlerService.executeCommand(commandID, null); diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotEclipseEditor.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotEclipseEditor.java index cc0452e3..9e0978e3 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotEclipseEditor.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotEclipseEditor.java @@ -199,6 +199,7 @@ public class SWTBotEclipseEditor extends SWTBotEditor { private void selectProposal(final SWTBotTable proposalTable, final int proposalIndex) { log.debug(MessageFormat.format("Trying to select proposal with index {0}", proposalIndex)); //$NON-NLS-1$ UIThreadRunnable.asyncExec(new VoidResult() { + @Override public void run() { Table table = proposalTable.widget; log.debug(MessageFormat.format("Selecting row [{0}] {1} in {2}", proposalIndex, table.getItem(proposalIndex).getText(), //$NON-NLS-1$ @@ -638,6 +639,7 @@ public class SWTBotEclipseEditor extends SWTBotEditor { // clear away all content assists for next retry. log.debug("Making proposals disappear."); SWTBotShell proposalShell = syncExec(new Result<SWTBotShell>() { + @Override public SWTBotShell run() { if (table != null && !table.widget.isDisposed()) { Shell shell = table.widget.getShell(); @@ -649,6 +651,7 @@ public class SWTBotEclipseEditor extends SWTBotEditor { } }); syncExec(new VoidResult() { + @Override public void run() { Event event = new Event(); event.keyCode = SWT.ESC; @@ -656,6 +659,7 @@ public class SWTBotEclipseEditor extends SWTBotEditor { } }); syncExec(new VoidResult() { + @Override public void run() { Event event = new Event(); event.keyCode = SWT.ESC; @@ -675,6 +679,7 @@ public class SWTBotEclipseEditor extends SWTBotEditor { return ((SWTBotTable) item).containsItem(itemText); } + @Override public void describeTo(Description description) { description.appendText("table with item (").appendText(itemText).appendText(")"); } @@ -696,6 +701,7 @@ public class SWTBotEclipseEditor extends SWTBotEditor { return false; } + @Override public void describeTo(Description description) { description.appendText("table with item (").appendText(itemText).appendText(")"); } @@ -720,6 +726,7 @@ public class SWTBotEclipseEditor extends SWTBotEditor { return null; } + @Override public String getFailureMessage() { return "Could not find auto complete proposal using matcher " + matcher; } @@ -736,6 +743,7 @@ public class SWTBotEclipseEditor extends SWTBotEditor { log.debug("Activating proposal shell."); //$NON-NLS-1$ try { Shell mainWindow = syncExec(new WidgetResult<Shell>() { + @Override public Shell run() { return styledText.widget.getShell(); } @@ -743,6 +751,7 @@ public class SWTBotEclipseEditor extends SWTBotEditor { final List<Shell> shells = bot.shells("", mainWindow); Shell widgetShell = syncExec(new WidgetResult<Shell>() { + @Override public Shell run() { for(int j=0; j<shells.size(); j++) { Shell s = shells.get(j); @@ -785,6 +794,7 @@ public class SWTBotEclipseEditor extends SWTBotEditor { return null; } + @Override public String getFailureMessage() { return "Could not find auto complete proposal using matcher " + matcher; } @@ -799,6 +809,7 @@ public class SWTBotEclipseEditor extends SWTBotEditor { private void invokeAction(final String actionId) { final IAction action = ((ITextEditor) partReference.getEditor(false)).getAction(actionId); syncExec(new VoidResult() { + @Override public void run() { log.debug(MessageFormat.format("Activating action with id {0}", actionId)); action.run(); diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotEditor.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotEditor.java index f3ced376..e5daefac 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotEditor.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotEditor.java @@ -66,6 +66,7 @@ public class SWTBotEditor extends SWTBotWorkbenchPart<IEditorReference> { @Override public void setFocus() { syncExec(new VoidResult() { + @Override public void run() { IEditorPart editor = partReference.getEditor(true); editor.setFocus(); @@ -84,6 +85,7 @@ public class SWTBotEditor extends SWTBotWorkbenchPart<IEditorReference> { @Override public void close() { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { partReference.getPage().closeEditor(partReference.getEditor(false), false); } @@ -95,6 +97,7 @@ public class SWTBotEditor extends SWTBotWorkbenchPart<IEditorReference> { */ public void save() { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { IEditorPart editor = partReference.getEditor(false); partReference.getPage().saveEditor(editor, false); @@ -108,6 +111,7 @@ public class SWTBotEditor extends SWTBotWorkbenchPart<IEditorReference> { @Override public void show() { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { IEditorPart editor = partReference.getEditor(true); partReference.getPage().activate(editor); @@ -122,6 +126,7 @@ public class SWTBotEditor extends SWTBotWorkbenchPart<IEditorReference> { */ public boolean isDirty() { return UIThreadRunnable.syncExec(new Result<Boolean>() { + @Override public Boolean run() { return partReference.isDirty(); } diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotMultiPageEditor.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotMultiPageEditor.java index b9982215..ce6189de 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotMultiPageEditor.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotMultiPageEditor.java @@ -104,6 +104,7 @@ public class SWTBotMultiPageEditor extends SWTBotEditor { */ public int getPageCount() { return syncExec(new IntResult() { + @Override public Integer run() { return tabFolder.getItemCount(); } @@ -152,6 +153,7 @@ public class SWTBotMultiPageEditor extends SWTBotEditor { List<String> pages = null; if (getPageCount() > 0) { pages = UIThreadRunnable.syncExec(new Result<List<String>>() { + @Override public List<String> run() { ArrayList<String> titles = new ArrayList<String>(); for (CTabItem item : tabFolder.getItems()) { diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotPerspective.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotPerspective.java index ef54db20..f6c43643 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotPerspective.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotPerspective.java @@ -49,6 +49,7 @@ public class SWTBotPerspective { */ public void activate() { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { try { IWorkbench workbench = PlatformUI.getWorkbench(); diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotView.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotView.java index d09915ed..eb544792 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotView.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotView.java @@ -72,6 +72,7 @@ public class SWTBotView extends SWTBotWorkbenchPart<IViewReference> { @Override public void setFocus() { syncExec(new VoidResult() { + @Override public void run() { ((Control) getWidget()).setFocus(); } @@ -96,6 +97,7 @@ public class SWTBotView extends SWTBotWorkbenchPart<IViewReference> { @Override public void close() { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { partReference.getPage().hideView(partReference); } @@ -183,6 +185,7 @@ public class SWTBotView extends SWTBotWorkbenchPart<IViewReference> { @Override public void show() { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { try { partReference.getPage().activate(partReference.getPart(true)); diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotViewMenu.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotViewMenu.java index 4b6037bf..ea875ddf 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotViewMenu.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotViewMenu.java @@ -124,6 +124,7 @@ public class SWTBotViewMenu { final IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class); UIThreadRunnable.asyncExec(new VoidResult() { + @Override public void run() { try { menuClickResult = handlerService.executeCommand(commandID, null); @@ -134,6 +135,7 @@ public class SWTBotViewMenu { }); } else if (action != null) UIThreadRunnable.asyncExec(new VoidResult() { + @Override public void run() { if((action.getStyle() == IAction.AS_CHECK_BOX) || (action.getStyle() == IAction.AS_RADIO_BUTTON)) { action.setChecked(!action.isChecked()); diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotWorkbenchPart.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotWorkbenchPart.java index c2627e5e..fe48393c 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotWorkbenchPart.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/SWTBotWorkbenchPart.java @@ -112,6 +112,7 @@ public abstract class SWTBotWorkbenchPart<T extends IWorkbenchPartReference> { */ public void show() { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { try { partReference.getPage().activate(partReference.getPart(true)); @@ -140,6 +141,7 @@ public abstract class SWTBotWorkbenchPart<T extends IWorkbenchPartReference> { public List<SWTBotToolbarButton> getToolbarButtons() { return UIThreadRunnable.syncExec(new ListResult<SWTBotToolbarButton>() { + @Override public List<SWTBotToolbarButton> run() { ToolBar toolbar = null; diff --git a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/utils/PartLabelDescription.java b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/utils/PartLabelDescription.java index 13c0480c..c279a28c 100644 --- a/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/utils/PartLabelDescription.java +++ b/org.eclipse.swtbot.eclipse.finder/src/org/eclipse/swtbot/eclipse/finder/widgets/utils/PartLabelDescription.java @@ -30,6 +30,7 @@ public class PartLabelDescription<T extends IWorkbenchPartReference> implements this.partReference = partReference; } + @Override public void describeTo(Description description) { description.appendText(ClassUtils.simpleClassName(partReference) + " with label {" + partReference.getPartName() + "}"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.eclipse.junit.headless/src/org/eclipse/swtbot/eclipse/junit/headless/UITestApplication.java b/org.eclipse.swtbot.eclipse.junit.headless/src/org/eclipse/swtbot/eclipse/junit/headless/UITestApplication.java index 7165e53b..17a0a098 100644 --- a/org.eclipse.swtbot.eclipse.junit.headless/src/org/eclipse/swtbot/eclipse/junit/headless/UITestApplication.java +++ b/org.eclipse.swtbot.eclipse.junit.headless/src/org/eclipse/swtbot/eclipse/junit/headless/UITestApplication.java @@ -7,7 +7,7 @@ * * Contributors: * Ketan Padegaonkar - initial API and implementation - * Jérôme Joslet - Bug 460403 + * Jérôme Joslet - Bug 460403 *******************************************************************************/ package org.eclipse.swtbot.eclipse.junit.headless; @@ -31,7 +31,7 @@ import org.eclipse.ui.testing.TestableObject; * suite specified in the command line arguments. * * @author Ketan Padegaonkar <KetanPadegaonkar [at] gmail [dot] com> - * @author Jérôme Joslet + * @author Jérôme Joslet */ public class UITestApplication implements IApplication, ITestHarness { @@ -44,6 +44,7 @@ public class UITestApplication implements IApplication, ITestHarness { * (non-Javadoc) * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext) */ + @Override public Object start(IApplicationContext context) throws Exception { String[] args = (String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS); Object app = getApplication(args); @@ -63,6 +64,7 @@ public class UITestApplication implements IApplication, ITestHarness { * (non-Javadoc) * @see org.eclipse.equinox.app.IApplication#stop() */ + @Override public void stop() { if (fApplication != null) fApplication.stop(); @@ -111,6 +113,7 @@ public class UITestApplication implements IApplication, ITestHarness { * (non-Javadoc) * @see org.eclipse.ui.testing.ITestHarness#runTests() */ + @Override public void runTests() { fTestableObject.testingStarting(); try { diff --git a/org.eclipse.swtbot.eclipse.spy/src/org/eclipse/swtbot/eclipse/spy/EclipseSpy.java b/org.eclipse.swtbot.eclipse.spy/src/org/eclipse/swtbot/eclipse/spy/EclipseSpy.java index 6d0ef5d7..3f845126 100644 --- a/org.eclipse.swtbot.eclipse.spy/src/org/eclipse/swtbot/eclipse/spy/EclipseSpy.java +++ b/org.eclipse.swtbot.eclipse.spy/src/org/eclipse/swtbot/eclipse/spy/EclipseSpy.java @@ -77,6 +77,7 @@ public class EclipseSpy { private void hookAccelerator() { parent.getDisplay().addFilter(SWT.KeyDown, new Listener() { + @Override public void handleEvent(Event e) { if ((e.stateMask == SWT.CTRL) && (e.keyCode == SWT.SHIFT)) if (actionMonitor.isChecked()) diff --git a/org.eclipse.swtbot.eclipse.spy/src/org/eclipse/swtbot/eclipse/spy/EclipseWidgetTracker.java b/org.eclipse.swtbot.eclipse.spy/src/org/eclipse/swtbot/eclipse/spy/EclipseWidgetTracker.java index 343a5ac4..b272a316 100644 --- a/org.eclipse.swtbot.eclipse.spy/src/org/eclipse/swtbot/eclipse/spy/EclipseWidgetTracker.java +++ b/org.eclipse.swtbot.eclipse.spy/src/org/eclipse/swtbot/eclipse/spy/EclipseWidgetTracker.java @@ -176,6 +176,7 @@ class EclipseWidgetTracker implements Runnable { return SWTUtils.toString(sibling); } + @Override public void run() { if ((view.output == null) || view.output.isDisposed() || !view.actionMonitor.isChecked()) return; diff --git a/org.eclipse.swtbot.eclipse.ui.test/src/org/eclipse/swtbot/eclipse/ui/wizards/ProjectSettingValidatorTest.java b/org.eclipse.swtbot.eclipse.ui.test/src/org/eclipse/swtbot/eclipse/ui/wizards/ProjectSettingValidatorTest.java index 99300868..bb1882c4 100644 --- a/org.eclipse.swtbot.eclipse.ui.test/src/org/eclipse/swtbot/eclipse/ui/wizards/ProjectSettingValidatorTest.java +++ b/org.eclipse.swtbot.eclipse.ui.test/src/org/eclipse/swtbot/eclipse/ui/wizards/ProjectSettingValidatorTest.java @@ -24,10 +24,12 @@ public class ProjectSettingValidatorTest { private boolean complete; private String newMessage; + @Override public void setPageComplete(boolean complete) { this.complete = complete; } + @Override public void setErrorMessage(String newMessage) { this.newMessage = newMessage; } diff --git a/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/preferences/PreferenceInitializer.java b/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/preferences/PreferenceInitializer.java index 4f7d82ec..8b83eb31 100644 --- a/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/preferences/PreferenceInitializer.java +++ b/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/preferences/PreferenceInitializer.java @@ -63,6 +63,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer impleme swtbotPreferenceStore.setDefault(PreferenceInitializer.ENABLE_ADDITIONAL_AUTOCOMPLETE_FAVOURTES, true); } + @Override public void earlyStartup() { new PreferenceInitializer().initializeFavorites(); } @@ -108,6 +109,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer impleme return orderedSet; } + @Override public void propertyChange(PropertyChangeEvent event) { initializeFavorites(); } diff --git a/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/preferences/SWTBotPreferencePage.java b/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/preferences/SWTBotPreferencePage.java index 989d6679..986b4a43 100644 --- a/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/preferences/SWTBotPreferencePage.java +++ b/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/preferences/SWTBotPreferencePage.java @@ -40,6 +40,7 @@ public class SWTBotPreferencePage extends FieldEditorPreferencePage implements I addField(editor); } + @Override public void init(IWorkbench workbench) { } diff --git a/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/LaunchConfigPropertiesWizardPage.java b/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/LaunchConfigPropertiesWizardPage.java index 870c9565..db368759 100644 --- a/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/LaunchConfigPropertiesWizardPage.java +++ b/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/LaunchConfigPropertiesWizardPage.java @@ -16,6 +16,7 @@ public class LaunchConfigPropertiesWizardPage extends WizardPage { setTitle("Settings when you launch your application"); } + @Override public void createControl(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); diff --git a/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/NewPluginProjectWizardPage.java b/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/NewPluginProjectWizardPage.java index 20c252b0..e8150486 100644 --- a/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/NewPluginProjectWizardPage.java +++ b/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/NewPluginProjectWizardPage.java @@ -51,6 +51,7 @@ public class NewPluginProjectWizardPage extends WizardPage implements WizardPage setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.getDefault().getBundle().getSymbolicName(), "icons/swtbot_plugin64.png")); //$NON-NLS-1$ } + @Override public void createControl(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -99,28 +100,33 @@ public class NewPluginProjectWizardPage extends WizardPage implements WizardPage private void hookListeners() { applicationIdButton.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { productId.setEnabled(false); applicationId.setEnabled(true); } + @Override public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); } }); productIdButton.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { applicationId.setEnabled(false); productId.setEnabled(true); } + @Override public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); } }); ModifyListener listener = new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { ProjectSettingValidator validator = new ProjectSettingValidator(pluginId.getText(), pluginName.getText(), pluginVersion.getText(), getProjects(), NewPluginProjectWizardPage.this); validator.validate(); diff --git a/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/NewSWTBotTestPluginWizard.java b/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/NewSWTBotTestPluginWizard.java index 98d182f7..34546f67 100644 --- a/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/NewSWTBotTestPluginWizard.java +++ b/org.eclipse.swtbot.eclipse.ui/src/org/eclipse/swtbot/eclipse/ui/wizards/NewSWTBotTestPluginWizard.java @@ -54,6 +54,7 @@ public class NewSWTBotTestPluginWizard extends Wizard implements INewWizard { } } + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { } diff --git a/org.eclipse.swtbot.forms.finder/src/org/eclipse/swtbot/forms/finder/widgets/SWTBotImageHyperlink.java b/org.eclipse.swtbot.forms.finder/src/org/eclipse/swtbot/forms/finder/widgets/SWTBotImageHyperlink.java index ca42943a..c4af45ed 100644 --- a/org.eclipse.swtbot.forms.finder/src/org/eclipse/swtbot/forms/finder/widgets/SWTBotImageHyperlink.java +++ b/org.eclipse.swtbot.forms.finder/src/org/eclipse/swtbot/forms/finder/widgets/SWTBotImageHyperlink.java @@ -70,6 +70,7 @@ public class SWTBotImageHyperlink extends AbstractSWTBotControl<ImageHyperlink> */ public Image image() { return syncExec(new Result<Image>() { + @Override public Image run() { return widget.getImage(); } @@ -83,6 +84,7 @@ public class SWTBotImageHyperlink extends AbstractSWTBotControl<ImageHyperlink> */ public Image hoverImage() { return syncExec(new Result<Image>() { + @Override public Image run() { return widget.getHoverImage(); } @@ -96,6 +98,7 @@ public class SWTBotImageHyperlink extends AbstractSWTBotControl<ImageHyperlink> */ public Image activeImage() { return syncExec(new Result<Image>() { + @Override public Image run() { return widget.getActiveImage(); } diff --git a/org.eclipse.swtbot.generator.jdt.test/src/org/eclipse/swtbot/generator/jdt/test/AbstractJDTGeneratorTest.java b/org.eclipse.swtbot.generator.jdt.test/src/org/eclipse/swtbot/generator/jdt/test/AbstractJDTGeneratorTest.java index b72799b8..4f61b142 100644 --- a/org.eclipse.swtbot.generator.jdt.test/src/org/eclipse/swtbot/generator/jdt/test/AbstractJDTGeneratorTest.java +++ b/org.eclipse.swtbot.generator.jdt.test/src/org/eclipse/swtbot/generator/jdt/test/AbstractJDTGeneratorTest.java @@ -42,6 +42,7 @@ public abstract class AbstractJDTGeneratorTest extends AbstractGeneratorTest { methodShell.bot().button("OK").click(); this.display = Display.getDefault(); this.display.syncExec(new Runnable() { + @Override public void run() { dialog = new TestDialog(new Shell(), AbstractJDTGeneratorTest.this); dialog.open(); diff --git a/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/AddClassDialog.java b/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/AddClassDialog.java index c229aada..7f23daf2 100644 --- a/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/AddClassDialog.java +++ b/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/AddClassDialog.java @@ -51,6 +51,7 @@ public class AddClassDialog extends TitleAreaDialog{ classText.setLayoutData(dataClassText); classText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent arg0) { if (!classText.getText().isEmpty() && !classText.getText().contains(" ")) { diff --git a/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/AddMethodDialog.java b/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/AddMethodDialog.java index 38691438..a89e48c6 100644 --- a/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/AddMethodDialog.java +++ b/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/AddMethodDialog.java @@ -56,6 +56,7 @@ public class AddMethodDialog extends TitleAreaDialog { methodText.setLayoutData(dataMethodText); methodText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent arg0) { for(Method m: methods){ if(m.getName().equals(methodText.getText())){ diff --git a/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/JDTRecorderDialog.java b/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/JDTRecorderDialog.java index 1bca1c97..8961498b 100644 --- a/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/JDTRecorderDialog.java +++ b/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/JDTRecorderDialog.java @@ -134,6 +134,7 @@ public class JDTRecorderDialog extends TitleAreaDialog implements IRecorderDialo generatorSelectionCombo.setSelection(new StructuredSelection(this.recorder.getCurrentGenerator())); generatorSelectionCombo.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { Generator newGenerator = (Generator) ((IStructuredSelection) event.getSelection()).getFirstElement(); recorder.setGenerator(newGenerator); @@ -207,6 +208,7 @@ public class JDTRecorderDialog extends TitleAreaDialog implements IRecorderDialo }); this.recorder.addListener(new CodeGenerationListener() { + @Override public void handleCodeGenerated(GenerationRule code) { SourceViewer viewer = tabViewer.get(classTabFolder.getSelection()); ClassDocument doc = (ClassDocument) viewer.getDocument(); @@ -297,6 +299,7 @@ public class JDTRecorderDialog extends TitleAreaDialog implements IRecorderDialo this.getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { if(Window.OK == d.open()){ String classText = d.getClassName(); @@ -317,6 +320,7 @@ public class JDTRecorderDialog extends TitleAreaDialog implements IRecorderDialo this.getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { if(Window.OK == d.open()){ String methodText = d.getMethodName(); @@ -343,31 +347,38 @@ public class JDTRecorderDialog extends TitleAreaDialog implements IRecorderDialo // Override to remove default buttons } + @Override public BotGeneratorEventDispatcher getRecorder() { return recorder; } + @Override public void setRecorder(BotGeneratorEventDispatcher recorder) { this.recorder = recorder; } + @Override public List<Generator> getAvailableGenerators() { return availableGenerators; } + @Override public void setAvailableGenerators(List<Generator> availableGenerators) { this.availableGenerators = availableGenerators; } + @Override public List<Shell> getIgnoredShells() { return ignoredShells; } + @Override public String getName() { return "JDT Dialog"; } + @Override public String getId() { return ID; } diff --git a/org.eclipse.swtbot.generator.test/src/org/eclipse/swtbot/generator/test/AbstractGeneratorTest.java b/org.eclipse.swtbot.generator.test/src/org/eclipse/swtbot/generator/test/AbstractGeneratorTest.java index 6ff98bc5..196b960c 100644 --- a/org.eclipse.swtbot.generator.test/src/org/eclipse/swtbot/generator/test/AbstractGeneratorTest.java +++ b/org.eclipse.swtbot.generator.test/src/org/eclipse/swtbot/generator/test/AbstractGeneratorTest.java @@ -39,6 +39,7 @@ public abstract class AbstractGeneratorTest { this.display = Display.getDefault(); this.display.syncExec(new Runnable() { + @Override public void run() { dialog = new TestDialog(new Shell(), AbstractGeneratorTest.this); dialog.open(); @@ -52,6 +53,7 @@ public abstract class AbstractGeneratorTest { @After public void tearDown() { this.display.syncExec(new Runnable() { + @Override public void run() { if (!dialog.getShell().isDisposed()) { dialog.close(); @@ -72,6 +74,7 @@ public abstract class AbstractGeneratorTest { */ public void flushEvents() { this.display.syncExec(new Runnable() { + @Override public void run() { AbstractGeneratorTest.this.recorderDialog.getRecorder().flushGenerationRules(); } diff --git a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/framework/rules/SWTBotGeneratorRules.java b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/framework/rules/SWTBotGeneratorRules.java index 59285de2..410b8987 100644 --- a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/framework/rules/SWTBotGeneratorRules.java +++ b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/framework/rules/SWTBotGeneratorRules.java @@ -54,6 +54,7 @@ public class SWTBotGeneratorRules implements Generator { private static final String RULES_EXTENSION_POINT = "org.eclipse.swtbot.generator.rules.additions"; //$NON-NLS-1$ + @Override public List<GenerationSimpleRule> createSimpleRules() { List<GenerationSimpleRule> res = new ArrayList<GenerationSimpleRule>(); @@ -101,10 +102,12 @@ public class SWTBotGeneratorRules implements Generator { } + @Override public String getLabel() { return "SWTBot"; } + @Override public List<GenerationComplexRule> createComplexRules() { List<GenerationComplexRule> cres = new ArrayList<GenerationComplexRule>(); cres.add(new ToolBarMenuComplexRule()); @@ -133,12 +136,14 @@ public class SWTBotGeneratorRules implements Generator { return cres; } + @Override public List<AnnotationRule> createAnnotationRules() { List<AnnotationRule> ares = new ArrayList<AnnotationRule>(); ares.add(new TestAnnotationRule()); return ares; } + @Override public Image getImage() { // TODO SWTBot has no logo ? return null; diff --git a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/listener/WorkbenchListener.java b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/listener/WorkbenchListener.java index 5b22df83..84bb892d 100644 --- a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/listener/WorkbenchListener.java +++ b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/listener/WorkbenchListener.java @@ -26,6 +26,7 @@ public class WorkbenchListener implements IPartListener2{ this.dispatcher=dispatcher; } + @Override public void partActivated(IWorkbenchPartReference arg0) { Event e = new Event(); e.type=SWT.Selection; @@ -34,6 +35,7 @@ public class WorkbenchListener implements IPartListener2{ dispatcher.handleEvent(e); } + @Override public void partClosed(IWorkbenchPartReference arg0) { Event e = new Event(); e.type=SWT.Selection; @@ -43,31 +45,37 @@ public class WorkbenchListener implements IPartListener2{ } + @Override public void partBroughtToTop(IWorkbenchPartReference arg0) { // TODO Auto-generated method stub } + @Override public void partDeactivated(IWorkbenchPartReference arg0) { // TODO Auto-generated method stub } + @Override public void partHidden(IWorkbenchPartReference arg0) { // TODO Auto-generated method stub } + @Override public void partInputChanged(IWorkbenchPartReference arg0) { // TODO Auto-generated method stub } + @Override public void partOpened(IWorkbenchPartReference arg0) { // TODO Auto-generated method stub } + @Override public void partVisible(IWorkbenchPartReference arg0) { // TODO Auto-generated method stub diff --git a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/server/RecorderServer.java b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/server/RecorderServer.java index c1f9d93b..f82aca6d 100644 --- a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/server/RecorderServer.java +++ b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/server/RecorderServer.java @@ -112,6 +112,7 @@ public class RecorderServer { * @param code * The generated code. */ + @Override public void handleCodeGenerated(GenerationRule code) { for (String text : code.getActions()) { output.println(text); diff --git a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/server/StartupRecorderServer.java b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/server/StartupRecorderServer.java index 601bb214..8fa14a32 100644 --- a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/server/StartupRecorderServer.java +++ b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/server/StartupRecorderServer.java @@ -56,6 +56,7 @@ public class StartupRecorderServer implements IStartup { this.port = port; } + @Override public void run() { final List<Generator> availableGenerators = GeneratorExtensionPointManager.loadGenerators(); Generator generator = availableGenerators.get(0); @@ -98,6 +99,7 @@ public class StartupRecorderServer implements IStartup { * argument ENABLED_WITH_PORT can be found and it is equal to an integer * which is used as the port number. */ + @Override public void earlyStartup() { if (System.getProperty(ENABLED_WITH_PORT) == null) { return; diff --git a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/BotGeneratorEventDispatcher.java b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/BotGeneratorEventDispatcher.java index 0b1b949a..612287a3 100644 --- a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/BotGeneratorEventDispatcher.java +++ b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/BotGeneratorEventDispatcher.java @@ -71,6 +71,7 @@ public class BotGeneratorEventDispatcher implements Listener{ return this.generator; } + @Override public void handleEvent(Event event) { if (!this.recording) { return; diff --git a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/RecorderDialog.java b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/RecorderDialog.java index b0662a23..79bc4ece 100644 --- a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/RecorderDialog.java +++ b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/RecorderDialog.java @@ -107,6 +107,7 @@ public class RecorderDialog extends TitleAreaDialog implements IRecorderDialog { comboViewer.setInput(this.availableGenerators); comboViewer.setSelection(new StructuredSelection(this.recorder.getCurrentGenerator())); comboViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { Generator newGenerator = (Generator) ((IStructuredSelection)event.getSelection()).getFirstElement(); recorder.setGenerator(newGenerator); @@ -136,6 +137,7 @@ public class RecorderDialog extends TitleAreaDialog implements IRecorderDialog { }); this.recorder.addListener(new CodeGenerationListener() { + @Override public void handleCodeGenerated(GenerationRule code) { String lineSeparator = System.getProperty("line.separator"); StringBuilder builder = new StringBuilder(generatedCode.getText()); @@ -186,31 +188,38 @@ public class RecorderDialog extends TitleAreaDialog implements IRecorderDialog { return this.generatedCode; } + @Override public BotGeneratorEventDispatcher getRecorder() { return this.recorder; } + @Override public void setAvailableGenerators(List<Generator> availableGenerators) { this.availableGenerators = availableGenerators; } + @Override public List<Generator> getAvailableGenerators() { return availableGenerators; } + @Override public void setRecorder(BotGeneratorEventDispatcher recorder) { this.recorder = recorder; } + @Override public List<Shell> getIgnoredShells() { return ignoredShells; } + @Override public String getName() { return "Basic Dialog"; } + @Override public String getId() { return ID; } diff --git a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/StartupRecorder.java b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/StartupRecorder.java index 7868f6fd..b69c56a6 100644 --- a/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/StartupRecorder.java +++ b/org.eclipse.swtbot.generator/src/org/eclipse/swtbot/generator/ui/StartupRecorder.java @@ -53,6 +53,7 @@ public class StartupRecorder implements IStartup { this.recorderDialogId = dialog; } + @Override public void run() { final List<Generator> availableGenerators = GeneratorExtensionPointManager.loadGenerators(); Generator generator = availableGenerators.get(0); @@ -105,6 +106,7 @@ public class StartupRecorder implements IStartup { } } + @Override public void earlyStartup() { if (Boolean.parseBoolean(System.getProperty(ENABLEMENT_PROPERTY)) != true) { return; diff --git a/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/ParameterizedSWTBotJunit4ClassRunner.java b/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/ParameterizedSWTBotJunit4ClassRunner.java index ebb8c9f2..61ccad50 100644 --- a/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/ParameterizedSWTBotJunit4ClassRunner.java +++ b/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/ParameterizedSWTBotJunit4ClassRunner.java @@ -88,6 +88,7 @@ public class ParameterizedSWTBotJunit4ClassRunner extends BlockJUnit4ClassRunner * Creates a runner for a single {@link TestWithParameters}. */ public static class RunnerFactory implements ParametersRunnerFactory { + @Override public Runner createRunnerForTestWithParameters(TestWithParameters test) throws InitializationError { return new ParameterizedSWTBotJunit4ClassRunner(test); } diff --git a/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/SWTBotApplicationLauncherClassRunner.java b/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/SWTBotApplicationLauncherClassRunner.java index 8f546662..cc4c1c26 100644 --- a/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/SWTBotApplicationLauncherClassRunner.java +++ b/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/SWTBotApplicationLauncherClassRunner.java @@ -59,6 +59,7 @@ public abstract class SWTBotApplicationLauncherClassRunner extends SWTBotJunit4C if (isApplicationRunning()) return; Runnable runnable = new Runnable() { + @Override public void run() { startApplication(); } @@ -71,6 +72,7 @@ public abstract class SWTBotApplicationLauncherClassRunner extends SWTBotJunit4C SWTUtils.waitForDisplayToAppear(); } + @Override public boolean isApplicationRunning() { try { SWTUtils.waitForDisplayToAppear(); diff --git a/org.eclipse.swtbot.nebula.gallery.finder.test/src/org/eclipse/swtbot/nebula/gallery/finder/test/AbstractNebulaGalleryTestCase.java b/org.eclipse.swtbot.nebula.gallery.finder.test/src/org/eclipse/swtbot/nebula/gallery/finder/test/AbstractNebulaGalleryTestCase.java index 918d974e..836bcbe7 100644 --- a/org.eclipse.swtbot.nebula.gallery.finder.test/src/org/eclipse/swtbot/nebula/gallery/finder/test/AbstractNebulaGalleryTestCase.java +++ b/org.eclipse.swtbot.nebula.gallery.finder.test/src/org/eclipse/swtbot/nebula/gallery/finder/test/AbstractNebulaGalleryTestCase.java @@ -45,6 +45,7 @@ public class AbstractNebulaGalleryTestCase { private void runInUIThread() { final Display display = Display.getDefault(); display.syncExec(new Runnable() { + @Override public void run() { shell = createShell(display, "Nebula Gallery Test"); gallery = createGallery(shell); @@ -98,6 +99,7 @@ public class AbstractNebulaGalleryTestCase { @After public void tearDown(){ Display.getDefault().syncExec(new Runnable() { + @Override public void run() { if(shell != null){ shell.dispose(); diff --git a/org.eclipse.swtbot.nebula.gallery.finder/src/org/eclipse/swtbot/nebula/gallery/finder/widgets/SWTBotGallery.java b/org.eclipse.swtbot.nebula.gallery.finder/src/org/eclipse/swtbot/nebula/gallery/finder/widgets/SWTBotGallery.java index 9847a8c1..5f352431 100644 --- a/org.eclipse.swtbot.nebula.gallery.finder/src/org/eclipse/swtbot/nebula/gallery/finder/widgets/SWTBotGallery.java +++ b/org.eclipse.swtbot.nebula.gallery.finder/src/org/eclipse/swtbot/nebula/gallery/finder/widgets/SWTBotGallery.java @@ -51,6 +51,7 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { public int getItemCount(){ return syncExec(new IntResult() { + @Override public Integer run() { return widget.getItemCount(); } @@ -59,6 +60,7 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { public int getSelectionCount(){ return syncExec(new IntResult() { + @Override public Integer run() { return widget.getSelectionCount(); } @@ -73,6 +75,7 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { public SWTBotGalleryItem[] selection() { return syncExec(new Result<SWTBotGalleryItem[]>() { + @Override public SWTBotGalleryItem[] run() { GalleryItem[] selection = widget.getSelection(); SWTBotGalleryItem[] res = new SWTBotGalleryItem[selection.length]; @@ -106,6 +109,7 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { waitForEnabled(); setFocus(); asyncExec(new VoidResult() { + @Override public void run() { List<GalleryItem> selection = new ArrayList<GalleryItem>(); for (String item : items) { @@ -132,6 +136,7 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { assertEnabled(); setFocus(); asyncExec(new VoidResult() { + @Override public void run() { List<GalleryItem> selection = new ArrayList<GalleryItem>(); for (SWTBotGalleryItem galleryItem : items) { @@ -153,10 +158,12 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { public SWTBotGalleryItem getGalleryItem(final int index){ try { new SWTNebulaBot().waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "Could not find gallery item for index " + index; //$NON-NLS-1$ } + @Override public boolean test() throws Exception { return getItem(index) != null; } @@ -170,6 +177,7 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { protected GalleryItem getItem(final int index){ return syncExec(new WidgetResult<GalleryItem>() { + @Override public GalleryItem run() { return widget.getItem(index); } @@ -186,10 +194,12 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { public SWTBotGalleryItem getGalleryItem(final String nodeText) throws WidgetNotFoundException { try { new SWTBot().waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "Could not find node with text " + nodeText; //$NON-NLS-1$ } + @Override public boolean test() throws Exception { return getItem(nodeText) != null; } @@ -208,6 +218,7 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { */ private GalleryItem getItem(final String nodeText) { return syncExec(new WidgetResult<GalleryItem>() { + @Override public GalleryItem run() { GalleryItem[] items = widget.getItems(); for (GalleryItem item : items) { @@ -227,6 +238,7 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { */ public SWTBotGalleryItem[] getAllItems() { return syncExec(new ArrayResult<SWTBotGalleryItem>() { + @Override public SWTBotGalleryItem[] run() { GalleryItem[] items = widget.getItems(); SWTBotGalleryItem[] result = new SWTBotGalleryItem[items.length]; @@ -268,6 +280,7 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { waitForEnabled(); setFocus(); asyncExec(new VoidResult() { + @Override public void run() { log.debug(MessageFormat.format("Unselecting all in {0}", widget)); //$NON-NLS-1$ widget.deselectAll(); @@ -282,6 +295,7 @@ public class SWTBotGallery extends AbstractSWTBotControl<Gallery> { private void additionalSelectAndNotify(final int j) { //assertIsLegalRowIndex(j); asyncExec(new VoidResult() { + @Override public void run() { List<GalleryItem> newSelection = new ArrayList<GalleryItem>(); GalleryItem[] oldSelection = widget.getSelection(); diff --git a/org.eclipse.swtbot.nebula.gallery.finder/src/org/eclipse/swtbot/nebula/gallery/finder/widgets/SWTBotGalleryItem.java b/org.eclipse.swtbot.nebula.gallery.finder/src/org/eclipse/swtbot/nebula/gallery/finder/widgets/SWTBotGalleryItem.java index 408ca69a..88b5ad82 100644 --- a/org.eclipse.swtbot.nebula.gallery.finder/src/org/eclipse/swtbot/nebula/gallery/finder/widgets/SWTBotGalleryItem.java +++ b/org.eclipse.swtbot.nebula.gallery.finder/src/org/eclipse/swtbot/nebula/gallery/finder/widgets/SWTBotGalleryItem.java @@ -42,6 +42,7 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { public SWTBotGalleryItem(final GalleryItem w) throws WidgetNotFoundException { super(w); this.gallery = syncExec(new WidgetResult<Gallery>() { + @Override public Gallery run() { return w.getParent(); } @@ -55,6 +56,7 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { public String getText(){ //TODO: check that we really want to override return syncExec(new StringResult() { + @Override public String run() { return widget.getText(); } @@ -66,6 +68,7 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { */ public String getText(final int index){ return syncExec(new StringResult() { + @Override public String run() { return widget.getText(index); } @@ -78,6 +81,7 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { */ public int getItemCount(){ return syncExec(new IntResult() { + @Override public Integer run() { return widget.getItemCount(); } @@ -91,10 +95,12 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { public SWTBotGalleryItem getGalleryItem(final int index){ try { new SWTNebulaBot().waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "Could not find gallery item for index " + index; //$NON-NLS-1$ } + @Override public boolean test() throws Exception { return getItem(index) != null; } @@ -108,6 +114,7 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { protected GalleryItem getItem(final int index){ return syncExec(new WidgetResult<GalleryItem>() { + @Override public GalleryItem run() { return widget.getItem(index); } @@ -124,10 +131,12 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { public SWTBotGalleryItem getGalleryItem(final String itemText) throws WidgetNotFoundException { try { new SWTNebulaBot().waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "Could not find node with text " + itemText; //$NON-NLS-1$ } + @Override public boolean test() throws Exception { return getItem(itemText) != null; } @@ -146,6 +155,7 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { */ private GalleryItem getItem(final String itemText) { return syncExec(new WidgetResult<GalleryItem>() { + @Override public GalleryItem run() { GalleryItem[] items = widget.getItems(); for (int i = 0; i < items.length; i++) { @@ -169,10 +179,12 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { public SWTBotGalleryItem getGalleryItem(final String itemText, final int textIndex) throws WidgetNotFoundException { try { new SWTNebulaBot().waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "Could not find node with text " + itemText; //$NON-NLS-1$ } + @Override public boolean test() throws Exception { return getItem(itemText, textIndex) != null; } @@ -192,6 +204,7 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { */ private GalleryItem getItem(final String itemText, final int textIndex) { return syncExec(new WidgetResult<GalleryItem>() { + @Override public GalleryItem run() { GalleryItem[] items = widget.getItems(); for (int i = 0; i < items.length; i++) { @@ -213,6 +226,7 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { public SWTBotGalleryItem select() { assertEnabled(); syncExec(new VoidResult() { + @Override public void run() { gallery.setFocus(); gallery.setSelection(new GalleryItem[]{widget}); @@ -236,6 +250,7 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { Assert.isTrue(getNodes().containsAll(nodes)); syncExec(new VoidResult() { + @Override public void run() { ArrayList<GalleryItem> selection = new ArrayList<GalleryItem>(); @@ -295,6 +310,7 @@ public class SWTBotGalleryItem extends AbstractSWTBot<GalleryItem> { */ private List<String> getNodes() { return syncExec(new ListResult<String>() { + @Override public List<String> run() { GalleryItem[] items = widget.getItems(); List<String> result = new ArrayList<String>(items.length); diff --git a/org.eclipse.swtbot.swt.finder.test/src/DumpEvents.java b/org.eclipse.swtbot.swt.finder.test/src/DumpEvents.java index a70b2e2a..3e0b18fa 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/DumpEvents.java +++ b/org.eclipse.swtbot.swt.finder.test/src/DumpEvents.java @@ -42,6 +42,7 @@ public class DumpEvents { } class EventListener implements Listener { + @Override public void handleEvent(Event event) { if (event.type == SWT.Dispose || event.type == SWT.MouseMove || event.type == SWT.MouseHover || event.type == SWT.MouseEnter || event.type == SWT.MouseExit || event.type == SWT.MouseExit || event.type == SWT.Paint || event.type == SWT.Move diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/RunUIThreadRule.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/RunUIThreadRule.java index 2090e7aa..42f3b877 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/RunUIThreadRule.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/RunUIThreadRule.java @@ -21,6 +21,7 @@ public class RunUIThreadRule implements MethodRule { this.testObject = testObject; } + @Override public Statement apply(final Statement testStatement, FrameworkMethod method, final Object target) { return new Statement() { @Override @@ -38,6 +39,7 @@ public class RunUIThreadRule implements MethodRule { private Runnable createTestRunnable(final Statement testStatement) { return new Runnable() { + @Override public void run() { runTestThread(testStatement); } @@ -68,6 +70,7 @@ public class RunUIThreadRule implements MethodRule { private void waitForEventLoop() { display.syncExec(new Runnable() { + @Override public void run() { // no-op, wait for sync } @@ -77,6 +80,7 @@ public class RunUIThreadRule implements MethodRule { private void disposeDisplay() { if (display != null && !display.isDisposed()) { display.syncExec(new Runnable() { + @Override public void run() { display.dispose(); } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBot2Test.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBot2Test.java index 50fcd071..33784001 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBot2Test.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBot2Test.java @@ -43,6 +43,7 @@ public class SWTBot2Test extends AbstractControlExampleTest { @Test public void findsTextBox() throws Exception { UIThreadRunnable.syncExec(display, new VoidResult() { + @Override public void run() { Shell shell2 = new Shell(display); shell2.setText("Hello Shell"); @@ -63,6 +64,7 @@ public class SWTBot2Test extends AbstractControlExampleTest { } finally { // a hacked tear down UIThreadRunnable.syncExec(display, new VoidResult() { + @Override public void run() { try { bot.shell("Hello Shell").widget.dispose(); @@ -113,6 +115,7 @@ public class SWTBot2Test extends AbstractControlExampleTest { final SWTBotButton button = bot.button("Two"); assertNull(button.getId()); syncExec(new VoidResult() { + @Override public void run() { button.widget.setData(SWTBotPreferences.DEFAULT_KEY, "foo"); } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBotTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBotTest.java index f5bbd398..ff59e97a 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBotTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBotTest.java @@ -44,10 +44,12 @@ public class SWTBotTest extends AbstractMenuExampleTest { final long begin = System.currentTimeMillis(); try { bot.waitUntil(new DefaultCondition() { + @Override public boolean test() throws Exception { return false; } + @Override public String getFailureMessage() { return "timed out"; } @@ -69,10 +71,12 @@ public class SWTBotTest extends AbstractMenuExampleTest { public void doesNotWait5SecondsAndPassesForPassingCondition() throws Exception { final long begin = System.currentTimeMillis(); bot.waitUntil(new DefaultCondition() { + @Override public boolean test() throws Exception { return true; } + @Override public String getFailureMessage() { return "timed out"; } @@ -102,6 +106,7 @@ public class SWTBotTest extends AbstractMenuExampleTest { public void findsShellsById() throws Exception { final SWTBotShell shell = bot.shell("Address Book - Untitled"); UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { shell.widget.setData("foo-shell", "bar"); } @@ -115,10 +120,12 @@ public class SWTBotTest extends AbstractMenuExampleTest { final long begin = System.currentTimeMillis(); bot.waitWhile(new DefaultCondition() { + @Override public String getFailureMessage() { return "time out"; } + @Override public boolean test() throws Exception { if (System.currentTimeMillis() < begin + 2500) return true; @@ -143,10 +150,12 @@ public class SWTBotTest extends AbstractMenuExampleTest { try { bot.waitWhile(new DefaultCondition() { + @Override public String getFailureMessage() { return "time out"; } + @Override public boolean test() throws Exception { if (System.currentTimeMillis() < begin + 10000) return true; diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBotTestCaseTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBotTestCaseTest.java index 210e1d36..44b64ec4 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBotTestCaseTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/SWTBotTestCaseTest.java @@ -74,6 +74,7 @@ public class SWTBotTestCaseTest extends AbstractSWTBotTest { public void assertEnabledThrowsExceptionWhenWidgetIsDisable() throws Exception { final SWTBotButton button = bot.button("One"); UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { button.widget.setEnabled(false); } @@ -86,6 +87,7 @@ public class SWTBotTestCaseTest extends AbstractSWTBotTest { .getMessage()); } finally { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { button.widget.setEnabled(true); } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ChildrenControlFinderTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ChildrenControlFinderTest.java index e0b259e6..823735b3 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ChildrenControlFinderTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ChildrenControlFinderTest.java @@ -75,6 +75,7 @@ public class ChildrenControlFinderTest extends AbstractControlExampleTest { private Image getImage(final Button button) { return UIThreadRunnable.syncExec(new Result<Image>() { + @Override public Image run() { return button.getImage(); } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ControlFinder2Test.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ControlFinder2Test.java index 7b800383..e1305bd7 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ControlFinder2Test.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ControlFinder2Test.java @@ -51,6 +51,7 @@ public class ControlFinder2Test extends AbstractCustomControlExampleTest { private void selectCTabFolder() { UIThreadRunnable.syncExec(display, new VoidResult() { + @Override public void run() { List<TabFolder> findControls = controlFinder.findControls(widgetOfType(TabFolder.class)); TabFolder folder = findControls.get(0); diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ControlFinderTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ControlFinderTest.java index b669e0db..a6923c37 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ControlFinderTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/finders/ControlFinderTest.java @@ -67,6 +67,7 @@ public class ControlFinderTest extends AbstractControlExampleTest { List<TabItem> tabItems = controlFinder.findControls(allOf(widgetOfType(TabItem.class), withText)); final TabItem items[] = new TabItem[] { null }; display.syncExec(new Runnable() { + @Override public void run() { items[0] = ((TabFolder) shell.getChildren()[0]).getItems()[5]; } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/keyboard/KeyboardLayoutGenerator.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/keyboard/KeyboardLayoutGenerator.java index 4036b6a5..289b4e4e 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/keyboard/KeyboardLayoutGenerator.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/keyboard/KeyboardLayoutGenerator.java @@ -198,6 +198,7 @@ public class KeyboardLayoutGenerator { } } + @Override public Iterator<List<T>> iterator() { return result.iterator(); } @@ -262,10 +263,12 @@ public class KeyboardLayoutGenerator { return a; } + @Override public boolean hasNext() { return numLeft.compareTo(BigInteger.ZERO) == 1; } + @Override public List<E> next() { ArrayList<E> arrayList = new ArrayList<E>(); int[] indices = getIndices(); @@ -275,10 +278,12 @@ public class KeyboardLayoutGenerator { return arrayList; } + @Override public void remove() { throw new UnsupportedOperationException(); } + @Override public Iterator<List<E>> iterator() { return this; } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/matchers/MyMatcher.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/matchers/MyMatcher.java index 77527be3..2c3668c8 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/matchers/MyMatcher.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/matchers/MyMatcher.java @@ -22,6 +22,7 @@ final class MyMatcher extends AbstractMatcher<Widget> { this.toAnswer = toAnswer; } + @Override public void describeTo(Description description) { } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/matchers/WidgetMatcherFactoryTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/matchers/WidgetMatcherFactoryTest.java index abbb4e89..8915de18 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/matchers/WidgetMatcherFactoryTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/matchers/WidgetMatcherFactoryTest.java @@ -98,6 +98,7 @@ public class WidgetMatcherFactoryTest extends AbstractClipboardExampleTest { public void findsControlsById() throws Exception { final Text text = (Text) bot.widget(allOf(withLabel("TextTransfer:", finder), inGroup("Copy From:"))); UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { text.setData("foo-text", "bar"); } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/test/AbstractSWTShellTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/test/AbstractSWTShellTest.java index ec6ea3c5..7227aa27 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/test/AbstractSWTShellTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/test/AbstractSWTShellTest.java @@ -60,6 +60,7 @@ public abstract class AbstractSWTShellTest extends AbstractSWTTest { private String text; + @Override public boolean test() throws Exception { text = listeners.getText(); // keyLocation was added in 3.6, we don't care about it for the tests @@ -67,6 +68,7 @@ public abstract class AbstractSWTShellTest extends AbstractSWTTest { return matcher.matches(listenersText); } + @Override public String getFailureMessage() { Description description = new StringDescription(); description.appendText("\nExpected:\n").appendDescriptionOf(matcher).appendText("\ngot:\n").appendValue(text).appendText("\n"); diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/test/AbstractSWTTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/test/AbstractSWTTest.java index 7866fc4f..acbad50e 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/test/AbstractSWTTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/test/AbstractSWTTest.java @@ -48,6 +48,7 @@ public abstract class AbstractSWTTest { @Rule public MethodRule runner = new MethodRule(){ + @Override public Statement apply(Statement base, FrameworkMethod method, Object target) { return new RunUIThreadRule(target).apply(base, method, target); } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/MenuDetectTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/MenuDetectTest.java index d411ef40..752503fb 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/MenuDetectTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/MenuDetectTest.java @@ -47,6 +47,7 @@ public class MenuDetectTest extends AbstractSWTShellTest { menuItem.setText(MENU_ITEM_TEXT); label.setMenu(menu); label.addListener(SWT.MenuDetect, new Listener() { + @Override public void handleEvent(Event event) { checkInsideBounds(label.getParent().toControl(new Point(event.x, event.y)), label.getBounds()); label.setText(EXPECTED_TEXT); @@ -79,6 +80,7 @@ public class MenuDetectTest extends AbstractSWTShellTest { menuItem.setText(MENU_ITEM_TEXT); tree.setMenu(menu); tree.addListener(SWT.MenuDetect, new Listener() { + @Override public void handleEvent(Event event) { Point point = new Point(event.x, event.y); checkInsideBounds(tree.getParent().toControl(point), tree.getBounds()); @@ -106,6 +108,7 @@ public class MenuDetectTest extends AbstractSWTShellTest { menuItem.setText(MENU_ITEM_TEXT); table.setMenu(menu); table.addListener(SWT.MenuDetect, new Listener() { + @Override public void handleEvent(Event event) { Point point = new Point(event.x, event.y); checkInsideBounds(table.getParent().toControl(point), table.getBounds()); diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/SWTUtilsTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/SWTUtilsTest.java index d8ee4c1d..17740152 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/SWTUtilsTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/SWTUtilsTest.java @@ -83,6 +83,7 @@ public class SWTUtilsTest extends AbstractControlExampleTest { private Control[] getChildren() { final Control[][] children = new Control[][] { null }; display.syncExec(new Runnable() { + @Override public void run() { children[0] = controlExample.getTabFolder().getChildren(); } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/StringUtilsTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/StringUtilsTest.java index 58475470..bd19a3ef 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/StringUtilsTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/StringUtilsTest.java @@ -35,6 +35,7 @@ public class StringUtilsTest { public void canJoinListsUsingTheObjectConverter() throws Exception { Object[] toJoin = new Object[] { new TestObject("foo"), new TestObject("bar"), new TestObject("baz") }; StringConverter converter = new StringConverter() { + @Override public String toString(Object object) { return ((TestObject) object).string; } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/ShellClosesTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/ShellClosesTest.java index 7d7e62b5..9b475b92 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/ShellClosesTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/ShellClosesTest.java @@ -41,6 +41,7 @@ public class ShellClosesTest extends AbstractSWTShellTest { @Override protected void createUI(Composite parent) { new Thread(new Runnable() { + @Override public void run() { try { Thread.sleep(200); diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/TableHasRowsTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/TableHasRowsTest.java index cb628b6d..d228f5d6 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/TableHasRowsTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/TableHasRowsTest.java @@ -59,6 +59,7 @@ public class TableHasRowsTest extends AbstractSWTShellTest { private void keepAddingRowsInTable(final Table table, final int rows) { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { for (int i = 0; i < rows; i++) { new TableItem(table, SWT.NONE).setText("item " + i); diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/TreeHasRowsTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/TreeHasRowsTest.java index 740859e6..ae20658b 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/TreeHasRowsTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/TreeHasRowsTest.java @@ -46,6 +46,7 @@ public class TreeHasRowsTest extends AbstractSWTShellTest { private void keepAddingRowsInTree(final Tree Tree, final int rows) { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { for (int i = 0; i < rows; i++) { new TreeItem(Tree, SWT.NONE).setText("item " + i); @@ -73,6 +74,7 @@ public class TreeHasRowsTest extends AbstractSWTShellTest { private Shell createShell(final String text) { return UIThreadRunnable.syncExec(new WidgetResult<Shell>() { + @Override public Shell run() { Shell shell = new Shell(Display.getCurrent()); shell.setText(text); @@ -85,6 +87,7 @@ public class TreeHasRowsTest extends AbstractSWTShellTest { private Tree createTree(final Shell shell) { return UIThreadRunnable.syncExec(new WidgetResult<Tree>() { + @Override public Tree run() { Tree tree = new Tree(shell, SWT.SINGLE); tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/WaitForShellTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/WaitForShellTest.java index d76856d6..17f20b42 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/WaitForShellTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/WaitForShellTest.java @@ -53,8 +53,10 @@ public class WaitForShellTest extends AbstractSWTTest { private void createShellAfter(int delay) { new Thread(new DelayedExecutionRunnable(new Runnable() { + @Override public void run() { UIThreadRunnable.syncExec(new WidgetResult<Shell>() { + @Override public Shell run() { Shell shell = new Shell(Display.getDefault()); shell.setText(TEXT); @@ -77,6 +79,7 @@ public class WaitForShellTest extends AbstractSWTTest { this.delayInMillis = delayInMillis; } + @Override public void run() { try { Thread.sleep(delayInMillis); diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidgetInParentTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidgetInParentTest.java index 6d033e39..94874404 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidgetInParentTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidgetInParentTest.java @@ -50,6 +50,7 @@ public class WaitForWidgetInParentTest extends AbstractControlExampleTest { this.i = i; } + @Override public boolean matches(Object item) { long diff = System.currentTimeMillis() - start; if (diff >= i) @@ -57,6 +58,7 @@ public class WaitForWidgetInParentTest extends AbstractControlExampleTest { return false; } + @Override public void describeTo(Description description) { } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotMenuTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotMenuTest.java index 728e59d3..96ac3871 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotMenuTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotMenuTest.java @@ -60,6 +60,7 @@ public class SWTBotMenuTest extends AbstractMenuExampleTest { @Test public void clicksSubMenus() throws Exception { display.syncExec(new Runnable() { + @Override public void run() { addressBook .addAddressBook(new String[] { "last2", "first", "business phone", "home phone", "email@addres.ss", "fax number" }); @@ -78,6 +79,7 @@ public class SWTBotMenuTest extends AbstractMenuExampleTest { final TableItem[][] treeItems = new TableItem[][] { null }; display.syncExec(new Runnable() { + @Override public void run() { treeItems[0] = addressBook.getTreeItems(); } @@ -91,6 +93,7 @@ public class SWTBotMenuTest extends AbstractMenuExampleTest { new SWTBotMenu(menuItem).click(); display.syncExec(new Runnable() { + @Override public void run() { treeItems[0] = addressBook.getTreeItems(); } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotShellTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotShellTest.java index 036f8eff..b8b0820f 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotShellTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotShellTest.java @@ -80,6 +80,7 @@ public class SWTBotShellTest extends AbstractSWTShellTest { @Test public void closesShell() throws Exception { UIThreadRunnable.asyncExec(display, new VoidResult() { + @Override public void run() { Shell someShell = new Shell(shell); someShell.setText("some shell"); @@ -113,6 +114,7 @@ public class SWTBotShellTest extends AbstractSWTShellTest { @Test public void findsShellsById() throws Exception { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { shell.setData("foo-shell", "bar"); } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotStyledTextTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotStyledTextTest.java index a1412482..dbcef9da 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotStyledTextTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotStyledTextTest.java @@ -161,6 +161,7 @@ public class SWTBotStyledTextTest extends AbstractCustomControlExampleTest { assertFalse(styledText.hasBulletOnCurrentLine()); display.syncExec(new Runnable() { + @Override public void run() { StyledText t = styledText.widget; StyleRange style = new StyleRange(); @@ -183,6 +184,7 @@ public class SWTBotStyledTextTest extends AbstractCustomControlExampleTest { private void setTabs(final int tabSize) { display.syncExec(new Runnable() { + @Override public void run() { StyledText t = styledText.widget; t.setTabs(tabSize); diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableDoubleClickListenerTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableDoubleClickListenerTest.java index 2d5aaf16..79652b18 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableDoubleClickListenerTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableDoubleClickListenerTest.java @@ -56,6 +56,7 @@ public class SWTBotTableDoubleClickListenerTest extends AbstractSWTTest { viewer.setContentProvider(ArrayContentProvider.getInstance()); viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { label.setText(((StructuredSelection) event.getSelection()) diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItemTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItemTest.java index d24da8d6..44765574 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItemTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItemTest.java @@ -216,6 +216,7 @@ public class SWTBotTableItemTest extends AbstractControlExampleTest { private Point getCellCenter(final SWTBotTableItem node, final int columnIndex) { return UIThreadRunnable.syncExec(new Result<Point>() { + @Override public Point run() { Rectangle bounds = node.widget.getBounds(columnIndex); return new Point(bounds.x + (bounds.width / 2), bounds.y + (bounds.height / 2)); diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableTest2.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableTest2.java index a30d1008..5610f8e4 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableTest2.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableTest2.java @@ -70,6 +70,7 @@ public class SWTBotTableTest2 extends AbstractMenuExampleTest { private void populateData() { display.syncExec(new Runnable() { + @Override public void run() { addressBook.clearAddressbook(); addressBook.addAddressBook(row1()); diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarPushButtonTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarPushButtonTest.java index df6cc920..876a543c 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarPushButtonTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarPushButtonTest.java @@ -108,6 +108,7 @@ public class SWTBotToolbarPushButtonTest extends AbstractControlExampleTest { assertTrue(button.isEnabled()); try { UIThreadRunnable.syncExec(display, new VoidResult() { + @Override public void run() { button.widget.setEnabled(false); } @@ -115,6 +116,7 @@ public class SWTBotToolbarPushButtonTest extends AbstractControlExampleTest { assertFalse(button.isEnabled()); } finally { UIThreadRunnable.syncExec(display, new VoidResult() { + @Override public void run() { button.widget.setEnabled(true); } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTrayItemTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTrayItemTest.java index 218929b7..f5fac014 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTrayItemTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTrayItemTest.java @@ -87,6 +87,7 @@ public class SWTBotTrayItemTest extends AbstractSWTShellTest { } private final Listener popupMenu = new Listener() { + @Override public void handleEvent(Event event) { tray_item_menu = new Menu(shell, SWT.POP_UP); MenuItem item = new MenuItem(tray_item_menu, SWT.PUSH); @@ -100,6 +101,7 @@ public class SWTBotTrayItemTest extends AbstractSWTShellTest { private boolean menuSelected = false; private final Listener menuSelectedListener = new Listener() { + @Override public void handleEvent(Event event) { SWTBotTrayItemTest.this.menuSelected = true; } @@ -107,6 +109,7 @@ public class SWTBotTrayItemTest extends AbstractSWTShellTest { private Tray getSystemTray() { Tray tray = UIThreadRunnable.syncExec(new WidgetResult<Tray>() { + @Override public Tray run() { return display.getSystemTray(); } @@ -119,6 +122,7 @@ public class SWTBotTrayItemTest extends AbstractSWTShellTest { private TrayItem createTrayItem(final Tray tray, final String text, final int icon) { return UIThreadRunnable.syncExec(new WidgetResult<TrayItem>() { + @Override public TrayItem run() { TrayItem trayItem = new TrayItem(tray, SWT.NONE); trayItem.setText(text); @@ -135,6 +139,7 @@ public class SWTBotTrayItemTest extends AbstractSWTShellTest { private void destroyTrayItems() { final Tray tray = getSystemTray(); UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { tray.dispose(); } diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemDoubleClickListenerTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemDoubleClickListenerTest.java index 7fc70123..c4f4ed72 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemDoubleClickListenerTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemDoubleClickListenerTest.java @@ -67,21 +67,26 @@ public class SWTBotTreeItemDoubleClickListenerTest extends AbstractSWTTest { | SWT.FULL_SELECTION); viewer.setContentProvider(new ITreeContentProvider() { + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public void dispose() { } + @Override public boolean hasChildren(Object element) { return !(element instanceof String); } + @Override public Object getParent(Object element) { return null; } + @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof Model[]) { return (Object[]) inputElement; @@ -92,6 +97,7 @@ public class SWTBotTreeItemDoubleClickListenerTest extends AbstractSWTTest { return new Object[0]; } + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof Model[]) { return (Object[]) parentElement; @@ -105,6 +111,7 @@ public class SWTBotTreeItemDoubleClickListenerTest extends AbstractSWTTest { viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { label.setText(((StructuredSelection) event.getSelection()) diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemTest.java index d4cc3b07..f7f9cf81 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemTest.java @@ -387,6 +387,7 @@ public class SWTBotTreeItemTest extends AbstractControlExampleTest { private Point getCellCenter(final SWTBotTreeItem node, final int columnIndex) { return UIThreadRunnable.syncExec(new Result<Point>() { + @Override public Point run() { Rectangle bounds = node.widget.getBounds(columnIndex); return new Point(bounds.x + (bounds.width / 2), bounds.y + (bounds.height / 2)); diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeTest.java index e7d940fb..69b646cf 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeTest.java @@ -282,6 +282,7 @@ public class SWTBotTreeTest extends AbstractControlExampleTest { private Rectangle getColumnBounds(final SWTBotTreeItem node, final int columnIndex) { return UIThreadRunnable.syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { return node.widget.getBounds(2); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/CombinationGenerator.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/CombinationGenerator.java index 4b7f3b9d..817ca57b 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/CombinationGenerator.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/CombinationGenerator.java @@ -47,6 +47,7 @@ class CombinationGenerator<T> implements Iterable<List<T>> { } } + @Override public Iterator<List<T>> iterator() { return result.iterator(); } @@ -119,10 +120,12 @@ class CombinationGenerator<T> implements Iterable<List<T>> { return a; } + @Override public boolean hasNext() { return numLeft.compareTo(BigInteger.ZERO) == 1; } + @Override public List<E> next() { ArrayList<E> arrayList = new ArrayList<E>(); int[] indices = getIndices(); @@ -132,10 +135,12 @@ class CombinationGenerator<T> implements Iterable<List<T>> { return arrayList; } + @Override public void remove() { throw new UnsupportedOperationException(); } + @Override public Iterator<List<E>> iterator() { return this; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/ReferenceBy.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/ReferenceBy.java index 87424209..06de71bc 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/ReferenceBy.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/ReferenceBy.java @@ -225,6 +225,7 @@ public enum ReferenceBy { protected static Comparator<ReferenceBy> comparator() { return new Comparator<ReferenceBy>() { + @Override public int compare(ReferenceBy o1, ReferenceBy o2) { return o2.priority - o1.priority; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotAssert.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotAssert.java index 1e52dc54..dd0ebab8 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotAssert.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotAssert.java @@ -59,6 +59,7 @@ public abstract class SWTBotAssert { return pattern.matcher(item).matches(); } + @Override public void describeTo(Description description) { description.appendText("matching regex (").appendValue(pattern).appendText(")"); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotFactory.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotFactory.java index 9b185b6b..b3fb8bbc 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotFactory.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/SWTBotFactory.java @@ -621,6 +621,7 @@ abstract class SWTBotFactory { */ public Control getFocusedWidget() { return syncExec(new WidgetResult<Control>() { + @Override public Control run() { return display.getFocusControl(); } @@ -689,6 +690,7 @@ abstract class SWTBotFactory { */ protected Tray systemTray() { Tray tray = syncExec(SWTUtils.display(), new WidgetResult<Tray>() { + @Override public Tray run() { return SWTUtils.display().getSystemTray(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ContextMenuFinder.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ContextMenuFinder.java index 60c951c3..081324b5 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ContextMenuFinder.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ContextMenuFinder.java @@ -82,6 +82,7 @@ public class ContextMenuFinder extends MenuFinder { @Override protected Menu menuBar(final Shell shell) { return UIThreadRunnable.syncExec(display, new WidgetResult<Menu>() { + @Override public Menu run() { Menu popupMenu = control.getMenu(); if (popupMenu != null) { diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ContextMenuHelper.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ContextMenuHelper.java index eb4b4d78..24926500 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ContextMenuHelper.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ContextMenuHelper.java @@ -102,6 +102,7 @@ public class ContextMenuHelper { event.x = bounds.x + bounds.width / 2; event.y = bounds.y + bounds.height / 2; UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { control.notifyListeners(SWT.MenuDetect, event); } @@ -117,6 +118,7 @@ public class ContextMenuHelper { private static Rectangle getBounds(final Widget widget) { return UIThreadRunnable.syncExec(widget.getDisplay(), new Result<Rectangle>() { + @Override public Rectangle run() { Control parent; Rectangle widgetBounds; diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ControlFinder.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ControlFinder.java index 6a17e163..842cd9ef 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ControlFinder.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/ControlFinder.java @@ -148,6 +148,7 @@ public class ControlFinder { */ public <T extends Widget> List<T> findControls(final Widget parentWidget, final Matcher<T> matcher, final boolean recursive) { return UIThreadRunnable.syncExec(display, new ListResult<T>() { + @Override public List<T> run() { return findControlsInternal(parentWidget, matcher, recursive); } @@ -216,6 +217,7 @@ public class ControlFinder { */ public List<Shell> findShells(final String text) { return UIThreadRunnable.syncExec(new ListResult<Shell>() { + @Override public List<Shell> run() { ArrayList<Shell> list = new ArrayList<Shell>(); Shell[] shells = getShells(); @@ -263,6 +265,7 @@ public class ControlFinder { */ public Shell[] getShells() { return UIThreadRunnable.syncExec(display, new ArrayResult<Shell>() { + @Override public Shell[] run() { Shell[] shells = display.getShells(); List<Shell> undisposedShells = new ArrayList<Shell>(); @@ -283,6 +286,7 @@ public class ControlFinder { */ public Shell activeShell() { Shell activeShell = UIThreadRunnable.syncExec(display, new WidgetResult<Shell>() { + @Override public Shell run() { return display.getActiveShell(); } @@ -290,6 +294,7 @@ public class ControlFinder { if (activeShell != null) return activeShell; return UIThreadRunnable.syncExec(display, new WidgetResult<Shell>() { + @Override public Shell run() { Shell[] shells = getShells(); for (Shell shell : shells) @@ -302,6 +307,7 @@ public class ControlFinder { private List<Widget> getParents(final Widget w) { return UIThreadRunnable.syncExec(display, new ListResult<Widget>() { + @Override public List<Widget> run() { Widget parent = w; List<Widget> parents = new LinkedList<Widget>(); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/EventContextMenuFinder.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/EventContextMenuFinder.java index eedcbb5a..4e8cb701 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/EventContextMenuFinder.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/EventContextMenuFinder.java @@ -86,6 +86,7 @@ public class EventContextMenuFinder extends MenuFinder { */ public void register() { UIThreadRunnable.syncExec(display, new VoidResult() { + @Override public void run() { display.addFilter(SWT.Show, showHideListener); display.addFilter(SWT.Hide, showHideListener); @@ -99,6 +100,7 @@ public class EventContextMenuFinder extends MenuFinder { */ public void unregister() { UIThreadRunnable.syncExec(display, new VoidResult() { + @Override public void run() { display.removeFilter(SWT.Show, showHideListener); display.removeFilter(SWT.Hide, showHideListener); @@ -129,6 +131,7 @@ public class EventContextMenuFinder extends MenuFinder { * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) * @param event the event to check. */ + @Override public void handleEvent(Event event) { if (!(event.widget instanceof Menu)) return; diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/MenuFinder.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/MenuFinder.java index 233c9eb3..2d7e89a4 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/MenuFinder.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/MenuFinder.java @@ -119,6 +119,7 @@ public class MenuFinder { */ protected Menu menuBar(final Shell shell) { return UIThreadRunnable.syncExec(display, new WidgetResult<Menu>() { + @Override public Menu run() { return shell.getMenuBar(); } @@ -140,6 +141,7 @@ public class MenuFinder { */ public MenuItem findMenuItem(final Menu menu, final Matcher<MenuItem> matcher, final boolean recursive, final int index) { return UIThreadRunnable.syncExec(new WidgetResult<MenuItem>() { + @Override public MenuItem run() { return findMenuItemInternal(menu, matcher, recursive, new int[] { index } ); } @@ -158,6 +160,7 @@ public class MenuFinder { */ public List<MenuItem> findMenus(final Menu menu, final Matcher<MenuItem> matcher, final boolean recursive) { return UIThreadRunnable.syncExec(display, new ListResult<MenuItem>() { + @Override public List<MenuItem> run() { return findMenusInternal(menu, matcher, recursive); } @@ -172,6 +175,7 @@ public class MenuFinder { */ protected Shell[] getShells() { return UIThreadRunnable.syncExec(display, new ArrayResult<Shell>() { + @Override public Shell[] run() { return display.getShells(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/PathGenerator.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/PathGenerator.java index 91c5af56..a6fd056b 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/PathGenerator.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/PathGenerator.java @@ -137,6 +137,7 @@ public class PathGenerator { */ Widget getShell(final Display display, final int index) { return UIThreadRunnable.syncExec(display, new WidgetResult<Shell>() { + @Override public Shell run() { return display.getShells()[index]; } @@ -150,6 +151,7 @@ public class PathGenerator { */ Widget getWidget(final Widget parent, final int index) { return UIThreadRunnable.syncExec(parent.getDisplay(), new WidgetResult<Widget>() { + @Override public Widget run() { return getChildrenResolver().getChildren(parent).get(index); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/UIThreadRunnable.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/UIThreadRunnable.java index c8115d98..5cfce7db 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/UIThreadRunnable.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/finders/UIThreadRunnable.java @@ -62,6 +62,7 @@ public abstract class UIThreadRunnable implements Runnable { /** * This method is intelligent to execute in the UI thread. */ + @Override public void run() { if ((display == null) || display.isDisposed()) return; @@ -82,6 +83,7 @@ public abstract class UIThreadRunnable implements Runnable { */ private Runnable runnable() { final Runnable runnable = new Runnable() { + @Override public void run() { doRun(); dispatchAllEvents(); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/keyboard/AbstractKeyboardStrategy.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/keyboard/AbstractKeyboardStrategy.java index cdb6ad34..964838a7 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/keyboard/AbstractKeyboardStrategy.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/keyboard/AbstractKeyboardStrategy.java @@ -31,6 +31,7 @@ public abstract class AbstractKeyboardStrategy implements KeyboardStrategy { this.log = Logger.getLogger(getClass()); } + @Override public void init(Widget widget, SelfDescribing description) { // do nothing } @@ -49,6 +50,7 @@ public abstract class AbstractKeyboardStrategy implements KeyboardStrategy { */ protected abstract void releaseKey(KeyStroke key); + @Override public void pressKeys(KeyStroke... keys) { assertKeys(keys); for (KeyStroke key : keys) { @@ -57,6 +59,7 @@ public abstract class AbstractKeyboardStrategy implements KeyboardStrategy { } } + @Override public void releaseKeys(KeyStroke... keys) { assertKeys(keys); for (KeyStroke key : keys) { diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AbstractMatcher.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AbstractMatcher.java index 686f65af..ebb1a809 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AbstractMatcher.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AbstractMatcher.java @@ -32,6 +32,7 @@ public abstract class AbstractMatcher<T> extends BaseMatcher<T> { public static final Logger log = Logger.getLogger(AbstractMatcher.class); + @Override public boolean matches(Object item) { boolean result = false; try { diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AllOf.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AllOf.java index cf3ef0e0..ae48105a 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AllOf.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AllOf.java @@ -41,6 +41,7 @@ public class AllOf<T> extends AbstractMatcher<T> { return true; } + @Override public void describeTo(Description description) { description.appendList("(", " and ", ")", matchers); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AnyOf.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AnyOf.java index 657b4168..8255c45b 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AnyOf.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/AnyOf.java @@ -40,6 +40,7 @@ public class AnyOf<T> extends AbstractMatcher<T> { return false; } + @Override public void describeTo(Description description) { description.appendList("(", " or ", ")", matchers); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/InGroup.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/InGroup.java index b37a240e..18541c19 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/InGroup.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/InGroup.java @@ -65,6 +65,7 @@ public class InGroup<T extends Widget> extends AbstractMatcher<T> { return false; } + @Override public void describeTo(Description description) { description.appendText("in group (").appendDescriptionOf(matcher).appendText(")"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/InUIThread.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/InUIThread.java index 29e56a7a..ec824d0c 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/InUIThread.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/InUIThread.java @@ -40,12 +40,14 @@ public class InUIThread<T extends Widget> extends AbstractMatcher<T> { @Override protected boolean doMatch(final Object obj) { return UIThreadRunnable.syncExec(new BoolResult() { + @Override public Boolean run() { return matcher.matches(obj); } }); } + @Override public void describeTo(Description description) { description.appendText("evaluates matcher [").appendDescriptionOf(matcher).appendText("] in the ui thread"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WidgetOfType.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WidgetOfType.java index ce233216..7e182a54 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WidgetOfType.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WidgetOfType.java @@ -44,6 +44,7 @@ public class WidgetOfType<T extends Widget> extends AbstractMatcher<T> { return type.isInstance(obj); } + @Override public void describeTo(Description description) { description.appendText("of type '").appendText(type.getSimpleName()).appendText("'"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithId.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithId.java index 73de18fe..27992585 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithId.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithId.java @@ -51,6 +51,7 @@ public class WithId<T extends Widget> extends AbstractMatcher<T> { @Override protected boolean doMatch(final Object obj) { String data = UIThreadRunnable.syncExec(new Result<String>() { + @Override public String run() { return (String) ((Widget) obj).getData(key); } @@ -58,6 +59,7 @@ public class WithId<T extends Widget> extends AbstractMatcher<T> { return value.equals(data); } + @Override public void describeTo(Description description) { description.appendText("with key/value (").appendText(key).appendText("/").appendText(value).appendText(")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithItem.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithItem.java index 602fce6b..820a6ec0 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithItem.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithItem.java @@ -38,6 +38,7 @@ public class WithItem<T extends Item> extends AbstractMatcher<T> { matches = new ArrayList<T>(); } + @Override public void describeTo(Description description) { description.appendText("with item matching ("); this.itemMatcher.describeTo(description); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithLabel.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithLabel.java index 8648ff6f..05c19e70 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithLabel.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithLabel.java @@ -79,6 +79,7 @@ public class WithLabel<T extends Widget> extends AbstractMatcher<T> { return widget instanceof Label || widget instanceof CLabel; } + @Override public void describeTo(Description description) { description.appendText("with label (").appendDescriptionOf(mnemonicTextMatcher).appendText(")"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithMessage.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithMessage.java index 80285cb9..81dba1ec 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithMessage.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithMessage.java @@ -66,6 +66,7 @@ class WithMessage<T extends Widget> extends AbstractMatcher<T> { return ((String) SWTUtils.invokeMethod(obj, "getMessage")); //$NON-NLS-1$ } + @Override public void describeTo(Description description) { description.appendText("with message '").appendText(message).appendText("'"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithMnemonic.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithMnemonic.java index fe76a90d..18ef1670 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithMnemonic.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithMnemonic.java @@ -67,6 +67,7 @@ public class WithMnemonic<T extends Widget> extends AbstractMatcher<T> { return WithText.getText(obj).replaceAll("&", "").split("\t")[0]; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } + @Override public void describeTo(Description description) { description.appendText("with mnemonic '").appendText(text).appendText("'"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithRegex.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithRegex.java index 091b58be..1c840ef7 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithRegex.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithRegex.java @@ -49,6 +49,7 @@ public class WithRegex<T extends Widget> extends AbstractMatcher<T> { return false; } + @Override public void describeTo(Description description) { description.appendText("with regex '").appendValue(pattern).appendText("'"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithStyle.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithStyle.java index feb3c350..af31c510 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithStyle.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithStyle.java @@ -46,6 +46,7 @@ public class WithStyle<T extends Widget> extends AbstractMatcher<T> { return SWTUtils.hasStyle((Widget) obj, style); } + @Override public void describeTo(Description description) { description.appendText("with style '").appendText(styleDescription).appendText("'"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithText.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithText.java index 25d4ce67..23e158d1 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithText.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithText.java @@ -94,6 +94,7 @@ public class WithText<T extends Widget> extends AbstractMatcher<T> { return ((String) SWTUtils.invokeMethod(obj, "getText")).replaceAll(Text.DELIMITER, "\n"); //$NON-NLS-1$ //$NON-NLS-2$ } + @Override public void describeTo(Description description) { description.appendText("with text '").appendText(text).appendText("'"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithTooltip.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithTooltip.java index 75163b46..83eae892 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithTooltip.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/matchers/WithTooltip.java @@ -98,6 +98,7 @@ public class WithTooltip<T extends Widget> extends AbstractMatcher<T> { return ""; } + @Override public void describeTo(Description description) { description.appendText("with tooltip '").appendText(text).appendText("'"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CTabFolderResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CTabFolderResolver.java index 62f1b8f1..dc783349 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CTabFolderResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CTabFolderResolver.java @@ -24,10 +24,12 @@ import org.eclipse.swt.widgets.Widget; */ public class CTabFolderResolver implements IChildrenResolver, IParentResolver { + @Override public boolean canResolve(Widget w) { return w instanceof CTabFolder; } + @Override public List<Widget> getChildren(Widget w) { List<Widget> res = new ArrayList<Widget>(); if (hasChildren(w)) { @@ -40,18 +42,22 @@ public class CTabFolderResolver implements IChildrenResolver, IParentResolver { return res; } + @Override public Widget getParent(Widget w) { return canResolve(w) ? ((CTabFolder) w).getParent() : null; } + @Override public Class<?>[] getResolvableClasses() { return new Class<?>[] { CTabFolder.class }; } + @Override public boolean hasChildren(Widget w) { return canResolve(w) && (((CTabFolder) w).getItems().length > 0 || ((CTabFolder)w).getTopRight() != null); } + @Override public boolean hasParent(Widget w) { return getParent(w) != null; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CTabItemResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CTabItemResolver.java index 6691cd98..2fa44919 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CTabItemResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CTabItemResolver.java @@ -25,6 +25,7 @@ import org.eclipse.swt.widgets.Widget; */ public class CTabItemResolver implements IChildrenResolver, IParentResolver { + @Override public List<Widget> getChildren(Widget w) { List<Widget> children = new ArrayList<Widget>(); Control control = ((CTabItem) w).getControl(); @@ -33,22 +34,27 @@ public class CTabItemResolver implements IChildrenResolver, IParentResolver { return children; } + @Override public boolean hasChildren(Widget w) { return canResolve(w) && ((CTabItem) w).getControl() != null; } + @Override public boolean canResolve(Widget w) { return w instanceof CTabItem; } + @Override public Class<?>[] getResolvableClasses() { return new Class[] { CTabItem.class }; } + @Override public Widget getParent(Widget w) { return canResolve(w) ? ((CTabItem) w).getParent() : null; } + @Override public boolean hasParent(Widget w) { return getParent(w) != null; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CompositeResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CompositeResolver.java index c3096a18..051c5476 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CompositeResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/CompositeResolver.java @@ -30,11 +30,13 @@ import org.eclipse.swtbot.swt.finder.utils.SWTUtils; */ public class CompositeResolver implements IChildrenResolver, IParentResolver { + @Override public boolean canResolve(Widget w) { // FIXME https://bugs.eclipse.org/bugs/show_bug.cgi?id=206868 return (w instanceof Composite) && !(w.getClass().getName().equals("org.eclipse.swt.widgets.DateTime")); //$NON-NLS-1$ } + @Override public List<Widget> getChildren(Widget w) { // FIXME https://bugs.eclipse.org/bugs/show_bug.cgi?id=206868 if (w.getClass().getName().equals("org.eclipse.swt.widgets.DateTime")) //$NON-NLS-1$ @@ -42,6 +44,7 @@ public class CompositeResolver implements IChildrenResolver, IParentResolver { return hasChildren(w) ? Arrays.<Widget>asList(((Composite) w).getChildren()) : new ArrayList<Widget>(); } + @Override public Widget getParent(Widget w) { Composite parent = w instanceof Control ? ((Control) w).getParent() : null; if ((w instanceof Composite) && (parent instanceof TabFolder)) { @@ -51,10 +54,12 @@ public class CompositeResolver implements IChildrenResolver, IParentResolver { return parent; } + @Override public Class<?>[] getResolvableClasses() { return new Class[] { Composite.class, Control.class }; } + @Override public boolean hasChildren(Widget w) { // FIXME https://bugs.eclipse.org/bugs/show_bug.cgi?id=206868 // No "instanceof DateTime" is used in order to be compatible with PDE 3.2. @@ -63,6 +68,7 @@ public class CompositeResolver implements IChildrenResolver, IParentResolver { return canResolve(w) && ((Composite) w).getChildren().length > 0; } + @Override public boolean hasParent(Widget w) { return getParent(w) != null; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/DefaultChildrenResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/DefaultChildrenResolver.java index e69abd51..6c456196 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/DefaultChildrenResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/DefaultChildrenResolver.java @@ -22,6 +22,7 @@ import org.eclipse.swt.widgets.Widget; */ public class DefaultChildrenResolver extends Resolvable implements IChildrenResolver { + @Override public List<Widget> getChildren(Widget w) { List<Widget> result = new ArrayList<Widget>(); @@ -43,6 +44,7 @@ public class DefaultChildrenResolver extends Resolvable implements IChildrenReso return result; } + @Override public boolean hasChildren(Widget w) { List<IResolvable> resolvers = resolver.getResolvers(w.getClass()); for (Iterator<IResolvable> iterator = resolvers.iterator(); iterator.hasNext();) { diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/DefaultParentResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/DefaultParentResolver.java index 50294ad3..e2f221fc 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/DefaultParentResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/DefaultParentResolver.java @@ -21,6 +21,7 @@ import org.eclipse.swt.widgets.Widget; */ public class DefaultParentResolver extends Resolvable implements IParentResolver { + @Override public Widget getParent(Widget w) { if (!hasParent(w)) return null; @@ -35,6 +36,7 @@ public class DefaultParentResolver extends Resolvable implements IParentResolver return null; } + @Override public boolean hasParent(Widget w) { List<IResolvable> resolvers = getResolver().getResolvers(w.getClass()); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ExpandBarResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ExpandBarResolver.java index 6ef333f1..aa845195 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ExpandBarResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ExpandBarResolver.java @@ -22,26 +22,32 @@ import org.eclipse.swt.widgets.Widget; */ public class ExpandBarResolver implements IChildrenResolver, IParentResolver { + @Override public boolean canResolve(Widget w) { return w instanceof ExpandBar; } + @Override public List<Widget> getChildren(Widget w) { return hasChildren(w) ? Arrays.<Widget>asList(((ExpandBar) w).getItems()) : new ArrayList<Widget>(); } + @Override public Widget getParent(Widget w) { return canResolve(w) ? ((ExpandBar) w).getParent() : null; } + @Override public Class<?>[] getResolvableClasses() { return new Class[] { ExpandBar.class }; } + @Override public boolean hasChildren(Widget w) { return canResolve(w) && ((ExpandBar) w).getItems().length > 0; } + @Override public boolean hasParent(Widget w) { return getParent(w) != null; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ExpandItemResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ExpandItemResolver.java index 136bfdc5..8349e2d9 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ExpandItemResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ExpandItemResolver.java @@ -24,6 +24,7 @@ import org.eclipse.swt.widgets.Widget; */ public class ExpandItemResolver implements IChildrenResolver, IParentResolver { + @Override public List<Widget> getChildren(Widget w) { List<Widget> children = new ArrayList<Widget>(); Control control = ((ExpandItem) w).getControl(); @@ -32,22 +33,27 @@ public class ExpandItemResolver implements IChildrenResolver, IParentResolver { return children; } + @Override public boolean hasChildren(Widget w) { return canResolve(w) && ((ExpandItem) w).getControl() != null; } + @Override public boolean canResolve(Widget w) { return w instanceof ExpandItem; } + @Override public Class<?>[] getResolvableClasses() { return new Class[] { ExpandItem.class }; } + @Override public Widget getParent(Widget w) { return canResolve(w) ? ((ExpandItem) w).getParent() : null; } + @Override public boolean hasParent(Widget w) { return getParent(w) != null; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/NullResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/NullResolver.java index e283d3d3..0b79671f 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/NullResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/NullResolver.java @@ -21,26 +21,32 @@ import org.eclipse.swt.widgets.Widget; */ public class NullResolver implements IChildrenResolver, IParentResolver { + @Override public boolean canResolve(Widget w) { return true; } + @Override public List<Widget> getChildren(Widget w) { return new ArrayList<Widget>(); } + @Override public Widget getParent(Widget w) { return null; } + @Override public Class<?>[] getResolvableClasses() { return new Class[0]; } + @Override public boolean hasChildren(Widget w) { return false; } + @Override public boolean hasParent(Widget w) { return false; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/Resolvable.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/Resolvable.java index 87ff1236..b54b83f2 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/Resolvable.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/Resolvable.java @@ -57,6 +57,7 @@ public class Resolvable implements IResolvable { * @param w The widget to resolve. * @return <code>true</code> if any of the resolvers can resolve the widget. Otherwise <code>false</code>. */ + @Override public boolean canResolve(Widget w) { Class<?>[] resolvableClasses = getResolvableClasses(); for (Class<?> clazz : resolvableClasses) { @@ -72,6 +73,7 @@ public class Resolvable implements IResolvable { * * @return the types that this resolver can resolve */ + @Override public Class<?>[] getResolvableClasses() { return resolver.getResolvableClasses(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/TabFolderResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/TabFolderResolver.java index a71b976e..6c91592e 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/TabFolderResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/TabFolderResolver.java @@ -23,26 +23,32 @@ import org.eclipse.swt.widgets.Widget; */ public class TabFolderResolver implements IChildrenResolver, IParentResolver { + @Override public boolean canResolve(Widget w) { return w instanceof TabFolder; } + @Override public List<Widget> getChildren(Widget w) { return hasChildren(w) ? Arrays.<Widget>asList(((TabFolder) w).getItems()) : new ArrayList<Widget>(); } + @Override public Widget getParent(Widget w) { return (canResolve(w)) ? ((TabFolder) w).getParent() : null; } + @Override public Class<?>[] getResolvableClasses() { return new Class[] { TabFolder.class }; } + @Override public boolean hasChildren(Widget w) { return (canResolve(w)) && ((TabFolder) w).getItems().length > 0; } + @Override public boolean hasParent(Widget w) { return getParent(w) != null; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/TabItemResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/TabItemResolver.java index f2344bbd..5827757b 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/TabItemResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/TabItemResolver.java @@ -22,28 +22,34 @@ import org.eclipse.swt.widgets.Widget; */ public class TabItemResolver implements IChildrenResolver, IParentResolver { + @Override public boolean canResolve(Widget w) { return w instanceof TabItem; } + @Override public List<Widget> getChildren(Widget w) { List<Widget> children = new ArrayList<Widget>(); children.add(((TabItem) w).getControl()); return children; } + @Override public Widget getParent(Widget w) { return (canResolve(w)) ? ((TabItem) w).getParent() : null; } + @Override public Class<?>[] getResolvableClasses() { return new Class[] { TabItem.class }; } + @Override public boolean hasChildren(Widget w) { return (canResolve(w)) && ((TabItem) w).getControl() != null; } + @Override public boolean hasParent(Widget w) { return getParent(w) != null; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ToolItemResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ToolItemResolver.java index 82895b7c..0b12aa68 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ToolItemResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ToolItemResolver.java @@ -27,28 +27,34 @@ import org.eclipse.swt.widgets.Widget; */ public class ToolItemResolver implements IChildrenResolver, IParentResolver { + @Override public boolean canResolve(Widget w) { return w instanceof ToolItem; } + @Override public List<Widget> getChildren(Widget w) { List<Widget> children = new ArrayList<Widget>(); children.add(((ToolItem) w).getControl()); return children; } + @Override public Widget getParent(Widget w) { return (canResolve(w)) ? ((ToolItem) w).getParent() : null; } + @Override public Class<?>[] getResolvableClasses() { return new Class[] { ToolItem.class }; } + @Override public boolean hasChildren(Widget w) { return (canResolve(w)) && ((ToolItem) w).getControl() != null; } + @Override public boolean hasParent(Widget w) { return getParent(w) != null; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ToolbarResolver.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ToolbarResolver.java index 1de78a4a..7bb15886 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ToolbarResolver.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/resolvers/ToolbarResolver.java @@ -23,26 +23,32 @@ import org.eclipse.swt.widgets.Widget; */ public class ToolbarResolver implements IChildrenResolver, IParentResolver { + @Override public boolean canResolve(Widget w) { return w instanceof ToolBar; } + @Override public List<Widget> getChildren(Widget w) { return hasChildren(w) ? Arrays.<Widget>asList(((ToolBar) w).getItems()) : new ArrayList<Widget>(); } + @Override public Widget getParent(Widget w) { return (canResolve(w)) ? ((ToolBar) w).getParent() : null; } + @Override public Class<?>[] getResolvableClasses() { return new Class[] { ToolBar.class }; } + @Override public boolean hasChildren(Widget w) { return (canResolve(w)) && ((ToolBar) w).getItems().length > 0; } + @Override public boolean hasParent(Widget w) { return getParent(w) != null; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/BidiMap.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/BidiMap.java index 09732de0..c4f97cbd 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/BidiMap.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/BidiMap.java @@ -46,6 +46,7 @@ public class BidiMap<K, V> implements Iterable<Entry<K, V>> { return forward.size(); } + @Override public Iterator<Entry<K, V>> iterator() { return forward.entrySet().iterator(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/SWTUtils.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/SWTUtils.java index a078aba8..c2510f30 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/SWTUtils.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/SWTUtils.java @@ -151,6 +151,7 @@ public abstract class SWTUtils { */ public static String[] getTextPath(final MenuItem menuItem) { return UIThreadRunnable.syncExec(new ArrayResult<String>() { + @Override public String[] run() { List<String> textPath = new ArrayList<String>(); textPath.add(menuItem.getText()); @@ -221,6 +222,7 @@ public abstract class SWTUtils { if (style == SWT.NONE) return true; return UIThreadRunnable.syncExec(w.getDisplay(), new BoolResult() { + @Override public Boolean run() { return (w.getStyle() & style) != 0; } @@ -322,6 +324,7 @@ public abstract class SWTUtils { if (object instanceof Widget) { widget = (Widget) object; result = UIThreadRunnable.syncExec(widget.getDisplay(), new Result<Object>() { + @Override public Object run() { try { return method.invoke(object, new Object[0]); @@ -362,6 +365,7 @@ public abstract class SWTUtils { public static boolean captureScreenshot(final String fileName) { new ImageFormatConverter().imageTypeOf(fileName.substring(fileName.lastIndexOf('.') + 1)); return UIThreadRunnable.syncExec(new BoolResult() { + @Override public Boolean run() { return captureScreenshotInternal(fileName); } @@ -379,6 +383,7 @@ public abstract class SWTUtils { public static boolean captureScreenshot(final String fileName, final Control control) { new ImageFormatConverter().imageTypeOf(fileName.substring(fileName.lastIndexOf('.') + 1)); return UIThreadRunnable.syncExec(new BoolResult() { + @Override public Boolean run() { if (control instanceof Shell) return captureScreenshotInternal(fileName, control.getBounds()); @@ -402,6 +407,7 @@ public abstract class SWTUtils { public static boolean captureScreenshot(final String fileName, final Rectangle bounds) { new ImageFormatConverter().imageTypeOf(fileName.substring(fileName.lastIndexOf('.') + 1)); return UIThreadRunnable.syncExec(new BoolResult() { + @Override public Boolean run() { return captureScreenshotInternal(fileName, bounds); } @@ -487,10 +493,12 @@ public abstract class SWTUtils { public static void waitForDisplayToAppear(long timeout) { waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "Could not find a display"; //$NON-NLS-1$ } + @Override public boolean test() throws Exception { return SWTUtils.display() != null; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/TextDescription.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/TextDescription.java index 25aedd4d..a86352a4 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/TextDescription.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/TextDescription.java @@ -30,6 +30,7 @@ public class TextDescription implements SelfDescribing { this.description = description; } + @Override public void describeTo(Description description) { description.appendText(this.description); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/WidgetTextDescription.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/WidgetTextDescription.java index e175efdd..a8472b44 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/WidgetTextDescription.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/WidgetTextDescription.java @@ -31,6 +31,7 @@ public class WidgetTextDescription implements SelfDescribing { this.widget = widget; } + @Override public void describeTo(Description description) { String text = SWTUtils.getText(widget); if (text.isEmpty()) { diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/NextWidgetFinder.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/NextWidgetFinder.java index 3644f162..f2fd2a36 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/NextWidgetFinder.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/NextWidgetFinder.java @@ -48,6 +48,7 @@ public class NextWidgetFinder implements WidgetResult<Widget> { * @see org.eclipse.swtbot.swt.finder.results.WidgetResult#run() * @return The next widget or <code>null</code> if not found. */ + @Override public Widget run() { Widget[] siblings = new SiblingFinder(w).run(); int widgetIndex = new WidgetIndexFinder(w).run(); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/PreviousWidgetFinder.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/PreviousWidgetFinder.java index fb91ed28..e7da64fe 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/PreviousWidgetFinder.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/PreviousWidgetFinder.java @@ -47,6 +47,7 @@ public final class PreviousWidgetFinder implements WidgetResult<Widget> { * @see org.eclipse.swtbot.swt.finder.results.WidgetResult#run() * @return The widget found or <code>null</code> if not found. */ + @Override public Widget run() { Widget[] siblings = new SiblingFinder(w).run(); int myIndex = new WidgetIndexFinder(w).run(); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/ReflectionInvoker.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/ReflectionInvoker.java index c9e03ea7..02a7ac9c 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/ReflectionInvoker.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/ReflectionInvoker.java @@ -47,6 +47,7 @@ public final class ReflectionInvoker implements StringResult { * @see org.eclipse.swtbot.swt.finder.results.StringResult#run() * @return The results of the invoke. */ + @Override public String run() { String result = ""; //$NON-NLS-1$ try { diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/SiblingFinder.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/SiblingFinder.java index f032ea7a..6dea78c5 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/SiblingFinder.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/SiblingFinder.java @@ -46,6 +46,7 @@ public final class SiblingFinder implements ArrayResult<Widget> { * @see org.eclipse.swtbot.swt.finder.results.ArrayResult#run() * @return The object found. */ + @Override public Widget[] run() { Widget[] siblings = new Widget[] {}; if (isControl(w)) diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/WidgetIndexFinder.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/WidgetIndexFinder.java index e43c4127..9a6c39dd 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/WidgetIndexFinder.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/utils/internal/WidgetIndexFinder.java @@ -47,6 +47,7 @@ public final class WidgetIndexFinder implements IntResult { * @see org.eclipse.swtbot.swt.finder.results.IntResult#run() * @return The index value. */ + @Override public Integer run() { Widget[] siblings = new SiblingFinder(w).run(); return indexOf(siblings, w); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/DefaultCondition.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/DefaultCondition.java index 766535d8..70aa9518 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/DefaultCondition.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/DefaultCondition.java @@ -30,6 +30,7 @@ public abstract class DefaultCondition implements ICondition { * @see org.eclipse.swtbot.swt.finder.waits.ICondition#init(org.eclipse.swtbot.swt.finder.SWTBot) * @param bot The bot to use. This should never be <code>null</code>. */ + @Override public void init(SWTBot bot) { this.bot = bot; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/ShellCloses.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/ShellCloses.java index 46b8494b..66837fb9 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/ShellCloses.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/ShellCloses.java @@ -38,12 +38,15 @@ class ShellCloses extends DefaultCondition { this.shell = shell; } + @Override public String getFailureMessage() { return "The shell " + shell + " did not close."; //$NON-NLS-1$ //$NON-NLS-2$ } + @Override public boolean test() throws Exception { return UIThreadRunnable.syncExec(new BoolResult() { + @Override public Boolean run() { return shell.widget.isDisposed() || !shell.widget.isVisible(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/ShellIsActive.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/ShellIsActive.java index 3b126b2a..7891b4ed 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/ShellIsActive.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/ShellIsActive.java @@ -36,14 +36,17 @@ class ShellIsActive extends DefaultCondition { this.text = text; } + @Override public String getFailureMessage() { return "The shell '" + text + "' did not activate"; //$NON-NLS-1$ //$NON-NLS-2$ } + @Override public boolean test() throws Exception { try { final SWTBotShell shell = bot.shell(text); return UIThreadRunnable.syncExec(new BoolResult() { + @Override public Boolean run() { return shell.widget.isVisible() || shell.widget.isFocusControl(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TableHasRows.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TableHasRows.java index 18fe09fe..8f364f00 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TableHasRows.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TableHasRows.java @@ -54,6 +54,7 @@ class TableHasRows extends DefaultCondition { * @return <code>true</code> if the condition row count equals the number of rows in the table. Otherwise * <code>false</code> is returned. */ + @Override public boolean test() { return table.rowCount() == rowCount; } @@ -64,6 +65,7 @@ class TableHasRows extends DefaultCondition { * @see org.eclipse.swtbot.swt.finder.waits.ICondition#getFailureMessage() * @return The failure message. */ + @Override public String getFailureMessage() { return "Timed out waiting for " + table + " to contain " + rowCount + " rows."; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TreeHasRows.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TreeHasRows.java index 8abc3003..e29a9de1 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TreeHasRows.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TreeHasRows.java @@ -54,6 +54,7 @@ class TreeHasRows extends DefaultCondition { * @return <code>true</code> if the condition node count equals the number of nodes in the tree. Otherwise * <code>false</code> is returned. */ + @Override public boolean test() { return tree.rowCount() == rowCount; } @@ -64,6 +65,7 @@ class TreeHasRows extends DefaultCondition { * @see org.eclipse.swtbot.swt.finder.waits.ICondition#getFailureMessage() * @return The failure message. */ + @Override public String getFailureMessage() { return "Timed out waiting for " + tree + " to contain " + rowCount + " rows."; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TreeItemHasNode.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TreeItemHasNode.java index 4c12577a..2b65a3a1 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TreeItemHasNode.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/TreeItemHasNode.java @@ -55,8 +55,10 @@ class TreeItemHasNode extends DefaultCondition { * @return <code>true</code> if the tree item has a node with the given * text. Otherwise <code>false</code> is returned. */ + @Override public boolean test() { boolean hasNode = UIThreadRunnable.syncExec(new BoolResult() { + @Override public Boolean run() { for (TreeItem item : treeItem.widget.getItems()) { if (item.getText().equals(text)) { @@ -84,6 +86,7 @@ class TreeItemHasNode extends DefaultCondition { * @see org.eclipse.swtbot.swt.finder.waits.ICondition#getFailureMessage() * @return The failure message. */ + @Override public String getFailureMessage() { return "Timed out waiting for " + treeItem + " to contain a node with text: " + text; //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenu.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenu.java index 2899a494..9cab1218 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenu.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenu.java @@ -50,6 +50,7 @@ public class WaitForMenu extends WaitForObjectCondition<MenuItem> { this.recursive = recursive; } + @Override public String getFailureMessage() { return "Could not find a menu within the shell '" + shell + "' matching '" + matcher + "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenuBar.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenuBar.java index 219b7540..4b8916b3 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenuBar.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenuBar.java @@ -42,6 +42,7 @@ public class WaitForMenuBar extends WaitForObjectCondition<Menu> { this.shell = shell; } + @Override public String getFailureMessage() { return "Could not find menu bar for shell: " + shell; //$NON-NLS-1$ } @@ -49,6 +50,7 @@ public class WaitForMenuBar extends WaitForObjectCondition<Menu> { @Override protected List<Menu> findMatches() { Menu menuBar = UIThreadRunnable.syncExec(new WidgetResult<Menu>() { + @Override public Menu run() { return shell.widget.getMenuBar(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenuItem.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenuItem.java index c3f9d690..68f8c76e 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenuItem.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForMenuItem.java @@ -68,6 +68,7 @@ public class WaitForMenuItem extends WaitForObjectCondition<MenuItem> { this.index = index; } + @Override public String getFailureMessage() { return "Could not find menu item matching: " + matcher; //$NON-NLS-1$ } @@ -75,6 +76,7 @@ public class WaitForMenuItem extends WaitForObjectCondition<MenuItem> { @Override protected List<MenuItem> findMatches() { MenuItem menuItem = UIThreadRunnable.syncExec(new WidgetResult<MenuItem>() { + @Override public MenuItem run() { if (widget instanceof Menu) { return menuFinder.findMenuItem((Menu) widget, matcher, recursive, index); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForObjectCondition.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForObjectCondition.java index 7fe2612a..f33c1131 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForObjectCondition.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForObjectCondition.java @@ -38,6 +38,7 @@ public abstract class WaitForObjectCondition<T> extends DefaultCondition { matches = new ArrayList<T>(); } + @Override public boolean test() throws Exception { matches.clear(); matches.addAll(findMatches()); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForPopupMenu.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForPopupMenu.java index 6c98e610..177521c3 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForPopupMenu.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForPopupMenu.java @@ -44,6 +44,7 @@ public class WaitForPopupMenu extends WaitForObjectCondition<Menu> { this.control = control; } + @Override public String getFailureMessage() { return "Could not find pop up menu for control: " + control; //$NON-NLS-1$ } @@ -51,6 +52,7 @@ public class WaitForPopupMenu extends WaitForObjectCondition<Menu> { @Override protected List<Menu> findMatches() { Menu popupMenu = UIThreadRunnable.syncExec(new WidgetResult<Menu>() { + @Override public Menu run() { Menu menu = control.getMenu(); if (menu != null) { diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForShell.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForShell.java index 8005e83d..946ad96e 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForShell.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForShell.java @@ -31,6 +31,7 @@ class WaitForShell extends WaitForObjectCondition<Shell> { super(matcher); } + @Override public String getFailureMessage() { return "Could not find shell matching: " + matcher; //$NON-NLS-1$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForShellInParent.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForShellInParent.java index 3929d549..cf274dd9 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForShellInParent.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForShellInParent.java @@ -36,6 +36,7 @@ class WaitForShellInParent extends WaitForShell { @Override protected Shell[] findShells() { return UIThreadRunnable.syncExec(new ArrayResult<Shell>() { + @Override public Shell[] run() { return parent.getShells(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidget.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidget.java index afa53044..738853c6 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidget.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidget.java @@ -27,6 +27,7 @@ class WaitForWidget<T extends Widget> extends WaitForObjectCondition<T> { super(matcher); } + @Override public String getFailureMessage() { return "Could not find widget matching: " + matcher; //$NON-NLS-1$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidgetInParent.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidgetInParent.java index d0f9300d..644e99ae 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidgetInParent.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WaitForWidgetInParent.java @@ -30,6 +30,7 @@ class WaitForWidgetInParent<T extends Widget> extends WaitForObjectCondition<T> this.parent = parent; } + @Override public String getFailureMessage() { return "Could not find widget matching: " + matcher; //$NON-NLS-1$ } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WidgetIsEnabledCondition.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WidgetIsEnabledCondition.java index ea793583..c0111965 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WidgetIsEnabledCondition.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/waits/WidgetIsEnabledCondition.java @@ -21,10 +21,12 @@ class WidgetIsEnabledCondition extends DefaultCondition { this.widget = widget; } + @Override public boolean test() throws Exception { return widget.isEnabled(); } + @Override public String getFailureMessage() { return "The widget " + widget + " was not enabled."; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/AbstractSWTBot.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/AbstractSWTBot.java index 29063028..fee1be13 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/AbstractSWTBot.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/AbstractSWTBot.java @@ -152,6 +152,7 @@ public abstract class AbstractSWTBot<T extends Widget> { protected void notify(final int eventType, final Event createEvent, final Widget widget) { createEvent.type = eventType; final Object[] result = syncExec(new ArrayResult<Object>() { + @Override public Object[] run() { return new Object[] { SWTBotEvents.toString(createEvent), AbstractSWTBot.this.toString() }; } @@ -159,6 +160,7 @@ public abstract class AbstractSWTBot<T extends Widget> { log.trace(MessageFormat.format("Enquing event {0} on {1}", result)); //$NON-NLS-1$ asyncExec(new VoidResult() { + @Override public void run() { if ((widget == null) || widget.isDisposed()) { log.trace(MessageFormat.format("Not notifying {0} is null or has been disposed", AbstractSWTBot.this)); //$NON-NLS-1$ @@ -175,6 +177,7 @@ public abstract class AbstractSWTBot<T extends Widget> { }); UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { // do nothing, just wait for sync. } @@ -415,6 +418,7 @@ public abstract class AbstractSWTBot<T extends Widget> { */ public String getId() { return syncExec(new StringResult() { + @Override public String run() { return (String) widget.getData(SWTBotPreferences.DEFAULT_KEY); } @@ -429,6 +433,7 @@ public abstract class AbstractSWTBot<T extends Widget> { */ public String getToolTipText() { return syncExec(new StringResult() { + @Override public String run() { return SWTUtils.getToolTipText(widget); } @@ -520,6 +525,7 @@ public abstract class AbstractSWTBot<T extends Widget> { public boolean isEnabled() { if (widget instanceof Control) return syncExec(new BoolResult() { + @Override public Boolean run() { return isEnabledInternal(); } @@ -643,6 +649,7 @@ public abstract class AbstractSWTBot<T extends Widget> { */ public Color foregroundColor() { return syncExec(new Result<Color>() { + @Override public Color run() { if (widget instanceof Control) return ((Control) widget).getForeground(); @@ -660,6 +667,7 @@ public abstract class AbstractSWTBot<T extends Widget> { */ public Color backgroundColor() { return syncExec(new Result<Color>() { + @Override public Color run() { if (widget instanceof Control) return ((Control) widget).getBackground(); @@ -694,6 +702,7 @@ public abstract class AbstractSWTBot<T extends Widget> { */ public boolean isVisible() { return syncExec(new BoolResult() { + @Override public Boolean run() { if (widget instanceof Control) return ((Control) widget).isVisible(); @@ -711,6 +720,7 @@ public abstract class AbstractSWTBot<T extends Widget> { waitForEnabled(); log.debug(MessageFormat.format("Attempting to set focus on {0}", this)); syncExec(new VoidResult() { + @Override public void run() { if (widget instanceof Control) { Control control = (Control) widget; @@ -742,6 +752,7 @@ public abstract class AbstractSWTBot<T extends Widget> { + widget.getClass().getName()); return syncExec(new BoolResult() { + @Override public Boolean run() { return ((Control) widget).traverse(traverse.type); } @@ -754,6 +765,7 @@ public abstract class AbstractSWTBot<T extends Widget> { */ public boolean isActive() { return syncExec(new BoolResult() { + @Override public Boolean run() { return display.getFocusControl() == widget; } @@ -789,6 +801,7 @@ public abstract class AbstractSWTBot<T extends Widget> { protected AbstractSWTBot<T> click(final int x, final int y, final boolean post) { if (post) { syncExec(new VoidResult() { + @Override public void run() { Point cursorLocation = display.getCursorLocation(); moveMouse(x, y); @@ -813,6 +826,7 @@ public abstract class AbstractSWTBot<T extends Widget> { protected AbstractSWTBot<T> rightClick(final int x, final int y, final boolean post) { if (post) { syncExec(new VoidResult() { + @Override public void run() { Point cursorLocation = display.getCursorLocation(); moveMouse(x, y); @@ -834,6 +848,7 @@ public abstract class AbstractSWTBot<T extends Widget> { */ void moveMouse(final int x, final int y) { asyncExec(new VoidResult() { + @Override public void run() { Event event = createMouseEvent(x, y, 0, 0, 0); event.type = SWT.MouseMove; @@ -851,6 +866,7 @@ public abstract class AbstractSWTBot<T extends Widget> { */ private void mouseDown(final int x, final int y, final int button) { asyncExec(new VoidResult() { + @Override public void run() { Event event = createMouseEvent(x, y, button, 0, 0); event.type = SWT.MouseDown; @@ -868,6 +884,7 @@ public abstract class AbstractSWTBot<T extends Widget> { */ private void mouseUp(final int x, final int y, final int button) { asyncExec(new VoidResult() { + @Override public void run() { Event event = createMouseEvent(x, y, button, 0, 0); event.type = SWT.MouseUp; @@ -965,6 +982,7 @@ public abstract class AbstractSWTBot<T extends Widget> { public void dragAndDrop(final AbstractSWTBot<? extends Widget> target) { DragSource dragSource = syncExec(new Result<DragSource>() { + @Override public DragSource run() { Control control = getDNDControl(); return control == null ? null : (DragSource) control.getData(DND.DRAG_SOURCE_KEY); @@ -976,6 +994,7 @@ public abstract class AbstractSWTBot<T extends Widget> { } DropTarget dropTarget = syncExec(new Result<DropTarget>() { + @Override public DropTarget run() { Control control = target.getDNDControl(); return control == null ? null : (DropTarget) control.getData(DND.DROP_TARGET_KEY); @@ -1136,6 +1155,7 @@ public abstract class AbstractSWTBot<T extends Widget> { // otherwise the cursor gets stuck in drag mode final Control control = getDNDControl(); final Listener dragSourceListener = syncExec(new Result<Listener>() { + @Override public Listener run() { // The DragSource listener is an anonymous class of DragSource for (Listener listener : control.getListeners(SWT.DragDetect)) { @@ -1149,6 +1169,7 @@ public abstract class AbstractSWTBot<T extends Widget> { try { if (dragSourceListener != null) { syncExec(new VoidResult() { + @Override public void run() { control.removeListener(SWT.DragDetect, dragSourceListener); } @@ -1158,6 +1179,7 @@ public abstract class AbstractSWTBot<T extends Widget> { } finally { if (dragSourceListener != null) { syncExec(new VoidResult() { + @Override public void run() { control.addListener(SWT.DragDetect, dragSourceListener); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/AbstractSWTBotControl.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/AbstractSWTBotControl.java index 19daa889..42e1adb7 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/AbstractSWTBotControl.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/AbstractSWTBotControl.java @@ -51,6 +51,7 @@ public class AbstractSWTBotControl<T extends Control> extends AbstractSWTBot<T> @Override protected Rectangle getBounds() { return syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { return widget.getBounds(); } @@ -78,6 +79,7 @@ public class AbstractSWTBotControl<T extends Control> extends AbstractSWTBot<T> @Override protected Rectangle absoluteLocation() { return syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { return display.map(widget.getParent(), null, widget.getBounds()); } @@ -122,6 +124,7 @@ public class AbstractSWTBotControl<T extends Control> extends AbstractSWTBot<T> */ protected AbstractSWTBotControl<T> moveMouseToWidget() { syncExec(new VoidResult() { + @Override public void run() { Rectangle location = absoluteLocation(); moveMouse(location.x + location.width / 2, location.y + location.height / 2); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/BrowserAuthenticationListener.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/BrowserAuthenticationListener.java index 0a495616..0873ed60 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/BrowserAuthenticationListener.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/BrowserAuthenticationListener.java @@ -29,6 +29,7 @@ final class BrowserAuthenticationListener implements AuthenticationListener { public void init(final Browser widget) { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { widget.addAuthenticationListener(BrowserAuthenticationListener.this); } @@ -43,6 +44,7 @@ final class BrowserAuthenticationListener implements AuthenticationListener { return this.credentials; } + @Override public void authenticate(AuthenticationEvent event) { if (credentials == null) { event.doit = false; diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotBrowser.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotBrowser.java index 18308eab..3bed16f6 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotBrowser.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotBrowser.java @@ -69,6 +69,7 @@ public class SWTBotBrowser extends AbstractSWTBotControl<Browser> { */ public void setUrl(final String url) { UIThreadRunnable.syncExec(new VoidResult() { + @Override public void run() { progressListener.setDone(false); widget.addProgressListener(progressListener); @@ -87,6 +88,7 @@ public class SWTBotBrowser extends AbstractSWTBotControl<Browser> { public String getUrl() { waitForPageLoaded(); return UIThreadRunnable.syncExec(new Result<String>() { + @Override public String run() { return widget.getUrl(); } @@ -107,6 +109,7 @@ public class SWTBotBrowser extends AbstractSWTBotControl<Browser> { public void execute(final String script) { waitForPageLoaded(); UIThreadRunnable.asyncExec(new VoidResult() { + @Override public void run() { widget.execute(script); } @@ -118,6 +121,7 @@ public class SWTBotBrowser extends AbstractSWTBotControl<Browser> { */ public boolean isBackEnabled() { return UIThreadRunnable.syncExec(new Result<Boolean>() { + @Override public Boolean run() { return widget.isBackEnabled(); } @@ -129,6 +133,7 @@ public class SWTBotBrowser extends AbstractSWTBotControl<Browser> { */ public boolean isForwardEnabled() { return UIThreadRunnable.syncExec(new Result<Boolean>() { + @Override public Boolean run() { return widget.isForwardEnabled(); } @@ -140,6 +145,7 @@ public class SWTBotBrowser extends AbstractSWTBotControl<Browser> { */ public void back() { UIThreadRunnable.asyncExec(new VoidResult() { + @Override public void run() { progressListener.setDone(false); widget.addProgressListener(progressListener); @@ -158,6 +164,7 @@ public class SWTBotBrowser extends AbstractSWTBotControl<Browser> { */ public void forward() { UIThreadRunnable.asyncExec(new VoidResult() { + @Override public void run() { progressListener.setDone(false); widget.addProgressListener(progressListener); @@ -176,6 +183,7 @@ public class SWTBotBrowser extends AbstractSWTBotControl<Browser> { */ public void refresh() { UIThreadRunnable.asyncExec(new VoidResult() { + @Override public void run() { widget.refresh(); } @@ -258,9 +266,11 @@ public class SWTBotBrowser extends AbstractSWTBotControl<Browser> { this.done = done; } + @Override public void changed(ProgressEvent event) { } + @Override public void completed(ProgressEvent event) { setDone(true); browser.widget.removeProgressListener(this); @@ -277,10 +287,12 @@ public class SWTBotBrowser extends AbstractSWTBotControl<Browser> { this.browser = browser; } + @Override public String getFailureMessage() { return "Browser dit not finish loading page before timeout."; //$NON-NLS-1$ } + @Override public boolean test() throws Exception { return browser.isPageLoaded(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCCombo.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCCombo.java index aff76628..309292a9 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCCombo.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCCombo.java @@ -69,6 +69,7 @@ public class SWTBotCCombo extends AbstractSWTBotControl<CCombo> { if (hasStyle(widget, SWT.READ_ONLY)) throw new RuntimeException("This combo box is read-only."); //$NON-NLS-1$ asyncExec(new VoidResult() { + @Override public void run() { widget.setText(text); } @@ -84,6 +85,7 @@ public class SWTBotCCombo extends AbstractSWTBotControl<CCombo> { */ public int textLimit() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getTextLimit(); } @@ -109,6 +111,7 @@ public class SWTBotCCombo extends AbstractSWTBotControl<CCombo> { private void _setSelection(final String text) { waitForEnabled(); final int indexOf = syncExec(new IntResult() { + @Override public Integer run() { String[] items = widget.getItems(); return Arrays.asList(items).indexOf(text); @@ -122,6 +125,7 @@ public class SWTBotCCombo extends AbstractSWTBotControl<CCombo> { private void select(final int indexOf) { asyncExec(new VoidResult() { + @Override public void run() { widget.select(indexOf); } @@ -136,6 +140,7 @@ public class SWTBotCCombo extends AbstractSWTBotControl<CCombo> { */ public String selection() { return syncExec(new StringResult() { + @Override public String run() { int selectionIndex = widget.getSelectionIndex(); if (selectionIndex == -1) @@ -152,6 +157,7 @@ public class SWTBotCCombo extends AbstractSWTBotControl<CCombo> { */ public int selectionIndex() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getSelectionIndex(); } @@ -179,6 +185,7 @@ public class SWTBotCCombo extends AbstractSWTBotControl<CCombo> { */ public int itemCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getItemCount(); } @@ -192,6 +199,7 @@ public class SWTBotCCombo extends AbstractSWTBotControl<CCombo> { */ public String[] items() { return syncExec(new ArrayResult<String>() { + @Override public String[] run() { return widget.getItems(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCLabel.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCLabel.java index 78819a23..067ef4d6 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCLabel.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCLabel.java @@ -67,6 +67,7 @@ public class SWTBotCLabel extends AbstractSWTBotControl<CLabel> { */ public int alignment() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getAlignment(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCTabItem.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCTabItem.java index ba050a35..266a0861 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCTabItem.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCTabItem.java @@ -59,6 +59,7 @@ public class SWTBotCTabItem extends AbstractSWTBot<CTabItem> { public SWTBotCTabItem(CTabItem w, SelfDescribing description) throws WidgetNotFoundException { super(w, description); this.parent = syncExec(new WidgetResult<CTabFolder>() { + @Override public CTabFolder run() { return widget.getParent(); } @@ -74,6 +75,7 @@ public class SWTBotCTabItem extends AbstractSWTBot<CTabItem> { */ public SWTBotCTabItem show() { syncExec(new VoidResult() { + @Override public void run() { parent.showItem(widget); } @@ -92,6 +94,7 @@ public class SWTBotCTabItem extends AbstractSWTBot<CTabItem> { waitForEnabled(); // this runs in sync because tabFolder.setSelection() does not send a notification, and so should not block. asyncExec(new VoidResult() { + @Override public void run() { widget.getParent().setSelection(widget); log.debug(MessageFormat.format("Activated {0}", this)); //$NON-NLS-1$ @@ -101,10 +104,12 @@ public class SWTBotCTabItem extends AbstractSWTBot<CTabItem> { notify(SWT.Selection, createEvent(), parent); new SWTBot().waitUntil(new DefaultCondition() { + @Override public boolean test() throws Exception { return isActive(); } + @Override public String getFailureMessage() { return "Timed out waiting for " + SWTUtils.toString(widget) + " to activate"; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -124,6 +129,7 @@ public class SWTBotCTabItem extends AbstractSWTBot<CTabItem> { @Override public boolean isActive() { return syncExec(new BoolResult() { + @Override public Boolean run() { return parent.getSelection() == widget; } @@ -133,6 +139,7 @@ public class SWTBotCTabItem extends AbstractSWTBot<CTabItem> { @Override public boolean isEnabled() { return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getParent().isEnabled(); } @@ -147,6 +154,7 @@ public class SWTBotCTabItem extends AbstractSWTBot<CTabItem> { public SWTBotCTabItem close() { waitForEnabled(); Rectangle rectangleCloseBox = syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { try { Field field = CTabItem.class.getDeclaredField("closeRect"); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCanvas.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCanvas.java index d41ca585..42b2f051 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCanvas.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCanvas.java @@ -50,6 +50,7 @@ public class SWTBotCanvas extends AbstractSWTBotControl<Canvas> { @Override public AbstractSWTBot<Canvas> click() { Point size = syncExec(new Result<Point>() { + @Override public Point run() { return widget.getSize(); } @@ -82,6 +83,7 @@ public class SWTBotCanvas extends AbstractSWTBotControl<Canvas> { */ public void doubleClick() { Point size = syncExec(new Result<Point>() { + @Override public Point run() { return widget.getSize(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCheckBox.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCheckBox.java index 41e2c8c9..e8904186 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCheckBox.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCheckBox.java @@ -81,6 +81,7 @@ public class SWTBotCheckBox extends AbstractSWTBotControl<Button> { return; } asyncExec(new VoidResult() { + @Override public void run() { log.debug(MessageFormat.format("Deselecting {0}", this)); //$NON-NLS-1$ widget.setSelection(false); @@ -100,6 +101,7 @@ public class SWTBotCheckBox extends AbstractSWTBotControl<Button> { return; } asyncExec(new VoidResult() { + @Override public void run() { log.debug(MessageFormat.format("Selecting {0}", this)); //$NON-NLS-1$ widget.setSelection(true); @@ -114,6 +116,7 @@ public class SWTBotCheckBox extends AbstractSWTBotControl<Button> { protected void toggle() { waitForEnabled(); asyncExec(new VoidResult() { + @Override public void run() { log.debug(MessageFormat.format("Toggling state on {0}. Setting state to {1}", widget, (!widget.getSelection() ? "selected" //$NON-NLS-1$ //$NON-NLS-2$ : "unselected"))); //$NON-NLS-1$ @@ -148,6 +151,7 @@ public class SWTBotCheckBox extends AbstractSWTBotControl<Button> { */ public boolean isChecked() { return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getSelection(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCombo.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCombo.java index 62e2013a..585229b5 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCombo.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotCombo.java @@ -101,6 +101,7 @@ public class SWTBotCombo extends AbstractSWTBotControl<Combo> { */ private void _setSelection(final String text) { final int indexOf = syncExec(new IntResult() { + @Override public Integer run() { String[] items = widget.getItems(); return Arrays.asList(items).indexOf(text); @@ -109,6 +110,7 @@ public class SWTBotCombo extends AbstractSWTBotControl<Combo> { if (indexOf == -1) throw new RuntimeException("Item `" + text + "' not found in combo box."); //$NON-NLS-1$ //$NON-NLS-2$ asyncExec(new VoidResult() { + @Override public void run() { widget.select(indexOf); } @@ -122,6 +124,7 @@ public class SWTBotCombo extends AbstractSWTBotControl<Combo> { */ public String selection() { return syncExec(new StringResult() { + @Override public String run() { return widget.getItem(widget.getSelectionIndex()); } @@ -135,6 +138,7 @@ public class SWTBotCombo extends AbstractSWTBotControl<Combo> { */ public int selectionIndex() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getSelectionIndex(); } @@ -153,6 +157,7 @@ public class SWTBotCombo extends AbstractSWTBotControl<Combo> { throw new RuntimeException("The index (" + index + ") is more than the number of items (" + itemCount + ") in the combo."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ asyncExec(new VoidResult() { + @Override public void run() { widget.select(index); } @@ -167,6 +172,7 @@ public class SWTBotCombo extends AbstractSWTBotControl<Combo> { */ public int itemCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getItemCount(); } @@ -181,6 +187,7 @@ public class SWTBotCombo extends AbstractSWTBotControl<Combo> { */ public String[] items() { return syncExec(new ArrayResult<String>() { + @Override public String[] run() { return widget.getItems(); } @@ -201,6 +208,7 @@ public class SWTBotCombo extends AbstractSWTBotControl<Combo> { throw new RuntimeException("This combo box is read-only."); //$NON-NLS-1$ asyncExec(new VoidResult() { + @Override public void run() { widget.setText(text); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotDateTime.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotDateTime.java index c39d6c88..13097ab0 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotDateTime.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotDateTime.java @@ -60,6 +60,7 @@ public class SWTBotDateTime extends AbstractSWTBotControl<DateTime> { */ public Date getDate() { return syncExec(new Result<Date>() { + @Override public Date run() { int year = widget.getYear(); int month = widget.getMonth(); @@ -86,6 +87,7 @@ public class SWTBotDateTime extends AbstractSWTBotControl<DateTime> { log.debug(MessageFormat.format("Setting date on control: {0} to {1}", this, toSet)); //$NON-NLS-1$ waitForEnabled(); syncExec(new VoidResult() { + @Override @SuppressWarnings("deprecation") public void run() { widget.setDate(toSet.getYear() + 1900, toSet.getMonth(), toSet.getDate()); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandBar.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandBar.java index 81419c67..cae560fa 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandBar.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandBar.java @@ -66,6 +66,7 @@ public class SWTBotExpandBar extends AbstractSWTBotControl<ExpandBar> { */ public int itemCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getItemCount(); } @@ -79,6 +80,7 @@ public class SWTBotExpandBar extends AbstractSWTBotControl<ExpandBar> { */ public int expandedItemCount() { return syncExec(new IntResult() { + @Override public Integer run() { int count = 0; for (ExpandItem item : widget.getItems()) { @@ -164,6 +166,7 @@ public class SWTBotExpandBar extends AbstractSWTBotControl<ExpandBar> { */ public List<SWTBotExpandItem> getAllItems() { return syncExec(new ListResult<SWTBotExpandItem>() { + @Override public List<SWTBotExpandItem> run() { List<SWTBotExpandItem> result = new ArrayList<SWTBotExpandItem>(); for (ExpandItem item : widget.getItems()) { diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandItem.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandItem.java index e7e87b01..2fb44f2c 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandItem.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotExpandItem.java @@ -49,6 +49,7 @@ public class SWTBotExpandItem extends AbstractSWTBot<ExpandItem> { public SWTBotExpandItem(final ExpandItem w, SelfDescribing description) throws WidgetNotFoundException {
super(w, description);
this.expandBar = syncExec(new WidgetResult<ExpandBar>() {
+ @Override
public ExpandBar run() {
return w.getParent();
}
@@ -62,6 +63,7 @@ public class SWTBotExpandItem extends AbstractSWTBot<ExpandItem> { */
public SWTBotExpandItem expand() {
asyncExec(new VoidResult() {
+ @Override
public void run() {
if (isExpanded())
return;
@@ -79,6 +81,7 @@ public class SWTBotExpandItem extends AbstractSWTBot<ExpandItem> { */
public SWTBotExpandItem collapse() {
asyncExec(new VoidResult() {
+ @Override
public void run() {
if (isCollapsed())
return;
@@ -95,6 +98,7 @@ public class SWTBotExpandItem extends AbstractSWTBot<ExpandItem> { */
public boolean isExpanded() {
return syncExec(new BoolResult() {
+ @Override
public Boolean run() {
return widget.getExpanded();
}
diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotLabel.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotLabel.java index f6d36d00..04450f6f 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotLabel.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotLabel.java @@ -65,6 +65,7 @@ public class SWTBotLabel extends AbstractSWTBotControl<Label> { */ public Image image() { return syncExec(new Result<Image>() { + @Override public Image run() { return widget.getImage(); } @@ -78,6 +79,7 @@ public class SWTBotLabel extends AbstractSWTBotControl<Label> { */ public int alignment() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getAlignment(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotList.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotList.java index f43e83ea..57f31f80 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotList.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotList.java @@ -64,6 +64,7 @@ public class SWTBotList extends AbstractSWTBotControl<List> { waitForEnabled(); final int indexOf = indexOfChecked(item); asyncExec(new VoidResult() { + @Override public void run() { widget.setSelection(indexOf); } @@ -81,6 +82,7 @@ public class SWTBotList extends AbstractSWTBotControl<List> { waitForEnabled(); assertIsLegalIndex(index); asyncExec(new VoidResult() { + @Override public void run() { widget.setSelection(index); } @@ -95,6 +97,7 @@ public class SWTBotList extends AbstractSWTBotControl<List> { */ public int itemCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getItemCount(); } @@ -108,6 +111,7 @@ public class SWTBotList extends AbstractSWTBotControl<List> { */ public int selectionCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getSelectionCount(); } @@ -121,6 +125,7 @@ public class SWTBotList extends AbstractSWTBotControl<List> { */ public String[] selection() { return syncExec(new ArrayResult<String>() { + @Override public String[] run() { return widget.getSelection(); } @@ -141,6 +146,7 @@ public class SWTBotList extends AbstractSWTBotControl<List> { assertIsLegalIndex(indices[i]); } asyncExec(new VoidResult() { + @Override public void run() { for (int i = 0; i < indices.length; i++) { if (i == 0) { @@ -224,6 +230,7 @@ public class SWTBotList extends AbstractSWTBotControl<List> { public void unselect() { assertMultiSelect("unselect"); asyncExec(new VoidResult() { + @Override public void run() { int[] selectionIndices = widget.getSelectionIndices(); for (int i = 0; i < selectionIndices.length; i++) { @@ -249,6 +256,7 @@ public class SWTBotList extends AbstractSWTBotControl<List> { waitForEnabled(); setFocus(); asyncExec(new VoidResult() { + @Override public void run() { if (widget.isSelected(row)) { log.debug(MessageFormat.format("Unselecting row {0} in {1}", row, widget)); //$NON-NLS-1$ @@ -269,6 +277,7 @@ public class SWTBotList extends AbstractSWTBotControl<List> { */ public int indexOf(final String item) { return syncExec(new IntResult() { + @Override public Integer run() { return widget.indexOf(item); } @@ -283,6 +292,7 @@ public class SWTBotList extends AbstractSWTBotControl<List> { */ public String itemAt(final int index) { return syncExec(new StringResult() { + @Override public String run() { return widget.getItem(index); } @@ -296,6 +306,7 @@ public class SWTBotList extends AbstractSWTBotControl<List> { */ public String[] getItems() { return syncExec(new ArrayResult<String>() { + @Override public String[] run() { return widget.getItems(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotMenu.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotMenu.java index 50633fa7..b3417123 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotMenu.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotMenu.java @@ -77,6 +77,7 @@ public class SWTBotMenu extends AbstractSWTBot<MenuItem> { * to ensure that the UI runnable triggered from the E4 model to * dispose hidden menus is queued after the SWT.Selection event. */ + @Override public void run() { hide(); if (SWTUtils.hasStyle(widget, SWT.CHECK)) { @@ -88,6 +89,7 @@ public class SWTBotMenu extends AbstractSWTBot<MenuItem> { }; }); syncExec(new VoidResult() { + @Override public void run() { // do nothing, just wait for sync. } @@ -119,6 +121,7 @@ public class SWTBotMenu extends AbstractSWTBot<MenuItem> { */ public SWTBotMenu hide() { syncExec(new VoidResult() { + @Override public void run() { Menu menu = widget.getParent(); /* the menu bar of a shell does not get hidden */ @@ -139,6 +142,7 @@ public class SWTBotMenu extends AbstractSWTBot<MenuItem> { */ private void toggleCheckSelection() { syncExec(new VoidResult() { + @Override public void run() { widget.setSelection(!widget.getSelection()); } @@ -154,6 +158,7 @@ public class SWTBotMenu extends AbstractSWTBot<MenuItem> { if (otherSelectedRadioItem != null) { otherSelectedRadioItem.notify(SWT.Deactivate); asyncExec(new VoidResult() { + @Override public void run() { otherSelectedRadioItem.widget.setSelection(false); } @@ -161,6 +166,7 @@ public class SWTBotMenu extends AbstractSWTBot<MenuItem> { otherSelectedRadioItem.notify(SWT.Selection); } syncExec(new VoidResult() { + @Override public void run() { widget.setSelection(true); } @@ -169,6 +175,7 @@ public class SWTBotMenu extends AbstractSWTBot<MenuItem> { private SWTBotMenu otherSelectedRadioItem() { MenuItem other = syncExec(new WidgetResult<MenuItem>() { + @Override public MenuItem run() { if (hasStyle(widget.getParent(), SWT.NO_RADIO_GROUP)) return null; @@ -287,6 +294,7 @@ public class SWTBotMenu extends AbstractSWTBot<MenuItem> { @Override public boolean isEnabled() { return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.isEnabled(); } @@ -301,6 +309,7 @@ public class SWTBotMenu extends AbstractSWTBot<MenuItem> { */ public boolean hasMenu() { return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getMenu() != null; } @@ -316,6 +325,7 @@ public class SWTBotMenu extends AbstractSWTBot<MenuItem> { */ public boolean isChecked() { return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getSelection(); } @@ -333,6 +343,7 @@ public class SWTBotMenu extends AbstractSWTBot<MenuItem> { */ public List<String> menuItems() { return syncExec(new ListResult<String>() { + @Override public List<String> run() { List<String> items = new ArrayList<String>(); Menu menu = widget.getMenu(); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotRadio.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotRadio.java index c95d46b2..270cfd10 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotRadio.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotRadio.java @@ -78,6 +78,7 @@ public class SWTBotRadio extends AbstractSWTBotControl<Button> { if (otherSelectedButton != null) { otherSelectedButton.notify(SWT.Deactivate); asyncExec(new VoidResult() { + @Override public void run() { otherSelectedButton.widget.setSelection(false); } @@ -90,6 +91,7 @@ public class SWTBotRadio extends AbstractSWTBotControl<Button> { notify(SWT.MouseDown, createMouseEvent(0, 0, 1, 0, 1)); notify(SWT.MouseUp, createMouseEvent(0, 0, 1, SWT.BUTTON1, 1)); asyncExec(new VoidResult() { + @Override public void run() { widget.setSelection(true); } @@ -102,6 +104,7 @@ public class SWTBotRadio extends AbstractSWTBotControl<Button> { private SWTBotRadio otherSelectedButton() { Button button = syncExec(new WidgetResult<Button>() { + @Override public Button run() { if (hasStyle(widget.getParent(), SWT.NO_RADIO_GROUP)) return null; @@ -127,6 +130,7 @@ public class SWTBotRadio extends AbstractSWTBotControl<Button> { */ public boolean isSelected() { return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getSelection(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotRootMenu.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotRootMenu.java index cd41e10a..6f73d475 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotRootMenu.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotRootMenu.java @@ -152,6 +152,7 @@ public class SWTBotRootMenu extends AbstractSWTBot<Menu> { */ public SWTBotRootMenu hide() { syncExec(new VoidResult() { + @Override public void run() { if ((widget.getStyle() & SWT.POP_UP) != 0) { widget.setVisible(false); @@ -172,6 +173,7 @@ public class SWTBotRootMenu extends AbstractSWTBot<Menu> { */ public List<String> menuItems() { return syncExec(new ListResult<String>() { + @Override public List<String> run() { List<String> items = new ArrayList<String>(); for (MenuItem menuItem : widget.getItems()) { diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotScale.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotScale.java index ac9839e0..06ab0e59 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotScale.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotScale.java @@ -56,6 +56,7 @@ public class SWTBotScale extends AbstractSWTBotControl<Scale> { */
public int getValue() {
return syncExec(new IntResult() {
+ @Override
public Integer run() {
return widget.getSelection();
}
@@ -71,6 +72,7 @@ public class SWTBotScale extends AbstractSWTBotControl<Scale> { log.debug(MessageFormat.format("Setting selection on {0} to {1}", this, value)); //$NON-NLS-1$
waitForEnabled();
asyncExec(new VoidResult() {
+ @Override
public void run() {
widget.setSelection(value);
}
@@ -86,6 +88,7 @@ public class SWTBotScale extends AbstractSWTBotControl<Scale> { */
public int getMaximum() {
return syncExec(new IntResult() {
+ @Override
public Integer run() {
return widget.getMaximum();
}
@@ -99,6 +102,7 @@ public class SWTBotScale extends AbstractSWTBotControl<Scale> { */
public int getMinimum() {
return syncExec(new IntResult() {
+ @Override
public Integer run() {
return widget.getMinimum();
}
@@ -112,6 +116,7 @@ public class SWTBotScale extends AbstractSWTBotControl<Scale> { */
public int getIncrement() {
return syncExec(new IntResult() {
+ @Override
public Integer run() {
return widget.getIncrement();
}
@@ -125,6 +130,7 @@ public class SWTBotScale extends AbstractSWTBotControl<Scale> { */
public int getPageIncrement() {
return syncExec(new IntResult() {
+ @Override
public Integer run() {
return widget.getPageIncrement();
}
diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotShell.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotShell.java index 8ee43f2f..91288337 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotShell.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotShell.java @@ -73,12 +73,15 @@ public class SWTBotShell extends AbstractSWTBotControl<Shell> { */ public SWTBotShell activate() throws TimeoutException { new SWTBot().waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "Timed out waiting for " + SWTUtils.toString(widget) + " to get activated"; //$NON-NLS-1$ //$NON-NLS-2$ } + @Override public boolean test() throws Exception { syncExec(new VoidResult() { + @Override public void run() { widget.forceActive(); widget.forceFocus(); @@ -99,6 +102,7 @@ public class SWTBotShell extends AbstractSWTBotControl<Shell> { public void close() throws TimeoutException { notify(SWT.Close); asyncExec(new VoidResult() { + @Override public void run() { // TODO investigate bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=259895 if (!widget.isDisposed()) @@ -106,10 +110,12 @@ public class SWTBotShell extends AbstractSWTBotControl<Shell> { } }); new SWTBot().waitUntil(new DefaultCondition() { + @Override public boolean test() throws Exception { return !isOpen(); } + @Override public String getFailureMessage() { return "Timed out waiting for " + SWTUtils.toString(widget) + " to close."; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -123,6 +129,7 @@ public class SWTBotShell extends AbstractSWTBotControl<Shell> { */ public boolean isOpen() { return syncExec(new BoolResult() { + @Override public Boolean run() { return !widget.isDisposed() && widget.isVisible(); } @@ -137,6 +144,7 @@ public class SWTBotShell extends AbstractSWTBotControl<Shell> { @Override public boolean isActive() { return syncExec(new BoolResult() { + @Override public Boolean run() { return display.getActiveShell() == widget; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotSlider.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotSlider.java index 6f969743..9c043be1 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotSlider.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotSlider.java @@ -57,6 +57,7 @@ public class SWTBotSlider extends AbstractSWTBotControl<Slider> { */ public int getSelection() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getSelection(); } @@ -72,6 +73,7 @@ public class SWTBotSlider extends AbstractSWTBotControl<Slider> { log.debug(MessageFormat.format("Setting selection on {0} to {1}", this, value)); //$NON-NLS-1$ waitForEnabled(); asyncExec(new VoidResult() { + @Override public void run() { widget.setSelection(value); } @@ -87,6 +89,7 @@ public class SWTBotSlider extends AbstractSWTBotControl<Slider> { */ public int getMaximum() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getMaximum(); } @@ -100,6 +103,7 @@ public class SWTBotSlider extends AbstractSWTBotControl<Slider> { */ public int getMinimum() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getMinimum(); } @@ -113,6 +117,7 @@ public class SWTBotSlider extends AbstractSWTBotControl<Slider> { */ public int getIncrement() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getIncrement(); } @@ -126,6 +131,7 @@ public class SWTBotSlider extends AbstractSWTBotControl<Slider> { */ public int getPageIncrement() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getPageIncrement(); } @@ -139,6 +145,7 @@ public class SWTBotSlider extends AbstractSWTBotControl<Slider> { */ public int getThumb() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getThumb(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotSpinner.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotSpinner.java index 7b5da125..edfd38ab 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotSpinner.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotSpinner.java @@ -58,6 +58,7 @@ public class SWTBotSpinner extends AbstractSWTBotControl<Spinner> { */ public int getSelection() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getSelection(); } @@ -73,6 +74,7 @@ public class SWTBotSpinner extends AbstractSWTBotControl<Spinner> { log.debug(MessageFormat.format("Setting selection on {0} to {1}", this, value)); //$NON-NLS-1$ waitForEnabled(); asyncExec(new VoidResult() { + @Override public void run() { widget.setSelection(value); } @@ -88,6 +90,7 @@ public class SWTBotSpinner extends AbstractSWTBotControl<Spinner> { */ public int getMaximum() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getMaximum(); } @@ -101,6 +104,7 @@ public class SWTBotSpinner extends AbstractSWTBotControl<Spinner> { */ public int getMinimum() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getMinimum(); } @@ -114,6 +118,7 @@ public class SWTBotSpinner extends AbstractSWTBotControl<Spinner> { */ public int getIncrement() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getIncrement(); } @@ -127,6 +132,7 @@ public class SWTBotSpinner extends AbstractSWTBotControl<Spinner> { */ public int getPageIncrement() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getPageIncrement(); } @@ -140,6 +146,7 @@ public class SWTBotSpinner extends AbstractSWTBotControl<Spinner> { */ public int getDigits() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getDigits(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotStyledText.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotStyledText.java index a6df1bec..148780f0 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotStyledText.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotStyledText.java @@ -72,6 +72,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { public void setText(final String text) { waitForEnabled(); asyncExec(new VoidResult() { + @Override public void run() { widget.setText(text); } @@ -122,6 +123,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { waitForEnabled(); setFocus(); asyncExec(new VoidResult() { + @Override public void run() { log.debug(MessageFormat.format("Navigating to location {0}, {1} in {2}", line, column, widget)); //$NON-NLS-1$ widget.setSelection(offset(line, column)); @@ -145,6 +147,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { */ public Position cursorPosition() { return syncExec(new Result<Position>() { + @Override public Position run() { widget.setFocus(); int offset = widget.getSelectionRange().x; @@ -192,6 +195,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { public void insertText(final String text) { waitForEnabled(); syncExec(new VoidResult() { + @Override public void run() { widget.insert(text); } @@ -236,6 +240,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { */ public StyleRange getStyle(final int line, final int column) { return syncExec(new Result<StyleRange>() { + @Override public StyleRange run() { return widget.getStyleRangeAtOffset(offset(line, column)); } @@ -264,6 +269,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { public void selectRange(final int line, final int column, final int length) { waitForEnabled(); asyncExec(new VoidResult() { + @Override public void run() { int offset = offset(line, column); widget.setSelection(offset, offset + length); @@ -279,6 +285,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { */ public String getSelection() { return syncExec(new StringResult() { + @Override public String run() { return widget.getSelectionText(); } @@ -296,6 +303,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { */ public StyleRange[] getStyles(final int line, final int column, final int length) { return syncExec(new ArrayResult<StyleRange>() { + @Override public StyleRange[] run() { return widget.getStyleRanges(offset(line, column), length); } @@ -326,6 +334,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { */ public String getTextOnLine(final int line) { return syncExec(new StringResult() { + @Override public String run() { return widget.getContent().getLine(line); } @@ -372,6 +381,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { */ public Bullet getBulletOnLine(final int line) { return syncExec(new Result<Bullet>() { + @Override public Bullet run() { return widget.getLineBullet(line); } @@ -406,6 +416,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { */ public RGB getLineBackground(final int line) { return syncExec(new Result<RGB>() { + @Override public RGB run() { return widget.getLineBackground(line).getRGB(); } @@ -419,6 +430,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { */ public int getLineCount(){ return syncExec(new IntResult() { + @Override public Integer run() { return widget.getLineCount(); } @@ -432,6 +444,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { */ public List<String> getLines() { return syncExec(new ListResult<String>() { + @Override public List<String> run() { int lineCount = widget.getLineCount(); ArrayList<String> lines = new ArrayList<String>(lineCount); @@ -450,6 +463,7 @@ public class SWTBotStyledText extends AbstractSWTBotControl<StyledText> { */ public int getTabs() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getTabs(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTabItem.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTabItem.java index 27dc6cbd..5f401bd8 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTabItem.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTabItem.java @@ -56,6 +56,7 @@ public class SWTBotTabItem extends AbstractSWTBot<TabItem> { public SWTBotTabItem(TabItem w, SelfDescribing description) throws WidgetNotFoundException { super(w, description); this.parent = syncExec(new WidgetResult<TabFolder>() { + @Override public TabFolder run() { return widget.getParent(); } @@ -73,6 +74,7 @@ public class SWTBotTabItem extends AbstractSWTBot<TabItem> { waitForEnabled(); // this runs in sync because tabFolder.setSelection() does not send a notification, and so should not block. asyncExec(new VoidResult() { + @Override public void run() { widget.getParent().setSelection(widget); log.debug(MessageFormat.format("Activated {0}", this)); //$NON-NLS-1$ @@ -82,10 +84,12 @@ public class SWTBotTabItem extends AbstractSWTBot<TabItem> { notify(SWT.Selection, createEvent(), parent); new SWTBot().waitUntil(new DefaultCondition() { + @Override public boolean test() throws Exception { return isActive(); } + @Override public String getFailureMessage() { return "Timed out waiting for " + SWTUtils.toString(widget) + " to activate"; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -104,6 +108,7 @@ public class SWTBotTabItem extends AbstractSWTBot<TabItem> { @Override public boolean isActive() { return syncExec(new BoolResult() { + @Override public Boolean run() { return parent.getSelection()[0] == widget; } @@ -113,6 +118,7 @@ public class SWTBotTabItem extends AbstractSWTBot<TabItem> { @Override public boolean isEnabled() { return syncExec(new BoolResult() { + @Override public Boolean run() { return parent.isEnabled(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTable.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTable.java index 10b533c1..4f644fcc 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTable.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTable.java @@ -83,6 +83,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { */ public int rowCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getItemCount(); } @@ -96,6 +97,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { */ public int columnCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getColumnCount(); } @@ -109,6 +111,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { */ public List<String> columns() { return syncExec(new ListResult<String>() { + @Override public List<String> run() { ArrayList<String> result = new ArrayList<String>(); @@ -141,6 +144,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { */ public SWTBotTableColumn header(final String label) throws WidgetNotFoundException { TableColumn column = syncExec(new Result<TableColumn>() { + @Override public TableColumn run() { TableColumn[] columns = widget.getColumns(); for (TableColumn column : columns) { @@ -164,6 +168,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { assertIsLegalCell(row, column); return syncExec(new StringResult() { + @Override public String run() { TableItem item = widget.getItem(row); return item.getText(column); @@ -194,6 +199,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { */ public int selectionCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getSelectionCount(); } @@ -208,6 +214,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { public TableCollection selection() { final int columnCount = columnCount(); return syncExec(new Result<TableCollection>() { + @Override public TableCollection run() { final TableCollection selection = new TableCollection(); TableItem[] items = widget.getSelection(); @@ -255,6 +262,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { */ public int indexOf(final String item) { return syncExec(new IntResult() { + @Override public Integer run() { TableItem[] items = widget.getItems(); for (int i = 0; i < items.length; i++) { @@ -293,6 +301,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { public int searchText(final String text) { final int columnCount = columnCount(); return syncExec(new IntResult() { + @Override public Integer run() { TableItem[] items = widget.getItems(); for (int i = 0; i < items.length; i++) { @@ -330,6 +339,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { */ public int indexOf(final String text, final int column) { return syncExec(new IntResult() { + @Override public Integer run() { TableItem[] items = widget.getItems(); for (int i = 0; i < items.length; i++) { @@ -362,6 +372,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { setFocus(); log.debug(MessageFormat.format("Unselecting all in {0}", this)); //$NON-NLS-1$ TableItem[] selection = syncExec(new ArrayResult<TableItem>() { + @Override public TableItem[] run() { return widget.getSelection(); } @@ -380,6 +391,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { */ private void unselect(final TableItem item) { syncExec(new VoidResult() { + @Override public void run() { widget.deselect(widget.indexOf(item)); lastSelectionItem = item; @@ -432,6 +444,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { */ private void processSelection(final TableItem item, final boolean add) { syncExec(new VoidResult() { + @Override public void run() { if (add) { widget.select(widget.indexOf(item)); @@ -491,6 +504,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { // for some reason, it does not work without setting selection first setFocus(); Rectangle cellBounds = syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { TableItem item = widget.getItem(row); Rectangle cellBounds = item.getBounds(column); @@ -513,6 +527,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { assertIsLegalCell(row, column); setFocus(); Rectangle cellBounds = syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { TableItem item = widget.getItem(row); Rectangle cellBounds = item.getBounds(column); @@ -551,10 +566,12 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { public SWTBotTableItem getTableItem(final String itemText) throws WidgetNotFoundException { try { new SWTBot().waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "Could not find node with text " + itemText; //$NON-NLS-1$ } + @Override public boolean test() throws Exception { return getItem(itemText) != null; } @@ -573,6 +590,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { */ private TableItem getItem(final String itemText) { return syncExec(new WidgetResult<TableItem>() { + @Override public TableItem run() { TableItem[] items = widget.getItems(); for (int i = 0; i < items.length; i++) { @@ -596,10 +614,12 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { public SWTBotTableItem getTableItem(final int row) throws WidgetNotFoundException { try { new SWTBot().waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "Could not find table item for row " + row; //$NON-NLS-1$ } + @Override public boolean test() throws Exception { return getItem(row) != null; } @@ -618,6 +638,7 @@ public class SWTBotTable extends AbstractSWTBotControl<Table> { */ private TableItem getItem(final int row) { return syncExec(new WidgetResult<TableItem>() { + @Override public TableItem run() { return widget.getItem(row); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableColumn.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableColumn.java index 98180313..731f150f 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableColumn.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableColumn.java @@ -40,6 +40,7 @@ public class SWTBotTableColumn extends AbstractSWTBot<TableColumn> { */ public SWTBotTableColumn(final TableColumn w) throws WidgetNotFoundException { this(w, UIThreadRunnable.syncExec(new WidgetResult<Table>() { + @Override public Table run() { return w.getParent(); } @@ -75,6 +76,7 @@ public class SWTBotTableColumn extends AbstractSWTBot<TableColumn> { @Override protected Rectangle getBounds() { return syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { Table table = widget.getParent(); Point location = widget.getDisplay().map(table.getParent(), table, table.getLocation()); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItem.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItem.java index 1e78d7e8..f33b82a4 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItem.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItem.java @@ -57,6 +57,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { public SWTBotTableItem(final TableItem tableItem, SelfDescribing description) throws WidgetNotFoundException { super(tableItem, description); this.table = syncExec(new WidgetResult<Table>() { + @Override public Table run() { return tableItem.getParent(); } @@ -71,6 +72,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { public SWTBotTableItem select() { waitForEnabled(); syncExec(new VoidResult() { + @Override public void run() { table.setFocus(); table.setSelection(widget); @@ -92,6 +94,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { notifyTable(SWT.MouseEnter, createMouseEvent(x, y, 0, SWT.NONE, 0)); notifyTable(SWT.Activate, super.createEvent()); syncExec(new VoidResult() { + @Override public void run() { if (table.getSelectionCount() != 1 || !table.getSelection()[0].equals(widget)) { table.setSelection(widget); @@ -158,6 +161,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { notifyTable(SWT.MouseEnter, createMouseEvent(0, SWT.NONE, 0)); notifyTable(SWT.Activate, super.createEvent()); syncExec(new VoidResult() { + @Override public void run() { if (table.getSelectionCount() != 1 || !table.getSelection()[0].equals(widget)) { table.setSelection(widget); @@ -191,6 +195,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { @Override protected void dragStart() { syncExec(new VoidResult() { + @Override public void run() { table.setFocus(); table.setSelection(widget); @@ -205,6 +210,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { @Override protected Rectangle getBounds() { return syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { return widget.getBounds(); } @@ -219,6 +225,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { */ private Rectangle getCellBounds(final int column) { return syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { return widget.getBounds(column); } @@ -238,6 +245,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { @Override public String getText() { return syncExec(new StringResult() { + @Override public String run() { return widget.getText(); } @@ -246,6 +254,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { public String getText(final int index) { return syncExec(new StringResult() { + @Override public String run() { return widget.getText(index); } @@ -288,6 +297,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { public boolean isChecked() { assertIsCheck(); return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getChecked(); } @@ -302,6 +312,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { public boolean isGrayed() { assertIsCheck(); return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getGrayed(); } @@ -331,6 +342,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { waitForEnabled(); assertIsCheck(); syncExec(new VoidResult() { + @Override public void run() { TableItem item = widget; log.debug(MessageFormat.format("Setting state to {0} on: {1}", (checked ? "checked" : "unchecked"), item.getText())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ @@ -351,6 +363,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { */ private void notifyCheck() { syncExec(new VoidResult() { + @Override public void run() { table.notifyListeners(SWT.Selection, createCheckEvent()); } @@ -382,6 +395,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { @Override public boolean isEnabled() { return syncExec(new BoolResult() { + @Override public Boolean run() { return table.isEnabled(); } @@ -391,6 +405,7 @@ public class SWTBotTableItem extends AbstractSWTBot<TableItem> { @Override protected Rectangle absoluteLocation() { return syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { return display.map(widget.getParent(), null, widget.getBounds()); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotText.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotText.java index 23934f76..2c0c1f8e 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotText.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotText.java @@ -65,6 +65,7 @@ public class SWTBotText extends AbstractSWTBotControl<Text> { waitForEnabled(); assertWritable(); syncExec(new VoidResult() { + @Override public void run() { widget.setText(text); } @@ -138,6 +139,7 @@ public class SWTBotText extends AbstractSWTBotControl<Text> { */ public SWTBotText selectAll() { syncExec(new VoidResult() { + @Override public void run() { widget.selectAll(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToggleButton.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToggleButton.java index 8310fcdc..e91f1161 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToggleButton.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToggleButton.java @@ -81,6 +81,7 @@ public class SWTBotToggleButton extends AbstractSWTBotControl<Button> { return; } asyncExec(new VoidResult() { + @Override public void run() { log.debug(MessageFormat.format("Deselecting {0}", this)); //$NON-NLS-1$ widget.setSelection(false); @@ -100,6 +101,7 @@ public class SWTBotToggleButton extends AbstractSWTBotControl<Button> { return; } asyncExec(new VoidResult() { + @Override public void run() { log.debug(MessageFormat.format("Selecting {0}", this)); //$NON-NLS-1$ widget.setSelection(true); @@ -114,6 +116,7 @@ public class SWTBotToggleButton extends AbstractSWTBotControl<Button> { protected void toggle() { waitForEnabled(); asyncExec(new VoidResult() { + @Override public void run() { log.debug(MessageFormat.format("Toggling state on {0}. Setting state to {1}", widget, (!widget.getSelection() ? "selected" //$NON-NLS-1$ //$NON-NLS-2$ : "unselected"))); //$NON-NLS-1$ @@ -148,6 +151,7 @@ public class SWTBotToggleButton extends AbstractSWTBotControl<Button> { */ public boolean isPressed() { return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getSelection(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarButton.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarButton.java index 57c116aa..049fb9bf 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarButton.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarButton.java @@ -87,6 +87,7 @@ public abstract class SWTBotToolbarButton extends AbstractSWTBot<ToolItem> { @Override public boolean isEnabled() { return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.isEnabled(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarRadioButton.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarRadioButton.java index 2d4f681d..5559ca61 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarRadioButton.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarRadioButton.java @@ -91,6 +91,7 @@ public class SWTBotToolbarRadioButton extends SWTBotToolbarButton { if (otherSelectedButton != null) { otherSelectedButton.notify(SWT.Deactivate); asyncExec(new VoidResult() { + @Override public void run() { otherSelectedButton.widget.setSelection(false); } @@ -99,6 +100,7 @@ public class SWTBotToolbarRadioButton extends SWTBotToolbarButton { } } syncExec(new VoidResult() { + @Override public void run() { widget.setSelection(selected); } @@ -107,6 +109,7 @@ public class SWTBotToolbarRadioButton extends SWTBotToolbarButton { private SWTBotToolbarRadioButton otherSelectedButton() { ToolItem other = syncExec(new WidgetResult<ToolItem>() { + @Override public ToolItem run() { Widget[] siblings = SWTUtils.siblings(widget); boolean ownGroup = false; @@ -156,6 +159,7 @@ public class SWTBotToolbarRadioButton extends SWTBotToolbarButton { */ public boolean isChecked() { return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getSelection(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarToggleButton.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarToggleButton.java index 170b4e30..d51170ed 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarToggleButton.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotToolbarToggleButton.java @@ -85,6 +85,7 @@ public class SWTBotToolbarToggleButton extends SWTBotToolbarButton { private void internalToggle() { syncExec(new VoidResult() { + @Override public void run() { widget.setSelection(!widget.getSelection()); } @@ -112,6 +113,7 @@ public class SWTBotToolbarToggleButton extends SWTBotToolbarButton { */ public boolean isChecked() { return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getSelection(); } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTree.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTree.java index 0eaa2734..be58766f 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTree.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTree.java @@ -82,6 +82,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { */ public int rowCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getItems().length; } @@ -95,6 +96,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { */ public int columnCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getColumnCount(); } @@ -111,6 +113,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { public List<String> columns() { final int columnCount = columnCount(); return syncExec(new ListResult<String>() { + @Override public List<String> run() { String columns[] = new String[columnCount]; for (int i = 0; i < columnCount; i++) @@ -130,6 +133,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { */ public SWTBotTreeColumn header(final String label) throws WidgetNotFoundException { TreeColumn column = syncExec(new Result<TreeColumn>() { + @Override public TreeColumn run() { TreeColumn[] columns = widget.getColumns(); for (TreeColumn column : columns) { @@ -158,6 +162,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { + ") in the tree."); //$NON-NLS-1$ return syncExec(new StringResult() { + @Override public String run() { TreeItem item = widget.getItem(row); return item.getText(column); @@ -188,6 +193,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { */ public int selectionCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getSelectionCount(); } @@ -203,6 +209,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { final int columnCount = columnCount(); return syncExec(new Result<TableCollection>() { + @Override public TableCollection run() { final TableCollection selection = new TableCollection(); TreeItem[] items = widget.getSelection(); @@ -285,6 +292,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { waitForEnabled(); log.debug(MessageFormat.format("Unselecting all in {0}", this)); //$NON-NLS-1$ TreeItem[] selection = syncExec(new ArrayResult<TreeItem>() { + @Override public TreeItem[] run() { return widget.getSelection(); } @@ -304,6 +312,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { */ private void unselect(final TreeItem item) { syncExec(new VoidResult() { + @Override public void run() { widget.deselect(item); lastSelectionItem = item; @@ -350,6 +359,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { */ private void processSelection(final TreeItem item, final boolean add) { syncExec(new VoidResult() { + @Override public void run() { if (add) { widget.select(item); @@ -440,6 +450,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { */ public int visibleRowCount() { return syncExec(new IntResult() { + @Override public Integer run() { TreeItem[] items = widget.getItems(); return getVisibleChildrenCount(items); @@ -474,6 +485,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { public SWTBotTreeItem expandNode(final String nodeText, final boolean recursive) throws WidgetNotFoundException { waitForEnabled(); return syncExec(new Result<SWTBotTreeItem>() { + @Override public SWTBotTreeItem run() { SWTBotTreeItem item; try { @@ -510,10 +522,12 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { public SWTBotTreeItem getTreeItem(final String nodeText) throws WidgetNotFoundException { try { new SWTBot().waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "Could not find node with text " + nodeText; //$NON-NLS-1$ } + @Override public boolean test() throws Exception { return getItem(nodeText) != null; } @@ -532,6 +546,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { */ private TreeItem getItem(final int index) { return syncExec(new WidgetResult<TreeItem>() { + @Override public TreeItem run() { return widget.getItem(index); } @@ -546,6 +561,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { */ private TreeItem getItem(final String nodeText) { return syncExec(new WidgetResult<TreeItem>() { + @Override public TreeItem run() { TreeItem[] items = widget.getItems(); for (TreeItem item : items) { @@ -565,6 +581,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { */ public SWTBotTreeItem[] getAllItems() { return syncExec(new ArrayResult<SWTBotTreeItem>() { + @Override public SWTBotTreeItem[] run() { TreeItem[] items = widget.getItems(); SWTBotTreeItem[] result = new SWTBotTreeItem[items.length]; @@ -588,6 +605,7 @@ public class SWTBotTree extends AbstractSWTBotControl<Tree> { */ public boolean hasItems() { return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getItemCount() > 0; } diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeColumn.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeColumn.java index 92ccc0c4..98f90b64 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeColumn.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeColumn.java @@ -43,6 +43,7 @@ public class SWTBotTreeColumn extends AbstractSWTBot<TreeColumn> { */ public SWTBotTreeColumn(final TreeColumn w) throws WidgetNotFoundException { this(w, UIThreadRunnable.syncExec(new WidgetResult<Tree>() { + @Override public Tree run() { return w.getParent(); } @@ -52,6 +53,7 @@ public class SWTBotTreeColumn extends AbstractSWTBot<TreeColumn> { @Override protected Rectangle getBounds() { return syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { Tree tree = widget.getParent(); Point location = widget.getDisplay().map(tree.getParent(), tree, tree.getLocation()); diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java index 22ea23b6..12057f5d 100644 --- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java +++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java @@ -78,6 +78,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { public SWTBotTreeItem(final TreeItem treeItem, SelfDescribing description) throws WidgetNotFoundException { super(treeItem, description); this.tree = syncExec(new WidgetResult<Tree>() { + @Override public Tree run() { return treeItem.getParent(); } @@ -100,6 +101,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { Assert.isLegal(column < columnCount, java.text.MessageFormat.format( "The column index ({0}) is more than the number of column({1}) in the tree.", column, columnCount)); //$NON-NLS-1$ return syncExec(new StringResult() { + @Override public String run() { return widget.getText(column); } @@ -113,6 +115,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { */ public TableRow row() { return syncExec(new Result<TableRow>() { + @Override public TableRow run() { int columnCount = tree.getColumnCount(); TableRow tableRow = new TableRow(); @@ -133,6 +136,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { */ public int rowCount() { return syncExec(new IntResult() { + @Override public Integer run() { return widget.getItemCount(); } @@ -151,6 +155,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { Assert.isLegal(row < rowCount, java.text.MessageFormat.format("The row number ({0}) is more than the number of rows({1}) in the tree.", row, rowCount)); //$NON-NLS-1$ return syncExec(new Result<SWTBotTreeItem>() { + @Override public SWTBotTreeItem run() { return new SWTBotTreeItem(widget.getItem(row)); } @@ -185,6 +190,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { preExpandNotify(); asyncExec(new VoidResult() { + @Override public void run() { widget.setExpanded(true); } @@ -208,6 +214,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { preCollapseNotify(); asyncExec(new VoidResult() { + @Override public void run() { widget.setExpanded(false); } @@ -267,6 +274,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { */ public List<String> getNodes() { return syncExec(new ListResult<String>() { + @Override public List<String> run() { TreeItem[] items = widget.getItems(); List<String> result = new ArrayList<String>(items.length); @@ -331,6 +339,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { */ public List<SWTBotTreeItem> getNodes(final String nodeText) { List<SWTBotTreeItem> foundItems = syncExec(new ListResult<SWTBotTreeItem>() { + @Override public List<SWTBotTreeItem> run() { TreeItem[] items = widget.getItems(); List<SWTBotTreeItem> results = new ArrayList<SWTBotTreeItem>(); @@ -366,6 +375,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { public SWTBotTreeItem select() { waitForEnabled(); syncExec(new VoidResult() { + @Override public void run() { tree.setFocus(); tree.setSelection(widget); @@ -389,6 +399,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { notifyTree(SWT.MouseEnter, createMouseEvent(x, y, 0, SWT.NONE, 0)); notifyTree(SWT.Activate, super.createEvent()); syncExec(new VoidResult() { + @Override public void run() { if (tree.getSelectionCount() != 1 || !tree.getSelection()[0].equals(widget)) { tree.setSelection(widget); @@ -448,6 +459,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { notifyTree(SWT.MouseEnter, createMouseEvent(0, SWT.NONE, 0)); notifyTree(SWT.Activate, super.createEvent()); syncExec(new VoidResult() { + @Override public void run() { if (tree.getSelectionCount() != 1 || !tree.getSelection()[0].equals(widget)) { tree.setSelection(widget); @@ -481,6 +493,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { @Override protected void dragStart() { syncExec(new VoidResult() { + @Override public void run() { tree.setFocus(); tree.setSelection(widget); @@ -496,6 +509,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { @Override protected Rectangle getBounds() { return syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { return widget.getBounds(); } @@ -510,6 +524,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { */ private Rectangle getCellBounds(final int column) { return syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { return widget.getBounds(column); } @@ -606,6 +621,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { */ private void processSelection(final TreeItem item, final boolean add) { syncExec(new VoidResult() { + @Override public void run() { if (add) { tree.select(item); @@ -700,6 +716,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { public boolean isChecked() { assertIsCheck(); return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getChecked(); } @@ -724,6 +741,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { waitForEnabled(); assertIsCheck(); syncExec(new VoidResult() { + @Override public void run() { log.debug(MessageFormat.format("Setting state to {0} on: {1}", (checked ? "checked" : "unchecked"), widget.getText())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ widget.setChecked(checked); @@ -743,6 +761,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { */ private void notifyCheck() { syncExec(new VoidResult() { + @Override public void run() { tree.notifyListeners(SWT.Selection, createCheckEvent()); } @@ -768,6 +787,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { */ public boolean isSelected() { return UIThreadRunnable.syncExec(new BoolResult() { + @Override public Boolean run() { return Arrays.asList(tree.getSelection()).contains(widget); } @@ -783,6 +803,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { public boolean isExpanded() { waitForEnabled(); return UIThreadRunnable.syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getExpanded(); } @@ -796,6 +817,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { */ public SWTBotTreeItem[] getItems() { return syncExec(new ArrayResult<SWTBotTreeItem>() { + @Override public SWTBotTreeItem[] run() { TreeItem[] items = widget.getItems(); List<SWTBotTreeItem> children = new ArrayList<SWTBotTreeItem>(); @@ -812,6 +834,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { @Override public Color foregroundColor() { return syncExec(new Result<Color>() { + @Override public Color run() { return widget.getForeground(); } @@ -821,6 +844,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { @Override public Color backgroundColor() { return syncExec(new Result<Color>() { + @Override public Color run() { return widget.getBackground(); } @@ -837,10 +861,12 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { private SWTBotTreeItem getTreeItem(final String nodeText) throws WidgetNotFoundException { try { new SWTBot().waitUntil(new DefaultCondition() { + @Override public String getFailureMessage() { return "Could not find node with text " + nodeText; //$NON-NLS-1$ } + @Override public boolean test() throws Exception { return getItem(nodeText) != null; } @@ -859,6 +885,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { */ private TreeItem getItem(final int index) { return syncExec(new WidgetResult<TreeItem>() { + @Override public TreeItem run() { return widget.getItem(index); } @@ -873,6 +900,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { */ private TreeItem getItem(final String nodeText) { return syncExec(new WidgetResult<TreeItem>() { + @Override public TreeItem run() { TreeItem[] items = widget.getItems(); for (TreeItem item : items) { @@ -887,6 +915,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { @Override public boolean isEnabled() { return syncExec(new BoolResult() { + @Override public Boolean run() { return tree.isEnabled(); } @@ -896,6 +925,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { public boolean isGrayed() { assertIsCheck(); return syncExec(new BoolResult() { + @Override public Boolean run() { return widget.getGrayed(); } @@ -905,6 +935,7 @@ public class SWTBotTreeItem extends AbstractSWTBot<TreeItem> { @Override protected Rectangle absoluteLocation() { return UIThreadRunnable.syncExec(new Result<Rectangle>() { + @Override public Rectangle run() { return display.map(widget.getParent(), null, widget.getBounds()); } diff --git a/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/FormEditorInput.java b/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/FormEditorInput.java index 5d7dbc5a..a156d262 100755 --- a/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/FormEditorInput.java +++ b/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/FormEditorInput.java @@ -10,7 +10,10 @@ *******************************************************************************/ package org.eclipse.ui.forms.examples.internal; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.*; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IPersistableElement; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.PlatformUI; public class FormEditorInput implements IEditorInput { private String name; @@ -63,7 +66,7 @@ public class FormEditorInput implements IEditorInput { * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + public <T> T getAdapter(Class<T> adapter) { return null; } } diff --git a/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/rcp/NewStylePage.java b/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/rcp/NewStylePage.java index c2edd4db..ca209f89 100755 --- a/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/rcp/NewStylePage.java +++ b/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/rcp/NewStylePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,6 +12,7 @@ package org.eclipse.ui.forms.examples.internal.rcp; import java.text.MessageFormat; import java.util.ArrayList; +import java.util.List; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ControlContribution; @@ -274,7 +275,7 @@ public class NewStylePage extends FormPage { }); Control[] children = client.getChildren(); - ArrayList buttons = new ArrayList(); + List<Button> buttons = new ArrayList<Button>(); for (int i = 0; i < children.length; i++) { if (children[i] instanceof Button) { Button button = (Button) children[i]; @@ -283,7 +284,7 @@ public class NewStylePage extends FormPage { } } } - final Button[] checkboxes = (Button[]) buttons.toArray(new Button[buttons.size()]); + final Button[] checkboxes = buttons.toArray(new Button[buttons.size()]); final Button manageMessage = toolkit.createButton(client2, "Use message manager", SWT.CHECK); diff --git a/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/rcp/SimpleModel.java b/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/rcp/SimpleModel.java index ba1ceab2..0a8eef2d 100755 --- a/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/rcp/SimpleModel.java +++ b/org.eclipse.ui.forms.examples/src/org/eclipse/ui/forms/examples/internal/rcp/SimpleModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. + * Copyright (c) 2000, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.ui.forms.examples.internal.rcp; import java.util.ArrayList; +import java.util.List; /** * @author dejan * @@ -17,10 +18,10 @@ import java.util.ArrayList; * Preferences - Java - Code Generation - Code and Comments */ public class SimpleModel { - private ArrayList modelListeners; - private ArrayList objects; + private List<IModelListener> modelListeners; + private List<NamedObject> objects; public SimpleModel() { - modelListeners = new ArrayList(); + modelListeners = new ArrayList<IModelListener>(); initialize(); } public void addModelListener(IModelListener listener) { @@ -32,7 +33,7 @@ public class SimpleModel { } public void fireModelChanged(Object[] objects, String type, String property) { for (int i = 0; i < modelListeners.size(); i++) { - ((IModelListener) modelListeners.get(i)).modelChanged(objects, + modelListeners.get(i).modelChanged(objects, type, property); } } @@ -40,7 +41,7 @@ public class SimpleModel { return objects.toArray(); } private void initialize() { - objects = new ArrayList(); + objects = new ArrayList<NamedObject>(); NamedObject[] objects = { new TypeOne("TypeOne instance 1", 2, true, "Some text"), new TypeOne("TypeOne instance 2", 1, false, "Different text"), |