[jboss-cvs] JBossAS SVN: r68142 - in branches/Branch_4_2: console/src/main/org/jboss/console/manager/interfaces/impl and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: csaldanh
Date: 2007-12-11 11:39:35 -0500 (Tue, 11 Dec 2007)
New Revision: 68142

Modified:
   branches/Branch_4_2/build/build-thirdparty.xml
   branches/Branch_4_2/console/src/main/org/jboss/console/manager/interfaces/impl/GraphMBeanAttributeAction.java
   branches/Branch_4_2/console/src/main/org/jboss/console/plugins/monitor/ManageSnapshotServlet.java
Log:
JBAS-5060: Upgrade jfreechart to v1.0.2


Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml	2007-12-11 15:38:21 UTC (rev 68141)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2007-12-11 16:39:35 UTC (rev 68142)
@@ -90,7 +90,7 @@
     <componentref name="jboss/remoting" version="2.2.2.SP1-brew"/>
     <componentref name="jboss/serialization" version="1.0.3.GA"/>
     <componentref name="jboss/web" version="2.0.1.GA"/>
-    <componentref name="jfreechart" version="0.9.20"/>
+    <componentref name="jfreechart" version="1.0.2"/>
     <componentref name="jgroups" version="2.4.1.SP4"/>
     <componentref name="joesnmp" version="0.3.4-brew"/>
     <componentref name="juddi" version="0.9RC4-brew"/>

Modified: branches/Branch_4_2/console/src/main/org/jboss/console/manager/interfaces/impl/GraphMBeanAttributeAction.java
===================================================================
--- branches/Branch_4_2/console/src/main/org/jboss/console/manager/interfaces/impl/GraphMBeanAttributeAction.java	2007-12-11 15:38:21 UTC (rev 68141)
+++ branches/Branch_4_2/console/src/main/org/jboss/console/manager/interfaces/impl/GraphMBeanAttributeAction.java	2007-12-11 16:39:35 UTC (rev 68142)
@@ -28,8 +28,8 @@
 import org.jfree.chart.ChartFrame;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.data.AbstractXYDataset;
-import org.jfree.data.DatasetChangeEvent;
+import org.jfree.data.xy.AbstractXYDataset;
+import org.jfree.data.general.DatasetChangeEvent;
 
 import javax.management.ObjectName;
 import java.util.ArrayList;
@@ -84,9 +84,9 @@
        *
        * @return the x-value for the specified series and item.
        */
-      public Number getXValue(int series, int item)
+      public Number getX(int series, int item)
       {
-         return new Integer(item);
+          return (Number)item;
       }
 
       /**
@@ -97,12 +97,59 @@
        *
        * @return the y-value for the specified series and item.
        */
-      public Number getYValue(int series, int item)
+      public Number getY(int series, int item)
       {
-         return (Number) data.get(item);
+	return (Number)data.get(item);
       }
 
       /**
+       * Returns the x-value for the specified series and item.  Series are numbered 0, 1, ...
+       *
+       * @param series  the index (zero-based) of the series.
+       * @param item  the index (zero-based) of the required item.
+       *
+       * @return the x-value for the specified series and item.
+       */
+      public double getXValue(int series, int item)
+      {
+          return item;
+      }
+
+      /**
+       * Returns the y-value for the specified series and item.  Series are numbered 0, 1, ...
+       *
+       * @param series  the index (zero-based) of the series.
+       * @param item  the index (zero-based) of the required item.
+       *
+       * @return the y-value for the specified series and item.
+       */
+      public double getYValue(int series, int item)
+      {
+	double result = Double.NaN;
+        Number x = (Number)data.get(item);
+        if (x != null) {
+            result = x.doubleValue();
+        }
+        return result;
+      }
+
+      /**
+       * Returns the key for a series.  
+       * <p>
+       * If <code>series</code> is not within the specified range, the 
+       * implementing method should throw an {@link IndexOutOfBoundsException} 
+       * (preferred) or an {@link IllegalArgumentException}.
+       *
+       * @param series  the series index (in the range <code>0</code> to 
+       *     <code>getSeriesCount() - 1</code>).
+       *
+       * @return The series key.
+       */
+      public Comparable getSeriesKey(int series){
+          return null; //Switching to new jfreechart API so really don't use this.
+      }
+
+      /**
        * Returns the number of series in the dataset.
        *
        * @return the number of series in the dataset.

Modified: branches/Branch_4_2/console/src/main/org/jboss/console/plugins/monitor/ManageSnapshotServlet.java
===================================================================
--- branches/Branch_4_2/console/src/main/org/jboss/console/plugins/monitor/ManageSnapshotServlet.java	2007-12-11 15:38:21 UTC (rev 68141)
+++ branches/Branch_4_2/console/src/main/org/jboss/console/plugins/monitor/ManageSnapshotServlet.java	2007-12-11 16:39:35 UTC (rev 68142)
@@ -38,8 +38,8 @@
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.data.DefaultTableXYDataset;
-import org.jfree.data.XYSeries;
+import org.jfree.data.xy.DefaultTableXYDataset;
+import org.jfree.data.xy.XYSeries;
 
 /**
  * @author Bill Burke