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

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

Author: wrzep
Date: 2005-12-09 10:04:25 -0500 (Fri, 09 Dec 2005)
New Revision: 1752

Modified:
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
Log:
introduced 2 plugins versions - status plugin and score plugin

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

Pawel


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-09 12:52:15 UTC (rev 1751)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2005-12-09 15:04:25 UTC (rev 1752)
@@ -52,7 +52,8 @@
 */
 public class Status extends AbstractDescriptor {
 	
-	private final static String PLUGIN_ELEMENT 				= "plugin";
+	private final static String STATUS_PLUGIN_ELEMENT		= "status-plugin";
+	private final static String SCORE_PLUGIN_ELEMENT		= "score-plugin";
 	
 	private final static String PLUGIN_ID_ELEMENT 			= "id";
 	private final static String PLUGIN_NAME_ELEMENT 		= "name";
@@ -82,7 +83,8 @@
 		
 		// Get the plugins
 		HashSet<String> pluginElementSet = new HashSet<String>();
-		pluginElementSet.add(PLUGIN_ELEMENT);
+		pluginElementSet.add(STATUS_PLUGIN_ELEMENT);
+		pluginElementSet.add(SCORE_PLUGIN_ELEMENT);
 		Set<Node> pluginsNodes = getChildNodesSet(pluginsRoot, pluginElementSet);
 		plugins = getPlugins(pluginsNodes);
 	}
@@ -179,9 +181,11 @@
 	}
 	
 	private StatusPlugin getPlugin(Node pluginNode) {
-		Map<String,Node> pluginProperties = getChildNodesMap(pluginNode, pluginsElements);
 		
 		// Get plugin info from pluginNode
+		String pluginType = pluginNode.getNodeName();
+		
+		Map<String,Node> pluginProperties = getChildNodesMap(pluginNode, pluginsElements);
 		String pluginClassString = XmlTools.unmarshallText(pluginProperties.get(PLUGIN_CLASS_ELEMENT));
 		String pluginName = XmlTools.unmarshallText(pluginProperties.get(PLUGIN_NAME_ELEMENT));
 		String pluginId = XmlTools.unmarshallText(pluginProperties.get(PLUGIN_ID_ELEMENT));
@@ -194,16 +198,7 @@
 			log.error("Plugin class not found: " + pluginClassString);
 			return null;
 		}
-		
-		// Get plugin instance
-		StatusPlugin plugin = null;
-		try {
-			plugin = (StatusPlugin) pluginClass.newInstance();
-		} catch (Exception e) {
-			log.error("Plugin class: " + pluginClassString + ". Instantination failed.", e);
-			return null;
-		}
-		
+
 		// Get plugin properies node
 		Map<String,String> pluginSpecificPropertiesMap = null;
 		Node pluginSpecificPropertiesNode = pluginProperties.get(PLUGIN_PROPERTIES_ELEMENT);
@@ -211,15 +206,25 @@
 			pluginSpecificPropertiesMap = getChildNodesStringMap(pluginSpecificPropertiesNode);
 		}
 		
-		// Initialize plugin
+		// Get plugin instance;
 		try {
-			plugin.init(pluginName, pluginId, projects, pluginSpecificPropertiesMap);
+			
+			if (pluginType == STATUS_PLUGIN_ELEMENT) {
+				StatusPlugin plugin = (StatusPlugin) pluginClass.newInstance();
+				plugin.init(pluginName, pluginId, projects, pluginSpecificPropertiesMap);
+				return plugin;
+			} else {
+
+			}	
+			
 		} catch (InvalidPluginPropertiesException e) {
 			log.warn(e);
-			return null;
+		} 
+		catch (Exception e) {
+			log.error("Plugin class: " + pluginClassString + ". Instantination failed.", e);
 		}
 		
-		return plugin;
+		return null;
 	}