[jboss-svn-commits] JBL Code SVN: r6306 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: . service service/impl templates

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Sep 19 18:38:00 EDT 2006


Author: wrzep
Date: 2006-09-19 18:37:52 -0400 (Tue, 19 Sep 2006)
New Revision: 6306

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresManager.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Column.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java
Log:
JBLAB-762
Separated updating values from parsing configuration.

Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-09-19 21:31:36 UTC (rev 6305)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-09-19 22:37:52 UTC (rev 6306)
@@ -23,7 +23,6 @@
 package org.jboss.forge.status;
 
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,7 +38,6 @@
 import org.jboss.forge.status.common.Tags;
 import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException;
 import org.jboss.forge.status.exceptions.GetScoresException;
-import org.jboss.forge.status.exceptions.ScoresSaveException;
 import org.jboss.forge.status.service.ScoresManager;
 import org.jboss.forge.status.service.impl.protocol.PluginConfImpl;
 import org.jboss.forge.status.service.protocol.PluginConf;
@@ -68,10 +66,6 @@
 	
 	/** Projects present in the Status Matrix */
 	private Projects projects;
-
-	private List<PluginConf> pluginsConf;
-
-	private boolean firstSave = false; /* true iff first save was performed */
 	
 	private ScoresManager scoresManager;
 	
@@ -90,34 +84,23 @@
 		
 		// Get configuration		
 		projects = ProjectsHelper.getProjects(portalName); 
-		pluginsConf = getPluginsConfList(pluginsRoot);
+		List<PluginConf> pluginsConf = getPluginsConfList(pluginsRoot);
 	
-		this.scoresManager = scoresManager; 
+		this.scoresManager = scoresManager;
+		scoresManager.setPluginsConf(pluginsConf);
 		
-		PluginsValues pluginsValues;
-		
-		//	Get latest available scores
-		try { 	
-			pluginsValues = scoresManager.getLatestScores();
-		} catch (GetScoresException e) {
-			log.warn("Getting computed scores failed: " + e.getMessage());
-			scoresManager.saveAsync(projects, pluginsConf);			
-			throw e;
-		}
-		
 		// Get columns to display on the main page
 		Node mainPageRoot =
 				XmlTools.getFirstNodeWithName(statusRoot,
 									Tags.MAIN_PAGE_COLUMNS_TAG);
-		mainPageColumns = new Columns(mainPageRoot, pluginsValues, projects);
+		mainPageColumns = new Columns(mainPageRoot, projects);
 		
 		// Get matrix to display on the project page
 		Node projectPageRoot =
 				XmlTools.getFirstNodeWithName(statusRoot,
 									Tags.PROJECT_PAGE_COLUMNS_TAG);
 		matrixTemplate =
-				new MatrixTemplate(projectPageRoot, pluginsValues, projects);
-	
+				new MatrixTemplate(projectPageRoot, projects);
 	}
 
 	private List<PluginConf> getPluginsConfList(Node pluginsRoot) {
@@ -150,7 +133,8 @@
 	 * 
 	 * @param context DelegateContext to fill.
 	 */
-	public void fillContext(DelegateContext context) {	
+	public void fillContext(DelegateContext context) {
+		
 		mainPageColumns.fillContext(context);
 	}
 
@@ -202,11 +186,7 @@
 		return colMap;
 	}
 
-	
-	/**
-	 * @return true iff updated scores are available
-	 */
-	public boolean needsUpdate() {
+	public void update() {
 		
 		log.info("Checking for updated scores.");
 		
@@ -216,34 +196,54 @@
 			pluginsValues = scoresManager.getLatestScores();
 		} catch (GetScoresException e) {
 			log.warn("Failed to get latest scores.", e);
+			return;
 		}
+			
+		refreshScores(pluginsValues);
 		
-		boolean update = (pluginsValues == null) ||
-							needsSave(pluginsValues.getDate());
+		log.info("Refreshed scores.");
+	}
+	
+	private void refreshScores(PluginsValues pluginsValues) {
+		
+		mainPageColumns.update(pluginsValues);
+		matrixTemplate.update(pluginsValues);
+	}
+	
+	/*
+	private void updateAsync(final PluginsValues pluginsValues) {
+		
+		new Thread() {
 			
-		if (update) {
-			
-			try {
-				scoresManager.save(projects, pluginsConf);
-				firstSave = true;
+			public void run() {
 				
-				pluginsValues = scoresManager.getLatestScores();
-			
-				refreshScores(pluginsValues);
-				log.info("Refreshed scores.");
-				
-			} catch (ScoresSaveException e) {
-				log.warn("Saving scores failed.", e);
-				return false;
-			} catch (GetScoresException e) {
-				log.warn("Failed to get updated scores.", e);
-				return false;
+				performUpdate(pluginsValues);
 			}
-		}	
+			
+		}.start();
 		
-		return update;
 	}
+	
+	private void performUpdate(PluginsValues pluginsValues) {
+		
+		try {
+			scoresManager.save(projects, pluginsConf);
+			firstSave = true;
+			
+			pluginsValues = scoresManager.getLatestScores();
+		
+			refreshScores(pluginsValues);
+			log.info("Refreshed scores.");
+			
+		} catch (ScoresSaveException e) {
+			log.warn("Saving scores failed.", e);
+			
+		} catch (GetScoresException e) {
+			log.warn("Failed to get updated scores.", e);
+		}
+	}	
 
+
 	private boolean needsSave(Calendar date) {
 		
 		if (!firstSave) {
@@ -254,12 +254,5 @@
 		
 		return (now.get(Calendar.DAY_OF_MONTH) != date.get(Calendar.DAY_OF_MONTH));
 	}
-
-	private void refreshScores(PluginsValues pluginsValues) {
-		
-		mainPageColumns.update(pluginsValues);
-		matrixTemplate.update(pluginsValues);
-
-	}
-
+*/
 }
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2006-09-19 21:31:36 UTC (rev 6305)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2006-09-19 22:37:52 UTC (rev 6306)
@@ -82,6 +82,8 @@
 		init();
 		
 		initStatus();
+		
+		update();
 	}
 
 	private void init() {
@@ -121,8 +123,6 @@
 			status = new Status(portalName, statusRoot, pluginsRoot,
 															scoresManager);
 			
-			fillContext();
-			
 		} catch (ScoresException e){
 			
 			// Do nothing.
@@ -173,9 +173,9 @@
 			initStatus();
 		}
 		
-		if ((status != null) && (status.needsUpdate())) {
-			fillContext();
-		}
+		status.update();
+		
+		fillContext();
 	}
 	
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresManager.java	2006-09-19 21:31:36 UTC (rev 6305)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresManager.java	2006-09-19 22:37:52 UTC (rev 6306)
@@ -29,7 +29,6 @@
 
 import org.jboss.forge.common.projects.Projects;
 import org.jboss.forge.status.exceptions.GetScoresException;
-import org.jboss.forge.status.exceptions.ScoresSaveException;
 import org.jboss.forge.status.service.protocol.PluginConf;
 import org.jboss.forge.status.service.protocol.PluginsValues;
 
@@ -40,23 +39,11 @@
 
 public interface ScoresManager {
 	
-	
-	public void saveAsync(final Projects projects,
-			final List<PluginConf> pluginsConf);
-	
-
-	public void save(Projects projects,
-										List<PluginConf> pluginsConf)
-										throws ScoresSaveException;
-	
-	
 	public boolean hasScores(Calendar cal) throws NamingException;
 	
-	
 	public PluginsValues getScores(Calendar cal)
 										throws GetScoresException;
 	
-	
 	public PluginsValues getLatestScores()
 									throws GetScoresException; 
 	
@@ -66,4 +53,6 @@
 
 	public long getValue(String id, String projectId,
 			Calendar start, Calendar end) throws GetScoresException;
+
+	public void setPluginsConf(List<PluginConf> pluginsConf);
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java	2006-09-19 21:31:36 UTC (rev 6305)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java	2006-09-19 22:37:52 UTC (rev 6306)
@@ -44,6 +44,7 @@
 	public void save(Projects projects, List<PluginConf> pluginsConf)
 												throws ScoresSaveException;	
 	
+	
 	public PluginsValues getPluginsValues(Calendar cal)
 												throws GetScoresException;
 	

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java	2006-09-19 21:31:36 UTC (rev 6305)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java	2006-09-19 22:37:52 UTC (rev 6306)
@@ -60,6 +60,7 @@
 	private Logger log;
 	
 	private ScoresService service;
+	private List<PluginConf> pluginsConf;
 	
 	public ServiceScoresManager(String portalName, ServiceConf serviceConf,
 									ScoresRepositoryManager repositoryManager,
@@ -101,7 +102,7 @@
 		
 		try {
 			log.info("Saving scores asynchronously...");
-			save(projects, pluginsConf);
+			save(projects);
 			asyncSave = true;
 			log.info("Finished async save.");
 		} catch (ScoresSaveException e) {
@@ -109,9 +110,7 @@
 		}
 	}
 
-	public void save(Projects projects,
-										List<PluginConf> pluginsConf)
-										throws ScoresSaveException {
+	public void save(Projects projects) throws ScoresSaveException {
 
 		service.save(projects, pluginsConf);		
 	}
@@ -231,5 +230,10 @@
 		
 		return service;
 	}
+
+	public void setPluginsConf(List<PluginConf> pluginsConf) {
+		
+		this.pluginsConf = pluginsConf;
+	}
 	
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java	2006-09-19 21:31:36 UTC (rev 6305)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java	2006-09-19 22:37:52 UTC (rev 6306)
@@ -46,14 +46,14 @@
 	 * @param cellNode root Node specfying cell properties
 	 * @param pluginsValues
 	 */
-	public CellTemplate(Node cellNode, PluginsValues pluginsValues) {
+	public CellTemplate(Node cellNode) {
 		
 		name = XmlTools.getChildNodeValue(cellNode,
 											    Tags.CELL_NAME_ELEMENT);
 		
 		Node metricsNode = XmlTools.getFirstNodeWithName(cellNode,
 												Tags.METRICS_ELEMENT);
-		metricTemplates = parseMetricTemplates(metricsNode, pluginsValues);
+		metricTemplates = parseMetricTemplates(metricsNode);
 	}
 
 	public void update(PluginsValues pluginsValues) {
@@ -68,11 +68,9 @@
 	 * Gets metrics information from the given Node.
 	 * 
 	 * @param metricsNode root Node specyfying metrics
-	 * @param pluginsValues
 	 * @return List of metrics defined in <code>metricsNode</code>
 	 */
-	private ArrayList<MetricTemplate> parseMetricTemplates(Node metricsNode,
-												PluginsValues pluginsValues) {
+	private ArrayList<MetricTemplate> parseMetricTemplates(Node metricsNode) {
 
 		ArrayList<MetricTemplate> rt = new ArrayList<MetricTemplate>();
 		
@@ -85,7 +83,7 @@
 			if (metricNode.getNodeName().equals(Tags.METRIC_ELEMENT)) {
 			
 				MetricTemplate metricTemplate =
-						new MetricTemplate(metricNode, pluginsValues);
+						new MetricTemplate(metricNode);
 				rt.add(metricTemplate);
 			}
 		}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Column.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Column.java	2006-09-19 21:31:36 UTC (rev 6305)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Column.java	2006-09-19 22:37:52 UTC (rev 6306)
@@ -49,12 +49,10 @@
 	
 	/**
 	 * @param name Column name
-	 * @param plugin Plugin to be used to generate values in project rows
 	 */
-	public Column(String name, PluginValues pluginValues) {
+	public Column(String name) {
 		
 		this.name = name;
-		this.pluginValues = pluginValues;
 		
 		log = Logger.getLogger(this.getClass());
 	}
@@ -80,6 +78,7 @@
 	}
 	
 	public void fillHeaderInfo(DelegateContext columnContext) {
+		
 		columnContext.put("name", getName());
 		columnContext.put("id", getId());
 		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java	2006-09-19 21:31:36 UTC (rev 6305)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java	2006-09-19 22:37:52 UTC (rev 6306)
@@ -22,11 +22,11 @@
 
 package org.jboss.forge.status.templates;
 
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Set;
 
 import org.jboss.forge.common.XmlTools;
@@ -41,7 +41,6 @@
 import org.jboss.forge.status.tools.ProjectsByScoreComparator;
 
 import org.jboss.portal.common.context.DelegateContext;
-
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -52,7 +51,7 @@
 public class Columns {
 
 	/** Status Matrix Columns list (Column order matters). */
-	private List<Column> columns;
+	private Map<String,Column> columns;
 	
 	/** Projects present in the Status Matrix */
 	private Projects projects;
@@ -64,22 +63,19 @@
 	
 	/**
 	 * @param pageRoot root Node specfying Columns properties
-	 * @param pluginsValues
 	 * @param projects Projects present in the Status Matrix
 	 */
-	public Columns(Node pageRoot, PluginsValues pluginsValues,
-												Projects projects) {
+	public Columns(Node pageRoot, Projects projects) {
 		
 		this.projects = projects;
-		this.pluginsValues = pluginsValues;
 		
 		// Get the columns
-		columns = new ArrayList<Column>();
+		columns = new LinkedHashMap<String,Column>();
 		Node columnsRoot = XmlTools.getFirstNodeWithName(pageRoot,
 											  Tags.COLUMNS_ELEMENT);
 		
 		if (columnsRoot != null) {
-			addColumns(columnsRoot, pluginsValues);
+			addColumns(columnsRoot);
 		}
 		
 		// Get id of plugin determining projects order
@@ -91,10 +87,12 @@
 		
 		this.pluginsValues = pluginsValues;
 		
-		for (Column column : columns) {
+		for (String pluginId : columns.keySet()) {
 			
 			PluginValues pluginValues =
-							pluginsValues.getPluginValues(column.getId());
+							pluginsValues.getPluginValues(pluginId);
+			
+			Column column = columns.get(pluginId);
 			column.update(pluginValues);
 		}
 	}
@@ -103,9 +101,8 @@
 	 * Adds to the columns list columns defined in columnsRoot.
 	 * 
 	 * @param columnsRoot Node defining columns list
-	 * @param pluginsValues
 	 */
-	private void addColumns(Node columnsRoot, PluginsValues pluginsValues) {
+	private void addColumns(Node columnsRoot) {
 		
 		NodeList columnsList = columnsRoot.getChildNodes();
 		
@@ -122,14 +119,8 @@
 				String pluginId = XmlTools.getChildNodeValue(columnNode,
 											Tags.COLUMN_PLUGIN_ELEMENT);
 				
-				PluginValues pluginValues =
-									pluginsValues.getPluginValues(pluginId);
-				
-				if (pluginValues != null) {
-					Column column = new Column(name, pluginValues);
-					columns.add(column);
-				}
-	
+				Column column = new Column(name);
+				columns.put(pluginId,column);
 			}
 		}
 	}
@@ -164,8 +155,7 @@
 	 */
 	private void fillColumnNames(DelegateContext context) {
 		
-		for (Iterator iter = columns.iterator(); iter.hasNext();) {
-			Column column = (Column) iter.next();
+		for (Column column : columns.values()) {
 			
 			DelegateContext columnContext = new DelegateContext();
 			column.fillHeaderInfo(columnContext);
@@ -209,7 +199,8 @@
 		Comparator<String> projectsComparator = null;
 		
 		PluginValues orderPluginValues =
-							pluginsValues.getPluginValues(orderPluginId);
+						(pluginsValues == null) ? null : 
+								pluginsValues.getPluginValues(orderPluginId);
 		
 		if (orderPluginValues != null) {
 			projectsComparator = new ProjectsByScoreComparator(orderPluginValues);
@@ -245,9 +236,9 @@
 	 */
 	private void fillEntries(DelegateContext projectContext, String projectId) {
 		
-		for (Iterator iter = columns.iterator(); iter.hasNext();) {
-			
-			Column column = (Column) iter.next();
+		
+		for (Column column : columns.values()) {	
+		
 			column.fillProjectContext(projectContext, projectId);
 		}
 	}
@@ -257,13 +248,15 @@
 	 */
 	public void add(Columns columnsToAdd) {
 		
-		for (Column col : columnsToAdd.columns) {
-			columns.add(col);
+		for (String pluginId : columnsToAdd.columns.keySet()) {
+			
+			columns.put(pluginId, columnsToAdd.columns.get(pluginId));
 		}
 	
 	}
 
-	public List<Column> getColumns() {
-		return columns;
+	public Collection<Column> getColumns() {
+		
+		return columns.values();
 	}
 }
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java	2006-09-19 21:31:36 UTC (rev 6305)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java	2006-09-19 22:37:52 UTC (rev 6306)
@@ -48,17 +48,15 @@
 	
 	/**
 	 * @param projectPageRoot root Node specfying matrix properties
-	 * @param pluginsValues
 	 * @param projects Projects present in the matrix
 	 */
-	public MatrixTemplate(Node projectPageRoot, PluginsValues pluginsValues,
-														Projects projects) {
+	public MatrixTemplate(Node projectPageRoot, Projects projects) {
 		
 		this.projects = projects;
 		
 		Node rowsRoot = XmlTools.getFirstNodeWithName(projectPageRoot,
 													Tags.ROWS_ELEMENT);
-		rowTemplates = parseMatrixTemplate(rowsRoot, pluginsValues);
+		rowTemplates = parseMatrixTemplate(rowsRoot);
 	}
 
 	public void update(PluginsValues pluginsValues) {
@@ -73,11 +71,9 @@
 	 * Gets rows information from the given Node.
 	 * 
 	 * @param rowsNode root Node specyfying rows
-	 * @param pluginsValues
 	 * @return List of rows defined in <code>rowsNode</code>
 	 */
-	private List<RowTemplate> parseMatrixTemplate(Node rowsNode,
-												PluginsValues pluginsValues) {
+	private List<RowTemplate> parseMatrixTemplate(Node rowsNode) {
 			
 		ArrayList<RowTemplate> mt = new ArrayList<RowTemplate>();
 		
@@ -90,7 +86,7 @@
 			if (rowNode.getNodeName().equals(Tags.ROW_ELEMENT)) {
 				
 				RowTemplate rowTemplate =
-							new RowTemplate(rowNode, rowNumber, pluginsValues);
+							new RowTemplate(rowNode, rowNumber);
 				
 				mt.add(rowTemplate);
 				rowNumber++;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java	2006-09-19 21:31:36 UTC (rev 6305)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java	2006-09-19 22:37:52 UTC (rev 6306)
@@ -43,9 +43,8 @@
 	
 	/**
 	 * @param cellNode root Node specfying cell properties
-	 * @param pluginsValues
 	 */
-	public MetricTemplate(Node cellNode, PluginsValues pluginsValues) {
+	public MetricTemplate(Node cellNode) {
 		
 		name = XmlTools.getChildNodeValue(cellNode,
 										  Tags.METRIC_NAME_ELEMENT);
@@ -57,10 +56,7 @@
 										  Tags.METRIC_BOOLEAN_ELEMENT);
 		
 		showAsBoolean = (booleanString == null) ? false :
-												booleanString.equals("true");
-		
-		pluginValues = pluginsValues.getPluginValues(pluginId);
-	
+												booleanString.equals("true");	
 	}
 	
 	public void update(PluginsValues pluginsValues) {

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java	2006-09-19 21:31:36 UTC (rev 6305)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java	2006-09-19 22:37:52 UTC (rev 6306)
@@ -51,17 +51,15 @@
 	/**
 	 * @param rowNode root Node specfying row properties
 	 * @param rowNumber
-	 * @param pluginsValues
 	 */
-	public RowTemplate(Node rowNode, int rowNumber,
-											PluginsValues pluginsValues) {
+	public RowTemplate(Node rowNode, int rowNumber) {
 		
 		name = XmlTools.getChildNodeValue(rowNode,Tags.ROW_NAME_ELEMENT);
 		this.rowNumber = rowNumber;
 		
 		Node cellsNode = XmlTools.getFirstNodeWithName(rowNode,
 													Tags.CELLS_ELEMENT);	
-		cellTemplates = parseRowTemplate(cellsNode, pluginsValues);
+		cellTemplates = parseRowTemplate(cellsNode);
 	}
 
 	public void update(PluginsValues pluginsValues) {
@@ -76,11 +74,9 @@
 	 * Gets cells information from the given Node.
 	 * 
 	 * @param cellsNode root Node specyfying cells
-	 * @param plugins Plugins used in the matrix
 	 * @return List of cells defined in <code>rowsNode</code>
 	 */
-	private ArrayList<CellTemplate> parseRowTemplate(Node cellsNode,
-												PluginsValues pluginsValues) {
+	private ArrayList<CellTemplate> parseRowTemplate(Node cellsNode) {
 
 		ArrayList<CellTemplate> rt = new ArrayList<CellTemplate>();
 		
@@ -93,7 +89,7 @@
 			if (cellNode.getNodeName().equals(Tags.CELL_ELEMENT)) {
 			
 				CellTemplate cellTemplate =
-									new CellTemplate(cellNode, pluginsValues);
+									new CellTemplate(cellNode);
 				rt.add(cellTemplate);
 			}
 		}




More information about the jboss-svn-commits mailing list