diff options
| author | Artur Signell <artur.signell@itmill.com> | 2011-04-26 14:52:10 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2011-04-26 14:52:10 +0000 |
| commit | aafe2fb0be0c801bb63882a3afbf8b431035bd97 (patch) | |
| tree | 8ef1d2252b43821430b1e3548c8c6f2783b55f63 | |
| parent | 934b26bcd2f67d97e57111b0904dcd68f3d2bb55 (diff) | |
| download | vaadin-framework-aafe2fb0be0c801bb63882a3afbf8b431035bd97.tar.gz vaadin-framework-aafe2fb0be0c801bb63882a3afbf8b431035bd97.zip | |
Add support for actions for Table when no row is selected
svn changeset:18475/svn branch:6.6
3 files changed, 16 insertions, 4 deletions
diff --git a/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java index dbc66ff8c3..528fbd7edd 100644 --- a/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java +++ b/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java @@ -38,7 +38,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends items.add(new Action(caption, icon));
}
- public Action[] getActions() {
+ public Action[] getActions(Object target, Object sender) {
Action[] actions = new Action[items.size()];
for (int i = 0; i < items.size(); i++) {
actions[i] = items.get(i);
diff --git a/tests/src/com/vaadin/tests/components/table/Tables.java b/tests/src/com/vaadin/tests/components/table/Tables.java index 46165a5fd4..4a0b914534 100644 --- a/tests/src/com/vaadin/tests/components/table/Tables.java +++ b/tests/src/com/vaadin/tests/components/table/Tables.java @@ -134,7 +134,7 @@ public class Tables extends AbstractSelectTestCase<Table> implements }
public Action[] getActions(Object target, Object sender) {
- return value.getActions();
+ return value.getActions(target, sender);
}
});
}
@@ -184,10 +184,22 @@ public class Tables extends AbstractSelectTestCase<Table> implements ICON_64_EMAIL_REPLY_PNG_UNCACHEABLE));
options.put("Empty", new ContextMenu() {
@Override
- public Action[] getActions() {
+ public Action[] getActions(Object target, Object sender) {
return null;
}
});
+ options.put("Edit/New", new ContextMenu() {
+ @Override
+ public Action[] getActions(Object itemId, Object component) {
+ if (itemId == null) {
+ return new Action[] { new Action("New..."),
+ new Action("Common action") };
+ } else {
+ return new Action[] { new Action("Edit " + itemId),
+ new Action("Common action") };
+ }
+ }
+ });
createSelectAction("Context menu", category, options, "None",
contextMenuCommand, true);
diff --git a/tests/src/com/vaadin/tests/components/tree/Trees.java b/tests/src/com/vaadin/tests/components/tree/Trees.java index dbb340d0ef..076e0c9dda 100644 --- a/tests/src/com/vaadin/tests/components/tree/Trees.java +++ b/tests/src/com/vaadin/tests/components/tree/Trees.java @@ -92,7 +92,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements }
public Action[] getActions(Object target, Object sender) {
- return value.getActions();
+ return value.getActions(target, sender);
}
});
}
|