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 2014/08/12 18:57:14 UTC
svn commit: r1617530 - in /openmeetings/branches/3.0.x: ivy.xml
src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Author: solomax
Date: Tue Aug 12 16:57:13 2014
New Revision: 1617530
URL: http://svn.apache.org/r1617530
Log:
Minor typos are fixed
Modified:
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Modified: openmeetings/branches/3.0.x/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1617530&r1=1617529&r2=1617530&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Tue Aug 12 16:57:13 2014
@@ -333,7 +333,7 @@
<!-- END OF OPENMEETINGS -->
<!-- START OF JUNIT -->
- <dependency org="org.springframework" name="spring-test" rev="4.0.3.RELEASE" conf="junit->*" transitive="false">
+ <dependency org="org.springframework" name="spring-test" rev="4.0.6.RELEASE" conf="junit->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="junit->*" transitive="false">
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1617530&r1=1617529&r2=1617530&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Tue Aug 12 16:57:13 2014
@@ -125,11 +125,7 @@ public class MessagesContactsPanel exten
return "" + object;
}
});
- private static PrivateMessageFolder NOT_MOVE_FOLDER = new PrivateMessageFolder();
- static {
- NOT_MOVE_FOLDER.setPrivateMessageFolderId(MOVE_CHOOSE);
- NOT_MOVE_FOLDER.setFolderName(WebSession.getString(1243));
- }
+ private PrivateMessageFolder NOT_MOVE_FOLDER = new PrivateMessageFolder();
private final DropDownChoice<PrivateMessageFolder> moveDropDown = new DropDownChoice<PrivateMessageFolder>("msgMove", Model.of(NOT_MOVE_FOLDER)
, Arrays.asList(NOT_MOVE_FOLDER)
, new IChoiceRenderer<PrivateMessageFolder>() {
@@ -243,6 +239,8 @@ public class MessagesContactsPanel exten
@SuppressWarnings("unchecked")
public MessagesContactsPanel(String id) {
super(id);
+ NOT_MOVE_FOLDER.setPrivateMessageFolderId(MOVE_CHOOSE);
+ NOT_MOVE_FOLDER.setFolderName(WebSession.getString(1243));
foldersModel = Model.ofList(getBean(PrivateMessageFolderDao.class).get(0, Integer.MAX_VALUE));
updateMoveModel();
add(newMessage = new MessageDialog("newMessage", new CompoundPropertyModel<PrivateMessage>(new PrivateMessage())) {