|
47 | 47 | import stroom.svg.shared.SvgImage;
|
48 | 48 | import stroom.ui.config.client.UiConfigCache;
|
49 | 49 | import stroom.ui.config.shared.ActivityConfig;
|
| 50 | +import stroom.util.shared.GwtNullSafe; |
50 | 51 | import stroom.widget.button.client.InlineSvgButton;
|
51 | 52 | import stroom.widget.button.client.InlineSvgToggleButton;
|
52 | 53 | import stroom.widget.menu.client.presenter.HideMenuEvent;
|
@@ -213,6 +214,7 @@ protected void onBind() {
|
213 | 214 | registerHandler(getEventBus().addHandler(ContentTabSelectionChangeEvent.getType(), e -> {
|
214 | 215 | selectedDoc = null;
|
215 | 216 | if (e.getTabData() instanceof DocumentTabData) {
|
| 217 | + @SuppressWarnings("PatternVariableCanBeUsed") // cos GWT |
216 | 218 | final DocumentTabData documentTabData = (DocumentTabData) e.getTabData();
|
217 | 219 | selectedDoc = documentTabData.getDocRef();
|
218 | 220 | }
|
@@ -265,7 +267,7 @@ protected void onBind() {
|
265 | 267 | explorerTree.getSelectionModel(),
|
266 | 268 | event.getSelectionType()));
|
267 | 269 | final ExplorerNode selectedNode = explorerTree.getSelectionModel().getSelected();
|
268 |
| - final boolean enabled = explorerTree.getSelectionModel().getSelectedItems().size() > 0 && |
| 270 | + final boolean enabled = GwtNullSafe.hasItems(explorerTree.getSelectionModel().getSelectedItems()) && |
269 | 271 | !ExplorerConstants.isFavouritesNode(selectedNode) &&
|
270 | 272 | !ExplorerConstants.isSystemNode(selectedNode);
|
271 | 273 | add.setEnabled(enabled);
|
@@ -308,7 +310,7 @@ public void newItem(final Element element) {
|
308 | 310 | }
|
309 | 311 |
|
310 | 312 | public void deleteItem() {
|
311 |
| - if (explorerTree.getSelectionModel().getSelectedItems().size() > 0) { |
| 313 | + if (GwtNullSafe.hasItems(explorerTree.getSelectionModel().getSelectedItems())) { |
312 | 314 | ExplorerTreeDeleteEvent.fire(this);
|
313 | 315 | }
|
314 | 316 | }
|
@@ -346,7 +348,7 @@ private void showMenuItems(final PopupPosition popupPosition,
|
346 | 348 | // Tell all plugins to add new menu items.
|
347 | 349 | BeforeRevealMenubarEvent.fire(this, menuItems);
|
348 | 350 | final List<Item> items = menuItems.getMenuItems(MenuKeys.MAIN_MENU);
|
349 |
| - if (items != null && items.size() > 0) { |
| 351 | + if (GwtNullSafe.hasItems(items)) { |
350 | 352 | ShowMenuEvent
|
351 | 353 | .builder()
|
352 | 354 | .items(items)
|
|
0 commit comments