Author: solomax
Date: Wed Feb 1 08:13:42 2017
New Revision: 1781205
URL: http://svn.apache.org/viewvc?rev=1781205&view=rev
Log:
[OPENMEETINGS-980] wicket version is updated to wicket-8
Modified:
openmeetings/application/trunk/LICENSE
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
openmeetings/application/trunk/openmeetings-util/pom.xml
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CalendarWebHelper.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
openmeetings/application/trunk/pom.xml
Modified: openmeetings/application/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/LICENSE?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
--- openmeetings/application/trunk/LICENSE (original)
+++ openmeetings/application/trunk/LICENSE Wed Feb 1 08:13:42 2017
@@ -1625,41 +1625,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
======================================================================================================================
-For ThreeTen library: threetenbp-1.3.3.jar
-
- * Copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of JSR-310 nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-======================================================================================================================
-
For javax.annotation-api-1.2.jar:
URL: http://jcp.org/en/jsr/detail?id=250
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
Wed Feb 1 08:13:42 2017
@@ -19,6 +19,7 @@
package org.apache.openmeetings;
import java.util.Locale;
+import java.util.function.Supplier;
import javax.servlet.ServletContext;
@@ -27,13 +28,12 @@ import org.apache.openmeetings.db.entity
import org.apache.wicket.request.IExceptionMapper;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.IProvider;
public interface IApplication {
<T> T getOmBean(Class<T> clazz);
ServletContext getServletContext();
IRequestMapper getRootRequestMapper();
- IProvider<IExceptionMapper> getExceptionMapperProvider();
+ Supplier<IExceptionMapper> getExceptionMapperProvider();
String getOmString(long id);
String getOmString(long id, long languageId);
String getOmString(String key, long languageId);
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
Wed Feb 1 08:13:42 2017
@@ -21,6 +21,8 @@ package org.apache.openmeetings.db.dao.r
import static org.apache.openmeetings.util.CalendarHelper.getZoneId;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
@@ -36,8 +38,6 @@ import org.apache.wicket.util.string.Str
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
-import org.threeten.bp.LocalDateTime;
-import org.threeten.bp.ZonedDateTime;
@Transactional
public class InvitationDao {
Modified: openmeetings/application/trunk/openmeetings-util/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/pom.xml?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-util/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-util/pom.xml Wed Feb 1
08:13:42 2017
@@ -100,10 +100,5 @@
<artifactId>wicket-native-websocket-core</artifactId>
<version>${wicket.version}</version>
</dependency>
- <dependency>
- <groupId>org.threeten</groupId>
- <artifactId>threetenbp</artifactId>
- <version>1.3.3</version>
- </dependency>
</dependencies>
</project>
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java
Wed Feb 1 08:13:42 2017
@@ -18,19 +18,18 @@
*/
package org.apache.openmeetings.util;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
import java.util.Date;
-import org.threeten.bp.Instant;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.LocalDateTime;
-import org.threeten.bp.ZoneId;
-import org.threeten.bp.ZonedDateTime;
-
public class CalendarHelper {
public static ZoneId getZoneId(String tzId) {
return ZoneId.of(tzId, ZoneId.SHORT_IDS);
}
-
+
public static Date getDate(LocalDate d, String tzId) {
return getDate(d.atStartOfDay(), tzId);
}
@@ -45,14 +44,14 @@ public class CalendarHelper {
}
return
Instant.ofEpochMilli(d.getTime()).atZone(getZoneId(tzId));
}
-
+
public static LocalDate getDate(Date d, String tzId) {
if (d == null) {
d = new Date();
}
return getZoneDateTime(d, tzId).toLocalDate();
}
-
+
public static LocalDateTime getDateTime(Date d, String tzId) {
if (d == null) {
d = new Date();
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
Wed Feb 1 08:13:42 2017
@@ -31,15 +31,15 @@ public abstract class AdminSavePanel<T>
private static final long serialVersionUID = 1L;
private final Label newRecord;
private final Form<T> form;
-
+
public AdminSavePanel(String id, final Form<T> form) {
super(id, form);
this.form = form;
-
+
newRecord = new Label("newRecord",
Model.of(Application.getString(344L)));
add(newRecord.setVisible(false).setOutputMarkupId(true));
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -47,7 +47,7 @@ public abstract class AdminSavePanel<T>
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget target) {
// repaint the feedback panel so that it is
hidden
target.add(feedback);
newRecord.setVisible(true);
@@ -56,7 +56,7 @@ public abstract class AdminSavePanel<T>
}
@Override
- protected void onError(AjaxRequestTarget target,
Form<?> form) {
+ protected void onError(AjaxRequestTarget target) {
// repaint the feedback panel so errors are
shown
target.add(feedback);
onNewError(target, form);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
Wed Feb 1 08:13:42 2017
@@ -57,9 +57,9 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
/**
* Panel component to manage Backup Import/Export
- *
+ *
* @author swagner
- *
+ *
*/
public class BackupPanel extends AdminPanel {
private static final Logger log =
Red5LoggerFactory.getLogger(BackupPanel.class, webAppRootKey);
@@ -70,9 +70,9 @@ public class BackupPanel extends AdminPa
/**
* Form to handle upload files
- *
+ *
* @author swagner
- *
+ *
*/
private class BackupForm extends Form<Void> {
private static final long serialVersionUID = 1L;
@@ -113,7 +113,7 @@ public class BackupPanel extends AdminPa
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget
target, Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget
target) {
File workingDir =
OmFileHelper.getUploadBackupDir();
String dateString = "backup_" +
CalendarPatterns.getTimeForStreamId(new Date());
File backupDir = new File(workingDir,
dateString);
@@ -131,7 +131,7 @@ public class BackupPanel extends AdminPa
}
@Override
- protected void onError(AjaxRequestTarget
target, Form<?> form) {
+ protected void onError(AjaxRequestTarget
target) {
// repaint the feedback panel so errors
are shown
target.add(feedback);
}
@@ -165,7 +165,7 @@ public class BackupPanel extends AdminPa
protected void onComplete(AjaxRequestTarget
target) {
timer.stop(target);
target.add(progressBar.setVisible(false));
-
+
download.setFileName(backupFile.getName());
download.setResourceStream(new
FileResourceStream(backupFile));
download.initiate(target);
@@ -206,13 +206,13 @@ public class BackupPanel extends AdminPa
includeFilesInBackup.detach();
super.onDetach();
}
-
+
private class BackupProcess implements Runnable {
private BackupExport backup;
private File backupDir;
private boolean includeFiles;
private ProgressHolder progressHolder;
-
+
public BackupProcess(BackupExport backup, File
backupDir, boolean includeFiles, ProgressHolder progressHolder) {
this.backup = backup;
this.backupDir = backupDir;
@@ -220,7 +220,7 @@ public class BackupPanel extends AdminPa
this.progressHolder = progressHolder;
th = null;
}
-
+
@Override
public void run() {
try {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
Wed Feb 1 08:13:42 2017
@@ -60,9 +60,9 @@ public class EmailForm extends Form<Mail
add(new Label("lastError"));
add(reset = new AjaxButton("reset") {
private static final long serialVersionUID = 1L;
-
+
@Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget target) {
getBean(MailMessageDao.class).resetSendingStatus(EmailForm.this.getModelObject().getId());
target.add(list);
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
Wed Feb 1 08:13:42 2017
@@ -65,9 +65,9 @@ import com.googlecode.wicket.kendo.ui.pa
/**
* Language Editor, add/insert/update Label and add/delete language contains
several Forms and one list
- *
+ *
* @author solomax, swagner
- *
+ *
*/
public class LangPanel extends AdminPanel {
private static final long serialVersionUID = 1L;
@@ -78,7 +78,7 @@ public class LangPanel extends AdminPane
final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
Map.Entry<Long, Locale> language;
-
+
@Override
public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
super.onMenuPanelLoad(handler);
@@ -106,12 +106,12 @@ public class LangPanel extends AdminPane
protected LabelDao getDao() {
return (LabelDao)super.getDao();
}
-
+
@Override
public long size() {
return
getDao().count(language.getValue(), search);
}
-
+
@Override
public Iterator<? extends StringLabel>
iterator(long first, long count) {
return
getDao().get(language.getValue(), search, (int)first, (int)count,
getSort()).iterator();
@@ -189,13 +189,13 @@ public class LangPanel extends AdminPane
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget target) {
final String name =
LabelDao.getLabelFileName(language.getValue());
download.setFileName(name);
download.setResourceStream(new
AbstractResourceStream() {
private static final long
serialVersionUID = 1L;
private transient InputStream is;
-
+
@Override
public InputStream getInputStream()
throws ResourceStreamNotFoundException {
try {
@@ -205,7 +205,7 @@ public class LangPanel extends AdminPane
throw new
ResourceStreamNotFoundException(e);
}
}
-
+
@Override
public void close() throws IOException {
if (is != null) {
@@ -219,15 +219,15 @@ public class LangPanel extends AdminPane
// repaint the feedback panel so that it is
hidden
target.add(feedback);
}
-
+
@Override
- protected void onError(AjaxRequestTarget target,
Form<?> form) {
+ protected void onError(AjaxRequestTarget target) {
// repaint the feedback panel so errors are
shown
target.add(feedback);
}
-
+
});
-
+
add(langForm);
final AddLanguageDialog addLang = new
AddLanguageDialog("addLang", this);
add(addLang, new AjaxLink<Void>("addLangBtn") {
@@ -257,7 +257,7 @@ public class LangPanel extends AdminPane
}
});
}
-
+
public LangForm getLangForm() {
return langForm;
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
Wed Feb 1 08:13:42 2017
@@ -45,7 +45,7 @@ public abstract class AddFolderDialog ex
public AddFolderDialog(String id) {
this(id, null);
}
-
+
public AddFolderDialog(String id, String name) {
super(id, Application.getString(1260), Model.of(name));
this.name = name;
@@ -59,12 +59,12 @@ public abstract class AddFolderDialog ex
private static final long
serialVersionUID = 1L;
@Override
- protected void
onSubmit(AjaxRequestTarget target, Form<?> form) {
+ protected void
onSubmit(AjaxRequestTarget target) {
AddFolderDialog.this.onSubmit(target);
}
-
+
@Override
- protected void
onError(AjaxRequestTarget target, Form<?> form) {
+ protected void
onError(AjaxRequestTarget target) {
AddFolderDialog.this.onError(target);
}
});
@@ -84,12 +84,12 @@ public abstract class AddFolderDialog ex
protected void onSubmit(AjaxRequestTarget target) {
close(target, getSubmitButton());
}
-
+
@Override
protected List<DialogButton> getButtons() {
return Arrays.asList(add, cancel);
}
-
+
@Override
public DialogButton getSubmitButton() {
return add;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.java
Wed Feb 1 08:13:42 2017
@@ -28,7 +28,7 @@ import com.googlecode.wicket.kendo.ui.pa
public abstract class FormSaveRefreshPanel<T> extends BasePanel {
private static final long serialVersionUID = 1L;
protected final KendoFeedbackPanel feedback;
-
+
public FormSaveRefreshPanel(String id, Form<T> form) {
super(id);
setOutputMarkupId(true);
@@ -41,14 +41,14 @@ public abstract class FormSaveRefreshPan
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget target) {
// repaint the feedback panel so that it is
hidden
target.add(feedback);
onSaveSubmit(target, form);
}
@Override
- protected void onError(AjaxRequestTarget target,
Form<?> form) {
+ protected void onError(AjaxRequestTarget target) {
// repaint the feedback panel so errors are
shown
target.add(feedback);
onSaveError(target, form);
@@ -60,7 +60,7 @@ public abstract class FormSaveRefreshPan
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget target) {
// repaint the feedback panel so that it is
hidden
target.add(feedback);
hideNewRecord();
@@ -68,7 +68,7 @@ public abstract class FormSaveRefreshPan
}
@Override
- protected void onError(AjaxRequestTarget target,
Form<?> form) {
+ protected void onError(AjaxRequestTarget target) {
// repaint the feedback panel so errors are
shown
target.add(feedback);
hideNewRecord();
@@ -83,7 +83,7 @@ public abstract class FormSaveRefreshPan
public void hideNewRecord() {
// for admin only, will be implemented in admin
}
-
+
protected abstract void onSaveSubmit(AjaxRequestTarget target, Form<?>
form);
protected abstract void onSaveError(AjaxRequestTarget target, Form<?>
form);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
Wed Feb 1 08:13:42 2017
@@ -26,6 +26,7 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static
org.apache.wicket.validation.validator.StringValidator.minimumLength;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -59,7 +60,6 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.string.Strings;
-import org.threeten.bp.LocalDate;
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2MultiChoice;
@@ -102,7 +102,7 @@ public class GeneralUserForm extends For
}));
add(new TextField<String>("firstname"));
add(new TextField<String>("lastname"));
-
+
add(new DropDownChoice<String>("timeZoneId",
AVAILABLE_TIMEZONES));
add(new LanguageDropDown("languageId"));
@@ -190,7 +190,7 @@ public class GeneralUserForm extends For
}
age = CalendarHelper.getDate(u.getAge(), u.getTimeZoneId());
}
-
+
@Override
protected void onValidate() {
User u = getModelObject();
@@ -199,11 +199,11 @@ public class GeneralUserForm extends For
}
super.onValidate();
}
-
+
public PasswordTextField getPasswordField() {
return passwordField;
}
-
+
public String getEmail() {
return email.getValue();
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
Wed Feb 1 08:13:42 2017
@@ -25,6 +25,7 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.WebSession.AVAILABLE_TIMEZONES;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
import java.util.UUID;
@@ -59,7 +60,6 @@ import org.apache.wicket.model.util.Coll
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.threeten.bp.LocalDateTime;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
Wed Feb 1 08:13:42 2017
@@ -18,14 +18,14 @@
*/
package org.apache.openmeetings.web.common;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.util.Locale;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.IModel;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.LocalDateTime;
-import org.threeten.bp.LocalTime;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.kendo.ui.KendoCultureHeaderItem;
@@ -39,12 +39,12 @@ public class OmDateTimePicker extends Da
public OmDateTimePicker(String id, IModel<LocalDateTime> model) {
super(id, model);
}
-
+
@Override
protected DatePicker newDatePicker(String id, IModel<LocalDate> model,
Locale locale, String datePattern, Options options) {
return new DatePicker(id, model, WebSession.get().getLocale());
}
-
+
@Override
protected TimePicker newTimePicker(String id, IModel<LocalTime> model,
Locale locale, String timePattern, Options options) {
return new TimePicker(id, model, WebSession.get().getLocale());
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
Wed Feb 1 08:13:42 2017
@@ -34,7 +34,7 @@ import com.googlecode.wicket.jquery.ui.f
public abstract class PagedEntityListPanel extends BasePanel {
private static final long serialVersionUID = 1L;
private List<Integer> numbers = Arrays.asList(10, 25, 50, 75, 100, 200);
-
+
public PagedEntityListPanel(String id, final SearchableDataView<?
extends IDataProviderEntity> dataView) {
super(id);
@@ -46,7 +46,7 @@ public abstract class PagedEntityListPan
PagedEntityListPanel.this.onEvent(target);
}
};
-
+
final SearchableDataProvider<? extends IDataProviderEntity> dp
= dataView.getDataProvider();
Form<Void> searchForm = new Form<Void>("searchForm");
add(searchForm.setOutputMarkupId(true));
@@ -55,7 +55,7 @@ public abstract class PagedEntityListPan
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget target) {
target.add(navPanel);
PagedEntityListPanel.this.onEvent(target);
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java
Wed Feb 1 08:13:42 2017
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.web.common.tree;
+import java.util.Optional;
+
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.db.entity.record.Recording;
@@ -94,8 +96,8 @@ public class FileItemTree extends Defaul
}
@Override
- protected void onClick(AjaxRequestTarget target) {
- FileItemTree.this.onClick(target,
getModelObject());
+ protected void onClick(Optional<AjaxRequestTarget>
targetOptional) {
+ FileItemTree.this.onClick(targetOptional.get(),
getModelObject());
}
@Override
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
Wed Feb 1 08:13:42 2017
@@ -30,6 +30,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
import java.util.UUID;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
@@ -274,9 +275,9 @@ public abstract class FileTreePanel exte
void updateNode(AjaxRequestTarget target, FileItem fi) {
if (fi != null && target != null) {
if (Type.Folder == fi.getType()) {
- tree.updateBranch(fi, target);
+ tree.updateBranch(fi, Optional.of(target));
} else {
- tree.updateNode(fi, target);
+ tree.updateNode(fi, Optional.of(target));
}
}
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
Wed Feb 1 08:13:42 2017
@@ -122,13 +122,13 @@ public class FolderPanel extends Panel {
add(drop.add(drag).setOutputMarkupId(true));
}
- private void moveAll(final FileTreePanel treePanel, AjaxRequestTarget
target, FileItem p) {
+ private static void moveAll(final FileTreePanel treePanel,
AjaxRequestTarget target, FileItem p) {
for (Entry<String, FileItem> e :
treePanel.getSelected().entrySet()) {
move(treePanel, target, p, e.getValue());
}
}
- private void move(final FileTreePanel treePanel, AjaxRequestTarget
target, FileItem p, FileItem f) {
+ private static void move(final FileTreePanel treePanel,
AjaxRequestTarget target, FileItem p, FileItem f) {
Long pid = p.getId();
//FIXME parent should not be moved to child !!!!!!!
if (pid != null && pid.equals(f.getId())) {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
Wed Feb 1 08:13:42 2017
@@ -68,13 +68,13 @@ public class InvitationPasswordDialog ex
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget target) {
InvitationPasswordDialog.this.onSubmit(target);
InvitationPasswordDialog.this.close(target,
null);
}
@Override
- protected void onError(AjaxRequestTarget target,
Form<?> form) {
+ protected void onError(AjaxRequestTarget target) {
InvitationPasswordDialog.this.onError(target);
}
};
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
Wed Feb 1 08:13:42 2017
@@ -69,19 +69,19 @@ public class ForgetPasswordDialog extend
private String name;
private Type type = Type.email;
final MessageDialog confirmDialog;
-
+
enum Type {
email
, login
}
-
+
public ForgetPasswordDialog(String id) {
super(id, Application.getString(312));
add(form = new Form<String>("form") {
private static final long serialVersionUID = 1L;
private IModel<String> lblModel =
Model.of(Application.getString(315));
private Label label = new Label("label", lblModel);
-
+
{
add(feedback.setOutputMarkupId(true));
add(label.setOutputMarkupId(true));
@@ -105,17 +105,17 @@ public class ForgetPasswordDialog extend
private static final long
serialVersionUID = 1L;
@Override
- protected void
onSubmit(AjaxRequestTarget target, Form<?> form) {
+ protected void
onSubmit(AjaxRequestTarget target) {
ForgetPasswordDialog.this.onSubmit(target);
}
-
+
@Override
- protected void
onError(AjaxRequestTarget target, Form<?> form) {
+ protected void
onError(AjaxRequestTarget target) {
ForgetPasswordDialog.this.onError(target);
}
});
}
-
+
@Override
protected void onValidate() {
UserDao dao = getBean(UserDao.class);
@@ -129,7 +129,7 @@ public class ForgetPasswordDialog extend
}
}
}
-
+
@Override
protected void onDetach() {
lblModel.detach();
@@ -142,10 +142,10 @@ public class ForgetPasswordDialog extend
@Override
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
- behavior.setOption("dialogClass",
Options.asString("no-close"));
+ behavior.setOption("dialogClass",
Options.asString("no-close"));
behavior.setOption("closeOnEscape", false);
}
-
+
@Override
public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
s.open(handler);
@@ -158,7 +158,7 @@ public class ForgetPasswordDialog extend
public boolean isDefaultCloseEventEnabled() {
return true;
}
-
+
@Override
public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
if (send.equals(button)){
@@ -171,12 +171,12 @@ public class ForgetPasswordDialog extend
public void setSignInDialog(SignInDialog s) {
this.s = s;
}
-
+
@Override
protected List<DialogButton> getButtons() {
return Arrays.asList(send, cancel);
}
-
+
@Override
public DialogButton getSubmitButton() {
return send;
@@ -201,7 +201,7 @@ public class ForgetPasswordDialog extend
/**
* reset a username by a given mail oder login by sending a mail to the
* registered EMail-Address
- *
+ *
* @param email
* @param username
* @param appLink
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Wed Feb 1 08:13:42 2017
@@ -126,7 +126,7 @@ public class RegisterDialog extends Abst
public void setClientTimeZone() {
tzModel.setObject(WebSession.get().getClientTZCode());
}
-
+
@Override
public int getWidth() {
return 400;
@@ -214,7 +214,7 @@ public class RegisterDialog extends Abst
tzModel.detach();
super.onDetach();
}
-
+
class RegisterForm extends StatelessForm<Void> {
private static final long serialVersionUID = 1L;
private PasswordTextField confirmPassword;
@@ -259,12 +259,12 @@ public class RegisterDialog extends Abst
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget
target, Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget
target) {
RegisterDialog.this.onSubmit(target);
}
@Override
- protected void onError(AjaxRequestTarget
target, Form<?> form) {
+ protected void onError(AjaxRequestTarget
target) {
RegisterDialog.this.onError(target);
}
});
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
Wed Feb 1 08:13:42 2017
@@ -80,12 +80,12 @@ public class ResetPasswordDialog extends
private static final long
serialVersionUID = 1L;
@Override
- protected void
onSubmit(AjaxRequestTarget target, Form<?> form) {
+ protected void
onSubmit(AjaxRequestTarget target) {
ResetPasswordDialog.this.onSubmit(target);
}
@Override
- protected void
onError(AjaxRequestTarget target, Form<?> form) {
+ protected void
onError(AjaxRequestTarget target) {
ResetPasswordDialog.this.onError(target);
}
});
@@ -101,7 +101,7 @@ public class ResetPasswordDialog extends
}
});
- confirmReset = new MessageDialog("confirmReset",
Application.getString(325), Application.getString(332),
+ confirmReset = new MessageDialog("confirmReset",
Application.getString(325), Application.getString(332),
DialogButtons.OK, DialogIcon.INFO) {
private static final long serialVersionUID = 1L;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Wed Feb 1 08:13:42 2017
@@ -62,7 +62,7 @@ import org.apache.wicket.markup.html.ima
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -102,7 +102,7 @@ public class SignInDialog extends Abstra
public void setForgetPasswordDialog(ForgetPasswordDialog f) {
this.f = f;
}
-
+
@Override
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
@@ -111,17 +111,17 @@ public class SignInDialog extends Abstra
behavior.setOption("dialogClass", Options.asString("no-close"));
behavior.setOption("resizable", false);
}
-
+
@Override
public boolean isDefaultCloseEventEnabled() {
return false;
}
-
+
@Override
public int getWidth() {
return allowOAuthLogin()? 550: 450;
}
-
+
@Override
public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
if (registerBtn.equals(button)) {
@@ -129,7 +129,7 @@ public class SignInDialog extends Abstra
r.open(handler);
}
}
-
+
@Override
protected List<DialogButton> getButtons() {
List<DialogButton> list = new ArrayList<DialogButton>();
@@ -139,7 +139,7 @@ public class SignInDialog extends Abstra
list.add(loginBtn);
return list;
}
-
+
@Override
public DialogButton getSubmitButton() {
return loginBtn;
@@ -149,18 +149,18 @@ public class SignInDialog extends Abstra
public Form<String> getForm() {
return form;
}
-
+
private void shake(AjaxRequestTarget target) {
target.appendJavaScript(JQueryEffectBehavior.toString("#" +
getMarkupId(), "shake"));
}
-
+
@Override
public void onClick(AjaxRequestTarget target, DialogButton button) {
if (registerBtn.equals(button) ||
WebSession.get().isSignedIn()) {
super.onClick(target, button);
}
}
-
+
@Override
protected void onError(AjaxRequestTarget target) {
shake(target);
@@ -193,7 +193,7 @@ public class SignInDialog extends Abstra
shake(target);
}
}
-
+
class SignInForm extends StatelessForm<String> {
private static final long serialVersionUID = 1L;
private PasswordTextField passField;
@@ -201,7 +201,7 @@ public class SignInDialog extends Abstra
public SignInForm(String id) {
super(id);
-
+
if (WebSession.get().isSignedIn()) {
alreadyLoggedIn();
}
@@ -221,12 +221,12 @@ public class SignInDialog extends Abstra
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget
target, Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget
target) {
SignInDialog.this.onSubmit(target);
}
-
+
@Override
- protected void onError(AjaxRequestTarget
target, Form<?> form) {
+ protected void onError(AjaxRequestTarget
target) {
SignInDialog.this.onError(target);
}
};
@@ -258,20 +258,20 @@ public class SignInDialog extends Abstra
Button btn = new
Button("oauthBtn");
Image icon = new Image("icon",
new Model<String>());
icon.setVisible(!Strings.isEmpty(item.getModelObject().getIconUrl()));
- icon.add(new
AttributeModifier("src", new AbstractReadOnlyModel<String>() {
+ icon.add(new
AttributeModifier("src", new IModel<String>() {
private static final
long serialVersionUID = 1L;
@Override
public String
getObject() {
return
item.getModelObject().getIconUrl();
}
-
+
}));
btn.add(icon);
btn.add(new Label("label",
item.getModelObject().getName()))
.add(new
AjaxEventBehavior("click") {
private static
final long serialVersionUID = 1L;
-
+
@Override
protected void
onEvent(AjaxRequestTarget target) {
PageParameters parameters = new PageParameters();
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
Wed Feb 1 08:13:42 2017
@@ -46,9 +46,9 @@ import org.apache.openmeetings.installat
import org.apache.openmeetings.installation.InstallationConfig;
import org.apache.openmeetings.util.ConnectionProperties;
import org.apache.openmeetings.util.ConnectionProperties.DbType;
+import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.process.ConverterProcessResult;
import org.apache.openmeetings.util.process.ProcessHelper;
-import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ErrorMessagePanel;
@@ -175,7 +175,7 @@ public class InstallWizard extends Abstr
super(prev);
setSummaryModel(Model.of(""));
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -247,12 +247,12 @@ public class InstallWizard extends Abstr
private static final long
serialVersionUID = 1L;
@Override
- protected void
onSubmit(AjaxRequestTarget target, Form<?> form) {
+ protected void
onSubmit(AjaxRequestTarget target) {
target.add(getFeedbackPanel());
}
@Override
- protected void
onError(AjaxRequestTarget target, Form<?> form) {
+ protected void
onError(AjaxRequestTarget target) {
target.add(getFeedbackPanel());
}
});
@@ -504,7 +504,7 @@ public class InstallWizard extends Abstr
add(new AjaxButton("validateSwf") {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget
target, Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget
target) {
checkToolPath(swfPath, new String[]
{InstallWizard.getPath(swfPath.getValue(), "pdf2swf" + GenerateSWF.execExt),
"--version"});
target.add(getFeedbackPanel());
}
@@ -513,7 +513,7 @@ public class InstallWizard extends Abstr
add(new AjaxButton("validateImageMagic") {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget
target, Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget
target) {
checkToolPath(imageMagicPath, new
String[] {InstallWizard.getPath(imageMagicPath.getValue(), "convert" +
GenerateSWF.execExt), "-version"});
target.add(getFeedbackPanel());
}
@@ -522,7 +522,7 @@ public class InstallWizard extends Abstr
add(new AjaxButton("validateFfmpeg") {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget
target, Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget
target) {
checkToolPath(ffmpegPath, new String[]
{InstallWizard.getPath(ffmpegPath.getValue(), "ffmpeg" + GenerateSWF.execExt),
"-version"});
target.add(getFeedbackPanel());
}
@@ -531,7 +531,7 @@ public class InstallWizard extends Abstr
add(new AjaxButton("validateSox") {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget
target, Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget
target) {
checkToolPath(soxPath, new String[]
{InstallWizard.getPath(soxPath.getValue(), "sox" + GenerateSWF.execExt),
"--version"});
target.add(getFeedbackPanel());
}
@@ -540,7 +540,7 @@ public class InstallWizard extends Abstr
add(new AjaxButton("validateOffice") {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget
target, Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget
target) {
checkOfficePath();
target.add(getFeedbackPanel());
}
@@ -580,7 +580,7 @@ public class InstallWizard extends Abstr
}
private boolean checkAllPath() {
- boolean result = checkToolPath(swfPath, new String[]
{InstallWizard.getPath(swfPath.getValue(), "pdf2swf" + GenerateSWF.execExt),
"--version"});
+ boolean result = checkToolPath(swfPath, new String[]
{InstallWizard.getPath(swfPath.getValue(), "pdf2swf" + GenerateSWF.execExt),
"--version"});
result = checkToolPath(imageMagicPath, new String[]
{InstallWizard.getPath(imageMagicPath.getValue(), "convert" +
GenerateSWF.execExt), "-version"}) && result;
result = checkToolPath(ffmpegPath, new String[]
{InstallWizard.getPath(ffmpegPath.getValue(), "ffmpeg" + GenerateSWF.execExt),
"-version"}) && result;
result = checkToolPath(soxPath, new String[]
{InstallWizard.getPath(soxPath.getValue(), "sox" + GenerateSWF.execExt),
"--version"}) && result;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
Wed Feb 1 08:13:42 2017
@@ -53,19 +53,19 @@ public class SipDialerDialog extends Abs
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget target) {
SipDialerDialog.this.onSubmit(target);
}
-
+
@Override
- protected void onError(AjaxRequestTarget target,
Form<?> form) {
+ protected void onError(AjaxRequestTarget target) {
SipDialerDialog.this.onError(target);
}
};
form.setDefaultButton(ab);
add(feedback.setOutputMarkupId(true), form.add(number, ab));
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -76,12 +76,12 @@ public class SipDialerDialog extends Abs
public int getWidth() {
return 300;
}
-
+
@Override
protected List<DialogButton> getButtons() {
return Arrays.asList(call, close);
}
-
+
@Override
public DialogButton getSubmitButton() {
return call;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
Wed Feb 1 08:13:42 2017
@@ -279,7 +279,7 @@ public class ChatPanel extends BasePanel
private static final long
serialVersionUID = 1L;
@Override
- protected void
onSubmit(AjaxRequestTarget target, Form<?> form) {
+ protected void
onSubmit(AjaxRequestTarget target) {
ChatDao dao =
getBean(ChatDao.class);
ChatMessage m = new
ChatMessage();
m.setMessage(chatMessage.getDefaultModelObjectAsString());
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
Wed Feb 1 08:13:42 2017
@@ -26,6 +26,9 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.util.CalendarWebHelper.getZoneId;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -63,9 +66,6 @@ import org.apache.wicket.model.CompoundP
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.util.CollectionModel;
-import org.threeten.bp.LocalDateTime;
-import org.threeten.bp.ZonedDateTime;
-import org.threeten.bp.temporal.ChronoUnit;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
@@ -85,19 +85,19 @@ public class MessageDialog extends Abstr
private final WebMarkupContainer roomParams = new
WebMarkupContainer("roomParams");
private final DateTimePicker start = new OmDateTimePicker("start",
Model.of(LocalDateTime.now()));
private final DateTimePicker end = new OmDateTimePicker("end",
Model.of(LocalDateTime.now()));
- private boolean isPrivate = false;
+ private boolean isPrivate = false;
private final IModel<Collection<User>> modelTo = new
CollectionModel<User>(new ArrayList<User>());
@Override
public int getWidth() {
return 650;
}
-
+
public void open(IPartialPageRequestHandler handler, Long userId) {
getModelObject().setTo(getBean(UserDao.class).get(userId));
open(handler);
}
-
+
public MessageDialog reset(boolean isPrivate) {
//TODO should be 'in sync' with appointment
LocalDateTime now =
ZonedDateTime.now(getZoneId()).toLocalDateTime();
@@ -119,7 +119,7 @@ public class MessageDialog extends Abstr
this.isPrivate = isPrivate;
return this;
}
-
+
@Override
protected void onOpen(IPartialPageRequestHandler handler) {
if (getModel().getObject().getTo() != null) {
@@ -128,11 +128,11 @@ public class MessageDialog extends Abstr
handler.add(form);
super.onOpen(handler);
}
-
+
public MessageDialog(String id, CompoundPropertyModel<PrivateMessage>
model) {
super(id, Application.getString(1209), model);
form = new Form<PrivateMessage>("form", getModel());
-
+
form.add(feedback.setOutputMarkupId(true));
form.add(new UserMultiChoice("to", modelTo).setRequired(true));
form.add(new TextField<String>("subject"));
@@ -143,7 +143,7 @@ public class MessageDialog extends Abstr
final CheckBox bookedRoom = new CheckBox("bookedRoom");
form.add(bookedRoom.setOutputMarkupId(true).add(new
AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
-
+
@Override
protected void onEvent(AjaxRequestTarget target) {
PrivateMessage p =
MessageDialog.this.getModelObject();
@@ -163,7 +163,7 @@ public class MessageDialog extends Abstr
protected List<DialogButton> getButtons() {
return Arrays.asList(send, cancel);
}
-
+
@Override
public DialogButton getSubmitButton() {
return send;
@@ -183,7 +183,7 @@ public class MessageDialog extends Abstr
protected void onSubmit(AjaxRequestTarget target) {
PrivateMessage m = getModelObject();
m.setInserted(new Date());
- UserDao userDao = getBean(UserDao.class);
+ UserDao userDao = getBean(UserDao.class);
User owner = userDao.get(getUserId());
if (m.isBookedRoom()) {
Room r = m.getRoom();
@@ -240,7 +240,7 @@ public class MessageDialog extends Abstr
false, null,
Valid.Period, owner, to.getLanguageId()
,
CalendarHelper.getDate(start.getModelObject(), to.getTimeZoneId())
,
CalendarHelper.getDate(end.getModelObject(), to.getTimeZoneId()), null);
-
+
invitation_link = getInvitationLink(i);
if (invitation_link == null) {
@@ -253,7 +253,7 @@ public class MessageDialog extends Abstr
+
Application.getString(504, to.getLanguageId()) + "</a><br/>";
}
}
-
+
String subj = p.getSubject() == null ? "" :
p.getSubject();
getBean(MailHandler.class).send(to.getAddress().getEmail(),
Application.getString(1301,
to.getLanguageId()) + subj,
@@ -261,7 +261,7 @@ public class MessageDialog extends Abstr
}
}
}
-
+
@Override
protected void onDetach() {
modelTo.detach();
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Wed Feb 1 08:13:42 2017
@@ -24,6 +24,7 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.util.CalendarWebHelper.getDate;
import static org.apache.openmeetings.web.util.CalendarWebHelper.getDateTime;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -72,7 +73,6 @@ import org.apache.wicket.model.PropertyM
import org.apache.wicket.model.util.CollectionModel;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.threeten.bp.LocalDateTime;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
@@ -91,7 +91,7 @@ import com.googlecode.wicket.kendo.ui.pa
public class AppointmentDialog extends AbstractFormDialog<Appointment> {
private static final long serialVersionUID = 1L;
private static final Logger log =
Red5LoggerFactory.getLogger(AppointmentDialog.class, webAppRootKey);
-
+
private AppointmentForm form;
private DialogButton save = new DialogButton("save",
Application.getString(813));
private DialogButton cancel = new DialogButton("cancel",
Application.getString(1130));
@@ -102,18 +102,18 @@ public class AppointmentDialog extends A
final MessageDialog confirmDelete;
private IModel<Collection<User>> attendeesModel = new
CollectionModel<User>(new ArrayList<User>());
private final WebMarkupContainer sipContainer = new
WebMarkupContainer("sip-container");
-
+
@Override
public int getWidth() {
return 650;
}
-
+
@Override
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
behavior.setOption("dialogClass",
Options.asString("appointment"));
}
-
+
public void setModelObjectWithAjaxTarget(Appointment a,
AjaxRequestTarget target) {
form.setModelObject(a);
form.start.setModelObject(getDateTime(a.getStart()));
@@ -133,7 +133,7 @@ public class AppointmentDialog extends A
save.setVisible(isOwner(a), target);
super.setModelObject(a);
}
-
+
public AppointmentDialog(String id, String title, CalendarPanel
calendarPanel, CompoundPropertyModel<Appointment> model) {
super(id, title, model, true);
log.debug(" -- AppointmentDialog -- Current model " +
getModel().getObject());
@@ -167,7 +167,7 @@ public class AppointmentDialog extends A
protected List<DialogButton> getButtons() {
return Arrays.asList(enterRoom, save, delete, cancel);
}
-
+
@Override
public DialogButton getSubmitButton() {
return save;
@@ -182,7 +182,7 @@ public class AppointmentDialog extends A
protected void onOpen(IPartialPageRequestHandler handler) {
handler.add(form.add(new JQueryUIBehavior("#tabs", "tabs")));
}
-
+
@Override
public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
if (delete.equals(button)) {
@@ -191,7 +191,7 @@ public class AppointmentDialog extends A
RoomEnterBehavior.roomEnter((MainPage)getPage(),
handler, getModelObject().getRoom().getId());
}
}
-
+
@Override
protected void onError(AjaxRequestTarget target) {
target.add(feedback);
@@ -208,7 +208,7 @@ public class AppointmentDialog extends A
currentIds.add(u.getId());
}
}
-
+
//remove users
for (Iterator<MeetingMember> i = attendees.iterator();
i.hasNext();) {
MeetingMember m = i.next();
@@ -243,17 +243,17 @@ public class AppointmentDialog extends A
target.add(feedback);
calendarPanel.refresh(target);
}
-
+
public static boolean isOwner(Appointment object) {
return object.getOwner() != null &&
getUserId().equals(object.getOwner().getId());
}
-
+
@Override
protected void onDetach() {
attendeesModel.detach();
super.onDetach();
}
-
+
private class AppointmentForm extends Form<Appointment> {
private static final long serialVersionUID = 1L;
private boolean createRoom = true;
@@ -318,7 +318,7 @@ public class AppointmentDialog extends A
start.setTime(a.getStart());
java.util.Calendar end =
WebSession.getCalendar();
end.setTime(a.getEnd());
-
+
if (start.equals(end)) {
end.add(java.util.Calendar.HOUR_OF_DAY,
1);
a.setEnd(end.getTime());
@@ -342,7 +342,7 @@ public class AppointmentDialog extends A
public AppointmentForm(String id,
CompoundPropertyModel<Appointment> model) {
super(id, model);
setOutputMarkupId(true);
-
+
add(feedback.setOutputMarkupId(true));
//General
add(new
RequiredTextField<String>("title").setLabel(Model.of(Application.getString(572))));
@@ -354,7 +354,7 @@ public class AppointmentDialog extends A
DefaultWysiwygToolbar toolbar = new
DefaultWysiwygToolbar("toolbarContainer");
add(toolbar);
add(new WysiwygEditor("description", toolbar));
-
+
//room
add(new AjaxCheckBox("createRoom", new
PropertyModel<Boolean>(this, "createRoom")) {
private static final long serialVersionUID = 1L;
@@ -369,7 +369,7 @@ public class AppointmentDialog extends A
add(groom.setRequired(true).setLabel(Model.of(Application.getString(406))).setEnabled(!createRoom).setOutputMarkupId(true));
add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
sipContainer.add(new Label("room.confno",
"")).setVisible(false);
-
+
//Advanced
add(new DropDownChoice<Reminder>(
"reminder"
@@ -412,7 +412,7 @@ public class AppointmentDialog extends A
add(pwd);
add(cals.setNullValid(true).setLabel(Model.of("calendar")).setOutputMarkupId(true));
}
-
+
private List<Room> getRoomList() {
//FIXME need to be reviewed
List<Room> result = new ArrayList<Room>();
@@ -430,7 +430,7 @@ public class AppointmentDialog extends A
private List<OmCalendar> getCalendarList(){
return
getBean(AppointmentManager.class).getCalendars(getUserId());
}
-
+
@Override
protected void onValidate() {
if
(end.getConvertedInput().isBefore(start.getConvertedInput())) {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
Wed Feb 1 08:13:42 2017
@@ -42,8 +42,8 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.UrlTextField;
-import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.validator.UrlValidator;
@@ -532,7 +532,7 @@ public class CalendarDialog extends Abst
//Add new AttributeModifier to change the type of
URLTextField, to text for
//Google Calendar and to URL for a normal CalDAV
calendar
- url.add(new AttributeModifier("type", new
AbstractReadOnlyModel<String>() {
+ url.add(new AttributeModifier("type", new
IModel<String>() {
private static final long serialVersionUID = 1L;
@Override
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Wed Feb 1 08:13:42 2017
@@ -25,9 +25,13 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.util.CalendarWebHelper.getDate;
import static org.apache.openmeetings.web.util.CalendarWebHelper.getZoneId;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Optional;
import org.apache.commons.httpclient.HttpClient;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -58,9 +62,6 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.threeten.bp.LocalDateTime;
-import org.threeten.bp.ZonedDateTime;
-import org.threeten.bp.temporal.ChronoUnit;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.calendar.Calendar;
@@ -128,10 +129,10 @@ public class CalendarPanel extends UserP
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- AjaxRequestTarget target =
getRequestCycle().find(AjaxRequestTarget.class);
- if (target != null) {
- target.appendJavaScript(javaScriptMarkup);
- target.appendJavaScript(javaScriptAddDatepicker);
+ Optional<AjaxRequestTarget> target =
getRequestCycle().find(AjaxRequestTarget.class);
+ if (target.isPresent()) {
+ target.get().appendJavaScript(javaScriptMarkup);
+ target.get().appendJavaScript(javaScriptAddDatepicker);
} else {
response.render(JavaScriptHeaderItem.forScript(javaScriptMarkup, this.getId()));
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
Wed Feb 1 08:13:42 2017
@@ -83,14 +83,14 @@ public class AdminCleanupInfoDialog exte
private static final long
serialVersionUID = 1L;
@Override
- protected void
onSubmit(AjaxRequestTarget target, Form<?> form) {
+ protected void
onSubmit(AjaxRequestTarget target) {
cleanup(target);
}
@Override
- protected void
onError(AjaxRequestTarget target, Form<?> form) {
+ protected void
onError(AjaxRequestTarget target) {
target.add(feedback);
- }
+ }
});
}
});
@@ -101,11 +101,11 @@ public class AdminCleanupInfoDialog exte
super.onInitialize();
setTitle(Model.of(getString("dashboard.widget.admin.cleanup.title")));
}
-
+
@Override
public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
}
-
+
private void update(AjaxRequestTarget target) {
uploadSize.setDefaultModelObject(getHumanSize(getUploadDir()));
profile.setDefaultModelObject(getProfileUnit(getBean(UserDao.class)));
@@ -116,7 +116,7 @@ public class AdminCleanupInfoDialog exte
fin.setDefaultModelObject(getRecUnit(getBean(RecordingDao.class)));
target.add(container);
}
-
+
public void show(AjaxRequestTarget target) {
update(target);
open(target);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
Wed Feb 1 08:13:42 2017
@@ -37,14 +37,14 @@ public class AdminWidgetView extends Wid
form.add(cleanupDialog = new
AdminCleanupInfoDialog("cleanup-dialog"));
form.add(new IndicatingAjaxButton("show-cleanup-dialog") {
private static final long serialVersionUID = 1L;
-
+
@Override
protected boolean isDisabledOnClick() {
return true;
}
-
+
@Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget target) {
cleanupDialog.show(target);
}
});
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Wed Feb 1 08:13:42 2017
@@ -67,10 +67,10 @@ public class UserSearchPanel extends Use
private void refresh(IPartialPageRequestHandler handler) {
handler.add(container.add(fixedHeader));
}
-
+
public UserSearchPanel(String id) {
super(id);
-
+
add(new Form<Void>("form") {
private static final long serialVersionUID = 1L;
{
@@ -81,7 +81,7 @@ public class UserSearchPanel extends Use
private static final long
serialVersionUID = 1L;
@Override
- protected void
onSubmit(AjaxRequestTarget target, Form<?> form) {
+ protected void
onSubmit(AjaxRequestTarget target) {
searched = true;
refresh(target);
}
@@ -110,7 +110,7 @@ public class UserSearchPanel extends Use
public IModel<User> model(User object) {
return new CompoundPropertyModel<User>(object);
}
-
+
};
final DataView<User> dw = new DataView<User>("users", dp) {
private static final long serialVersionUID = 1L;
@@ -130,7 +130,7 @@ public class UserSearchPanel extends Use
.add(AttributeAppender.append("onclick", String.format("addContact(%s);",
userId))));
item.add(new
WebMarkupContainer("message").setVisible(userId !=
getUserId()).add(AttributeAppender.append("onclick",
String.format("privateMessage(%s);", userId))));
item.add(new
WebMarkupContainer("invite").setVisible(userId !=
getUserId()).add(AttributeAppender.append("onclick",
String.format("inviteUser(%s);", userId))));
- //item.add(new TooltipBehavior(new
Options("content", "TODO:: Picture will be displayed"))); //FIXME
+ //item.add(new TooltipBehavior(new
Options("content", "TODO:: Picture will be displayed"))); //FIXME
}
};
@@ -143,11 +143,11 @@ public class UserSearchPanel extends Use
}
}).setOutputMarkupId(true));
}
-
+
private static String getName(User u) {
return "" + u.getFirstname() + " " + u.getLastname() + " [" +
u.getLogin() + "]"; //FIXME salutation
}
-
+
@Override
public void onNewMessageClose(IPartialPageRequestHandler handler) {
refresh(handler);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Wed Feb 1 08:13:42 2017
@@ -64,9 +64,9 @@ public class VideoInfo extends Panel {
protected String getIcon() {
return JQueryIcon.REFRESH;
};
-
+
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
+ protected void onSubmit(AjaxRequestTarget target) {
final IRecordingConverter converter = isInterview ?
getBean(InterviewConverter.class) : getBean(RecordingConverter.class);
new Thread() {
@Override
@@ -86,7 +86,7 @@ public class VideoInfo extends Panel {
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
+ protected void onSubmit(AjaxRequestTarget target) {
rif.setRecording(rm.getObject());
invite.updateModel(target);
invite.open(target);
@@ -96,12 +96,12 @@ public class VideoInfo extends Panel {
public VideoInfo(String id) {
this(id, null);
}
-
+
public VideoInfo(String id, Recording r) {
super(id);
add(form.setOutputMarkupId(true));
setDefaultModel(rm);
-
+
form.add(new Label("name"), new Label("duration"), new
Label("recordEnd"), new Label("roomName", roomName),
downloadBtn.setEnabled(false),
reConvert.setEnabled(false), share.setEnabled(false));
add(download);
@@ -110,7 +110,7 @@ public class VideoInfo extends Panel {
update(null, r);
}
-
+
public VideoInfo update(AjaxRequestTarget target, Recording _r) {
Recording r = _r == null ? new Recording() : _r;
rm.setObject(r);
@@ -127,7 +127,7 @@ public class VideoInfo extends Panel {
} catch (Exception e) {
//no-op
}
-
+
boolean reConvEnabled = false;
if (r.getOwnerId() != null &&
r.getOwnerId().equals(getUserId()) && r.getStatus() != Status.RECORDING &&
r.getStatus() != Status.CONVERTING) {
List<RecordingMetaData> metas =
getBean(RecordingMetaDataDao.class).getByRecording(r.getId());
@@ -148,10 +148,10 @@ public class VideoInfo extends Panel {
if (target != null) {
target.add(form);
}
-
+
return this;
}
-
+
@Override
protected void onDetach() {
rm.detach();
@@ -164,20 +164,20 @@ public class VideoInfo extends Panel {
super.onInitialize();
downloadBtn.setDefaultModelObject(newDownloadMenuList());
}
-
+
private List<IMenuItem> newDownloadMenuList() {
List<IMenuItem> list = new ArrayList<>();
//mp4
list.add(new MenuItem(EXTENSION_MP4,
JQueryIcon.ARROWTHICKSTOP_1_S) {
private static final long serialVersionUID = 1L;
-
+
@Override
public boolean isEnabled() {
Recording r = rm.getObject();
return r != null && r.exists(EXTENSION_MP4);
}
-
+
@Override
public void onClick(AjaxRequestTarget target) {
File f = rm.getObject().getFile(EXTENSION_MP4);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CalendarWebHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CalendarWebHelper.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CalendarWebHelper.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CalendarWebHelper.java
Wed Feb 1 08:13:42 2017
@@ -20,26 +20,26 @@ package org.apache.openmeetings.web.util
import static org.apache.openmeetings.web.app.WebSession.getUserTimeZone;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.Date;
import org.apache.openmeetings.util.CalendarHelper;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.LocalDateTime;
-import org.threeten.bp.ZoneId;
public class CalendarWebHelper extends CalendarHelper {
public static ZoneId getZoneId() {
return getZoneId(getUserTimeZone().getID());
}
-
+
public static Date getDate(LocalDateTime d) {
return getDate(d, getUserTimeZone().getID());
}
-
+
public static Date getDate(LocalDate d) {
return getDate(d, getUserTimeZone().getID());
}
-
+
public static LocalDateTime getDateTime(Date d) {
return getDateTime(d, getUserTimeZone().getID());
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
Wed Feb 1 08:13:42 2017
@@ -20,6 +20,8 @@ package org.apache.openmeetings.test.inv
import static org.apache.openmeetings.util.CalendarHelper.getDate;
+import java.time.LocalDateTime;
+
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.basic.ServiceResult;
@@ -32,7 +34,6 @@ import org.apache.openmeetings.test.Abst
import org.apache.openmeetings.webservice.UserWebService;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import org.threeten.bp.LocalDateTime;
public class TestInvitation extends AbstractWicketTester {
@Autowired
@@ -48,14 +49,14 @@ public class TestInvitation extends Abst
public void testSendInvitationLink() throws Exception {
ServiceResult result = userWebService.login(username, userpass);
User us = userDao.get(result.getCode());
-
+
LocalDateTime from =
LocalDateTime.now().plusDays(1).withHour(12).withMinute(0).withSecond(0);
User invitee = userDao.getContact("[email protected]",
"Testname", "Testlastname", us.getId());
Invitation i = invitationManager.getInvitation(invitee,
roomDao.get(1L),
false, "", Valid.OneTime
, us, us.getLanguageId(),
getDate(from, "GMT"),
getDate(from.plusHours(2), "GMT"), null);
-
+
invitationManager.sendInvitationLink(i, MessageType.Create,
"subject", "message", false);
}
}
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1781205&r1=1781204&r2=1781205&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Wed Feb 1 08:13:42 2017
@@ -40,10 +40,10 @@
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.19.1</maven.surefire.version>
<maven-site.version>3.3</maven-site.version>
- <wicket.version>7.6.0</wicket.version>
- <wicketju.version>7.6.0</wicketju.version>
- <wickets.version>7.6.0</wickets.version>
- <wicketws.version>7.6.0</wicketws.version>
+ <wicket.version>8.0.0-M3</wicket.version>
+ <wicketju.version>8.0.0-M3</wicketju.version>
+ <wickets.version>8.0.0-M3</wickets.version>
+ <wicketws.version>8.0.0-M3</wicketws.version>
<red5-server.version>1.0.8-RELEASE</red5-server.version>
<red5-client.version>1.0.8-RELEASE</red5-client.version>
<spring.version>4.3.5.RELEASE</spring.version>
