Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1853 - in trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status: . plugins
|
From: <jbo...@li...> - 2005-12-18 23:11:55
|
Author: wrzep Date: 2005-12-18 18:11:49 -0500 (Sun, 18 Dec 2005) New Revision: 1853 Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Plugin.java 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/KosmosStatusPlugin.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: removed defining plugin name (now columns define their names) http://jira.jboss.com/jira/browse/JBLAB-415 Pawel Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Plugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Plugin.java 2005-12-18 22:44:22 UTC (rev 1852) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Plugin.java 2005-12-18 23:11:49 UTC (rev 1853) @@ -35,23 +35,19 @@ /** Node from xml file which holds properties specyfic to this plugin */ protected Node propertiesNode; - /** Plugin name */ - protected String name; - /** Plugin id */ protected String id; /** - * @param name Plugin name * @param id Plugin id * @param propertiesNode Node with plugin specyfic properties * @throws InvalidPluginPropertiesException * Thrown when properties passed in <code>propertiesNode</code> * are incorrect or missed. */ - public void init(String name, String id, Node propertiesNode) throws InvalidPluginPropertiesException { + public void init(String id, Node propertiesNode) + throws InvalidPluginPropertiesException { this.propertiesNode = propertiesNode; - this.name = name; this.id = id; } @@ -68,10 +64,4 @@ * @return Plugin id */ public String getId() { return id; }; - - - /** - * @return Plugin name - */ - public String getName() { return name; }; } 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 22:44:22 UTC (rev 1852) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Plugins.java 2005-12-18 23:11:49 UTC (rev 1853) @@ -44,7 +44,6 @@ private final static String PLUGIN_ELEMENT = "plugin"; private final static String PLUGIN_ID_ELEMENT = "id"; - private final static String PLUGIN_NAME_ELEMENT = "name"; private final static String PLUGIN_CLASS_ELEMENT = "class"; private final static String PLUGIN_PROPERTIES_ELEMENT = "properties"; @@ -94,7 +93,6 @@ // Get plugin info from pluginNode String pluginClassString = XmlTools.getChildNodeValue(pluginNode, PLUGIN_CLASS_ELEMENT); - String pluginName = XmlTools.getChildNodeValue(pluginNode, PLUGIN_NAME_ELEMENT); String pluginId = XmlTools.getChildNodeValue(pluginNode, PLUGIN_ID_ELEMENT); // Get plugin class @@ -114,9 +112,9 @@ plugin = (Plugin) pluginClass.newInstance(); if (scorePlugin) { - ((ScorePlugin) plugin).init(pluginName, pluginId, statusPlugins, pluginSpecificPropertiesNode); + ((ScorePlugin) plugin).init(pluginId, statusPlugins, pluginSpecificPropertiesNode); } else { /* status plugin */ - ((StatusPlugin) plugin).init(pluginName, pluginId, projects, pluginSpecificPropertiesNode); + ((StatusPlugin) plugin).init(pluginId, projects, pluginSpecificPropertiesNode); } } catch (InvalidPluginPropertiesException e) { Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/KosmosStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/KosmosStatusPlugin.java 2005-12-18 22:44:22 UTC (rev 1852) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/KosmosStatusPlugin.java 2005-12-18 23:11:49 UTC (rev 1853) @@ -61,13 +61,10 @@ projectMaps = new HashMap<String,Map>(); } - /* (non-Javadoc) - * @see org.jboss.forge.status.plugins.StatusPlugin#init(java.lang.String, java.lang.String, org.jboss.forge.common.projects.Projects, org.w3c.dom.Node) - */ - public void init(String name, String id, Projects projects, Node propertiesNode) throws InvalidPluginPropertiesException { - super.init(name, id, projects,propertiesNode); + public void init(String id, Projects projects, + Node propertiesNode) throws InvalidPluginPropertiesException { + super.init(id, projects,propertiesNode); - getServiceProperty(propertiesNode); } @@ -77,18 +74,22 @@ * @param propertiesNode Node with plugin specyfic properties * @throws InvalidPluginPropertiesException */ - private void getServiceProperty(Node propertiesNode) throws InvalidPluginPropertiesException { - Map<String,String> properties = XmlTools.getMapFromNodeElements(propertiesNode); + private void getServiceProperty(Node propertiesNode) + throws InvalidPluginPropertiesException { + Map<String,String> properties = + XmlTools.getMapFromNodeElements(propertiesNode); if (properties.isEmpty()) { - throw new InvalidPluginPropertiesException("Missing properties for " + getName() + " plugin."); + throw new InvalidPluginPropertiesException( + "Missing properties for plugin: " + getId() + "."); } serviceURL = properties.get(getKosmosServiceProperty()); if (serviceURL == null) { throw new InvalidPluginPropertiesException( - "Missing " + getKosmosServiceProperty() + " property for " + getName() + " plugin."); + "Missing " + getKosmosServiceProperty() + + " property for plugin: " + getId() + "."); } } @@ -138,7 +139,8 @@ for (Iterator iter = map.keySet().iterator(); iter.hasNext();) { Object obj = (Object) iter.next(); - System.out.println("object: " + obj + " binding: " + map.get(obj)); + System.out.println( + "object: " + obj + " binding: " + map.get(obj)); } } } 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 22:44:22 UTC (rev 1852) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java 2005-12-18 23:11:49 UTC (rev 1853) @@ -35,8 +35,8 @@ protected Map<String,Plugin> plugins; - public void init(String name, String id, Map<String, Plugin> plugins, Node propertiesNode) throws InvalidPluginPropertiesException { + public void init(String id, Map<String, Plugin> plugins, Node propertiesNode) throws InvalidPluginPropertiesException { this.plugins = plugins; - init(name, id, propertiesNode); + init(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-18 22:44:22 UTC (rev 1852) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-12-18 23:11:49 UTC (rev 1853) @@ -46,8 +46,8 @@ * @param propertiesNode Node with plugin specyfic properties * @throws InvalidPluginPropertiesException */ - public void init(String name, String id, Projects projects, Node propertiesNode) throws InvalidPluginPropertiesException { + public void init(String id, Projects projects, Node propertiesNode) throws InvalidPluginPropertiesException { this.projects = projects; - init(name, id, propertiesNode); + init(id, propertiesNode); } } |
