Repository: openmeetings Updated Branches: refs/heads/master 687415930 -> d1466705d
[OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d1466705 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d1466705 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d1466705 Branch: refs/heads/master Commit: d1466705df13d0a57cfa8b8733d0d26bfb50a72c Parents: 6874159 Author: Maxim Solodovnik <[email protected]> Authored: Tue Oct 10 12:54:41 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Oct 10 12:54:41 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/backup/converter/DateConverter.java | 4 +++- .../openmeetings/util/OpenmeetingsVariables.java | 2 ++ .../web/admin/configurations/ConfigsPanel.java | 4 +++- .../web/admin/connection/ConnectionsPanel.java | 3 ++- .../openmeetings/web/admin/email/EmailPanel.java | 4 +++- .../web/admin/groups/GroupUsersPanel.java | 3 ++- .../openmeetings/web/admin/groups/GroupsPanel.java | 4 +++- .../openmeetings/web/admin/labels/LangPanel.java | 3 ++- .../openmeetings/web/admin/ldaps/LdapsPanel.java | 4 +++- .../openmeetings/web/admin/oauth/OAuthPanel.java | 4 +++- .../openmeetings/web/admin/rooms/RoomForm.java | 3 ++- .../openmeetings/web/admin/rooms/RoomsPanel.java | 3 ++- .../openmeetings/web/admin/users/UsersPanel.java | 4 +++- .../apache/openmeetings/web/common/ImagePanel.java | 4 +++- .../openmeetings/web/common/menu/MenuPanel.java | 9 ++++++--- .../web/common/tree/ConvertingErrorsDialog.java | 3 ++- .../openmeetings/web/common/tree/FileTreePanel.java | 7 ++++--- .../openmeetings/web/common/tree/FolderPanel.java | 6 ++++-- .../org/apache/openmeetings/web/room/RoomPanel.java | 3 ++- .../web/room/activities/ActivitiesPanel.java | 11 ++++++----- .../openmeetings/web/room/menu/RoomMenuPanel.java | 8 +++++--- .../web/room/menu/StartSharingButton.java | 3 ++- .../web/room/sidebar/RoomClientPanel.java | 8 +++++--- .../openmeetings/web/room/sidebar/RoomSidebar.java | 6 ++++-- .../web/room/sidebar/icon/ClientIcon.java | 6 ++++-- .../org/apache/openmeetings/web/room/wb/WbPanel.java | 3 ++- .../web/user/profile/MessagesContactsPanel.java | 15 ++++++++------- .../web/user/profile/UserSearchPanel.java | 3 ++- .../openmeetings/web/user/rooms/RoomListPanel.java | 4 +++- 29 files changed, 95 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/DateConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/DateConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/DateConverter.java index b24e0ce..a7d352b 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/DateConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/DateConverter.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.backup.converter; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; + import java.util.Date; import org.apache.openmeetings.util.CalendarPatterns; @@ -34,7 +36,7 @@ public class DateConverter implements Converter<Date> { @Override public void write(OutputNode node, Date value) throws Exception { - node.setAttribute("class", "java.util.Date"); + node.setAttribute(ATTR_CLASS, "java.util.Date"); node.setData(true); node.setValue(value == null ? "0" : CalendarPatterns.getExportDate(value)); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java index 3c6c86b..a694819 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java @@ -21,6 +21,8 @@ package org.apache.openmeetings.util; import com.github.openjson.JSONObject; public class OpenmeetingsVariables { + public static final String ATTR_CLASS = "class"; + public static final String ATTR_TITLE = "title"; public static final String CONFIG_CRYPT = "crypt.class.name"; public static final String CONFIG_DASHBOARD_SHOW_CHAT = "dashboard.show.chat"; public static final String CONFIG_DASHBOARD_SHOW_MYROOMS = "dashboard.show.myrooms"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java index f417c49..1f3db9b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.admin.configurations; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; + import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.entity.basic.Configuration; import org.apache.openmeetings.web.admin.AdminBasePanel; @@ -68,7 +70,7 @@ public class ConfigsPanel extends AdminBasePanel { target.appendJavaScript("adminPanelInit();"); } }); - item.add(AttributeModifier.replace("class", getRowClass(c.getId(), form.getModelObject().getId()))); + item.add(AttributeModifier.replace(ATTR_CLASS, getRowClass(c.getId(), form.getModelObject().getId()))); } }; add(listContainer.add(dataView).setOutputMarkupId(true)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java index 39f0c54..6aa1ea8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.web.admin.connection; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.web.app.Application.getBean; import java.lang.reflect.Field; @@ -144,7 +145,7 @@ public class ConnectionsPanel extends AdminBasePanel { target.add(details.setVisible(true)); } }); - item.add(AttributeModifier.append("class", ROW_CLASS)); + item.add(AttributeModifier.append(ATTR_CLASS, ROW_CLASS)); } }; add(container.add(dataView).setOutputMarkupId(true), details.setVisible(false).setOutputMarkupPlaceholderTag(true)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java index 5406b4b..2c60d9c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.admin.email; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; + import org.apache.openmeetings.db.dao.basic.MailMessageDao; import org.apache.openmeetings.db.entity.basic.MailMessage; import org.apache.openmeetings.web.admin.AdminBasePanel; @@ -61,7 +63,7 @@ public class EmailPanel extends AdminBasePanel { target.add(form, list); } }); - item.add(AttributeModifier.replace("class", getRowClass(m))); + item.add(AttributeModifier.replace(ATTR_CLASS, getRowClass(m))); } }; add(list.add(dataView).setOutputMarkupId(true)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java index 6685fbf..e4db41f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.web.admin.groups; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.web.app.Application.getBean; import java.util.ArrayList; @@ -69,7 +70,7 @@ public class GroupUsersPanel extends Panel { User u = grpUser.getUser(); Label label = new Label("label", u == null ? "" : GroupForm.formatUser(u)); if (grpUser.getId() == null) { - label.add(AttributeModifier.append("class", "newItem")); + label.add(AttributeModifier.append(ATTR_CLASS, "newItem")); } item.add(label); item.add(new ConfirmableAjaxBorder("deleteUserBtn", getString("80"), getString("833")) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java index 2d85ad0..9fd12a5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.admin.groups; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; + import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.entity.user.Group; import org.apache.openmeetings.db.entity.user.GroupUser; @@ -76,7 +78,7 @@ public class GroupsPanel extends AdminBasePanel { target.appendJavaScript("adminPanelInit();"); } }); - item.add(AttributeModifier.append("class", getRowClass(g.getId(), form.getModelObject().getId()))); + item.add(AttributeModifier.append(ATTR_CLASS, getRowClass(g.getId(), form.getModelObject().getId()))); } }; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java index 9690a71..6c45812 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.web.admin.labels; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.IOException; @@ -123,7 +124,7 @@ public class LangPanel extends AdminBasePanel { target.appendJavaScript("adminPanelInit();"); } }); - item.add(AttributeModifier.append("class", getRowClass(fv.getId(), form.getModelObject().getId()))); + item.add(AttributeModifier.append(ATTR_CLASS, getRowClass(fv.getId(), form.getModelObject().getId()))); } }; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java index 97371ac..e46c3a0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.admin.ldaps; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; + import org.apache.openmeetings.db.dao.server.LdapConfigDao; import org.apache.openmeetings.db.entity.server.LdapConfig; import org.apache.openmeetings.web.admin.AdminBasePanel; @@ -67,7 +69,7 @@ public class LdapsPanel extends AdminBasePanel { target.appendJavaScript("adminPanelInit();"); } }); - item.add(AttributeModifier.replace("class", getRowClass(lc.getId(), form.getModelObject().getId()))); + item.add(AttributeModifier.replace(ATTR_CLASS, getRowClass(lc.getId(), form.getModelObject().getId()))); } }; add(listContainer.add(dataView).setOutputMarkupId(true)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java index 5b0c18e..7d1cca6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.admin.oauth; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; + import org.apache.openmeetings.db.dao.server.OAuth2Dao; import org.apache.openmeetings.db.entity.server.OAuthServer; import org.apache.openmeetings.web.admin.AdminBasePanel; @@ -61,7 +63,7 @@ public class OAuthPanel extends AdminBasePanel { target.appendJavaScript("adminPanelInit();"); } }); - item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId()))); + item.add(AttributeModifier.replace(ATTR_CLASS, getRowClass(server.getId(), form.getModelObject().getId()))); } }; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java index e7010e8..d9d85da 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.web.admin.rooms; import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.web.admin.AdminUserChoiceProvider.PAGE_SIZE; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.getRights; @@ -295,7 +296,7 @@ public class RoomForm extends AdminBaseForm<Room> { RoomModerator moderator = item.getModelObject(); Label name = new Label("uName", moderator.getUser().getFirstname() + " " + moderator.getUser().getLastname()); if (moderator.getId() == null) { - name.add(AttributeModifier.append("class", "newItem")); + name.add(AttributeModifier.append(ATTR_CLASS, "newItem")); } item.add(new CheckBox("superModerator", new PropertyModel<Boolean>(moderator, "superModerator"))) .add(new Label("userId", "" + moderator.getUser().getId())) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java index cd73387..275ae28 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.web.admin.rooms; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.web.app.Application.getBean; import org.apache.openmeetings.db.dao.room.RoomDao; @@ -66,7 +67,7 @@ public class RoomsPanel extends AdminBasePanel { target.appendJavaScript("adminPanelInit();"); } }); - item.add(AttributeModifier.replace("class", getRowClass(room.getId(), form.getModelObject().getId()))); + item.add(AttributeModifier.replace(ATTR_CLASS, getRowClass(room.getId(), form.getModelObject().getId()))); } }; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java index bfb425f..514aca8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java @@ -18,11 +18,13 @@ */ package org.apache.openmeetings.web.admin.users; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.getUserId; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.User; +import org.apache.openmeetings.util.OpenmeetingsVariables; import org.apache.openmeetings.web.admin.AdminBasePanel; import org.apache.openmeetings.web.admin.SearchableDataView; import org.apache.openmeetings.web.app.Application; @@ -82,7 +84,7 @@ public class UsersPanel extends AdminBasePanel { form.update(target); } }); - item.add(AttributeModifier.append("class", getRowClass(u.getId(), form.getModelObject().getId()))); + item.add(AttributeModifier.append(ATTR_CLASS, getRowClass(u.getId(), form.getModelObject().getId()))); } }; add(listContainer.add(dataView).setOutputMarkupId(true)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java index c6bceb3..dc07b37 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.common; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE; + import org.apache.wicket.AttributeModifier; import org.apache.wicket.markup.html.TransparentWebMarkupContainer; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -47,7 +49,7 @@ public abstract class ImagePanel extends Panel { public void update() { profile.addOrReplace(new WebMarkupContainer("img").add( AttributeModifier.append("alt", getTitle()) - , AttributeModifier.append("title", getTitle()) + , AttributeModifier.append(ATTR_TITLE, getTitle()) , AttributeModifier.append("src", getImageUrl()))); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java index fd370e1..6feac5e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java @@ -18,6 +18,9 @@ */ package org.apache.openmeetings.web.common.menu; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE; + import java.util.List; import org.apache.wicket.AttributeModifier; @@ -52,12 +55,12 @@ public class MenuPanel extends Panel { protected void addMenuItem(ListItem<IMenuItem> item, IMenuItem menuItem) { super.addMenuItem(item, menuItem); MenuItem m = (MenuItem)menuItem; - item.add(AttributeModifier.append("class", m.isTop() ? "top" : "sub")); + item.add(AttributeModifier.append(ATTR_CLASS, m.isTop() ? "top" : "sub")); if (!Strings.isEmpty(m.getDesc())) { - item.add(AttributeModifier.append("title", m.getDesc())); + item.add(AttributeModifier.append(ATTR_TITLE, m.getDesc())); } if (!Strings.isEmpty(m.getIcon())) { - item.add(AttributeModifier.append("class", m.getIcon())); + item.add(AttributeModifier.append(ATTR_CLASS, m.getIcon())); } } }); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java index 801a924..0c49b65 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.web.common.tree; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.web.app.Application.getBean; import java.util.ArrayList; @@ -52,7 +53,7 @@ public class ConvertingErrorsDialog extends AbstractDialog<BaseFileItem> { item.add(new Label("exitCode", l.getExitCode())); item.add(new Label("message", l.getMessage())); if (!l.isOk()) { - item.add(AttributeModifier.replace("class", "alert")); + item.add(AttributeModifier.replace(ATTR_CLASS, "alert")); } } }; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java index 6b82454..d619a3d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java @@ -21,6 +21,7 @@ package org.apache.openmeetings.web.common.tree; import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.getUserId; import static org.apache.wicket.util.time.Duration.NONE; @@ -275,10 +276,10 @@ public abstract class FileTreePanel extends Panel { this.readOnly = readOnly; tree.refreshRoots(!readOnly); createDir.setEnabled(!readOnly); - createDir.add(AttributeModifier.replace("class", new StringBuilder(CREATE_DIR_CLASS).append(readOnly ? DISABLED_CLASS : ""))); + createDir.add(AttributeModifier.replace(ATTR_CLASS, new StringBuilder(CREATE_DIR_CLASS).append(readOnly ? DISABLED_CLASS : ""))); upload.setEnabled(!readOnly); - upload.add(AttributeModifier.replace("class", new StringBuilder(UPLOAD_CLASS).append(readOnly ? DISABLED_CLASS : ""))); - trashBorder.add(AttributeModifier.replace("class", new StringBuilder(TRASH_CLASS).append(readOnly ? DISABLED_CLASS : ""))); + upload.add(AttributeModifier.replace(ATTR_CLASS, new StringBuilder(UPLOAD_CLASS).append(readOnly ? DISABLED_CLASS : ""))); + trashBorder.add(AttributeModifier.replace(ATTR_CLASS, new StringBuilder(TRASH_CLASS).append(readOnly ? DISABLED_CLASS : ""))); if (handler != null) { handler.add(createDir, upload, trashBorder); update(handler); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java index 257a251..0b66141 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.common.tree; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE; import static org.apache.openmeetings.web.app.Application.getBean; import java.util.Map.Entry; @@ -95,7 +97,7 @@ public class FolderPanel extends Panel { } }.setContainment(treePanel.getContainment()); String cls = r instanceof Recording ? "recorditem" : "fileitem"; - drag.add(AttributeModifier.append("class", r.isReadOnly() ? "readonlyitem" : cls)); + drag.add(AttributeModifier.append(ATTR_CLASS, r.isReadOnly() ? "readonlyitem" : cls)); } Component name = r.getId() == null || !editable ? new Label("name", r.getName()) : new AjaxEditableLabel<String>("name", Model.of(model.getObject().getName())) { private static final long serialVersionUID = 1L; @@ -119,7 +121,7 @@ public class FolderPanel extends Panel { }; drag.add(name); add(drop.add(drag).setOutputMarkupId(true)); - add(AttributeModifier.append("title", r.getName())); + add(AttributeModifier.append(ATTR_TITLE, r.getName())); } private static void moveAll(final FileTreePanel treePanel, AjaxRequestTarget target, BaseFileItem p) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index fc940ee..06540e6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.web.room; import static org.apache.openmeetings.db.util.RoomHelper.videoJson; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.web.app.Application.addUserToRoom; import static org.apache.openmeetings.web.app.Application.exitRoom; @@ -244,7 +245,7 @@ public class RoomPanel extends BasePanel { Component accessDenied = new WebMarkupContainer(ACCESS_DENIED_ID).setVisible(false); Component eventDetail = new WebMarkupContainer(EVENT_DETAILS_ID).setVisible(false); - room.add(AttributeModifier.append("class", r.getType().name())); + room.add(AttributeModifier.append(ATTR_CLASS, r.getType().name())); room.add(menu = new RoomMenuPanel("menu", this)); room.add(AttributeModifier.append("data-room-id", r.getId())); if (isInterview) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java index 57c6385..64170ce 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java @@ -21,6 +21,7 @@ package org.apache.openmeetings.web.room.activities; import static org.apache.openmeetings.core.util.WebSocketHelper.sendRoom; import static org.apache.openmeetings.db.dao.room.SipDao.SIP_FIRST_NAME; import static org.apache.openmeetings.util.OmFileHelper.SIP_USER_ID; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.Application.getOnlineClient; @@ -240,12 +241,12 @@ public class ActivitiesPanel extends Panel { } final String align = ((BasePage)getPage()).isRtl() ? ALIGN_LEFT : ALIGN_RIGHT; item.add(new WebMarkupContainer("close").add(addOnClick(String.format(ACTIVITY_FUNC_FMT, roomId, Action.close.name(), a.getId()))) - .add(AttributeModifier.append("class", align))); - item.add(accept.add(AttributeModifier.append("class", align)) - , decline.add(AttributeModifier.append("class", align)) - , find.add(AttributeModifier.append("class", align)) + .add(AttributeModifier.append(ATTR_CLASS, align))); + item.add(accept.add(AttributeModifier.append(ATTR_CLASS, align)) + , decline.add(AttributeModifier.append(ATTR_CLASS, align)) + , find.add(AttributeModifier.append(ATTR_CLASS, align)) , new Label("text", text)); - item.add(AttributeModifier.append("class", getClass(a))); + item.add(AttributeModifier.append(ATTR_CLASS, getClass(a))); } private String getClass(Activity a) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java index 2d358ba..0c4c8f3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java @@ -21,6 +21,8 @@ package org.apache.openmeetings.web.room.menu; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL; import static org.apache.openmeetings.web.app.Application.exitRoom; @@ -249,7 +251,7 @@ public class RoomMenuPanel extends Panel { @Override protected void onInitialize() { super.onInitialize(); - add(askBtn.add(AttributeModifier.replace("title", getString("84")))); + add(askBtn.add(AttributeModifier.replace(ATTR_TITLE, getString("84")))); Label demo = new Label("demo", Model.of("")); Room r = room.getRoom(); add(demo.setVisible(r.isDemoRoom() && r.getDemoTime() != null && room.getRoom().getDemoTime().intValue() > 0)); @@ -259,7 +261,7 @@ public class RoomMenuPanel extends Panel { @Override protected void onTimer(int remain) { - getComponent().add(AttributeModifier.replace("title", getText("639", remain))); + getComponent().add(AttributeModifier.replace(ATTR_TITLE, getText("639", remain))); } @Override @@ -353,7 +355,7 @@ public class RoomMenuPanel extends Panel { roomClass.append(" screen"); } } - handler.add(roomName.add(AttributeModifier.replace("class", roomClass), AttributeModifier.replace("title", roomTitle))); + handler.add(roomName.add(AttributeModifier.replace(ATTR_CLASS, roomClass), AttributeModifier.replace(ATTR_TITLE, roomTitle))); handler.add(askBtn.setVisible(!moder && r.isAllowUserQuestions())); handler.add(shareBtn.setVisible(shareVisible)); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java index a9c1ae8..3dd68f2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.web.room.menu; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_ALLOW_REMOTE; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW; @@ -68,7 +69,7 @@ public class StartSharingButton extends OmButton { this.uid = uid; setOutputMarkupPlaceholderTag(true); setVisible(false); - add(AttributeModifier.replace("title", Application.getString("1480"))); + add(AttributeModifier.replace(ATTR_TITLE, Application.getString("1480"))); add(download = new AjaxDownloadBehavior(new ResourceStreamResource() { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java index 8828388..a99f35a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.room.sidebar; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE; import static org.apache.openmeetings.web.app.WebSession.getUserId; import static org.apache.openmeetings.web.pages.BasePage.ALIGN_LEFT; import static org.apache.openmeetings.web.pages.BasePage.ALIGN_RIGHT; @@ -53,14 +55,14 @@ public class RoomClientPanel extends Panel { final String name = getName(c); add(new Label("name", name)); add(new UserSpeaksIcon("user-speaks", uid, room)); - item.add(AttributeModifier.replace("title", name)); + item.add(AttributeModifier.replace(ATTR_TITLE, name)); WebMarkupContainer actions = new WebMarkupContainer("actions"); actions.add(new KickIcon("kick", uid, room)); actions.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat) && !getUserId().equals(c.getUserId()))); actions.setVisible(room.getClient().hasRight(Right.moderator)); if (c.getUid().equals(room.getClient().getUid())) { actions.add(new SelfIconsPanel("icons", uid, room, false)); - item.add(AttributeModifier.append("class", "current")); + item.add(AttributeModifier.append(ATTR_CLASS, "current")); } else { actions.add(new ClientIconsPanel("icons", uid, room)); } @@ -105,6 +107,6 @@ public class RoomClientPanel extends Panel { } status = String.format("%s %s", status, ((BasePage)getPage()).isRtl() ? ALIGN_LEFT : ALIGN_RIGHT); //TODO add ability to change 'first/last name' - add(new WebMarkupContainer("status").add(AttributeModifier.append("class", status), AttributeModifier.replace("title", getString(statusTitle)))); + add(new WebMarkupContainer("status").add(AttributeModifier.append(ATTR_CLASS, status), AttributeModifier.replace(ATTR_TITLE, getString(statusTitle)))); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java index 8dddd6a..2ed87a9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.room.sidebar; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.web.app.Application.getOnlineClient; import static org.apache.openmeetings.web.app.Application.getRoomClients; @@ -316,8 +318,8 @@ public class RoomSidebar extends Panel { WebMarkupContainer t = super.newTabContainer(id, tabId, tab, index); Component link = newTitleLabel("link", tab.getTitle()); link.add(AttributeModifier.replace("href", "#" + tabId)); - link.add(AttributeModifier.append("class", ((OmTab)tab).getCssClass())); - link.add(AttributeModifier.append("title", tab.getTitle())); + link.add(AttributeModifier.append(ATTR_CLASS, ((OmTab)tab).getCssClass())); + link.add(AttributeModifier.append(ATTR_TITLE, tab.getTitle())); t.replace(link); return t; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java index 4eb2a61..3c7f7ec 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.room.sidebar.icon; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE; import static org.apache.openmeetings.web.app.Application.getOnlineClient; import static org.apache.openmeetings.web.pages.BasePage.ALIGN_LEFT; import static org.apache.openmeetings.web.pages.BasePage.ALIGN_RIGHT; @@ -80,8 +82,8 @@ public abstract class ClientIcon extends WebMarkupContainer { add(addOnClick("")); } internalUpdate(); - add(AttributeModifier.replace("title", getTitle())); - add(AttributeModifier.replace("class", cls.append(cssClass))); + add(AttributeModifier.replace(ATTR_TITLE, getTitle())); + add(AttributeModifier.replace(ATTR_CLASS, cls.append(cssClass))); if (handler != null) { handler.add(this); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java index cd4ab95..40a5648 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.web.room.wb; import static org.apache.openmeetings.db.dto.room.Whiteboard.ITEMS_KEY; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.room.wb.WbWebSocketHelper.getObjWbJson; @@ -152,7 +153,7 @@ public class WbPanel extends AbstractWbPanel { @Override protected void populateItem(ListItem<String> item) { String cls = String.format("clipart-%s", item.getIndex()); - item.add(append("class", cls), append("data-mode", cls) + item.add(append(ATTR_CLASS, cls), append("data-mode", cls) , append("data-image", item.getModelObject()).setSeparator("")); } }, fileName); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java index 87189ab..b095991 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java @@ -21,6 +21,7 @@ package org.apache.openmeetings.web.user.profile; import static org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID; import static org.apache.openmeetings.db.entity.user.PrivateMessage.SENT_FOLDER_ID; import static org.apache.openmeetings.db.entity.user.PrivateMessage.TRASH_FOLDER_ID; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.getDateFormat; import static org.apache.openmeetings.web.app.WebSession.getUserId; @@ -301,7 +302,7 @@ public class MessagesContactsPanel extends UserBasePanel { } cssClass.append("ui-state-active"); } - item.add(AttributeModifier.replace("class", cssClass.toString())); + item.add(AttributeModifier.replace(ATTR_CLASS, cssClass.toString())); } }; PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dv) { @@ -442,7 +443,7 @@ public class MessagesContactsPanel extends UserBasePanel { final Long contactId = uc.getId(); final Long userId = uc.getOwner().getId(); if (uc.isPending()) { - item.add(AttributeModifier.append("class", "unread")); + item.add(AttributeModifier.append(ATTR_CLASS, "unread")); } item.add(new Label("name", getName(uc))); item.add(new WebMarkupContainer("accept").add(new AjaxEventBehavior("click") { @@ -503,17 +504,17 @@ public class MessagesContactsPanel extends UserBasePanel { } private void setDefaultFolderClass() { - inbox.add(AttributeModifier.replace("class", "email inbox clickable")); - sent.add(AttributeModifier.replace("class", "email sent clickable")); - trash.add(AttributeModifier.replace("class", "email trash clickable")); + inbox.add(AttributeModifier.replace(ATTR_CLASS, "email inbox clickable")); + sent.add(AttributeModifier.replace(ATTR_CLASS, "email sent clickable")); + trash.add(AttributeModifier.replace(ATTR_CLASS, "email trash clickable")); } private static void selectFolder(WebMarkupContainer folder) { - folder.add(AttributeModifier.append("class", "ui-widget-header ui-corner-all")); + folder.add(AttributeModifier.append(ATTR_CLASS, "ui-widget-header ui-corner-all")); } private void setFolderClass(ListItem<PrivateMessageFolder> folder) { - folder.add(AttributeModifier.replace("class", "email folder clickable")); + folder.add(AttributeModifier.replace(ATTR_CLASS, "email folder clickable")); if (folder.getModelObject().getId().equals(selectedFolderModel.getObject())) { selectFolder(folder); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java index c2a1677..933ca16 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.web.user.profile; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.Application.isUserOnline; import static org.apache.openmeetings.web.app.WebSession.getUserId; @@ -115,7 +116,7 @@ public class UserSearchPanel extends UserBasePanel { final UserContactDao contactsDao = getBean(UserContactDao.class); User u = item.getModelObject(); final long userId = u.getId(); - item.add(new WebMarkupContainer("status").add(AttributeModifier.append("class", isUserOnline(userId) ? "online" : "offline"))); + item.add(new WebMarkupContainer("status").add(AttributeModifier.append(ATTR_CLASS, isUserOnline(userId) ? "online" : "offline"))); item.add(new Label("name", getName(u))); item.add(new Label("tz", getBean(TimezoneUtil.class).getTimeZone(u).getID())); item.add(new Label("offer", u.getUserOffers())); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java index 451a546..ed56da8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.user.rooms; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE; + import java.util.List; import org.apache.openmeetings.db.entity.room.Room; @@ -66,7 +68,7 @@ public class RoomListPanel extends Panel { roomContainer.add(new Label("roomName", r.getName())); final WebMarkupContainer info = new WebMarkupContainer("info"); roomContainer.add(info.setOutputMarkupId(true) - .add(AttributeModifier.append("title", getString(String.format("room.type.%s.desc", r.getType().name()))))); + .add(AttributeModifier.append(ATTR_TITLE, getString(String.format("room.type.%s.desc", r.getType().name()))))); final Label curUsers = new Label("curUsers", new Model<>(Application.getRoomClients(r.getId()).size())); roomContainer.add(curUsers.setOutputMarkupId(true)); roomContainer.add(new Label("totalUsers", r.getCapacity()));
