Use unique key for resources (#105)

* Use unique key for resources - Update demo
vaadin · Sep 24, 2019 · d698bca · d698bca
1 parent c836b16
commit d698bca
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/vaadin-context-menu-addon/src/main/java/com/vaadin/contextmenu/ContextMenu.java b/vaadin-context-menu-addon/src/main/java/com/vaadin/contextmenu/ContextMenu.java
@@ -171,7 +171,9 @@ private List<ContextMenuItemState> convertItemsToState(List<MenuItem> items,
                     .getDescriptionContentMode();
             menuItemState.enabled = item.isEnabled();
             menuItemState.separator = item.isSeparator();
-            String key="icon";
+            String key= item.getIcon()!= null ?
+                    String.valueOf(item.getIcon().hashCode())
+                    : "icon";
             ResourceReference resourceReference = ResourceReference.create(item.getIcon(), this, key);
             if (item.getIcon()!=null && (item.getIcon() instanceof ConnectorResource)) {
                 super.getState().resources.put(key,resourceReference);

diff --git a/vaadin-context-menu-demo/src/main/java/com/vaadin/contextmenu/ContextMenuUI.java b/vaadin-context-menu-demo/src/main/java/com/vaadin/contextmenu/ContextMenuUI.java
@@ -86,7 +86,7 @@ private void fillMenu(ContextMenu menu) {
         item.setCheckable(true);
         item.setChecked(true);
 
-        MenuItem item2 = menu.addItem("Disabled",
+        MenuItem item2 = menu.addItem("Disabled",new ClassResource("/images/tiger.jpg"),
                 e -> Notification.show("disabled")
         );
         item2.setDescription("Disabled item");
@@ -118,7 +118,7 @@ private void fillMenu(ContextMenu menu) {
         MenuItem item6 = menu.addItem("Submenu");
         item6.addItem("Subitem", VaadinIcons.OPTION, e -> Notification.show("SubItem"));
         item6.addSeparator();
-        item6.addItem("Subitem", e -> Notification.show("SubItem"))
+        item6.addItem("Subitem",new ThemeResource("images/cat2.jpg"), e -> Notification.show("SubItem"))
                 .setDescription("Test");
         MenuItem openWindowNotification = item6.addItem(
                 "Open Window + Notification",

diff --git a/vaadin-context-menu-demo/src/main/resources/images/tiger.jpg b/vaadin-context-menu-demo/src/main/resources/images/tiger.jpg
diff --git a/vaadin-context-menu-demo/src/main/webapp/VAADIN/themes/contextmenu/images/cat2.jpg b/vaadin-context-menu-demo/src/main/webapp/VAADIN/themes/contextmenu/images/cat2.jpg