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

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

Author: wrzep
Date: 2005-12-18 09:27:51 -0500 (Sun, 18 Dec 2005)
New Revision: 1843

Modified:
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Plugins.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java
Log:
after moving everything about plugins to Plugins class, ScorePlugins didn't work - fixed

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

Pawel



Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Plugins.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Plugins.java	2005-12-18 13:55:48 UTC (rev 1842)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Plugins.java	2005-12-18 14:27:51 UTC (rev 1843)
@@ -48,6 +48,8 @@
 	private final static String PLUGIN_PROPERTIES_ELEMENT 	= "properties";
 	
 	Map<String, Plugin> plugins;
+	Map<String, Plugin> statusPlugins;
+	
 	Projects projects;
 	
 	private Logger log;
@@ -59,8 +61,9 @@
 		log = Logger.getLogger(this.getClass());
 		
 		plugins = new HashMap<String,Plugin>();
+		statusPlugins = new HashMap<String,Plugin>();
 
-		add(pluginsNodes, scorePlugins);
+		putAll(pluginsNodes, scorePlugins);
 	}
 	
 private Plugin getPlugin(Node pluginNode, boolean scorePlugin) {
@@ -88,7 +91,7 @@
 			plugin = (Plugin) pluginClass.newInstance();
 			
 			if (scorePlugin) {
-				((ScorePlugin) plugin).init(pluginName, pluginId, plugins.values(), pluginSpecificPropertiesNode);
+				((ScorePlugin) plugin).init(pluginName, pluginId, statusPlugins, pluginSpecificPropertiesNode);
 			} else { /* score plugin */
 				((StatusPlugin) plugin).init(pluginName, pluginId, projects, pluginSpecificPropertiesNode);
 			}	
@@ -111,7 +114,7 @@
 		return plugins.get(pluginId);
 	}
 
-	public void add(Set<Node> pluginsNodes, boolean scorePlugins) {
+	public void putAll(Set<Node> pluginsNodes, boolean scorePlugins) {
 		for (Iterator iter = pluginsNodes.iterator(); iter.hasNext();) {
 			Node pluginNode = (Node) iter.next();
 			
@@ -119,6 +122,9 @@
 			
 			if (plugin != null) {
 				plugins.put(plugin.getId(), plugin);
+				if (!scorePlugins) {
+					statusPlugins.put(plugin.getId(), plugin);
+				}
 			}	
 		}
 	}

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2005-12-18 13:55:48 UTC (rev 1842)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2005-12-18 14:27:51 UTC (rev 1843)
@@ -68,7 +68,7 @@
 		
 		// Add the score plugins
 		Set<Node> scorePluginsNodes = getPluginsNodes(scorePluginsRoot);
-		//plugins.putAll(scorePluginsNodes, true);	
+		plugins.putAll(scorePluginsNodes, true);	
 		
 		System.out.println("# 3 #");
 		

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java	2005-12-18 13:55:48 UTC (rev 1842)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java	2005-12-18 14:27:51 UTC (rev 1843)
@@ -22,7 +22,7 @@
 
 package org.jboss.forge.status.plugins;
 
-import java.util.Collection;
+import java.util.Map;
 
 import org.jboss.forge.status.Plugin;
 import org.w3c.dom.Node;
@@ -33,9 +33,9 @@
 
 public abstract class ScorePlugin extends Plugin {
 	
-	protected Collection<Plugin> plugins;
+	protected Map<String,Plugin> plugins;
 	
-	public void init(String name, String id, Collection<Plugin> plugins, Node propertiesNode) throws InvalidPluginPropertiesException {
+	public void init(String name, String id, Map<String, Plugin> plugins, Node propertiesNode) throws InvalidPluginPropertiesException {
 		this.plugins = plugins;
 		init(name, id, propertiesNode);
 	}

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java	2005-12-18 13:55:48 UTC (rev 1842)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java	2005-12-18 14:27:51 UTC (rev 1843)
@@ -39,7 +39,7 @@
 	public int getValue(String projectId) {
 		int total = 0;
 		
-		for (Iterator iter = plugins.iterator(); iter.hasNext();) {
+		for (Iterator iter = plugins.values().iterator(); iter.hasNext();) {
 			Plugin plugin = (Plugin) iter.next();
 			
 			total += plugin.getValue(projectId); // TODO weights