[Jboss-svn-commits] JBL Code SVN: r4944 - labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects

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

Author: unibrew
Date: 2006-07-07 10:44:59 -0400 (Fri, 07 Jul 2006)
New Revision: 4944

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
Log:
[JBLAB-682] Integrating DownloadsDescriptor's parsing into ProjectDescriptor.

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java	2006-07-07 14:39:39 UTC (rev 4943)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java	2006-07-07 14:44:59 UTC (rev 4944)
@@ -59,6 +59,11 @@
      * <code>CAT_ID_SEPARATOR</code> - a separator of category ids.
      */
     public final static String CAT_ID_SEPARATOR = "/";
+    
+    /**
+     * Name of the XML element under which downloads are described.
+     */
+    public final static String DOWNLOADS_ELEMENT = "downloads";
 
     private Map<String, DownloadsDescriptor> categories;
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java	2006-07-07 14:39:39 UTC (rev 4943)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java	2006-07-07 14:44:59 UTC (rev 4944)
@@ -50,13 +50,12 @@
  * @author adamw
  */
 public class ProjectDescriptor extends AbstractDescriptor {
-	private static final Logger log = Logger.getLogger(ProjectDescriptor.class);
 	
-	private DownloadsDescriptor downloads;
+    private static final Logger log = Logger.getLogger(ProjectDescriptor.class);
 
-	private String portalName;
+    private String portalName;
 
-	private ElementDescriptor thisProject;
+    private ElementDescriptor thisProject;
 
     private Node menuNode;
     private Menu menu;
@@ -67,9 +66,9 @@
     private Node issueTrackerNode;
     private IssueTracker issueTracker;
 
-    // TODO: HACK
     private Node downloadsNode;
-
+    private DownloadsDescriptor downloads;
+    
     /**
 	 * Reads information about a project from an xml file.
 	 * 
@@ -213,7 +212,7 @@
                 if (IssueTracker.ISSUE_TRACKER_ELEMENT.equals(node.getNodeName())) {
                     setIssueTrackerNode(node);
                 }
-                if ("downloads".equals(node.getNodeName())) {
+                if (DownloadsDescriptor.DOWNLOADS_ELEMENT.equals(node.getNodeName())) {
                     downloadsNode=node;
                 }
 			}