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/09/25 14:15:14 UTC
svn commit: r1627528 - in /openmeetings/trunk/singlewebapp:
openmeetings-web/pom.xml
openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
pom.xml
Author: solomax
Date: Thu Sep 25 12:15:14 2014
New Revision: 1627528
URL: http://svn.apache.org/r1627528
Log:
Code clean-up
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1627528&r1=1627527&r2=1627528&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Thu Sep 25 12:15:14 2014
@@ -350,57 +350,57 @@
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-core</artifactId>
- <version>${wicket.version}</version>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui</artifactId>
- <version>${wicket.version}</version>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-calendar</artifactId>
- <version>${wicket.version}</version>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-plugins</artifactId>
- <version>${wicket.version}</version>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-kendo-ui</artifactId>
- <version>${wicket.version}</version>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-kendo-ui-theme-default</artifactId>
- <version>${wicket.version}</version>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-urlfragment</artifactId>
- <version>${wicket.version}</version>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-html5</artifactId>
- <version>${wicket.version}</version>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-whiteboard</artifactId>
- <version>${wicket.version}</version>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-select2</artifactId>
- <version>${wicket.version}</version>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>jqplot</artifactId>
- <version>${wicket.version}</version>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1627528&r1=1627527&r2=1627528&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Thu Sep 25 12:15:14 2014
@@ -71,6 +71,7 @@ import org.apache.wicket.markup.repeater
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.ListModel;
import ro.fortsoft.wicket.dashboard.web.util.ConfirmAjaxCallListener;
@@ -93,7 +94,7 @@ public class MessagesContactsPanel exten
private final Label pendingContacts = new Label("pendingContacts", Model.of(0L));
private final Label allContacts = new Label("allContacts", Model.of(0L));
private final IModel<Long> selectedFolderModel = Model.of(INBOX_FOLDER_ID);
- private final IModel<List<? extends PrivateMessageFolder>> foldersModel;
+ private final IModel<List<PrivateMessageFolder>> foldersModel = new ListModel<PrivateMessageFolder>(null);
private final WebMarkupContainer inbox = new WebMarkupContainer("inbox");
private final WebMarkupContainer sent = new WebMarkupContainer("sent");
private final WebMarkupContainer trash = new WebMarkupContainer("trash");
@@ -240,7 +241,7 @@ public class MessagesContactsPanel exten
super(id);
NOT_MOVE_FOLDER.setId(MOVE_CHOOSE);
NOT_MOVE_FOLDER.setFolderName(WebSession.getString(1243));
- foldersModel = Model.ofList(getBean(PrivateMessageFolderDao.class).get(0, Integer.MAX_VALUE));
+ foldersModel.setObject(getBean(PrivateMessageFolderDao.class).get(0, Integer.MAX_VALUE));
updateMoveModel();
add(newMessage = new MessageDialog("newMessage", new CompoundPropertyModel<PrivateMessage>(new PrivateMessage())) {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1627528&r1=1627527&r2=1627528&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Thu Sep 25 12:15:14 2014
@@ -42,6 +42,7 @@
<maven.surefire.version>2.17</maven.surefire.version>
<maven-site.version>3.4</maven-site.version>
<wicket.version>7.0.0-M3</wicket.version>
+ <wickets.version>7.0.0-M3</wickets.version>
<red5-server.version>1.0.3-RELEASE</red5-server.version>
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
@@ -252,16 +253,16 @@
<id>flex-mojos-repository</id>
<url>https://oss.sonatype.org/content/groups/staging</url>
</repository>
- <!-- repository>
+ <repository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
- <id>apache-snapshots</id>
+ <id>apache-snapshots</id>
<url>https://repository.apache.org/content/groups/snapshots</url>
- </repository-->
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>