[Jboss-svn-commits] JBL Code SVN: r1827 - trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast

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

Author: wrzep
Date: 2005-12-16 18:31:19 -0500 (Fri, 16 Dec 2005)
New Revision: 1827

Modified:
   trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/Podcast.java
Log:
code cleanup,
added info whether item/channel has or hasn't got an image

http://jira.jboss.com/jira/browse/JBLAB-540

Pawel


Modified: trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/Podcast.java
===================================================================
--- trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/Podcast.java	2005-12-16 22:54:29 UTC (rev 1826)
+++ trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/Podcast.java	2005-12-16 23:31:19 UTC (rev 1827)
@@ -22,6 +22,7 @@
 
 package org.jboss.forge.podcast;
 
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.HashMap;
@@ -156,7 +157,9 @@
 		if (imageProperties != null) {
 			nodeContext.put("image", imageProperties[1]);
 			nodeContext.next("hasImage");
-		}		
+		} else {
+			nodeContext.next("hasNotImage");
+		}
 	}
 	
 	/**
@@ -199,6 +202,8 @@
 		if ((channelImage != null) && (channelImage.getLocation() != null)) {
 			nodeContext.put("channel-image", channelImage.getLocation().toString());
 			nodeContext.next("channel-hasImage");
+		} else {
+			nodeContext.next("channel-hasNotImage");
 		}
 	}
 	
@@ -287,21 +292,13 @@
 	 * @return Set of all items from feeds described in the given Set.
 	 */
 	private Set<ItemIF> getAllItems(Set<Map<String,Node>> nodes) {
-		/*
-		LogFactory lf = LogFactory.getFactory();
-		//org.apache.commons.logging.log = lf.getInstance(FeedParser.class)
-		String[] atribs = lf.getAttributeNames();
-		for (int i = 0; i < atribs.length; i++) {
-			System.out.println("atrib " + atribs[i] + " = " + lf.getAttribute(atribs[i]));
-		}
-		*/
 		
 		HashSet<ItemIF> ret = new HashSet<ItemIF>();
 		
 		Node urlNode = null;
 		String urlString = null;
 		
-		for (Iterator iter = nodes.iterator(); iter.hasNext();) {
+		for (Iterator<Map<String,Node>> iter = nodes.iterator(); iter.hasNext();) {
 			try {
 				Map<String,Node> nodeProperties = (Map<String,Node>) iter.next();
 				
@@ -311,16 +308,18 @@
 				if (urlString.charAt(0) == '/') { // local link
 					urlString = serverAdress + urlString;
 				}
+				
 				URL url = new URL(urlString);
+				
+				/*TODO updating when change registred only (using http protocol)
 				HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 				Date date = new Date(connection.getDate());
-				//System.out.println("date: " + date + " (" + urlString + ")");
 				
 				HttpURLConnection con = (HttpURLConnection) url.openConnection();
 				con.setRequestMethod("HEAD");
 				con.connect();
 				date = new Date(con.getDate());
-				//System.out.println("date: " + date + " (" + urlString + ")");
+				*/
 				
 				ChannelIF channel = FeedParser.parse(new ChannelBuilder(), url.openStream());
 				ret.addAll(channel.getItems());