Reload BasicUI if sitemap has been changed

Signed-off-by: Stefan Triller <stefan.triller@telekom.de>
eclipse-archived · Jul 17, 2017 · a373b6c · a373b6c
1 parent 8776d5e
commit a373b6c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 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
@@ -267,14 +267,10 @@ 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)) {
-                EList<Widget> widgets = collectWidgets(sitemapName, pageId);
-                listenerEntry.getValue().sitemapContentChanged(widgets);
+                listenerEntry.getValue().sitemapContentChanged();
             }
         }
-
     }
-
 }
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
@@ -213,8 +213,13 @@ private boolean definesVisibility(Widget w, String name) {
         return false;
     }
 
-    public void sitemapContentChanged(EList<Widget> widgets) {
-        updateItemsAndWidgets(widgets);
+    public void sitemapContentChanged() {
+        for (SitemapSubscriptionCallback callback : distinctCallbacks) {
+            SitemapChangedEvent changeEvent = new SitemapChangedEvent();
+            changeEvent.pageId = pageId;
+            changeEvent.sitemapName = sitemapName;
+            callback.onEvent(changeEvent);
+        }
     }
 
 }
diff --git a/...map/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapChangedEvent.java b/...map/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapChangedEvent.java
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) 2014-2017 by the respective copyright holders.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.smarthome.io.rest.sitemap.internal;
+
+/**
+ * Event to notify the browser that the sitemap has been changed
+ *
+ * @author Stefan Triller - Initial Contribution
+ *
+ */
+public class SitemapChangedEvent extends SitemapEvent {
+    public final String TYPE = "SITEMAP_CHANGED";
+}
diff --git a/...marthome.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java b/...marthome.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java
@@ -515,7 +515,7 @@ public Widget getWidget(Sitemap sitemap, String id) {
                     for (int i = 2; i < id.length(); i += 2) {
                         w = ((LinkableWidget) w).getChildren().get(Integer.valueOf(id.substring(i, i + 2)));
                     }
-                } catch (NumberFormatException e) {
+                } catch (NumberFormatException | IndexOutOfBoundsException e) {
                     // no valid number, so the requested page id does not exist
                 }
             }