[Jboss-svn-commits] JBL Code SVN: r1227 - trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins

[<jbo...@li...>]

Author: szimano
Date: 2005-09-27 17:57:39 -0400 (Tue, 27 Sep 2005)
New Revision: 1227

Modified:
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java
Log:
changed bug with showing same date couple times


Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java	2005-09-27 20:31:45 UTC (rev 1226)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java	2005-09-27 21:57:39 UTC (rev 1227)
@@ -26,7 +26,7 @@
 		
 		Set<String> pages = wikiEngine.getMediaDataSource().getAllPageNames();
 
-		TreeMap<Calendar, TreeSet<String>> sortedByDate = new TreeMap<Calendar, TreeSet<String>>();
+		TreeMap<String, TreeSet<String>> sortedByDate = new TreeMap<String, TreeSet<String>>();
 		
 		// get now date
 		Calendar now = Calendar.getInstance();
@@ -42,16 +42,23 @@
 			
 			if (then.after(now)) {
 				//this page has been edited in last numOfDays days
-				Calendar key = Calendar.getInstance();
+				Calendar cal = Calendar.getInstance();
+				String key;
 				
-				key.setTime(temp.getEditDate());
+				cal.setTime(temp.getEditDate());
 				
-				//make it 0:00:00 hour
-				key.set(Calendar.HOUR, 0);
-				key.set(Calendar.MINUTE, 0);
-				key.set(Calendar.SECOND, 0);
-				key.set(Calendar.MILLISECOND, 0);
+				String month = String.valueOf(cal.get(Calendar.MONTH)+1);
+				String day = String.valueOf(cal.get(Calendar.DAY_OF_MONTH));
 				
+				if (month.length() == 1)
+					month = "0"+month;
+				
+				if (day.length() == 1)
+					day = "0"+day;
+				
+				//create key
+				key = cal.get(Calendar.YEAR) + "/" + (month) + "/" + day;
+				
 				if (sortedByDate.get(key) == null) {
 					TreeSet<String> set = new TreeSet<String>();
 					set.add(temp.getName());
@@ -65,12 +72,12 @@
 		
 		// add pages to recentChanges page
 		
-		Set<Calendar> keySet = sortedByDate.keySet();
+		Set<String> keySet = sortedByDate.keySet();
 		
-		for (Calendar date : keySet) {
+		for (String date : keySet) {
 			StringBuilder day = new StringBuilder();
 		
-			day.append("!''").append(date.get(Calendar.DAY_OF_MONTH)).append("/").append(date.get(Calendar.MONTH)).append("/").append(date.get(Calendar.YEAR)).append("''\n");
+			day.append("!''").append(date).append("''\n");
 			for (String pageName : sortedByDate.get(date)) {
 				day.append("[").append(pageName).append("]\\\\\n");
 			}