diff options
author | Mariot Chauvin | 2009-09-24 14:24:16 +0000 |
---|---|---|
committer | Mariot Chauvin | 2009-09-24 14:24:16 +0000 |
commit | 0706d1dff855144d9017564313a4aa5d6bc83c41 (patch) | |
tree | 2076126e4e3be99a0dc94a9d682c8c70a7ff234b | |
parent | e71d0d749071e119a77e6a6115ebe1f26d04cdd6 (diff) | |
download | org.eclipse.swtbot-0706d1dff855144d9017564313a4aa5d6bc83c41.tar.gz org.eclipse.swtbot-0706d1dff855144d9017564313a4aa5d6bc83c41.tar.xz org.eclipse.swtbot-0706d1dff855144d9017564313a4aa5d6bc83c41.zip |
bug 286781
3 files changed, 5 insertions, 4 deletions
diff --git a/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SWTBotGefEditPart.java b/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SWTBotGefEditPart.java index adf5aae0..c58256fe 100644 --- a/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SWTBotGefEditPart.java +++ b/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SWTBotGefEditPart.java @@ -77,7 +77,7 @@ public class SWTBotGefEditPart { * @return a list of matches or an empty list if there are none */ @SuppressWarnings("unchecked") - public List<SWTBotGefEditPart> ancestors(final Matcher<SWTBotGefEditPart> matcher) { + public List<SWTBotGefEditPart> ancestors(final Matcher<? extends EditPart> matcher) { return UIThreadRunnable.syncExec(new Result<List<SWTBotGefEditPart>>() { public List<SWTBotGefEditPart> run() { List<SWTBotGefEditPart> ancestors = new ArrayList<SWTBotGefEditPart>(); diff --git a/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SWTBotGefEditor.java b/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SWTBotGefEditor.java index 695f1da5..35291be3 100644 --- a/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SWTBotGefEditor.java +++ b/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SWTBotGefEditor.java @@ -9,7 +9,7 @@ * MAKE Technologies Inc - initial API and implementation * Mariot Chauvin <mariot.chauvin@obeo.fr> - refactoring * Steve Monnier <steve.monnier@obeo.fr> - add mouseMoveDoubleClick action - * Nathalie Lépine <nathalie.lepine@obeo.fr> - add mouseMoveDoubleClick action + * Nathalie L�pine <nathalie.lepine@obeo.fr> - add mouseMoveDoubleClick action *******************************************************************************/ package org.eclipse.swtbot.eclipse.gef.finder.widgets; @@ -310,7 +310,7 @@ public class SWTBotGefEditor extends AbstractSWTBotEclipseEditor { * @return a collection of {@link SWTBotGefEditPart} * @throws WidgetNotFoundException */ - public List<SWTBotGefEditPart> editParts(Matcher<SWTBotGefEditPart> matcher) throws WidgetNotFoundException { + public List<SWTBotGefEditPart> editParts(Matcher<? extends EditPart> matcher) throws WidgetNotFoundException { return rootEditPart().ancestors(matcher); } diff --git a/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SwtBotGefConnectionEditPart.java b/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SwtBotGefConnectionEditPart.java index 3a7b26d6..87110339 100644 --- a/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SwtBotGefConnectionEditPart.java +++ b/org.eclipse.swtbot.eclipse.gef.finder/src/org/eclipse/swtbot/eclipse/gef/finder/widgets/SwtBotGefConnectionEditPart.java @@ -15,6 +15,7 @@ package org.eclipse.swtbot.eclipse.gef.finder.widgets; import java.util.Collections; import java.util.List; +import org.eclipse.gef.EditPart; import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.results.Result; import org.hamcrest.Matcher; @@ -76,7 +77,7 @@ public class SwtBotGefConnectionEditPart extends SWTBotGefEditPart { * @see net.sf.swtbot.eclipse.gef.EditPart#ancestors(org.hamcrest.Matcher) */ @Override - public List<SWTBotGefEditPart> ancestors(Matcher<SWTBotGefEditPart> matcher) { + public List<SWTBotGefEditPart> ancestors(Matcher<? extends EditPart> matcher) { return Collections.emptyList(); } |