You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/06/29 13:34:34 UTC
svn commit: r1688190 - in /openmeetings/branches/3.0.x: ./
src/web/java/org/apache/openmeetings/web/common/
src/web/java/org/apache/openmeetings/web/pages/auth/
src/web/java/org/apache/openmeetings/web/user/calendar/
src/web/java/org/apache/openmeeting...
Author: solomax
Date: Mon Jun 29 11:34:34 2015
New Revision: 1688190
URL: http://svn.apache.org/r1688190
Log:
[OPENMEETINGS-1212] commons-cli, wicket, wicketstuff and wicket-jquery-ui libraries are updated
Modified:
openmeetings/branches/3.0.x/LICENSE
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
Modified: openmeetings/branches/3.0.x/LICENSE
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/LICENSE?rev=1688190&r1=1688189&r2=1688190&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/LICENSE (original)
+++ openmeetings/branches/3.0.x/LICENSE Mon Jun 29 11:34:34 2015
@@ -280,7 +280,7 @@ projects licensed under the Apache Licen
red5-*.jar
webapps/openmeetings/screensharing/red5-*.jar
-commons-cli-jar-1.2.jar
+commons-cli-jar-1.3.1.jar
red5.bat
red5.sh
red5-highperf.sh
@@ -397,24 +397,24 @@ webapps/openmeetings/WEB-INF/lib/stax-ap
webapps/openmeetings/WEB-INF/lib/stax2-api-jar-3.1.1.jar
webapps/openmeetings/WEB-INF/lib/velocity-jar-1.7.jar
webapps/openmeetings/WEB-INF/lib/velocity-tools-jar-2.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-auth-roles-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-core-jar-6.19.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-auth-roles-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-core-jar-6.20.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-dashboard-core-jar-0.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-calendar-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-core-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-plugins-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-tomcat-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-request-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-select2-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-util-jar-6.19.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-calendar-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-core-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-plugins-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-tomcat-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-request-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-select2-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-util-jar-6.20.0.jar
webapps/openmeetings/WEB-INF/lib/woden-core-bundle-1.0-SNAPSHOT.jar
webapps/openmeetings/WEB-INF/lib/woodstox-core-asl-jar-4.1.4.jar
webapps/openmeetings/WEB-INF/lib/ws-commons-util-jar-1.0.2.jar
Modified: openmeetings/branches/3.0.x/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1688190&r1=1688189&r2=1688190&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Mon Jun 29 11:34:34 2015
@@ -229,46 +229,46 @@
<dependency org="org.simpleframework" name="simple-xml" rev="2.7" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-request" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-request" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-util" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-util" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-core" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-core" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-auth-roles" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-auth-roles" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-ioc" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-ioc" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-extensions" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-extensions" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-datetime" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-datetime" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="joda-time" name="joda-time" rev="2.3" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-devutils" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-devutils" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-native-websocket-core" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-native-websocket-core" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-native-websocket-tomcat" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-native-websocket-tomcat" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-core" rev="6.19.0" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui" rev="6.19.0" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-calendar" rev="6.19.0" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-plugins" rev="6.19.0" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui" rev="6.19.0" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui-theme-default" rev="6.19.0" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui-culture" rev="6.19.1" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-core" rev="6.20.0" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui" rev="6.20.0" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-calendar" rev="6.20.0" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-plugins" rev="6.20.0" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui" rev="6.20.0" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui-theme-default" rev="6.20.0" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui-culture" rev="6.20.0" conf="openmeetings->*" transitive="false"/>
<dependency org="org.threeten" name="threetenbp" rev="1.2" conf="openmeetings->*" transitive="false"/>
<dependency org="ro.fortsoft.wicket.dashboard" name="wicket-dashboard-core" rev="0.12.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
@@ -276,13 +276,13 @@
<dependency org="com.google.code.gson" name="gson" rev="2.2.4" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-urlfragment" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-urlfragment" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-html5" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-html5" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-select2" rev="6.19.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-select2" rev="6.20.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
@@ -406,7 +406,7 @@
<!-- END OF openlaszlo46 -->
<!-- START OF Command Line Admin -->
- <dependency org="commons-cli" name="commons-cli" rev="1.3" conf="cmdadmin->*" transitive="false">
+ <dependency org="commons-cli" name="commons-cli" rev="1.3.1" conf="cmdadmin->*" transitive="false">
<include type="jar" />
</dependency>
<!-- END OF Command Line Admin -->
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/AddFolderDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1688190&r1=1688189&r2=1688190&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/AddFolderDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/AddFolderDialog.java Mon Jun 29 11:34:34 2015
@@ -34,8 +34,8 @@ import com.googlecode.wicket.jquery.ui.w
public abstract class AddFolderDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
- private final DialogButton add = new DialogButton(Application.getString(1261));
- private final DialogButton cancel = new DialogButton(Application.getString(219));
+ private final DialogButton add = new DialogButton("add", Application.getString(1261));
+ private final DialogButton cancel = new DialogButton("cancel", Application.getString(219));
private final Form<String> form;
private final FeedbackPanel feedback = new FeedbackPanel("feedback");
private final String name;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1688190&r1=1688189&r2=1688190&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Mon Jun 29 11:34:34 2015
@@ -61,8 +61,8 @@ public class ForgetPasswordDialog extend
private static final Logger log = Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, webAppRootKey);
private static final long serialVersionUID = 1L;
private String sendLbl = Application.getString(317);
- private DialogButton send = new DialogButton(sendLbl);
- private DialogButton cancel = new DialogButton(Application.getString(122));
+ private DialogButton send = new DialogButton("send", sendLbl);
+ private DialogButton cancel = new DialogButton("cancel", Application.getString(122));
private FeedbackPanel feedback = new FeedbackPanel("feedback");
private RequiredTextField<String> nameField;
private Form<String> form;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1688190&r1=1688189&r2=1688190&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Mon Jun 29 11:34:34 2015
@@ -70,9 +70,8 @@ import com.googlecode.wicket.jquery.ui.w
public class RegisterDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
- private DialogButton cancelBtn = new DialogButton(Application.getString(122));
- private String registerLbl = Application.getString(121);
- private DialogButton registerBtn = new DialogButton(registerLbl);
+ private DialogButton cancelBtn = new DialogButton("cancel", Application.getString(122));
+ private DialogButton registerBtn = new DialogButton("register", Application.getString(121));
private FeedbackPanel feedback = new FeedbackPanel("feedback");
private final IModel<String> tzModel = Model.of(WebSession.get().getClientTZCode());
private final DropDownChoice<String> tzDropDown = new DropDownChoice<String>("tz", tzModel, AVAILABLE_TIMEZONES);
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1688190&r1=1688189&r2=1688190&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java Mon Jun 29 11:34:34 2015
@@ -49,8 +49,7 @@ import com.googlecode.wicket.jquery.ui.w
public class ResetPasswordDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = -523469331995677748L;
- private String resetLbl = Application.getString(327);
- private DialogButton resetBtn = new DialogButton(resetLbl);
+ private DialogButton resetBtn = new DialogButton("reset", Application.getString(327));
private Form<String> form;
private FeedbackPanel feedback = new FeedbackPanel("feedback");
private PasswordTextField password;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1688190&r1=1688189&r2=1688190&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Mon Jun 29 11:34:34 2015
@@ -77,9 +77,8 @@ import com.googlecode.wicket.jquery.ui.w
public class SignInDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private Form<String> form;
- private DialogButton loginBtn = new DialogButton(Application.getString(112));
- private String registerLbl = Application.getString(123);
- private DialogButton registerBtn = new DialogButton(registerLbl);
+ private DialogButton loginBtn = new DialogButton("login", Application.getString(112));
+ private DialogButton registerBtn = new DialogButton("register", Application.getString(123));
private String password;
private String login;
private boolean rememberMe = false;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1688190&r1=1688189&r2=1688190&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Mon Jun 29 11:34:34 2015
@@ -88,12 +88,10 @@ public class AppointmentDialog extends A
private static final Logger log = Red5LoggerFactory.getLogger(AppointmentDialog.class, webAppRootKey);
private AppointmentForm form;
- private DialogButton save = new DialogButton(Application.getString(813));
- private DialogButton cancel = new DialogButton(Application.getString(1130));
- private String deleteLbl = Application.getString(814);
- private DialogButton delete = new DialogButton(deleteLbl);
- private String enterRoomLbl = Application.getString(1282);
- private DialogButton enterRoom = new DialogButton(enterRoomLbl);
+ private DialogButton save = new DialogButton("save", Application.getString(813));
+ private DialogButton cancel = new DialogButton("cancel", Application.getString(1130));
+ private DialogButton delete = new DialogButton("delete", Application.getString(814));
+ private DialogButton enterRoom = new DialogButton("enterRoom", Application.getString(1282));
private final CalendarPanel calendarPanel;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
final MessageDialog confirmDelete;
@@ -132,7 +130,7 @@ public class AppointmentDialog extends A
private static final long serialVersionUID = 1L;
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (button != null && button.match(AbstractDialog.LBL_OK)){
+ if (button != null && button.match(AbstractDialog.OK)){
deleteAppointment(target);
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1688190&r1=1688189&r2=1688190&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java Mon Jun 29 11:34:34 2015
@@ -73,9 +73,8 @@ public class MessageDialog extends Abstr
private static final long serialVersionUID = 1L;
private final Form<PrivateMessage> form;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- String sendLbl = Application.getString(218);
- DialogButton send = new DialogButton(sendLbl);
- private DialogButton cancel = new DialogButton(Application.getString(219));
+ DialogButton send = new DialogButton("send", Application.getString(218));
+ private DialogButton cancel = new DialogButton("cancel", Application.getString(219));
private final WebMarkupContainer roomParamsBlock = new WebMarkupContainer("roomParamsBlock");
private final WebMarkupContainer roomParams = new WebMarkupContainer("roomParams");
private final DateTimePicker start = new OmDateTimePicker("start", Model.of(LocalDateTime.now()));
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java?rev=1688190&r1=1688189&r2=1688190&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java Mon Jun 29 11:34:34 2015
@@ -36,11 +36,9 @@ import com.googlecode.wicket.jquery.ui.w
public class UserInfoDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 6393565468567393270L;
private WebMarkupContainer container = new WebMarkupContainer("container");
- private DialogButton cancel = new DialogButton(Application.getString(61));
- private String messageLbl = Application.getString(1253);
- private DialogButton message = new DialogButton(messageLbl);
- private String contactsLbl = Application.getString(1186);
- private DialogButton contacts = new DialogButton(contactsLbl);
+ private DialogButton cancel = new DialogButton("cancel", Application.getString(61));
+ private DialogButton message = new DialogButton("message", Application.getString(1253));
+ private DialogButton contacts = new DialogButton("contacts", Application.getString(1186));
private MessageDialog newMessage;
private long userId;