[jboss-cvs] jboss-seam/src/pdf/org/jboss/seam/pdf/ui ...
Norman Richards
norman.richards at jboss.com
Sun Jul 1 19:19:36 EDT 2007
User: nrichards
Date: 07/07/01 19:19:36
Modified: src/pdf/org/jboss/seam/pdf/ui UIBarChart.java
UIChart.java UIStroke.java
Log:
more fixes
Revision Changes Path
1.11 +41 -7 jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIBarChart.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIBarChart.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIBarChart.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- UIBarChart.java 29 Jun 2007 05:26:30 -0000 1.10
+++ UIBarChart.java 1 Jul 2007 23:19:36 -0000 1.11
@@ -6,6 +6,7 @@
import org.jfree.chart.JFreeChart;
import org.jfree.chart.renderer.category.BarRenderer;
import org.jfree.chart.renderer.category.CategoryItemRenderer;
+import org.jfree.chart.title.TextTitle;
import org.jfree.data.category.CategoryDataset;
import org.jfree.data.category.DefaultCategoryDataset;
import org.jfree.data.general.Dataset;
@@ -24,6 +25,9 @@
private boolean legend;
private boolean is3D = false;
+ private String titleBackgroundPaint;
+ private String titlePaint;
+
public void setTitle(String title) {
this.title = title;
}
@@ -72,6 +76,22 @@
return (Boolean) valueBinding("is3D", is3D);
}
+ public void setTitleBackgroundPaint(String titleBackgroundPaint) {
+ this.titleBackgroundPaint = titleBackgroundPaint;
+ }
+
+ public String getTitleBackgroundPaint() {
+ return (String) valueBinding("titleBackgroundPaint", titleBackgroundPaint);
+ }
+
+ public void setTitlePaint(String titlePaint) {
+ this.titlePaint = titlePaint;
+ }
+
+ public String getTitlePaint() {
+ return (String) valueBinding("titlePaint", titlePaint);
+ }
+
@Override
public void restoreState(FacesContext context, Object state)
{
@@ -84,12 +104,14 @@
orientation = (String) values[4];
legend = (Boolean) values[5];
is3D = (Boolean) values[6];
+ titlePaint = (String) values[7];
+ titleBackgroundPaint = (String) values[8];
}
@Override
public Object saveState(FacesContext context)
{
- Object[] values = new Object[7];
+ Object[] values = new Object[9];
values[0] = super.saveState(context);
values[1] = title;
@@ -98,6 +120,8 @@
values[4] = orientation;
values[5] = legend;
values[6] = is3D;
+ values[7] = titlePaint;
+ values[8] = titleBackgroundPaint;
return values;
}
@@ -125,13 +149,14 @@
public void configureRenderer(BarRenderer renderer) {
-
}
@Override
public JFreeChart createChart(FacesContext context) {
+ JFreeChart chart;
+
if (!getIs3D()) {
- return ChartFactory.createBarChart(getTitle(),
+ chart = ChartFactory.createBarChart(getTitle(),
getCategoryAxisLabel(),
getValueAxisLabel(),
dataset,
@@ -140,7 +165,7 @@
false,
false);
} else {
- return ChartFactory.createBarChart3D(getTitle(),
+ chart = ChartFactory.createBarChart3D(getTitle(),
getCategoryAxisLabel(),
getValueAxisLabel(),
dataset,
@@ -149,6 +174,15 @@
false,
false);
}
+
+
+ TextTitle t = chart.getTitle();
+ t.setBackgroundPaint(findColor(getTitleBackgroundPaint()));
+ t.setPaint(findColor(getTitlePaint()));
+ // t.setFont(titleFont);
+
+
+ return chart;
}
@Override
1.13 +10 -5 jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIChart.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIChart.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIChart.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- UIChart.java 29 Jun 2007 05:26:30 -0000 1.12
+++ UIChart.java 1 Jul 2007 23:19:36 -0000 1.13
@@ -191,6 +191,10 @@
}
public static Stroke findStroke(String id) {
+ if (id == null || id.length() ==0) {
+ return null;
+ }
+
UIComponent component = FacesContext.getCurrentInstance().getViewRoot().findComponent(id);
if (component instanceof UIStroke) {
@@ -208,15 +212,16 @@
@Override
public void createITextObject(FacesContext context) {
- if (borderBackgroundPaint != null) {
+
+ if (getBorderBackgroundPaint() != null) {
chart.setBackgroundPaint(findColor(getBorderBackgroundPaint()));
}
- if (borderPaint != null) {
+ if (getBorderPaint() != null) {
chart.setBorderPaint(findColor(getBorderPaint()));
}
- if (borderStroke != null) {
+ if (getBorderStroke() != null) {
chart.setBorderStroke(findStroke(getBorderStroke()));
}
1.2 +32 -0 jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIStroke.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIStroke.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIStroke.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UIStroke.java 2 May 2007 01:09:04 -0000 1.1
+++ UIStroke.java 1 Jul 2007 23:19:36 -0000 1.2
@@ -4,6 +4,7 @@
import java.awt.Stroke;
import javax.faces.component.UIComponentBase;
+import javax.faces.context.FacesContext;
import org.jboss.seam.pdf.ITextUtils;
@@ -93,6 +94,37 @@
return ITextComponent.COMPONENT_FAMILY;
}
+
+ @Override
+ public void restoreState(FacesContext context, Object state)
+ {
+ Object[] values = (Object[]) state;
+ super.restoreState(context, values[0]);
+
+ width = (Float) values[1];
+ cap = (String) values[2];
+ join = (String) values[3];
+ miterLimit = (Float) values[4];
+ dashString = (String) values[5];
+ dashPhase = (Float) values[6];
+ }
+
+ @Override
+ public Object saveState(FacesContext context)
+ {
+ Object[] values = new Object[7];
+
+ values[0] = super.saveState(context);
+ values[1] = width;
+ values[2] = cap;
+ values[3] = join;
+ values[4] = miterLimit;
+ values[5] = dashString;
+ values[6] = dashPhase;
+
+ return values;
+ }
+
public Stroke getStroke() {
if (width == null) {
return new BasicStroke();
More information about the jboss-cvs-commits
mailing list