You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/09/17 12:56:23 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2429] widget
titles are not being hardcoded
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new b445477 [OPENMEETINGS-2429] widget titles are not being hardcoded
b445477 is described below
commit b4454773e8e4b11c30582f8c20bec453d34d1e67
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Sep 17 19:56:05 2020 +0700
[OPENMEETINGS-2429] widget titles are not being hardcoded
---
.../web/user/dashboard/MyRoomsWidget.java | 14 ++-----------
.../{WelcomeWidget.java => OmWidget.java} | 24 ++++++++--------------
.../web/user/dashboard/RecentRoomsWidget.java | 14 ++-----------
.../openmeetings/web/user/dashboard/RssWidget.java | 14 ++-----------
.../web/user/dashboard/StartWidget.java | 14 ++-----------
.../web/user/dashboard/WelcomeWidget.java | 14 ++-----------
.../web/user/dashboard/admin/AdminWidget.java | 15 +++-----------
7 files changed, 22 insertions(+), 87 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
index 4562fcb..cb50887 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
@@ -18,27 +18,17 @@
*/
package org.apache.openmeetings.web.user.dashboard;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class MyRoomsWidget extends AbstractWidget {
+public class MyRoomsWidget extends OmWidget {
private static final long serialVersionUID = 1L;
public static final String WIDGET_ID_MY_ROOMS = "MyRoomsWidget";
public MyRoomsWidget() {
- super();
+ super(WIDGET_ID_MY_ROOMS, "781");
location = new WidgetLocation(0, 1);
- init();
- }
-
- @Override
- public void init() {
- super.init();
- title = Application.getString("781");
- id = WIDGET_ID_MY_ROOMS;
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidget.java
similarity index 67%
copy from openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
copy to openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidget.java
index c9977be..4d5b963 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidget.java
@@ -19,29 +19,23 @@
package org.apache.openmeetings.web.user.dashboard;
import org.apache.openmeetings.web.app.Application;
-import org.apache.wicket.model.Model;
import org.wicketstuff.dashboard.AbstractWidget;
-import org.wicketstuff.dashboard.WidgetLocation;
-import org.wicketstuff.dashboard.web.WidgetView;
-public class WelcomeWidget extends AbstractWidget {
+public abstract class OmWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
+ private final String label;
- public WelcomeWidget() {
- super();
- location = new WidgetLocation(0, 0);
- init();
+ public OmWidget(String id, String label) {
+ this.id = id;
+ this.label = label;
}
- @Override
- public void init() {
- super.init();
- title = Application.getString("1546");
- id = "WelcomeWidget";
+ public String getLabel() {
+ return label;
}
@Override
- public WidgetView createView(String viewId) {
- return new WelcomeWidgetView(viewId, new Model<>(this));
+ public String getTitle() {
+ return Application.getString(label);
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java
index a42da35..18a9363 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java
@@ -18,27 +18,17 @@
*/
package org.apache.openmeetings.web.user.dashboard;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class RecentRoomsWidget extends AbstractWidget {
+public class RecentRoomsWidget extends OmWidget {
private static final long serialVersionUID = 1L;
public static final String WIDGET_ID_RECENT_ROOMS = "RecentRoomsWidget";
public RecentRoomsWidget() {
- super();
+ super(WIDGET_ID_RECENT_ROOMS, "widget.recent.title");
location = new WidgetLocation(1, 1);
- init();
- }
-
- @Override
- public void init() {
- super.init();
- title = Application.getString("widget.recent.title");
- id = WIDGET_ID_RECENT_ROOMS;
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
index 99b6df7..4afc86b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
@@ -18,27 +18,17 @@
*/
package org.apache.openmeetings.web.user.dashboard;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class RssWidget extends AbstractWidget {
+public class RssWidget extends OmWidget {
private static final long serialVersionUID = 1L;
public static final String WIDGET_ID_RSS = "RssWidget";
public RssWidget() {
- super();
+ super(WIDGET_ID_RSS, "277");
location = new WidgetLocation(1, 1);
- init();
- }
-
- @Override
- public void init() {
- super.init();
- title = Application.getString("277");
- id = WIDGET_ID_RSS;
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
index da8f200..9e31a3e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
@@ -18,26 +18,16 @@
*/
package org.apache.openmeetings.web.user.dashboard;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class StartWidget extends AbstractWidget {
+public class StartWidget extends OmWidget {
private static final long serialVersionUID = 1L;
public StartWidget() {
- super();
+ super("StartWidget", "widget.start.title");
location = new WidgetLocation(1, 0);
- init();
- }
-
- @Override
- public void init() {
- super.init();
- title = Application.getString("widget.start.title");
- id = "StartWidget";
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
index c9977be..8151099 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
@@ -18,26 +18,16 @@
*/
package org.apache.openmeetings.web.user.dashboard;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class WelcomeWidget extends AbstractWidget {
+public class WelcomeWidget extends OmWidget {
private static final long serialVersionUID = 1L;
public WelcomeWidget() {
- super();
+ super("WelcomeWidget", "1546");
location = new WidgetLocation(0, 0);
- init();
- }
-
- @Override
- public void init() {
- super.init();
- title = Application.getString("1546");
- id = "WelcomeWidget";
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
index 92015a4..3bc2a2e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
@@ -18,27 +18,18 @@
*/
package org.apache.openmeetings.web.user.dashboard.admin;
-import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.user.dashboard.OmWidget;
import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class AdminWidget extends AbstractWidget {
+public class AdminWidget extends OmWidget {
private static final long serialVersionUID = 1L;
public static final String WIDGET_ID_ADMIN = "AdminWidget";
public AdminWidget() {
- super();
+ super(WIDGET_ID_ADMIN, "dashboard.widget.admin.title");
location = new WidgetLocation(0, 2);
- init();
- }
-
- @Override
- public void init() {
- super.init();
- title = Application.getString("dashboard.widget.admin.title");
- id = WIDGET_ID_ADMIN;
}
@Override