diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/table/FilterableTableExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/table/FilterableTableExample.java index 7b0c9d1eb..55d8e2d51 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/table/FilterableTableExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/table/FilterableTableExample.java @@ -430,22 +430,22 @@ public void filterBeanList() { } List selectedItems = new ArrayList<>(); - List menuSelectedItems; + List menuSelectedItems; if (firstNameFilterMenu.isVisible()) { - menuSelectedItems = firstNameFilterMenu.getSelectedItems(); + menuSelectedItems = firstNameFilterMenu.getSelectedMenuItems(); if (menuSelectedItems != null && !menuSelectedItems.isEmpty()) { selectedItems.addAll(menuSelectedItems); } } if (lastNameFilterMenu.isVisible()) { - menuSelectedItems = lastNameFilterMenu.getSelectedItems(); + menuSelectedItems = lastNameFilterMenu.getSelectedMenuItems(); if (menuSelectedItems != null && !menuSelectedItems.isEmpty()) { selectedItems.addAll(menuSelectedItems); } } if (dobFilterMenu.isVisible()) { - menuSelectedItems = dobFilterMenu.getSelectedItems(); + menuSelectedItems = dobFilterMenu.getSelectedMenuItems(); if (menuSelectedItems != null && !menuSelectedItems.isEmpty()) { selectedItems.addAll(menuSelectedItems); } diff --git a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WMenuSelectModeExample.java b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WMenuSelectModeExample.java index 724b43476..c41b56ff5 100755 --- a/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WMenuSelectModeExample.java +++ b/wcomponents-examples/src/main/java/com/github/bordertech/wcomponents/examples/theme/WMenuSelectModeExample.java @@ -3,6 +3,7 @@ import com.github.bordertech.wcomponents.Action; import com.github.bordertech.wcomponents.ActionEvent; import com.github.bordertech.wcomponents.HeadingLevel; +import com.github.bordertech.wcomponents.MenuItemSelectable; import com.github.bordertech.wcomponents.Request; import com.github.bordertech.wcomponents.WAjaxControl; import com.github.bordertech.wcomponents.WButton; @@ -25,6 +26,7 @@ import com.github.bordertech.wcomponents.WTabSet.TabMode; import com.github.bordertech.wcomponents.WText; import com.github.bordertech.wcomponents.subordinate.builder.SubordinateBuilder; + import java.util.List; /** @@ -333,9 +335,9 @@ private void createHideShowControl(final WFieldLayout layout, final WCheckBox bo * Handle selected text. */ private void handleSelectedText() { - List list = menu.getSelectedItems(); + List list = menu.getSelectedMenuItems(); StringBuffer selected = new StringBuffer(); - for (WComponent comp : list) { + for (MenuItemSelectable comp : list) { if (comp instanceof WMenuItem) { WMenuItem item = (WMenuItem) comp; selected.append(item.getText()).append(", ");