Author: solomax
Date: Thu Dec 26 04:38:23 2013
New Revision: 1553449
URL: http://svn.apache.org/r1553449
Log:
Code clean up according to the latest changes in wicket-jquery-ui
Modified:
openmeetings/trunk/singlewebapp/.project
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Modified: openmeetings/trunk/singlewebapp/.project
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.project?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.project (original)
+++ openmeetings/trunk/singlewebapp/.project Thu Dec 26 04:38:23 2013
@@ -73,7 +73,7 @@
</natures>
<filteredResources>
<filter>
- <id>1373769575676</id>
+ <id>1387965572383</id>
<name></name>
<type>26</type>
<matcher>
@@ -82,7 +82,7 @@
</matcher>
</filter>
<filter>
- <id>1373769575677</id>
+ <id>1387965572384</id>
<name></name>
<type>10</type>
<matcher>
@@ -91,7 +91,7 @@
</matcher>
</filter>
<filter>
- <id>1373769575687</id>
+ <id>1387965572388</id>
<name></name>
<type>26</type>
<matcher>
@@ -100,7 +100,7 @@
</matcher>
</filter>
<filter>
- <id>1373769575695</id>
+ <id>1387965572390</id>
<name></name>
<type>26</type>
<matcher>
@@ -109,7 +109,7 @@
</matcher>
</filter>
<filter>
- <id>1373769576236</id>
+ <id>1387965572391</id>
<name></name>
<type>6</type>
<matcher>
@@ -118,7 +118,7 @@
</matcher>
</filter>
<filter>
- <id>1373769576238</id>
+ <id>1387965572392</id>
<name></name>
<type>30</type>
<matcher>
@@ -127,7 +127,7 @@
</matcher>
</filter>
<filter>
- <id>1373769576249</id>
+ <id>1387965572392</id>
<name></name>
<type>30</type>
<matcher>
@@ -136,7 +136,7 @@
</matcher>
</filter>
<filter>
- <id>1373769576258</id>
+ <id>1387965572393</id>
<name></name>
<type>30</type>
<matcher>
@@ -145,7 +145,7 @@
</matcher>
</filter>
<filter>
- <id>1373769576269</id>
+ <id>1387965572393</id>
<name></name>
<type>30</type>
<matcher>
@@ -154,7 +154,7 @@
</matcher>
</filter>
<filter>
- <id>1373769576283</id>
+ <id>1387965572394</id>
<name></name>
<type>30</type>
<matcher>
@@ -162,5 +162,14 @@
<arguments>1.0-projectRelativePath-matches-false-false-build/red5/server/src/main/server</arguments>
</matcher>
</filter>
+ <filter>
+ <id>1387965572395</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+
<arguments>1.0-projectRelativePath-matches-false-false-build/red5/server/webapps</arguments>
+ </matcher>
+ </filter>
</filteredResources>
</projectDescription>
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Thu Dec 26 04:38:23 2013
@@ -601,7 +601,7 @@
<netRemoteCallHib name="getLanguageByIdAndMax"
funcname="languageservice.getLanguageByIdAndMax" >
<attribute name="start" value="0" type="number" />
<attribute name="step" value="100" type="number" />
- <attribute name="max" value="1500" type="number" />
+ <attribute name="max" value="1600" type="number" />
<netparam><method name="getValue">return
parent.parent.userlang;</method></netparam>
<netparam><method name="getValue">return
parent.start;</method></netparam>
<netparam><method name="getValue">return
parent.step;</method></netparam>
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
Thu Dec 26 04:38:23 2013
@@ -52,7 +52,7 @@
remotecontext="$once{ canvas.thishib }" >
<attribute name="start" value="0" type="number" />
<attribute name="step" value="100" type="number" />
- <attribute name="max" value="1300" type="number" />
+ <attribute name="max" value="1600" type="number" />
<netparam><method name="getValue">return
canvas.thishib.userlang;</method></netparam>
<netparam><method name="getValue">return
parent.start;</method></netparam>
<netparam><method name="getValue">return
parent.step;</method></netparam>
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java
Thu Dec 26 04:38:23 2013
@@ -210,7 +210,7 @@ public class Application extends Authent
if (!isInstalled) {
if (InitializationContainer.initComplete) {
//TODO can also check crypt class here
- result =
get()._getBean(AdminUserDao.class).count() > 0
+ isInstalled = result =
get()._getBean(AdminUserDao.class).count() > 0
&&
get()._getBean(FieldLanguagesValuesDao.class).count() > 0;
}
}
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
Thu Dec 26 04:38:23 2013
@@ -60,7 +60,8 @@ import com.googlecode.wicket.jquery.ui.w
public class ForgetPasswordDialog extends AbstractFormDialog<String> {
private static final Logger log =
Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, webAppRootKey);
private static final long serialVersionUID = 8494008571497363018L;
- private DialogButton send = new DialogButton(WebSession.getString(317));
+ private String sendLbl = WebSession.getString(317);
+ private DialogButton send = new DialogButton(sendLbl);
private DialogButton cancel = new
DialogButton(WebSession.getString(122));
private FeedbackPanel feedback = new FeedbackPanel("feedback");
private RequiredTextField<String> nameField;
@@ -146,8 +147,13 @@ public class ForgetPasswordDialog extend
add(confirmDialog);
}
+ @Override
+ public boolean isDefaultCloseEventEnabled() {
+ return true;
+ }
+
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (button.equals(send)){
+ if (button != null && button.match(sendLbl)){
confirmDialog.open(target);
} else {
s.open(target);
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Thu Dec 26 04:38:23 2013
@@ -72,7 +72,8 @@ public class RegisterDialog extends Abst
private static final long serialVersionUID = -8333305491376538792L;
private static final Logger log =
Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
private DialogButton cancelBtn = new
DialogButton(WebSession.getString(122));
- private DialogButton registerBtn = new
DialogButton(WebSession.getString(121));
+ private String registerLbl = WebSession.getString(121);
+ private DialogButton registerBtn = new DialogButton(registerLbl);
private FeedbackPanel feedback = new FeedbackPanel("feedback");
private final IModel<String> tzModel =
Model.of(WebSession.get().getTimeZoneByBrowserLocale(0));
private final DropDownChoice<String> tzDropDown = new
DropDownChoice<String>("tz", tzModel, getAvailableTimezones());
@@ -151,7 +152,7 @@ public class RegisterDialog extends Abst
}
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (button.equals(registerBtn)){
+ if (button != null && button.match(registerLbl)){
confirmRegistration.open(target);
} else {
s.open(target);
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
Thu Dec 26 04:38:23 2013
@@ -50,7 +50,8 @@ import com.googlecode.wicket.jquery.ui.w
public class ResetPasswordDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = -523469331995677748L;
- private DialogButton resetBtn = new
DialogButton(WebSession.getString(327));
+ private String resetLbl = WebSession.getString(327);
+ private DialogButton resetBtn = new DialogButton(resetLbl);
private Form<String> form;
private FeedbackPanel feedback = new FeedbackPanel("feedback");
private PasswordTextField password;
@@ -163,7 +164,7 @@ public class ResetPasswordDialog extends
@Override
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (button.equals(resetBtn)){
+ if (button != null && button.match(resetLbl)){
confirmReset.open(target);
} else {
setResponsePage(Application.get().getSignInPageClass());
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Thu Dec 26 04:38:23 2013
@@ -73,7 +73,8 @@ public class SignInDialog extends Abstra
private static final long serialVersionUID = 7746996016261051947L;
private Form<String> form;
private DialogButton loginBtn = new
DialogButton(WebSession.getString(112));
- private DialogButton registerBtn = new
DialogButton(WebSession.getString(123));
+ private String registerLbl = WebSession.getString(123);
+ private DialogButton registerBtn = new DialogButton(registerLbl);
private String password;
private String login;
private boolean rememberMe = false;
@@ -145,7 +146,7 @@ public class SignInDialog extends Abstra
@Override
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (registerBtn.equals(button)) {
+ if (button != null && button.match(registerLbl)) {
r.setBrowserTZOffset(target,
browserTZOffset.getModelObject());
r.open(target);
}
@@ -179,7 +180,7 @@ public class SignInDialog extends Abstra
@Override
public void onClick(AjaxRequestTarget target, DialogButton button) {
- if (button.equals(registerBtn) ||
WebSession.get().isSignedIn()) {
+ if ((button != null && button.match(registerLbl)) ||
WebSession.get().isSignedIn()) {
super.onClick(target, button);
}
}
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Thu Dec 26 04:38:23 2013
@@ -67,6 +67,7 @@ import org.slf4j.Logger;
import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
import
com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.DefaultWysiwygToolbar;
+import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
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;
@@ -80,8 +81,10 @@ public class AppointmentDialog extends A
private AppointmentForm form;
private DialogButton save = new DialogButton(WebSession.getString(813));
private DialogButton cancel = new
DialogButton(WebSession.getString(1130));
- private DialogButton delete = new
DialogButton(WebSession.getString(814));
- private DialogButton enterRoom = new
DialogButton(WebSession.getString(1282));
+ private String deleteLbl = WebSession.getString(814);
+ private DialogButton delete = new DialogButton(deleteLbl);
+ private String enterRoomLbl = WebSession.getString(1282);
+ private DialogButton enterRoom = new DialogButton(enterRoomLbl);
private final CalendarPanel calendar;
protected final FeedbackPanel feedback;
final MeetingMemberDialog addAttendees;
@@ -121,7 +124,7 @@ public class AppointmentDialog extends A
private static final long serialVersionUID = 1L;
public void onClose(AjaxRequestTarget target,
DialogButton button) {
- if (button.equals(DialogButtons.OK)){
+ if (button != null &&
button.match(AbstractDialog.LBL_OK)){
deleteAppointment(target);
}
}
@@ -156,9 +159,9 @@ public class AppointmentDialog extends A
@Override
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (delete.equals(button)) {
+ if (button != null && button.match(deleteLbl)) {
confirmDelete.open(target);
- } else if (enterRoom.equals(button)) {
+ } else if (button != null && button.match(enterRoomLbl)) {
RoomEnterBehavior.roomEnter((MainPage)getPage(),
target, getModelObject().getRoom().getRooms_id());
}
}
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
Thu Dec 26 04:38:23 2013
@@ -57,7 +57,8 @@ public class MessageDialog extends Abstr
private static final long serialVersionUID = 1L;
private final Form<PrivateMessage> form;
private FeedbackPanel feedback = new FeedbackPanel("feedback");
- DialogButton send = new DialogButton(WebSession.getString(218));
+ String sendLbl = WebSession.getString(218);
+ DialogButton send = new DialogButton(sendLbl);
private DialogButton cancel = new
DialogButton(WebSession.getString(219));
private final WebMarkupContainer roomParamsBlock = new
WebMarkupContainer("roomParamsBlock");
private final WebMarkupContainer roomParams = new
WebMarkupContainer("roomParams");
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Thu Dec 26 04:38:23 2013
@@ -251,7 +251,7 @@ public class MessagesContactsPanel exten
@Override
public void onClose(AjaxRequestTarget target,
DialogButton button) {
- if (button.equals(send)) {
+ if (button != null && button.match(sendLbl)) {
target.add(container);
}
}
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
Thu Dec 26 04:38:23 2013
@@ -37,8 +37,10 @@ public class UserInfoDialog extends Abst
private static final long serialVersionUID = 6393565468567393270L;
private WebMarkupContainer container;
private DialogButton cancel = new
DialogButton(WebSession.getString(61));
- private DialogButton message = new
DialogButton(WebSession.getString(1253));
- private DialogButton contacts = new
DialogButton(WebSession.getString(1186));
+ private String messageLbl = WebSession.getString(1253);
+ private DialogButton message = new DialogButton(messageLbl);
+ private String contactsLbl = WebSession.getString(1186);
+ private DialogButton contacts = new DialogButton(contactsLbl);
private MessageDialog newMessage;
private long userId;
@@ -74,9 +76,9 @@ public class UserInfoDialog extends Abst
}
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (button.equals(message)) {
+ if (button != null && button.match(messageLbl)) {
newMessage.reset(false).open(target, userId);
- } else if (button.equals(contacts)) {
+ } else if (button != null && button.match(contactsLbl)) {
ContactsHelper.addUserToContactList(userId);
}
}
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1553449&r1=1553448&r2=1553449&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Thu Dec 26 04:38:23 2013
@@ -96,7 +96,7 @@ public class UserSearchPanel extends Use
@Override
public void onClose(AjaxRequestTarget target,
DialogButton button) {
- if (button.equals(send)) {
+ if (button != null && button.match(sendLbl)) {
refresh(target);
}
}
