refresh internal widget collection on sitemap change

This partially reverts eclipse-archived#3846. fixes eclipse-archived#5522 Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
sjsf · May 2, 2018 · 0b03add · 0b03add
1 parent db9f5ff
commit 0b03add
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...temap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/SitemapSubscriptionService.java b/...temap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/SitemapSubscriptionService.java
@@ -281,9 +281,11 @@ public void modelChanged(String modelName, EventType type) {
         for (Entry<String, PageChangeListener> listenerEntry : pageChangeListeners.entrySet()) {
             String sitemapWithPage = listenerEntry.getKey();
             String sitemapName = extractSitemapName(sitemapWithPage);
+            String pageId = extractPageId(sitemapWithPage);
 
             if (sitemapName.equals(changedSitemapName)) {
-                listenerEntry.getValue().sitemapContentChanged();
+                EList<Widget> widgets = collectWidgets(sitemapName, pageId);
+                listenerEntry.getValue().sitemapContentChanged(widgets);
             }
         }
     }

diff --git a/...emap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageChangeListener.java b/...emap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageChangeListener.java
@@ -257,7 +257,9 @@ private boolean definesVisibilityOrColor(Widget w, String name) {
         return false;
     }
 
-    public void sitemapContentChanged() {
+    public void sitemapContentChanged(EList<Widget> widgets) {
+        updateItemsAndWidgets(widgets);
+
         SitemapChangedEvent changeEvent = new SitemapChangedEvent();
         changeEvent.pageId = pageId;
         changeEvent.sitemapName = sitemapName;