Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1636 - trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast
|
From: <jbo...@li...> - 2005-11-23 23:53:21
|
Author: wrzep Date: 2005-11-23 18:53:13 -0500 (Wed, 23 Nov 2005) New Revision: 1636 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/PodcastDescriptor.java trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/PodcastNodeWatcher.java trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/PodcastPortlet.java Log: Code cleanup 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-11-23 19:49:23 UTC (rev 1635) +++ trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/Podcast.java 2005-11-23 23:53:13 UTC (rev 1636) @@ -27,7 +27,6 @@ import java.util.HashMap; import java.util.Set; import java.util.HashSet; -import java.util.SimpleTimeZone; import java.util.Date; import java.text.DateFormat; @@ -35,25 +34,13 @@ import java.net.URL; import java.net.HttpURLConnection; -import java.net.URLConnection; -import java.net.MalformedURLException; import java.io.IOException; import org.jboss.forge.common.XmlTools; import org.jboss.forge.common.projects.AbstractDescriptor; -import org.jboss.forge.common.projects.permissions.PermissionsChecker; -import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker; -import org.jboss.forge.common.projects.DomToXmlTransformer; - import org.jboss.portal.common.context.DelegateContext; -import org.jboss.shotoku.ContentManager; - import org.jboss.logging.Logger; -import org.apache.xerces.parsers.DOMParser; -import org.xml.sax.InputSource; - -import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.NamedNodeMap; @@ -95,7 +82,6 @@ private static final int BYTES_IN_MB = (1024*1024); - private String portalName; private String serverAdress; private Logger log; @@ -105,8 +91,7 @@ */ private Object[] allItemsArr; - Podcast(String portalName, String serverAdress, Node root) { - this.portalName = portalName; + Podcast(String serverAdress, Node root) { this.serverAdress = serverAdress; log = Logger.getLogger(this.getClass()); @@ -176,9 +161,7 @@ // filling the context with enclosure information ItemEnclosureIF enclosure = item.getEnclosure(); - if (enclosure != null) { - DelegateContext enclosureContext = nodeContext.next("enclosure-link"); - + if (enclosure != null) { nodeContext.put("enclosure-type", enclosure.getType()); nodeContext.put("enclosure-size", Math.round(enclosure.getLength() / BYTES_IN_MB)); @@ -223,8 +206,8 @@ * @return Set containing <code>root</code>'s child Nodes, * but only those with names included in <code>nodeNames</code> Set */ - private Set getChildNodesSet(Node root, Set<String> nodesNames) { - HashSet ret = new HashSet<Node>(); + private Set<Node> getChildNodesSet(Node root, Set<String> nodesNames) { + HashSet<Node> ret = new HashSet<Node>(); NodeList list = root.getChildNodes(); for (int i = 0; i < list.getLength(); i++) { @@ -242,8 +225,8 @@ * Similar to <code>getChildNodesSet(Node,Set)</code>. * Map binds child Nodes names with appropriate Nodes. */ - private Map getChildNodesMap(Node root, Set<String> nodesNames) { - HashMap ret = new HashMap<String,Node>(); + private Map<String,Node> getChildNodesMap(Node root, Set<String> nodesNames) { + HashMap<String,Node> ret = new HashMap<String,Node>(); NodeList list = root.getChildNodes(); for (int i = 0; i < list.getLength(); i++) { @@ -282,7 +265,7 @@ for (Iterator iter = nodes.iterator(); iter.hasNext();) { try { - Map nodeProperties = (Map<String,Node>) iter.next(); + Map<String,Node> nodeProperties = (Map<String,Node>) iter.next(); urlNode = (Node) nodeProperties.get(URL_ELEMENT); Modified: trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/PodcastDescriptor.java =================================================================== --- trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/PodcastDescriptor.java 2005-11-23 19:49:23 UTC (rev 1635) +++ trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/PodcastDescriptor.java 2005-11-23 23:53:13 UTC (rev 1636) @@ -22,24 +22,14 @@ package org.jboss.forge.podcast; -import java.io.IOException; -import java.util.Set; -import java.util.HashSet; - import org.jboss.forge.podcast.PodcastTools; import org.apache.xerces.parsers.DOMParser; -import org.jboss.forge.common.ForgeHelper; -import org.jboss.forge.common.projects.ProjectsHelper; import org.jboss.portal.common.context.DelegateContext; import org.jboss.portlet.JBossRenderRequest; import org.jboss.shotoku.ContentManager; -import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.jboss.logging.Logger; /** * @author Pawel Wrzeszcz @@ -47,18 +37,13 @@ */ public class PodcastDescriptor { - private static final Logger log = Logger.getLogger(PodcastDescriptor.class); - private DelegateContext context; private Podcast podcast; - private HashSet<String> feeds; public PodcastDescriptor(String portalName, String serverAdress, ContentManager cm) { - try { - feeds = new HashSet<String>(); - + try { DOMParser parser = new DOMParser(); parser.parse(new InputSource(cm.getNode(PodcastTools .getXmlCmPath(portalName)).getContentInputStream())); @@ -67,7 +52,7 @@ if ((root.getNodeType() == Node.ELEMENT_NODE) && (root.getNodeName().equals(Podcast.PODCAST_ELEMENT))) { - podcast = new Podcast(portalName, serverAdress, root); + podcast = new Podcast(portalName, root); } fillContext(); Modified: trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/PodcastNodeWatcher.java =================================================================== --- trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/PodcastNodeWatcher.java 2005-11-23 19:49:23 UTC (rev 1635) +++ trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/PodcastNodeWatcher.java 2005-11-23 23:53:13 UTC (rev 1636) @@ -23,8 +23,6 @@ package org.jboss.forge.podcast; import org.jboss.forge.common.service.NodeWatcher; -import org.jboss.forge.common.service.ResourceWatcher; - import org.jboss.shotoku.ContentManager; /** Modified: trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/PodcastPortlet.java =================================================================== --- trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/PodcastPortlet.java 2005-11-23 19:49:23 UTC (rev 1635) +++ trunk/forge/portal-extensions/forge-podcast/src/java/org/jboss/forge/podcast/PodcastPortlet.java 2005-11-23 23:53:13 UTC (rev 1636) @@ -28,11 +28,6 @@ import javax.portlet.PortletRequestDispatcher; import org.jboss.forge.common.ForgeHelper; -import org.jboss.forge.common.projects.Projects; -import org.jboss.forge.common.projects.ProjectsHelper; -import org.jboss.forge.common.projects.permissions.PermissionsChecker; -import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker; - import org.jboss.portal.common.context.DelegateContext; import org.jboss.portal.core.servlet.jsp.PortalJsp; |