svn commit: r1497659 - /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java

[solomax]

Author: solomax
Date: Fri Jun 28 07:01:04 2013
New Revision: 1497659

URL: http://svn.apache.org/r1497659
Log:
[OPENMEETINGS-615] Messages sort is implemented (need to be refactored)

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1497659&r1=1497658&r2=1497659&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
 Fri Jun 28 07:01:04 2013
@@ -224,14 +224,17 @@ public class MessagesContactsPanel exten
                        public Iterator<? extends PrivateMessage> iterator(long 
first, long count) {
                                //FIXME need to be refactored + sort + search
                                long folder = selectedModel.getObject();
+                               String sort = getSort() == null ? "" : 
getSort().getProperty();
+                               boolean isAsc = getSort() == null ? true : 
getSort().isAscending();
+                               String _search = search == null ? "" : "c." + 
search; //FIXME need to be refactored
                                if (INBOX_FOLDER_ID == folder) {
-                                       return 
getDao().getPrivateMessagesByUser(getUserId(), "", "", (int)first, true, 0L, 
(int)count).iterator();
+                                       return 
getDao().getPrivateMessagesByUser(getUserId(), _search, sort, (int)first, 
isAsc, 0L, (int)count).iterator();
                                } else if (SENT_FOLDER_ID == folder) {
-                                       return 
getDao().getSendPrivateMessagesByUser(getUserId(), "", "", (int)first, true, 
0L, (int)count).iterator();
+                                       return 
getDao().getSendPrivateMessagesByUser(getUserId(), _search, sort, (int)first, 
isAsc, 0L, (int)count).iterator();
                                } else if (TRASH_FOLDER_ID == folder) {
-                                       return 
getDao().getTrashPrivateMessagesByUser(getUserId(), "", "", (int)first, true, 
(int)count).iterator();
+                                       return 
getDao().getTrashPrivateMessagesByUser(getUserId(), _search, sort, (int)first, 
isAsc, (int)count).iterator();
                                } else {
-                                       return 
getDao().getPrivateMessagesByUser(getUserId(), "", "", (int)first, true, 
folder, (int)count).iterator();
+                                       return 
getDao().getPrivateMessagesByUser(getUserId(), _search, sort, (int)first, 
isAsc, folder, (int)count).iterator();
                                }
                        }