Author: solomax
Date: Sat Apr 8 11:02:23 2017
New Revision: 1790670
URL: http://svn.apache.org/viewvc?rev=1790670&view=rev
Log:
[OPENMEETINGS-551] merged changes to 3.2.x
Added:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/NonClosableDialog.java
- copied unchanged from r1790667,
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/NonClosableDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/NonClosableMessageDialog.java
- copied unchanged from r1790667,
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/NonClosableMessageDialog.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPdfResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
Sat Apr 8 11:02:23 2017
@@ -55,6 +55,7 @@ import org.springframework.beans.factory
public abstract class BaseConverter {
private static final Logger log =
Red5LoggerFactory.getLogger(BaseConverter.class, webAppRootKey);
private static final Pattern p = Pattern.compile("\\d{2,5}(x)\\d{2,5}");
+ public final static String EXEC_EXT =
System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") < 0 ? "" :
".exe";
@Autowired
private ConfigurationDao configurationDao;
@@ -91,11 +92,11 @@ public abstract class BaseConverter {
}
protected String getPathToConvert() {
- return getPath(CONFIG_IMAGEMAGIC_PATH, "convert") +
GenerateSWF.execExt;
+ return getPath(CONFIG_IMAGEMAGIC_PATH, "convert") + EXEC_EXT;
}
protected String getPathToIdentify() {
- return getPath(CONFIG_IMAGEMAGIC_PATH, "identify") +
GenerateSWF.execExt;
+ return getPath(CONFIG_IMAGEMAGIC_PATH, "identify") + EXEC_EXT;
}
protected File getStreamFolder(Recording recording) {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
Sat Apr 8 11:02:23 2017
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.core.converter;
+import static org.apache.openmeetings.core.converter.BaseConverter.EXEC_EXT;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -33,16 +34,11 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class GenerateSWF {
-
public static final Logger log =
Red5LoggerFactory.getLogger(GenerateSWF.class, webAppRootKey);
@Autowired
private ConfigurationDao configurationDao;
- public final static boolean isPosix =
System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1;
-
- public final static String execExt = isPosix ? "" : ".exe";
-
private String getPathToSwfTools() {
String pathToSWFTools =
configurationDao.getConfValue("swftools_path", String.class, "");
// If SWFTools Path is not blank a File.separator at the end of
the path
@@ -72,16 +68,16 @@ public class GenerateSWF {
}
public ConverterProcessResult generateSwf(File in, File out) throws
IOException {
-
+
// Create the Content of the Converter Script (.bat or .sh File)
String[] argv = new String[] {
- getPathToSwfTools() + "pdf2swf" + execExt, "-s",
+ getPathToSwfTools() + "pdf2swf" + EXEC_EXT,
"-s",
"insertstop", // insert Stop command into every
frame
"-s","poly2bitmap",
//http://www.swftools.org/gfx_tutorial.html#Rendering_pages_to_SWF_files
"--flashversion=9", //option to generate as3
compatible files
"-i", // change draw order to reduce pdf
complexity
- "-j", "" + getSwfJpegQuality(), // JPEG Quality
- "-s", "zoom=" + getSwfZoom(), // set zoom dpi
+ "-j", "" + getSwfJpegQuality(), // JPEG Quality
+ "-s", "zoom=" + getSwfZoom(), // set zoom dpi
in.getCanonicalPath(),
out.getCanonicalPath() };
@@ -93,7 +89,7 @@ public class GenerateSWF {
*/
public ConverterProcessResult generateSwfByImages(List<String> images,
String outputfile, int fps) {
List<String> argvList = Arrays.asList(new String[] {
- getPathToSwfTools() + "png2swf" + execExt,
"-s",
+ getPathToSwfTools() + "png2swf" + EXEC_EXT,
"-s",
"insertstop", // Insert Stop command into every
frame
"-o", outputfile, "-r", Integer.toString(fps),
"-z" });
@@ -106,7 +102,7 @@ public class GenerateSWF {
*/
public ConverterProcessResult generateSWFByCombine(List<String> swfs,
String outputswf, int fps) {
List<String> argvList = Arrays.asList(new String[] {
- getPathToSwfTools() + "swfcombine" + execExt,
"-s",
+ getPathToSwfTools() + "swfcombine" + EXEC_EXT,
"-s",
"insertstop", // Insert Stop command into every
frame
"-o", outputswf, "-r", Integer.toString(fps),
"-z", "-a" });
@@ -117,7 +113,7 @@ public class GenerateSWF {
public ConverterProcessResult generateSWFByFFMpeg(String inputWildCard,
String outputswf, int fps, int width, int height) {
// FIXME: ffmpeg should be on the system path
- String[] argv = new String[] { "ffmpeg" + execExt, "-r",
+ String[] argv = new String[] { "ffmpeg" + EXEC_EXT, "-r",
Integer.toString(fps), "-i", inputWildCard,
"-s",
width + "x" + height, "-b", "750k", "-ar",
"44100", "-y",
outputswf };
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
Sat Apr 8 11:02:23 2017
@@ -40,7 +40,7 @@ public abstract class NameDialog extends
private final DialogButton add;
private final DialogButton cancel = new DialogButton("cancel",
Application.getString(219));
private final Form<String> form;
- private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
+ protected final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private final String name;
private RequiredTextField<String> title;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
Sat Apr 8 11:02:23 2017
@@ -38,9 +38,9 @@ import org.apache.openmeetings.db.entity
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;
-import org.apache.openmeetings.web.common.NameDialog;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import
org.apache.openmeetings.web.common.ConfirmableAjaxBorder.ConfirmableBorderDialog;
+import org.apache.openmeetings.web.common.NameDialog;
import org.apache.openmeetings.web.util.AjaxDownload;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
@@ -149,7 +149,7 @@ public abstract class FileTreePanel exte
String
statement = "var $drop = $(this);";
statement +=
"$('body').append('<div id=" + dialogId + ">" + getString("713") + "</div>');";
statement +=
"$( '#" + dialogId
-
+ "' ).dialog({ title: '" + escapeEcmaScript(getString("80")) + "',
dialogClass: 'no-close', buttons: [";
+
+ "' ).dialog({ title: '" + escapeEcmaScript(getString("80")) + "', classes:
{'ui-dialog-titlebar': 'ui-corner-all no-close'}, buttons: [";
statement += "
{ text: '" + escapeEcmaScript(getString("54")) + "', click: function() {
$drop.append(ui.draggable); $(this).dialog('close'); " +
super.getCallbackFunctionBody(parameters) + " } },";
statement += "
{ text: '" + escapeEcmaScript(getString("25")) + "', click: function() {
$(this).dialog('close'); } } ";
statement +=
"],";
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
Sat Apr 8 11:02:23 2017
@@ -26,6 +26,7 @@ import org.apache.openmeetings.util.cryp
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.IUpdatable;
+import org.apache.openmeetings.web.util.NonClosableDialog;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -38,11 +39,10 @@ import org.apache.wicket.validation.Vali
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
-public class InvitationPasswordDialog extends AbstractFormDialog<Invitation> {
+public class InvitationPasswordDialog extends NonClosableDialog<Invitation> {
private static final long serialVersionUID = 1L;
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private final DialogButton check = new DialogButton("check",
Application.getString(537));
@@ -87,8 +87,6 @@ public class InvitationPasswordDialog ex
super.onConfigure(behavior);
Invitation i = WebSession.get().getInvitation();
behavior.setOption("autoOpen", i != null &&
i.isPasswordProtected());
- behavior.setOption("closeOnEscape", false);
- behavior.setOption("dialogClass", Options.asString("no-close"));
behavior.setOption("resizable", false);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
Sat Apr 8 11:02:23 2017
@@ -32,6 +32,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.service.mail.template.ResetPasswordTemplate;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.pages.ResetPage;
+import org.apache.openmeetings.web.util.NonClosableMessageDialog;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -48,12 +49,9 @@ import org.apache.wicket.request.mapper.
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
@@ -136,17 +134,10 @@ public class ForgetPasswordDialog extend
super.onDetach();
}
});
- confirmDialog = new MessageDialog("confirmDialog",
Application.getString(312), Application.getString(321), DialogButtons.OK,
DialogIcon.INFO){
+ confirmDialog = new NonClosableMessageDialog("confirmDialog",
Application.getString(312), Application.getString(321)){
private static final long serialVersionUID = 1L;
@Override
- public void onConfigure(JQueryBehavior behavior) {
- super.onConfigure(behavior);
- behavior.setOption("dialogClass",
Options.asString("no-close"));
- behavior.setOption("closeOnEscape", false);
- }
-
- @Override
public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
s.open(handler);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java
Sat Apr 8 11:02:23 2017
@@ -24,7 +24,6 @@ import org.apache.wicket.core.request.ha
import org.apache.wicket.markup.html.basic.Label;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
-import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
@@ -40,13 +39,13 @@ public class KickMessageDialog extends A
super.onInitialize();
add(new Label("message", getString("606")));
};
-
+
@Override
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
behavior.setOption("autoOpen", true);
behavior.setOption("closeOnEscape", false);
- behavior.setOption("dialogClass", Options.asString("no-close"));
+ behavior.setOption("classes", "{'ui-dialog-titlebar':
'ui-corner-all no-close'}");
behavior.setOption("resizable", false);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Sat Apr 8 11:02:23 2017
@@ -39,6 +39,8 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.LanguageDropDown;
import org.apache.openmeetings.web.util.CountryDropDown;
+import org.apache.openmeetings.web.util.NonClosableDialog;
+import org.apache.openmeetings.web.util.NonClosableMessageDialog;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -55,16 +57,12 @@ import org.apache.wicket.util.string.Str
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
-public class RegisterDialog extends AbstractFormDialog<String> {
+public class RegisterDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
private static final Logger log =
Red5LoggerFactory.getLogger(RegisterDialog.class, webAppRootKey);
private DialogButton cancelBtn = new DialogButton("cancel",
Application.getString(122));
@@ -92,18 +90,10 @@ public class RegisterDialog extends Abst
form.setOutputMarkupId(true);
tzDropDown.setOutputMarkupId(true);
- confirmRegistration = new MessageDialog("confirmRegistration",
Application.getString(235),
- Application.getString(674), DialogButtons.OK,
DialogIcon.INFO) {
+ confirmRegistration = new
NonClosableMessageDialog("confirmRegistration", Application.getString(235),
Application.getString(674)) {
private static final long serialVersionUID = 1L;
@Override
- public void onConfigure(JQueryBehavior behavior) {
- super.onConfigure(behavior);
- behavior.setOption("dialogClass",
Options.asString("no-close"));
- behavior.setOption("closeOnEscape", false);
- }
-
- @Override
public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
s.open(handler);
}
@@ -112,13 +102,6 @@ public class RegisterDialog extends Abst
reset();
}
- @Override
- public void onConfigure(JQueryBehavior behavior) {
- super.onConfigure(behavior);
- behavior.setOption("dialogClass", Options.asString("no-close"));
- behavior.setOption("closeOnEscape", false);
- }
-
public void setSignInDialog(SignInDialog s) {
this.s = s;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
Sat Apr 8 11:02:23 2017
@@ -29,6 +29,8 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.util.NonClosableDialog;
+import org.apache.openmeetings.web.util.NonClosableMessageDialog;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -39,14 +41,11 @@ import org.apache.wicket.model.Model;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
-public class ResetPasswordDialog extends AbstractFormDialog<String> {
+public class ResetPasswordDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
private DialogButton resetBtn = new DialogButton("reset",
Application.getString(327));
private Form<String> form;
@@ -101,18 +100,10 @@ public class ResetPasswordDialog extends
}
});
- confirmReset = new MessageDialog("confirmReset",
Application.getString(325), Application.getString(332),
- DialogButtons.OK, DialogIcon.INFO) {
+ confirmReset = new NonClosableMessageDialog("confirmReset",
Application.getString(325), Application.getString(332)) {
private static final long serialVersionUID = 1L;
@Override
- public void onConfigure(JQueryBehavior behavior) {
- super.onConfigure(behavior);
- behavior.setOption("dialogClass",
Options.asString("no-close"));
- behavior.setOption("closeOnEscape", false);
- }
-
- @Override
public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
setResponsePage(Application.get().getSignInPageClass());
}
@@ -124,8 +115,6 @@ public class ResetPasswordDialog extends
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
behavior.setOption("autoOpen", true);
- behavior.setOption("dialogClass", Options.asString("no-close"));
- behavior.setOption("closeOnEscape", false);
}
@Override
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Sat Apr 8 11:02:23 2017
@@ -42,6 +42,7 @@ import org.apache.openmeetings.web.app.O
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmAjaxClientInfoBehavior;
import org.apache.openmeetings.web.pages.HashPage;
+import org.apache.openmeetings.web.util.NonClosableDialog;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -72,11 +73,10 @@ import com.googlecode.wicket.jquery.core
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.effect.JQueryEffectBehavior;
import com.googlecode.wicket.jquery.ui.form.button.Button;
-import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
-public class SignInDialog extends AbstractFormDialog<String> {
+public class SignInDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
private Form<String> form;
private DialogButton loginBtn = new DialogButton("login",
Application.getString(112));
@@ -107,8 +107,6 @@ public class SignInDialog extends Abstra
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
behavior.setOption("autoOpen", true);
- behavior.setOption("closeOnEscape", false);
- behavior.setOption("dialogClass", Options.asString("no-close"));
behavior.setOption("resizable", false);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
Sat Apr 8 11:02:23 2017
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.pages.install;
+import static org.apache.openmeetings.core.converter.BaseConverter.EXEC_EXT;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_MINIMUM_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -40,7 +41,6 @@ import java.util.Locale;
import java.util.Map;
import org.apache.openmeetings.cli.ConnectionPropertiesPatcher;
-import org.apache.openmeetings.core.converter.GenerateSWF;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
@@ -135,7 +135,7 @@ public class InstallWizard extends Abstr
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
behavior.setOption("closeOnEscape", false);
- behavior.setOption("dialogClass", Options.asString("no-close"));
+ behavior.setOption("classes", "{'ui-dialog-titlebar':
'ui-corner-all no-close'}");
behavior.setOption("resizable", false);
}
@@ -505,7 +505,7 @@ public class InstallWizard extends Abstr
private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget
target) {
- checkToolPath(swfPath, new String[]
{InstallWizard.getPath(swfPath.getValue(), "pdf2swf" + GenerateSWF.execExt),
"--version"});
+ checkToolPath(swfPath, new String[]
{InstallWizard.getPath(swfPath.getValue(), "pdf2swf" + EXEC_EXT), "--version"});
target.add(getFeedbackPanel());
}
});
@@ -514,7 +514,7 @@ public class InstallWizard extends Abstr
private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget
target) {
- checkToolPath(imageMagicPath, new
String[] {InstallWizard.getPath(imageMagicPath.getValue(), "convert" +
GenerateSWF.execExt), "-version"});
+ checkToolPath(imageMagicPath, new
String[] {InstallWizard.getPath(imageMagicPath.getValue(), "convert" +
EXEC_EXT), "-version"});
target.add(getFeedbackPanel());
}
});
@@ -523,7 +523,7 @@ public class InstallWizard extends Abstr
private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget
target) {
- checkToolPath(ffmpegPath, new String[]
{InstallWizard.getPath(ffmpegPath.getValue(), "ffmpeg" + GenerateSWF.execExt),
"-version"});
+ checkToolPath(ffmpegPath, new String[]
{InstallWizard.getPath(ffmpegPath.getValue(), "ffmpeg" + EXEC_EXT),
"-version"});
target.add(getFeedbackPanel());
}
});
@@ -532,7 +532,7 @@ public class InstallWizard extends Abstr
private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget
target) {
- checkToolPath(soxPath, new String[]
{InstallWizard.getPath(soxPath.getValue(), "sox" + GenerateSWF.execExt),
"--version"});
+ checkToolPath(soxPath, new String[]
{InstallWizard.getPath(soxPath.getValue(), "sox" + EXEC_EXT), "--version"});
target.add(getFeedbackPanel());
}
});
@@ -580,10 +580,10 @@ public class InstallWizard extends Abstr
}
private boolean checkAllPath() {
- 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;
+ boolean result = checkToolPath(swfPath, new String[]
{InstallWizard.getPath(swfPath.getValue(), "pdf2swf" + EXEC_EXT), "--version"});
+ result = checkToolPath(imageMagicPath, new String[]
{InstallWizard.getPath(imageMagicPath.getValue(), "convert" + EXEC_EXT),
"-version"}) && result;
+ result = checkToolPath(ffmpegPath, new String[]
{InstallWizard.getPath(ffmpegPath.getValue(), "ffmpeg" + EXEC_EXT),
"-version"}) && result;
+ result = checkToolPath(soxPath, new String[]
{InstallWizard.getPath(soxPath.getValue(), "sox" + EXEC_EXT), "--version"}) &&
result;
result = checkOfficePath() && result;
isAllChecked = true;
return result;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
Sat Apr 8 11:02:23 2017
@@ -27,6 +27,7 @@ import java.util.List;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.util.NonClosableDialog;
import org.apache.wicket.ajax.AjaxRequestTarget;
import
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.markup.html.form.Form;
@@ -37,11 +38,10 @@ import org.apache.wicket.util.string.Str
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
-public class NicknameDialog extends AbstractFormDialog<User> {
+public class NicknameDialog extends NonClosableDialog<User> {
private static final long serialVersionUID = 1L;
private static final FastDateFormat TIME_DF =
FastDateFormat.getInstance("HH:mm:ss");
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
@@ -72,8 +72,6 @@ public class NicknameDialog extends Abst
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
behavior.setOption("autoOpen",
isVisible(form.getModelObject()));
- behavior.setOption("closeOnEscape", false);
- behavior.setOption("dialogClass", Options.asString("no-close"));
behavior.setOption("resizable", false);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
Sat Apr 8 11:02:23 2017
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.util.NonClosableMessageDialog;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -30,26 +31,24 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.flow.RedirectToUrlException;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
-import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
-import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
-public class RedirectMessageDialog extends MessageDialog {
+public class RedirectMessageDialog extends NonClosableMessageDialog {
private static final long serialVersionUID = 1L;
private final String labelId;
private final String url;
private final int delay = 5;
private final boolean autoOpen;
- private Component label;
-
+ private Component label;
+
public RedirectMessageDialog(String id, String labelId, boolean
autoOpen, String url) {
super(id, Application.getString(204), "", new
ArrayList<DialogButton>(), DialogIcon.ERROR);
this.labelId = labelId;
this.url = url;
this.autoOpen = autoOpen;
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -75,36 +74,34 @@ public class RedirectMessageDialog exten
handler.add(label);
}
}
-
+
@Override
protected void onOpen(IPartialPageRequestHandler handler) {
super.onOpen(handler);
startTimer(handler);
}
-
+
@Override
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
behavior.setOption("autoOpen", autoOpen);
- behavior.setOption("closeOnEscape", false);
- behavior.setOption("dialogClass", Options.asString("no-close"));
behavior.setOption("resizable", false);
}
-
+
@Override
public boolean isModal() {
return true;
}
-
+
@Override
public boolean isDefaultCloseEventEnabled() {
return false;
}
-
+
@Override
public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
}
-
+
@Override
protected Component newLabel(String id, IModel<String> model) {
label = super.newLabel(id, model);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomFileResourceReference.java
Sat Apr 8 11:02:23 2017
@@ -23,6 +23,7 @@ import static org.apache.openmeetings.ut
import java.io.File;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.wicket.request.resource.IResource.Attributes;
public class RoomFileResourceReference extends RoomResourceReference {
private static final long serialVersionUID = 1L;
@@ -42,7 +43,7 @@ public class RoomFileResourceReference e
}
@Override
- protected File getFile(FileExplorerItem r) {
+ protected File getFile(FileExplorerItem r, Attributes attr) {
return getFile(r, getFileExt(r.getName()));
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPdfResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPdfResourceReference.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPdfResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPdfResourceReference.java
Sat Apr 8 11:02:23 2017
@@ -21,6 +21,7 @@ package org.apache.openmeetings.web.room
import java.io.File;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.wicket.request.resource.IResource.Attributes;
public class RoomPdfResourceReference extends RoomResourceReference {
private static final long serialVersionUID = 1L;
@@ -40,7 +41,7 @@ public class RoomPdfResourceReference ex
}
@Override
- protected File getFile(FileExplorerItem r) {
+ protected File getFile(FileExplorerItem r, Attributes attr) {
return getFile(r, "pdf");
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
Sat Apr 8 11:02:23 2017
@@ -125,7 +125,7 @@ public class RoomResourceReference exten
}
@Override
- protected File getFile(FileExplorerItem f) {
+ protected File getFile(FileExplorerItem f, Attributes attr) {
return getFile(f, Type.Video == f.getType() && preview ?
EXTENSION_JPG : null);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/SettingsIcon.java
Sat Apr 8 11:02:23 2017
@@ -24,7 +24,7 @@ import org.apache.openmeetings.web.room.
public class SettingsIcon extends ClientIcon {
private static final long serialVersionUID = 1L;
-
+
public SettingsIcon(String id, Client client, RoomPanel room) {
super(id, client, room);
mainCssClass = "settings ";
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Sat Apr 8 11:02:23 2017
@@ -129,7 +129,7 @@ public class AppointmentDialog extends A
@Override
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
- behavior.setOption("dialogClass",
Options.asString("appointment"));
+ behavior.setOption("classes", "{'ui-dialog': 'ui-corner-all
appointment'}");
}
public void setModelObjectWithAjaxTarget(Appointment a,
AjaxRequestTarget target) {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java
Sat Apr 8 11:02:23 2017
@@ -25,6 +25,7 @@ import static org.apache.openmeetings.ut
import java.io.File;
import org.apache.openmeetings.db.entity.record.Recording;
+import org.apache.wicket.request.resource.IResource.Attributes;
public class JpgRecordingResourceReference extends RecordingResourceReference {
private static final long serialVersionUID = 1L;
@@ -44,7 +45,7 @@ public class JpgRecordingResourceReferen
}
@Override
- protected File getFile(Recording r) {
+ protected File getFile(Recording r, Attributes attr) {
return r.getFile(EXTENSION_JPG);
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
Sat Apr 8 11:02:23 2017
@@ -25,6 +25,7 @@ import static org.apache.openmeetings.ut
import java.io.File;
import org.apache.openmeetings.db.entity.record.Recording;
+import org.apache.wicket.request.resource.IResource.Attributes;
public class Mp4RecordingResourceReference extends RecordingResourceReference {
private static final long serialVersionUID = 1L;
@@ -44,7 +45,7 @@ public class Mp4RecordingResourceReferen
}
@Override
- protected File getFile(Recording r) {
+ protected File getFile(Recording r, Attributes attr) {
return r.getFile();
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java?rev=1790670&r1=1790669&r2=1790670&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
Sat Apr 8 11:02:23 2017
@@ -54,10 +54,10 @@ public abstract class FileItemResourceRe
}
@Override
- protected ResourceResponse
newResourceResponse(Attributes attributes) {
- r = getFileItem(attributes);
+ protected ResourceResponse
newResourceResponse(Attributes attr) {
+ r = getFileItem(attr);
if (r != null) {
- file = getFile(r);
+ file = getFile(r, attr);
ResourceResponse rr =
createResourceResponse(file.toPath());
rr.setFileName(getFileName(r));
return rr;
@@ -73,6 +73,6 @@ public abstract class FileItemResourceRe
protected abstract String getMimeType(T r);
protected abstract String getFileName(T r);
- protected abstract File getFile(T r);
- protected abstract T getFileItem(Attributes attributes);
+ protected abstract File getFile(T r, Attributes attr);
+ protected abstract T getFileItem(Attributes attr);
}
