Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1802 - in trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status: . plugins
|
From: <jbo...@li...> - 2005-12-13 16:43:01
|
Author: wrzep Date: 2005-12-13 11:42:49 -0500 (Tue, 13 Dec 2005) New Revision: 1802 Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/KosmosStatusPlugin.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/Plugin.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/StatusPlugin.java Log: passing properites Node instead of properties Map to plugin (allows more flexible plugins configuration) http://jira.jboss.com/jira/browse/JBLAB-415 Pawel Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/KosmosStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/KosmosStatusPlugin.java 2005-12-12 23:16:16 UTC (rev 1801) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/KosmosStatusPlugin.java 2005-12-13 16:42:49 UTC (rev 1802) @@ -22,6 +22,7 @@ package org.jboss.forge.status; +import org.jboss.forge.common.XmlTools; import org.jboss.forge.common.projects.Projects; import org.jboss.forge.status.plugins.InvalidPluginPropertiesException; import org.jboss.forge.status.plugins.StatusPlugin; @@ -32,6 +33,8 @@ import java.util.Iterator; import java.util.Map; +import org.w3c.dom.Node; + /** * @author Pawel Wrzeszcz */ @@ -53,9 +56,10 @@ projectsMaps = new HashMap<String,Map>(); } - public void init(String name, String id, Projects projects, Map<String,String> properties) throws InvalidPluginPropertiesException { - super.init(name, id, projects,properties); + public void init(String name, String id, Projects projects, Node propertiesNode) throws InvalidPluginPropertiesException { + super.init(name, id, projects,propertiesNode); + Map<String, String> properties = XmlTools.getMapFromNodeAttributes(propertiesNode); getProperties(properties); } 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-12 23:16:16 UTC (rev 1801) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-13 16:42:49 UTC (rev 1802) @@ -212,12 +212,7 @@ return null; } - // Get plugin properies node - Map<String,String> pluginSpecificPropertiesMap = null; Node pluginSpecificPropertiesNode = pluginProperties.get(PLUGIN_PROPERTIES_ELEMENT); - if (pluginSpecificPropertiesNode != null) { - pluginSpecificPropertiesMap = getChildNodesStringMap(pluginSpecificPropertiesNode); - } // Get plugin instance; Plugin plugin = null; @@ -225,9 +220,9 @@ plugin = (Plugin) pluginClass.newInstance(); if (pluginType == STATUS_PLUGIN_ELEMENT) { - ((StatusPlugin) plugin).init(pluginName, pluginId, projects, pluginSpecificPropertiesMap); + ((StatusPlugin) plugin).init(pluginName, pluginId, projects, pluginSpecificPropertiesNode); } else { /* score plugin */ - ((ScorePlugin) plugin).init(pluginName, pluginId, statusPlugins, pluginSpecificPropertiesMap); + ((ScorePlugin) plugin).init(pluginName, pluginId, statusPlugins, pluginSpecificPropertiesNode); } } catch (InvalidPluginPropertiesException e) { Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java 2005-12-12 23:16:16 UTC (rev 1801) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java 2005-12-13 16:42:49 UTC (rev 1802) @@ -22,7 +22,7 @@ package org.jboss.forge.status.plugins; -import java.util.Map; +import org.w3c.dom.Node; /** * @author Pawel Wrzeszcz @@ -30,13 +30,13 @@ public abstract class Plugin { - protected Map properties; + protected Node propertiesNode; protected String name; protected String id; - public void init(String name, String id, Map<String,String> properties) throws InvalidPluginPropertiesException { - this.properties = properties; + public void init(String name, String id, Node propertiesNode) throws InvalidPluginPropertiesException { + this.propertiesNode = propertiesNode; this.name = name; this.id = id; } 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-12 23:16:16 UTC (rev 1801) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java 2005-12-13 16:42:49 UTC (rev 1802) @@ -22,9 +22,10 @@ package org.jboss.forge.status.plugins; -import java.util.Map; import java.util.List; +import org.w3c.dom.Node; + /** * @author Pawel Wrzeszcz */ @@ -33,8 +34,8 @@ protected List<Plugin> plugins; - public void init(String name, String id, List<Plugin> plugins, Map<String,String> properties) throws InvalidPluginPropertiesException { + public void init(String name, String id, List<Plugin> plugins, Node propertiesNode) throws InvalidPluginPropertiesException { this.plugins = plugins; - init(name, id, properties); + init(name, id, propertiesNode); } } Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-12-12 23:16:16 UTC (rev 1801) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-12-13 16:42:49 UTC (rev 1802) @@ -22,10 +22,10 @@ package org.jboss.forge.status.plugins; -import java.util.Map; - import org.jboss.forge.common.projects.Projects; +import org.w3c.dom.Node; + /** * @author Pawel Wrzeszcz */ @@ -34,8 +34,8 @@ protected Projects projects; - public void init(String name, String id, Projects projects, Map<String,String> properties) throws InvalidPluginPropertiesException { + public void init(String name, String id, Projects projects, Node propertiesNode) throws InvalidPluginPropertiesException { this.projects = projects; - init(name, id, properties); + init(name, id, propertiesNode); } } |
