[Openuss-svn-commits] SF.net SVN: openuss:[4860] branches/openuss-plexus-3.1-light/plexus/ plexus-web/src/main/java/org/openuss/web/feeds

[<ro...@us...>]

Revision: 4860
          http://openuss.svn.sourceforge.net/openuss/?rev=4860&view=rev
Author:   roekens
Date:     2008-11-03 15:43:54 +0000 (Mon, 03 Nov 2008)

Log Message:
-----------
bugfixes for newsfeeds
several elements were visible even if they should be published in future.

Modified Paths:
--------------
    branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/CourseFeed.java
    branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/GlobalFeed.java
    branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/InstituteFeed.java

Modified: branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/CourseFeed.java
===================================================================
--- branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/CourseFeed.java	2008-11-03 15:20:56 UTC (rev 4859)
+++ branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/CourseFeed.java	2008-11-03 15:43:54 UTC (rev 4860)
@@ -7,6 +7,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -45,8 +46,11 @@
 				newsItem = (NewsItemInfo) i.next();
 				link = getSystemService().getProperty(SystemProperties.OPENUSS_SERVER_URL).getValue()
 						+ "/views/public/news/newsDetail.faces?news=" + newsItem.getId();
-				this.addEntry(entries, newsItem.getTitle(), link, newsItem.getPublishDate(), newsItem.getText(), course
-						.getName(), newsItem.getPublisherName());
+				if (newsItem.getPublishDate().before(new Date())) {
+					this.addEntry(entries, newsItem.getTitle(), link, newsItem
+							.getPublishDate(), newsItem.getText(), course
+							.getName(), newsItem.getPublisherName());
+				}
 			}
 
 			newsItem = (NewsItemInfo) newsEntries.get(0);

Modified: branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/GlobalFeed.java
===================================================================
--- branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/GlobalFeed.java	2008-11-03 15:20:56 UTC (rev 4859)
+++ branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/GlobalFeed.java	2008-11-03 15:43:54 UTC (rev 4860)
@@ -1,6 +1,7 @@
 package org.openuss.web.feeds;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -47,13 +48,12 @@
 			//Collections.reverse(newsEntries);
 			
 			for (NewsItemInfo item : newsEntries) {
-				this.addEntry(entries, 
-						item.getTitle() + " (" + item.getPublisherName() + ")", 
-						linkNewsItem + item.getId(), 
-						item.getPublishDate(), 
-						item.getText(),
-						"Global", 
-						item.getPublisherName());
+				if (item.getPublishDate().before(new Date())) {
+					this.addEntry(entries, item.getTitle() + " ("
+							+ item.getPublisherName() + ")", linkNewsItem
+							+ item.getId(), item.getPublishDate(), item
+							.getText(), "Global", item.getPublisherName());
+				}
 			}
 
 			feedWrapper.setLastModified(newsEntries.get(0).getPublishDate());

Modified: branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/InstituteFeed.java
===================================================================
--- branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/InstituteFeed.java	2008-11-03 15:20:56 UTC (rev 4859)
+++ branches/openuss-plexus-3.1-light/plexus/plexus-web/src/main/java/org/openuss/web/feeds/InstituteFeed.java	2008-11-03 15:43:54 UTC (rev 4860)
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -47,13 +48,15 @@
 		if (newsEntries != null && newsEntries.size() != 0) {
 			Collections.reverse(newsEntries);
 			for (NewsItemInfo item : newsEntries) {
-				this.addEntry(entries, 
-						item.getTitle(), 
-						linkNewsItem + item.getId(), 
-						item.getPublishDate(), 
-						item.getText(),
-						institute.getName(), 
-						item.getPublisherName());
+				if (item.getPublishDate().before(new Date())){
+					this.addEntry(entries, 
+							item.getTitle(), 
+							linkNewsItem + item.getId(), 
+							item.getPublishDate(), 
+							item.getText(),
+							institute.getName(), 
+							item.getPublisherName());
+				}
 			}
 
 			feedWrapper.setLastModified(newsEntries.get(0).getPublishDate());


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