[Jboss-svn-commits] JBL Code SVN: r1877 - in trunk/forge/portal-extensions/forge-status: . src/java/org/jboss/forge/status

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

Author: wrzep
Date: 2005-12-19 16:08:54 -0500 (Mon, 19 Dec 2005)
New Revision: 1877

Modified:
   trunk/forge/portal-extensions/forge-status/project.xml
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Columns.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ProjectByScoreComparator.java
Log:
projects order can be now determined by any plugin, not only score plugin

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

Pawel


Modified: trunk/forge/portal-extensions/forge-status/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-status/project.xml	2005-12-19 20:39:27 UTC (rev 1876)
+++ trunk/forge/portal-extensions/forge-status/project.xml	2005-12-19 21:08:54 UTC (rev 1877)
@@ -54,9 +54,9 @@
     <version>3.0.13</version> 
 		<jar>hessian-3.0.13.jar</jar>
     <properties>
-    <war.bundle>true</war.bundle>
+    	<war.bundle>true</war.bundle>
     </properties>
   </dependency>
-	
+
     </dependencies>
 </project>

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Columns.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Columns.java	2005-12-19 20:39:27 UTC (rev 1876)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Columns.java	2005-12-19 21:08:54 UTC (rev 1877)
@@ -55,7 +55,7 @@
 	/**
 	 * ScorePlugin, which determine projects order in the Matrix
 	 */
-	private ScorePlugin orderPlugin;
+	private Plugin orderPlugin;
 	
 	private Logger log;
 	
@@ -110,30 +110,23 @@
 	}
 
 	/**
-	 * Retruns ScorePlugin used to determine projects order
+	 * Retruns Plugin used to determine projects order
 	 * in the StatusMatrix
 	 * 
 	 * @param pageRoot Node specfying Columns properties
 	 * @param plugins Plugins used by Columns
-	 * @return ScorePlugin determining projects order
+	 * @return Plugin determining projects order
 	 */
-	private ScorePlugin getOrderPlugin(Node pageRoot, Plugins plugins) {
+	private Plugin getOrderPlugin(Node pageRoot, Plugins plugins) {
 		
-		ScorePlugin orderPlugin = null;
 		String orderPluginId = XmlTools.getChildNodeValue(pageRoot,
 											StatusTags.ORDER_PLUGIN_ELEMENT);
 		
 		if (orderPluginId != null) {
-			try {
-				orderPlugin = (ScorePlugin) plugins.get(orderPluginId);
-			} catch (ClassCastException e) {
-				log.warn("Order plugin: " + orderPluginId +
-						 " should be score plugin.");
-			}
-			
+			return plugins.get(orderPluginId);
 		}
 		
-		return orderPlugin;
+		return null;
 	}
 
 

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ProjectByScoreComparator.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ProjectByScoreComparator.java	2005-12-19 20:39:27 UTC (rev 1876)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ProjectByScoreComparator.java	2005-12-19 21:08:54 UTC (rev 1877)
@@ -2,13 +2,13 @@
 
 import java.util.Comparator;
 
-import org.jboss.forge.status.plugins.ScorePlugin;
+import org.jboss.forge.status.plugins.Plugin;
 
 public class ProjectByScoreComparator implements Comparator {
 
-	private ScorePlugin orderPlugin;
+	private Plugin orderPlugin;
 
-	public ProjectByScoreComparator(ScorePlugin orderPlugin) {
+	public ProjectByScoreComparator(Plugin orderPlugin) {
 		this.orderPlugin = orderPlugin;
 	}