Author: solomax
Date: Mon Jan 27 19:17:50 2014
New Revision: 1561799
URL: http://svn.apache.org/r1561799
Log:
Wicket related libraries are updated to 6.13.0
Modified:
openmeetings/trunk/singlewebapp/LICENSE
openmeetings/trunk/singlewebapp/ivy.xml
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/ChatPanel.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/calendar/CalendarPanel.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/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/LICENSE?rev=1561799&r1=1561798&r2=1561799&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/LICENSE (original)
+++ openmeetings/trunk/singlewebapp/LICENSE Mon Jan 27 19:17:50 2014
@@ -387,26 +387,26 @@ 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.12.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-auth-roles-jar-6.13.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-bootstrap-core-bundle-0.8.4.jar
webapps/openmeetings/WEB-INF/lib/wicket-bootstrap-extensions-bundle-0.8.4.jar
-webapps/openmeetings/WEB-INF/lib/wicket-core-jar-6.12.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-core-jar-6.13.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-dashboard-core-jar-0.9.jar
-webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-6.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-6.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-6.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-6.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-calendar-jar-6.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-core-jar-6.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-jar-6.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-plugins-jar-6.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-0.14.jar
-webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-tomcat-jar-0.14.jar
-webapps/openmeetings/WEB-INF/lib/wicket-request-jar-6.12.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-calendar-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-core-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-plugins-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-0.15.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-tomcat-jar-0.15.jar
+webapps/openmeetings/WEB-INF/lib/wicket-request-jar-6.13.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-select2-jar-2.2.2.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-6.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-6.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-util-jar-6.12.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-util-jar-6.13.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-webjars-jar-0.2.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
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1561799&r1=1561798&r2=1561799&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Mon Jan 27 19:17:50 2014
@@ -229,49 +229,49 @@
<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.12.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-request"
rev="6.13.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-util"
rev="6.12.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-util"
rev="6.13.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-core"
rev="6.12.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-core"
rev="6.13.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-auth-roles"
rev="6.12.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-auth-roles"
rev="6.13.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-ioc"
rev="6.12.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-ioc"
rev="6.13.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-extensions"
rev="6.12.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-extensions"
rev="6.13.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-datetime"
rev="6.12.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-datetime"
rev="6.13.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.12.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-devutils"
rev="6.13.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket"
name="wicket-native-websocket-core" rev="0.14" conf="openmeetings->*"
transitive="false">
+ <dependency org="org.apache.wicket"
name="wicket-native-websocket-core" rev="0.15" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket"
name="wicket-native-websocket-tomcat" rev="0.14" conf="openmeetings->*"
transitive="false">
+ <dependency org="org.apache.wicket"
name="wicket-native-websocket-tomcat" rev="0.15" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-core" rev="6.12.0" conf="openmeetings->*"
transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-core" rev="6.13.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui" rev="6.12.0" conf="openmeetings->*" transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui" rev="6.13.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-calendar" rev="6.12.0" conf="openmeetings->*"
transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-calendar" rev="6.13.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-plugins" rev="6.12.0" conf="openmeetings->*"
transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-plugins" rev="6.13.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
<dependency org="ro.fortsoft.wicket.dashboard"
name="wicket-dashboard-core" rev="0.9" conf="openmeetings->*"
transitive="false">
@@ -285,10 +285,10 @@
<include type="jar" />
</dependency>
-->
- <dependency org="org.wicketstuff"
name="wicketstuff-urlfragment" rev="6.12.0" conf="openmeetings->*"
transitive="false">
+ <dependency org="org.wicketstuff"
name="wicketstuff-urlfragment" rev="6.13.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-html5"
rev="6.12.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-html5"
rev="6.13.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="com.vaynberg.wicket.select2"
name="wicket-select2" rev="2.2.2" conf="openmeetings->*" transitive="false">
@@ -395,16 +395,16 @@
<!-- END OF MySQL Driver -->
<!-- Tomcat 7 -->
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.42" transitive="false" >
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.50" transitive="false" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.42" transitive="false" >
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.50" transitive="false" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.42"
transitive="false" >
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.50"
transitive="false" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.42"
transitive="false" >
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.50"
transitive="false" >
<include type="jar" />
</dependency>
<dependency org="tomcatplugin" name="tomcatplugin" rev="1.4"
conf="tomcat7->*" transitive="false">
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=1561799&r1=1561798&r2=1561799&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
Mon Jan 27 19:17:50 2014
@@ -119,8 +119,9 @@ public class Application extends Authent
Bootstrap.install(Application.get(), new BootstrapSettings());
- getRootRequestMapperAsCompound().add(new
NoVersionMapper(getHomePage()));
- getRootRequestMapperAsCompound().add(new
NoVersionMapper("notinited", NotInitedPage.class));
+ mountPage("notinited", NotInitedPage.class);
+ //getRootRequestMapperAsCompound().add(new
NoVersionMapper(getHomePage()));
+ //getRootRequestMapperAsCompound().add(new
NoVersionMapper("notinited", NotInitedPage.class));
mountPage("swf", SwfPage.class);
mountPage("install", InstallWizardPage.class);
mountPage("signin", getSignInPageClass());
@@ -132,7 +133,7 @@ public class Application extends Authent
mountResource("/recordings/mp4/${id}", new
Mp4RecordingResourceReference());
mountResource("/recordings/ogg/${id}", new
OggRecordingResourceReference());
}
-
+
private static class NoVersionMapper extends MountedMapper {
public NoVersionMapper(final Class<? extends IRequestablePage>
pageClass) {
this("/", pageClass);
@@ -156,7 +157,7 @@ public class Application extends Authent
}
}
}
-
+
public static OmAuthenticationStrategy getAuthenticationStrategy() {
return
(OmAuthenticationStrategy)get().getSecuritySettings().getAuthenticationStrategy();
}
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=1561799&r1=1561798&r2=1561799&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
Mon Jan 27 19:17:50 2014
@@ -153,7 +153,7 @@ public class ForgetPasswordDialog extend
}
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (button != null && button.match(sendLbl)){
+ if (send.equals(button)){
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=1561799&r1=1561798&r2=1561799&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
Mon Jan 27 19:17:50 2014
@@ -170,7 +170,7 @@ public class RegisterDialog extends Abst
}
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (button != null && button.match(registerLbl)){
+ if (registerBtn.equals(button)){
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=1561799&r1=1561798&r2=1561799&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
Mon Jan 27 19:17:50 2014
@@ -164,7 +164,7 @@ public class ResetPasswordDialog extends
@Override
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (button != null && button.match(resetLbl)){
+ if (resetBtn.equals(button)){
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=1561799&r1=1561798&r2=1561799&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
Mon Jan 27 19:17:50 2014
@@ -146,7 +146,7 @@ public class SignInDialog extends Abstra
@Override
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (button != null && button.match(registerLbl)) {
+ if (registerBtn.equals(button)) {
r.setBrowserTZOffset(target,
browserTZOffset.getModelObject());
r.open(target);
}
@@ -180,7 +180,7 @@ public class SignInDialog extends Abstra
@Override
public void onClick(AjaxRequestTarget target, DialogButton button) {
- if ((button != null && button.match(registerLbl)) ||
WebSession.get().isSignedIn()) {
+ if (registerBtn.equals(button) ||
WebSession.get().isSignedIn()) {
super.onClick(target, button);
}
}
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/ChatPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1561799&r1=1561798&r2=1561799&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/ChatPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/ChatPanel.java
Mon Jan 27 19:17:50 2014
@@ -44,7 +44,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.Model;
import org.apache.wicket.protocol.ws.IWebSocketSettings;
import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
-import org.apache.wicket.protocol.ws.api.IWebSocketConnectionRegistry;
+import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
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=1561799&r1=1561798&r2=1561799&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
Mon Jan 27 19:17:50 2014
@@ -159,9 +159,9 @@ public class AppointmentDialog extends A
@Override
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (button != null && button.match(deleteLbl)) {
+ if (delete.equals(button)) {
confirmDelete.open(target);
- } else if (button != null && button.match(enterRoomLbl)) {
+ } else if (enterRoom.equals(button)) {
RoomEnterBehavior.roomEnter((MainPage)getPage(),
target, getModelObject().getRoom().getRooms_id());
}
}
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1561799&r1=1561798&r2=1561799&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
Mon Jan 27 19:17:50 2014
@@ -160,11 +160,6 @@ public class CalendarPanel extends UserP
}
@Override
- public boolean isEditable() {
- return true;
- }
-
- @Override
public boolean isEventDropEnabled() {
return true;
}
@@ -226,7 +221,7 @@ public class CalendarPanel extends UserP
dao.update(a, getBaseUrl(), getUserId());
//FIXME add feedback info
}
-
+
@Override
public void onEventResize(AjaxRequestTarget target, int
eventId, long delta) {
AppointmentDao dao = getDao();
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=1561799&r1=1561798&r2=1561799&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
Mon Jan 27 19:17:50 2014
@@ -251,7 +251,7 @@ public class MessagesContactsPanel exten
@Override
public void onClose(AjaxRequestTarget target,
DialogButton button) {
- if (button != null && button.match(sendLbl)) {
+ if (send.equals(button)) {
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=1561799&r1=1561798&r2=1561799&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
Mon Jan 27 19:17:50 2014
@@ -73,9 +73,9 @@ public class UserInfoDialog extends Abst
}
public void onClose(AjaxRequestTarget target, DialogButton button) {
- if (button != null && button.match(messageLbl)) {
+ if (message.equals(button)) {
newMessage.reset(false).open(target, userId);
- } else if (button != null && button.match(contactsLbl)) {
+ } else if (contacts.equals(button)) {
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=1561799&r1=1561798&r2=1561799&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
Mon Jan 27 19:17:50 2014
@@ -96,7 +96,7 @@ public class UserSearchPanel extends Use
@Override
public void onClose(AjaxRequestTarget target,
DialogButton button) {
- if (button != null && button.match(sendLbl)) {
+ if (send.equals(button)) {
refresh(target);
}
}
