Repository: openmeetings Updated Branches: refs/heads/master ad0a8251b -> e02ba1131
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e02ba113 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e02ba113 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e02ba113 Branch: refs/heads/master Commit: e02ba1131ad36f2ea2bbdf31e18461eaae883abc Parents: ad0a825 Author: Maxim Solodovnik <[email protected]> Authored: Wed Oct 4 16:16:27 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Oct 4 16:16:27 2017 +0700 ---------------------------------------------------------------------- .../web/user/dashboard/MyRoomsWidgetDescriptor.java | 2 +- .../openmeetings/web/user/dashboard/OmWidgetDescriptor.java | 7 +++++-- .../web/user/dashboard/RecentRoomsWidgetDescriptor.java | 2 +- .../openmeetings/web/user/dashboard/RssWidgetDescriptor.java | 2 +- .../web/user/dashboard/StartWidgetDescriptor.java | 2 +- .../web/user/dashboard/WelcomeWidgetDescriptor.java | 2 +- .../web/user/dashboard/admin/AdminWidgetDescriptor.java | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e02ba113/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java index 36a1cc7..6647b17 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java @@ -22,6 +22,6 @@ public class MyRoomsWidgetDescriptor extends OmWidgetDescriptor { private static final long serialVersionUID = 1L; public MyRoomsWidgetDescriptor() { - super("781", "782", "om.widget.myrooms"); + super("781", "782", "om.widget.myrooms", MyRoomsWidget.class); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e02ba113/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidgetDescriptor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidgetDescriptor.java index a4110ec..cf74d17 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidgetDescriptor.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidgetDescriptor.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.web.user.dashboard; import org.apache.openmeetings.web.app.Application; +import org.wicketstuff.dashboard.Widget; import org.wicketstuff.dashboard.WidgetDescriptor; public class OmWidgetDescriptor implements WidgetDescriptor { @@ -26,11 +27,13 @@ public class OmWidgetDescriptor implements WidgetDescriptor { private final String name; private final String desc; private final String type; + private final Class<? extends Widget> clazz; - public OmWidgetDescriptor(String name, String desc, String type) { + public OmWidgetDescriptor(String name, String desc, String type, Class<? extends Widget> clazz) { this.name = name; this.desc = desc; this.type = type; + this.clazz = clazz; } @Override @@ -50,7 +53,7 @@ public class OmWidgetDescriptor implements WidgetDescriptor { @Override public String getWidgetClassName() { - return getClass().getName(); + return clazz.getName(); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e02ba113/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetDescriptor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetDescriptor.java index 9e62cf4..585e5f5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetDescriptor.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetDescriptor.java @@ -22,6 +22,6 @@ public class RecentRoomsWidgetDescriptor extends OmWidgetDescriptor { private static final long serialVersionUID = 1L; public RecentRoomsWidgetDescriptor() { - super("widget.recent.title", "widget.recent.desc", "om.widget.recentrooms"); + super("widget.recent.title", "widget.recent.desc", "om.widget.recentrooms", RecentRoomsWidget.class); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e02ba113/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java index b602f01..e4cc24b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java @@ -22,6 +22,6 @@ public class RssWidgetDescriptor extends OmWidgetDescriptor { private static final long serialVersionUID = 1L; public RssWidgetDescriptor() { - super("277", "277", "om.widget.rss"); + super("277", "277", "om.widget.rss", RssWidget.class); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e02ba113/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java index 9c64a29..a3926ef 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java @@ -22,6 +22,6 @@ public class StartWidgetDescriptor extends OmWidgetDescriptor { private static final long serialVersionUID = 1L; public StartWidgetDescriptor() { - super("widget.start.title", "widget.start.desc", "om.widget.start"); + super("widget.start.title", "widget.start.desc", "om.widget.start", StartWidget.class); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e02ba113/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java index a97fa54..20035b8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java @@ -22,6 +22,6 @@ public class WelcomeWidgetDescriptor extends OmWidgetDescriptor { private static final long serialVersionUID = 1L; public WelcomeWidgetDescriptor() { - super("1546", "1547", "om.widget.welcome"); + super("1546", "1547", "om.widget.welcome", WelcomeWidget.class); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e02ba113/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java index e9ea7cf..95e22cc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java @@ -24,6 +24,6 @@ public class AdminWidgetDescriptor extends OmWidgetDescriptor { private static final long serialVersionUID = 1L; public AdminWidgetDescriptor() { - super("dashboard.widget.admin.title", "dashboard.widget.admin.desc", "om.widget.admin"); + super("dashboard.widget.admin.title", "dashboard.widget.admin.desc", "om.widget.admin", AdminWidget.class); } }
