Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/src/org/mc4j/console/dashboard
Modified Files:
DashboardManager.java DashboardFactory.java
AttributeFactory.java Dashboard.java
Log Message:
Dashboard and component tweaks
Index: DashboardManager.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DashboardManager.java 12 Apr 2006 19:13:51 -0000 1.5
--- DashboardManager.java 17 Apr 2006 03:07:26 -0000 1.6
***************
*** 75,78 ****
--- 75,80 ----
Dashboard dashboard = (Dashboard) dashboardIterator.next();
+ dashboard.setConnectionNode(mBeanNode.getConnectionNode());
+
if (dashboard.matches(mBeanNode.getEmsBean())) {
results.add(dashboard);
Index: DashboardFactory.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardFactory.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DashboardFactory.java 12 Apr 2006 19:13:52 -0000 1.16
--- DashboardFactory.java 17 Apr 2006 03:07:26 -0000 1.17
***************
*** 297,301 ****
for (int i = 0; i < beanList.size(); i++) {
EmsBean emsBean = beanList.get(i);
! context.put("index", new Integer(i));
context.put(forEachPanelComponent.getIdKey(), emsBean);
--- 297,301 ----
for (int i = 0; i < beanList.size(); i++) {
EmsBean emsBean = beanList.get(i);
! context.put("index", new Integer(i));
context.put(forEachPanelComponent.getIdKey(), emsBean);
Index: Dashboard.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/Dashboard.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Dashboard.java 12 Apr 2006 19:13:52 -0000 1.18
--- Dashboard.java 17 Apr 2006 03:07:26 -0000 1.19
***************
*** 19,22 ****
--- 19,23 ----
import org.mc4j.console.dashboard.match.DashboardMatch;
import org.mc4j.console.dashboard.match.MatchExecutor;
+ import org.mc4j.console.connection.ConnectionNode;
import org.mc4j.ems.connection.bean.EmsBean;
import org.w3c.dom.Document;
***************
*** 56,59 ****
--- 57,62 ----
private Map contextStarter = new HashMap();
+ private ConnectionNode connectionNode;
+
private boolean standardHeader = false;
***************
*** 85,88 ****
--- 88,96 ----
}
+ public static Dashboard getDashboard(Map context) {
+ return (Dashboard) context.get(CONTEXT_DASHBOARD);
+ }
+
+
/**
* Compare on names to put in alphabetical order.
***************
*** 205,207 ****
--- 213,223 ----
this.refreshTime = refreshTime;
}
+
+ public ConnectionNode getConnectionNode() {
+ return connectionNode;
+ }
+
+ public void setConnectionNode(ConnectionNode connectionNode) {
+ this.connectionNode = connectionNode;
+ }
}
Index: AttributeFactory.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/AttributeFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AttributeFactory.java 12 Apr 2006 19:13:52 -0000 1.9
--- AttributeFactory.java 17 Apr 2006 03:07:26 -0000 1.10
***************
*** 113,117 ****
IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("*** Exception while setting attribute [" + name + "] = [" + valueString + "] on object: " + component);
! ErrorManager.getDefault().notify(e);
}
--- 113,117 ----
IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("*** Exception while setting attribute [" + name + "] = [" + valueString + "] on object: " + component);
! ErrorManager.getDefault().notify(new IllegalArgumentException("*** Exception while setting attribute [" + name + "] = [" + valueString + "] on object: " + component, e));
}
|
