[Comsuite-svn] SF.net SVN: comsuite: [172] trunk/code/CSMiddleware/src/org/commsuite

[<zd...@us...>]

Revision: 172
          http://svn.sourceforge.net/comsuite/?rev=172&view=rev
Author:   zduniak
Date:     2006-09-30 16:38:56 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
- Sorting performance improved a little bit
- Generated Message.hbm.xml file corrected

Modified Paths:
--------------
    trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml
    trunk/code/CSMiddleware/src/org/commsuite/model/Message.java
    trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java

Modified: trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml	2006-09-30 23:28:51 UTC (rev 171)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/Message.hbm.xml	2006-09-30 23:38:56 UTC (rev 172)
@@ -7,7 +7,7 @@
     <id name="id">
       <generator class="native">
         <param name="sequence">CS_MESSAGES_SEQ</param>
-        <param name="parameters">INCREMENT BY 1 START</param>
+        <param name="parameters">INCREMENT BY 1 START WITH 100</param>
       </generator>
     </id>
     <property name="creationDate" not-null="true" type="timestamp" column="CREATION_DATE"/>

Modified: trunk/code/CSMiddleware/src/org/commsuite/model/Message.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/model/Message.java	2006-09-30 23:28:51 UTC (rev 171)
+++ trunk/code/CSMiddleware/src/org/commsuite/model/Message.java	2006-09-30 23:38:56 UTC (rev 172)
@@ -219,14 +219,16 @@
 
 		final List<SentContent> scList = new FastTable<SentContent>();
 		for (final SentContent sc : sentContents) {
-			logger.debug("sc.getContent().getData(): " + sc.getContent().getData());
+			logger.debug("sc.getContent().getData(): "
+					+ sc.getContent().getData());
 			final SentContent clonedSc = new SentContent();
 			clonedSc.setContent(sc.getContent());
 			clonedSc.setInternalId(RandomGUID.getGUID());
 			clonedSc.setState(sc.getState());
 			clonedSc.setMessage(this);
 			scList.add(clonedSc);
-			logger.debug("clonedSc.getContent().getData(): " + clonedSc.getContent().getData());
+			logger.debug("clonedSc.getContent().getData(): "
+					+ clonedSc.getContent().getData());
 		}
 		msg.setSentContents(scList);
 
@@ -236,8 +238,7 @@
 	/**
 	 * @hibernate.id generator-class="native"
 	 * @hibernate.generator-param name="sequence" value="CS_MESSAGES_SEQ"
-	 * @hibernate.generator-param name="parameters" value="INCREMENT BY 1 START
-	 *                            WITH 100"
+	 * @hibernate.generator-param name="parameters" value="INCREMENT BY 1 START WITH 100"
 	 */
 	public Long getId() {
 		return super.id;

Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java	2006-09-30 23:28:51 UTC (rev 171)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/MessagesService.java	2006-09-30 23:38:56 UTC (rev 172)
@@ -52,6 +52,24 @@
  * @author Szymon Kuzniak
  */
 public class MessagesService {
+	
+	/**
+	 * TODO: JavaDoc
+	 */
+	private static final Comparator<Message> MESSAGES_COMPARATOR = new Comparator<Message>() {
+		public int compare(Message m1, Message m2) {
+			// Comparing m1 with m2 descending == m2 with m1 ascending:  
+			final int comparisonByLastProcessDate = m2.getLastProcessDate()
+					.compareTo(m1.getLastProcessDate());
+			if (0 == comparisonByLastProcessDate) {
+				final int comparisonBySendDate = m1.getSendDate()
+						.compareTo(m1.getSendDate());
+				return comparisonBySendDate;
+			} else {
+				return comparisonByLastProcessDate;
+			}
+		}
+	};
 
 	private final MessageManager messageManager;
 
@@ -120,22 +138,10 @@
 		}
 		return result;
 	}
-	
+
 	private void sortMessagesList(final List<Message> list) {
-	Collections.sort(list, new Comparator<WSMessage>() {
-		public int compare(WSMessage m1, WSMessage m2) {
-			final int comparisonByLastProcessDate = m2.getLastProcessDate()
-					.compareTo(m1.getLastProcessDate());
-			if (0 == comparisonByLastProcessDate) {
-				final int comparisonBySendDate = m1.getSendDate()
-						.compareTo(m1.getSendDate());
-				return comparisonBySendDate;
-			} else {
-				return comparisonByLastProcessDate;
-			}
-		}
-	});
-}
+		Collections.sort(list, MESSAGES_COMPARATOR);
+	}
 
 	/**
 	 * TODO: JavaDoc


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.