Sophie

Sophie

distrib > Fedora > 14 > x86_64 > by-pkgid > f454b1c192f4d577558edd61005ee3dc > files > 4

mars-sim-2.84-6.fc14.src.rpm

jfreechart-1.0.10 changed api a bit. Besides changing placement of certain
methods in hierarchy, a few functions disappeared and some abstract got added.
Beware that below I either comment them out, or implement with a lame duck
replacements, which is most likely not a right thing to do.

Lubomir Rintel (Fedora Astronomy) <lkundrak@fedoraprojecr.org>

diff -urp mars-sim.orig/org/mars_sim/msp/ui/standard/tool/monitor/BarChartTab.java mars-sim/org/mars_sim/msp/ui/standard/tool/monitor/BarChartTab.java
--- mars-sim.orig/org/mars_sim/msp/ui/standard/tool/monitor/BarChartTab.java	2008-04-09 01:15:00.000000000 +0200
+++ mars-sim/org/mars_sim/msp/ui/standard/tool/monitor/BarChartTab.java	2008-07-19 21:28:35.000000000 +0200
@@ -18,14 +18,15 @@ import javax.swing.event.TableModelEvent
 import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.List;
-import org.jfree.data.AbstractSeriesDataset;
-import org.jfree.data.CategoryDataset;
+import org.jfree.data.general.AbstractSeriesDataset;
+import org.jfree.data.category.CategoryDataset;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.plot.*;
 import org.jfree.chart.axis.CategoryAxis;
 import org.jfree.chart.axis.CategoryLabelPosition;
+import org.jfree.chart.axis.CategoryLabelWidthType;
 
 /**
  */
@@ -51,6 +52,10 @@ class BarChartTab extends MonitorTab {
         private int[] columns;
         private List<String> categories;
 
+	public java.lang.Comparable getSeriesKey(int unused) {
+		return new Boolean ("false");
+	}
+
         public TableBarDataset(TableModel model, int columns[]) {
             setModel(model);
             setColumns(columns);
@@ -262,8 +267,8 @@ class BarChartTab extends MonitorTab {
         CategoryAxis hAxis = ((CategoryPlot) plot).getDomainAxis();
         CategoryLabelPosition defaultPos = new CategoryLabelPosition();
         CategoryLabelPosition verticalPosition = new CategoryLabelPosition(defaultPos.getCategoryAnchor(), 
-            defaultPos.getLabelAnchor(), defaultPos.getRotationAnchor(), (3D * Math.PI / 2D));
-        hAxis.setBottomCategoryLabelPosition(verticalPosition);
+            defaultPos.getLabelAnchor(), defaultPos.getRotationAnchor(), (3D * Math.PI / 2D), CategoryLabelWidthType.RANGE, (float)0);
+        //hAxis.setBottomCategoryLabelPosition(verticalPosition);
 
         // Estimate the width of the chart by multipling the categories by the
         // number of series. First calculate the column width as this is
diff -urp mars-sim.orig/org/mars_sim/msp/ui/standard/tool/monitor/PieChartTab.java mars-sim/org/mars_sim/msp/ui/standard/tool/monitor/PieChartTab.java
--- mars-sim.orig/org/mars_sim/msp/ui/standard/tool/monitor/PieChartTab.java	2008-04-09 01:15:00.000000000 +0200
+++ mars-sim/org/mars_sim/msp/ui/standard/tool/monitor/PieChartTab.java	2008-07-19 21:25:56.000000000 +0200
@@ -21,8 +21,8 @@ import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.plot.PiePlot;
-import org.jfree.data.AbstractDataset;
-import org.jfree.data.PieDataset;
+import org.jfree.data.general.AbstractDataset;
+import org.jfree.data.general.PieDataset;
 
 /**
  * This class presents a Pie chart as a Monitor tab. The data for the Pie
@@ -251,8 +251,8 @@ class PieChartTab extends MonitorTab {
         // then customise it a little...
         PiePlot plot = (PiePlot)chart.getPlot();
         plot.setCircular(false);
-        plot.setRadius(0.60);
-        plot.setSectionLabelType(PiePlot.PERCENT_LABELS);
+        //plot.setRadius(0.60);
+        //plot.setSectionLabelType(PiePlot.PERCENT_LABELS);
         pieModel.addChangeListener(plot);
 
         chartpanel = new ChartPanel(chart, true);