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 2017/10/09 09:25:34 UTC
openmeetings git commit: [OPENMEETINGS-980] wicket-datetime
dependency is removed
Repository: openmeetings
Updated Branches:
refs/heads/master f2fb6c51b -> 5fca25f36
[OPENMEETINGS-980] wicket-datetime dependency is removed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/5fca25f3
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/5fca25f3
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/5fca25f3
Branch: refs/heads/master
Commit: 5fca25f36fde086a6c2ae318de0c842e0b50f99b
Parents: f2fb6c5
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Oct 9 16:25:27 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Oct 9 16:25:27 2017 +0700
----------------------------------------------------------------------
openmeetings-web/pom.xml | 5 --
.../web/admin/configurations/ConfigForm.java | 5 +-
.../openmeetings/web/admin/email/EmailForm.java | 14 ++----
.../openmeetings/web/admin/ldaps/LdapForm.java | 7 ++-
.../openmeetings/web/admin/users/UserForm.java | 7 ++-
.../apache/openmeetings/web/util/DateLabel.java | 52 ++++++++++++++++++++
6 files changed, 63 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5fca25f3/openmeetings-web/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 535a46b..f09b743 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -486,11 +486,6 @@
<version>${wicket.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-datetime</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-core</artifactId>
<version>${wicketju.version}</version>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5fca25f3/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
index 8ae972f..89731f4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
@@ -18,9 +18,7 @@
*/
package org.apache.openmeetings.web.admin.configurations;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import java.util.Arrays;
import java.util.List;
@@ -31,6 +29,7 @@ import org.apache.openmeetings.db.entity.basic.Configuration.Type;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.util.DateLabel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
@@ -119,7 +118,7 @@ public class ConfigForm extends AdminBaseForm<Configuration> {
}
};
valueB = new CheckBox("valueB");
- add(forDatePattern("updated", WEB_DATE_PATTERN));
+ add(new DateLabel("updated"));
add(new Label("user.login"));
add(new TextArea<String>("comment"));
update(null);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5fca25f3/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
index 3269cc5..a3b5e04 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
@@ -18,17 +18,13 @@
*/
package org.apache.openmeetings.web.admin.email;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
-
-import java.util.Date;
import org.apache.openmeetings.db.dao.basic.MailMessageDao;
import org.apache.openmeetings.db.entity.basic.MailMessage;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
+import org.apache.openmeetings.web.util.DateLabel;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.datetime.markup.html.basic.DateLabel;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -39,8 +35,6 @@ import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
public class EmailForm extends Form<MailMessage> {
private static final long serialVersionUID = 1L;
- private final DateLabel inserted;
- private final DateLabel updated;
private final Label status;
private final AjaxButton reset;
private ConfirmableAjaxBorder delBtn;
@@ -53,8 +47,8 @@ public class EmailForm extends Form<MailMessage> {
add(new Label("subject"));
add(new Label("recipients"));
add(new Label("body").setEscapeModelStrings(false));
- add(inserted = forDatePattern("inserted", Model.of((Date)null), WEB_DATE_PATTERN));
- add(updated = forDatePattern("updated", Model.of((Date)null), WEB_DATE_PATTERN));
+ add(new DateLabel("inserted"));
+ add(new DateLabel("updated"));
add(new Label("errorCount"));
add(new Label("lastError"));
add(reset = new AjaxButton("reset") {
@@ -92,8 +86,6 @@ public class EmailForm extends Form<MailMessage> {
MailMessage m = getModelObject();
delBtn.setEnabled(m.getId() != null);
status.setDefaultModelObject(getString("admin.email.status." + m.getStatus().name()));
- inserted.setModelObject(m.getInserted() == null ? null : m.getInserted().getTime());
- updated.setModelObject(m.getUpdated() == null ? null : m.getUpdated().getTime());
reset.setEnabled(m.getId() != null && MailMessage.Status.ERROR == m.getStatus());
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5fca25f3/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
index 7e6e435..bf02abb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
@@ -18,15 +18,14 @@
*/
package org.apache.openmeetings.web.admin.ldaps;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.entity.server.LdapConfig;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.util.DateLabel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -57,9 +56,9 @@ public class LdapForm extends AdminBaseForm<LdapConfig> {
add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString("165"))));
add(new CheckBox("active"));
- add(forDatePattern("inserted", WEB_DATE_PATTERN));
+ add(new DateLabel("inserted"));
add(new Label("insertedby.login"));
- add(forDatePattern("updated", WEB_DATE_PATTERN));
+ add(new DateLabel("updated"));
add(new Label("updatedby.login"));
add(new RequiredTextField<String>("configFileName").setLabel(Model.of(Application.getString("1115"))));
add(new CheckBox("addDomainToUserName"));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5fca25f3/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 0689ce3..87506d2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -22,12 +22,10 @@ import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel;
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getRights;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import static org.apache.wicket.validation.validator.StringValidator.minimumLength;
import java.util.ArrayList;
@@ -52,6 +50,7 @@ import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ComunityUserForm;
import org.apache.openmeetings.web.common.GeneralUserForm;
+import org.apache.openmeetings.web.util.DateLabel;
import org.apache.openmeetings.web.util.RestrictiveChoiceProvider;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
@@ -123,8 +122,8 @@ public class UserForm extends AdminBaseForm<User> {
update(null);
add(domain.add(domainId).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true));
add(new Label("ownerId"));
- add(forDatePattern("inserted", WEB_DATE_PATTERN));
- add(forDatePattern("updated", WEB_DATE_PATTERN));
+ add(new DateLabel("inserted"));
+ add(new DateLabel("updated"));
add(new CheckBox("forceTimeZoneCheck"));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5fca25f3/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/DateLabel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/DateLabel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/DateLabel.java
new file mode 100644
index 0000000..921fe96
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/DateLabel.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.util;
+
+import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.html.basic.Label;
+
+public class DateLabel extends Label {
+ private static final long serialVersionUID = 1L;
+ private static final FastDateFormat fmt = FastDateFormat.getInstance(WEB_DATE_PATTERN);
+
+ public DateLabel(String id) {
+ super(id);
+ }
+
+ @Override
+ public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) {
+ Object o = getDefaultModelObject();
+ String s = getDefaultModelObjectAsString();
+ if (o == null) {
+ // no-op
+ } else if (o instanceof Date || o.getClass().isAssignableFrom(Date.class)) {
+ s = fmt.format((Date)o);
+ } else if (o instanceof Calendar || o.getClass().isAssignableFrom(Calendar.class)) {
+ s = fmt.format((Calendar)o);
+ }
+ replaceComponentTagBody(markupStream, openTag, s);
+ }
+}