[jboss-cvs] jboss-seam/src/pdf/org/jboss/seam/pdf/ui ...

[Norman Richards]

  User: nrichards
  Date: 07/06/29 01:26:30

  Modified:    src/pdf/org/jboss/seam/pdf/ui   UIBarChart.java UIChart.java
  Log:
  work correctly w/ EL
  
  Revision  Changes    Path
  1.10      +2 -2      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.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- UIBarChart.java	29 Jun 2007 01:54:27 -0000	1.9
  +++ UIBarChart.java	29 Jun 2007 05:26:30 -0000	1.10
  @@ -135,7 +135,7 @@
                       getCategoryAxisLabel(),
                       getValueAxisLabel(),
                       dataset,
  -                    plotOrientation(orientation),
  +                    plotOrientation(getOrientation()),
                       getLegend(),
                       false,
                       false);
  @@ -144,7 +144,7 @@
                       getCategoryAxisLabel(),
                       getValueAxisLabel(),
                       dataset,
  -                    plotOrientation(orientation),
  +                    plotOrientation(getOrientation()),
                       getLegend(),
                       false,
                       false);
  
  
  
  1.12      +16 -17    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.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- UIChart.java	20 Jun 2007 10:28:37 -0000	1.11
  +++ UIChart.java	29 Jun 2007 05:26:30 -0000	1.12
  @@ -64,7 +64,7 @@
       }
       
       public String getBorderBackgroundPaint() {
  -        return (String) valueBinding(FacesContext.getCurrentInstance(), "backgroundPaint", borderBackgroundPaint);
  +        return (String) valueBinding(FacesContext.getCurrentInstance(), "borderBackgroundPaint", borderBackgroundPaint);
       }
       
       public void setBorderPaint(String borderPaint) {
  @@ -174,6 +174,9 @@
       
       
       public static Paint findColor(String name) {
  +        if (name == null || name.length() == 0) {
  +            return null;
  +        }
           UIComponent component = FacesContext.getCurrentInstance().getViewRoot().findComponent(name);
           
           if (component != null) {
  @@ -250,24 +253,20 @@
      
   
       public void configurePlot(Plot plot) {   
  -        if (plotBackgroundAlpha != null) {
  -            plot.setBackgroundAlpha(plotBackgroundAlpha);
  +        if (getPlotBackgroundAlpha() != null)  {        
  +            plot.setBackgroundAlpha(getPlotBackgroundAlpha()); 
           }
  -        
  -        if (plotForegroundAlpha != null) {
  -            plot.setForegroundAlpha(plotForegroundAlpha);          
  +        if (getPlotForegroundAlpha() != null) {
  +            plot.setForegroundAlpha(getPlotForegroundAlpha());
           }
  -        
  -        if (plotBackgroundPaint != null) {
  -            plot.setBackgroundPaint(findColor(plotBackgroundPaint));
  +        if (getPlotBackgroundPaint() != null) {
  +            plot.setBackgroundPaint(findColor(getPlotBackgroundPaint()));
           }
  -        
  -        if (plotOutlinePaint != null) {
  -            plot.setOutlinePaint(findColor(plotOutlinePaint));
  +        if (getPlotOutlinePaint() != null) {
  +            plot.setOutlinePaint(findColor(getPlotOutlinePaint()));
           }
  -        
  -        if (plotOutlineStroke != null) { 
  -            plot.setOutlineStroke(findStroke(plotOutlineStroke));
  +        if (getPlotOutlineStroke() != null) {
  +            plot.setOutlineStroke(findStroke(getPlotOutlineStroke()));
           }        
       }