[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard DashboardLoader.java,1.3,1.4 DashboardManager.java,1.2,1.3

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24157/src/org/mc4j/console/dashboard

Modified Files:
	DashboardLoader.java DashboardManager.java 
Log Message:
A little better error handling to deal with old dashboards.

Index: DashboardManager.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DashboardManager.java	8 Apr 2004 15:08:49 -0000	1.2
--- DashboardManager.java	21 Apr 2004 13:27:50 -0000	1.3
***************
*** 20,23 ****
--- 20,29 ----
  package org.mc4j.console.dashboard;
  
+ import org.openide.awt.StatusDisplayer;
+ import org.openide.modules.InstalledFileLocator;
+ import org.openide.windows.IOProvider;
+ 
+ import org.mc4j.console.bean.MBeanNode;
+ 
  import java.io.File;
  import java.io.FileFilter;
***************
*** 30,39 ****
  import java.util.TreeSet;
  
- import org.openide.awt.StatusDisplayer;
- import org.openide.modules.InstalledFileLocator;
- import org.openide.windows.IOProvider;
- 
- import org.mc4j.console.bean.MBeanNode;
- 
  /**
   * This static-singleton manages the set of dashboards for found by the MC4J
--- 36,39 ----
***************
*** 96,100 ****
  
          for (int i = 0; i < dashboardFiles.length; i++) {
!                 
              Dashboard dashboard = DashboardLoader.getInstance().buildDashboard(dashboardFiles[i]);
              if (dashboard != null)
--- 96,100 ----
  
          for (int i = 0; i < dashboardFiles.length; i++) {
! 
              Dashboard dashboard = DashboardLoader.getInstance().buildDashboard(dashboardFiles[i]);
              if (dashboard != null)

Index: DashboardLoader.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DashboardLoader.java	8 Apr 2004 20:30:43 -0000	1.3
--- DashboardLoader.java	21 Apr 2004 13:27:46 -0000	1.4
***************
*** 19,22 ****
--- 19,36 ----
  package org.mc4j.console.dashboard;
  
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Element;
+ import org.w3c.dom.NodeList;
+ import org.xml.sax.InputSource;
+ import org.xml.sax.SAXException;
+ import org.xml.sax.helpers.DefaultHandler;
+ 
+ import org.openide.ErrorManager;
+ import org.openide.windows.IOProvider;
+ 
+ import org.mc4j.console.dashboard.match.BeanCondition;
+ import org.mc4j.console.dashboard.match.BeanMatch;
+ import org.mc4j.console.dashboard.match.DashboardMatch;
+ 
  import java.io.File;
  import java.io.FileInputStream;
***************
*** 29,46 ****
  import javax.xml.parsers.ParserConfigurationException;
  
- import org.openide.ErrorManager;
- import org.openide.windows.IOProvider;
- 
- import org.mc4j.console.dashboard.match.BeanCondition;
- import org.mc4j.console.dashboard.match.BeanMatch;
- import org.mc4j.console.dashboard.match.DashboardMatch;
- 
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
- import org.w3c.dom.NodeList;
- import org.xml.sax.InputSource;
- import org.xml.sax.SAXException;
- import org.xml.sax.helpers.DefaultHandler;
- 
  /**
   * This static singleton is primarily here to load dashboard xml files into their
--- 43,46 ----
***************
*** 121,134 ****
       * @param rootElement
       */
!     private void assignDashboardMatch(Dashboard dashboard, Element rootElement) {
          Element dashboardMatchElement =
              (Element)
              rootElement.getElementsByTagName("DashboardMatch").item(0);
  
          DashboardMatch dashboardMatch = new DashboardMatch();
  
          String type = dashboardMatchElement.getAttribute("type");
!         if (type != null)
              dashboardMatch.setType(type);
  
          String location = dashboardMatchElement.getAttribute("location");
--- 121,143 ----
       * @param rootElement
       */
!     private void assignDashboardMatch(Dashboard dashboard, Element rootElement)
!     throws SAXException {
          Element dashboardMatchElement =
              (Element)
              rootElement.getElementsByTagName("DashboardMatch").item(0);
+         if (dashboardMatchElement == null) {
+             throw new SAXException(
+                 "The required element [DashboardMatch] is missing");
+         }
  
          DashboardMatch dashboardMatch = new DashboardMatch();
  
          String type = dashboardMatchElement.getAttribute("type");
!         if (type != null) {
              dashboardMatch.setType(type);
+         } else {
+             throw new SAXException(
+                 "The required attribute [type] on the element[DashboardMatch] is missing or invalid.");
+         }
  
          String location = dashboardMatchElement.getAttribute("location");