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

Norman Richards norman.richards at jboss.com
Fri May 18 13:54:23 EDT 2007


  User: nrichards
  Date: 07/05/18 13:54:23

  Modified:    src/pdf/org/jboss/seam/pdf/ui         UIBarChart.java
                        UIBarCode.java UICategoryChartBase.java
                        UIChart.java UIChartData.java UIChartSeries.java
                        UILineChart.java UIPieChart.java
  Log:
  state saving
  
  Revision  Changes    Path
  1.7       +29 -0     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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- UIBarChart.java	8 May 2007 18:25:16 -0000	1.6
  +++ UIBarChart.java	18 May 2007 17:54:23 -0000	1.7
  @@ -69,6 +69,35 @@
       }
          
       @Override
  +    public void restoreState(FacesContext context, Object state)
  +    {
  +       Object[] values = (Object[]) state;
  +       super.restoreState(context, values[0]);      
  +       
  +       title             = (String) values[1];
  +       categoryAxisLabel = (String) values[2];
  +       valueAxisLabel    = (String) values[3];
  +       orientation       = (String) values[4];
  +       legend            = (Boolean) values[5];
  +       is3D              = (Boolean) values[6];
  +    }
  +
  +    @Override
  +    public Object saveState(FacesContext context)
  +    {
  +       Object[] values = new Object[7];
  +
  +       values[1] = title;
  +       values[2] = categoryAxisLabel;
  +       values[3] = valueAxisLabel;
  +       values[4] = orientation;
  +       values[5] = legend;
  +       values[6] = is3D;
  +
  +       return values;
  +    }
  +    
  +    @Override
       public void createDataset() {
           dataset = new DefaultCategoryDataset();
       }
  
  
  
  1.3       +46 -3     jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIBarCode.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIBarCode.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIBarCode.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UIBarCode.java	16 May 2007 02:42:29 -0000	1.2
  +++ UIBarCode.java	18 May 2007 17:54:23 -0000	1.3
  @@ -3,7 +3,6 @@
   import java.awt.Color;
   import java.awt.Graphics;
   import java.awt.image.BufferedImage;
  -import java.io.BufferedReader;
   import java.io.ByteArrayOutputStream;
   import java.io.IOException;
   
  @@ -29,10 +28,13 @@
   public class UIBarCode 
       extends ITextComponent
   {
  -    private String type;
  -    private String code;
  +    
       private Barcode barcode;
       private Image image;
  +    
  +    
  +    private String type;
  +    private String code;
       private Float xpos;
       private Float ypos;
       private Float rotDegrees;
  @@ -42,6 +44,8 @@
       private Float minBarWidth;
       private Float barMultiplier;
   
  +
  +
       public String getCode() {
           return code;
       }
  @@ -123,6 +127,45 @@
       }
       
       @Override
  +    public void restoreState(FacesContext context, Object state)
  +    {
  +       Object[] values = (Object[]) state;
  +       super.restoreState(context, values[0]);
  +       
  +       type = (String) values[1];
  +       code = (String) values[2];
  +       xpos = (Float) values[5];
  +       ypos = (Float) values[6];
  +       rotDegrees = (Float) values[7];
  +       altText = (String) values[8];
  +       barHeight = (Float) values[9];
  +       textSize      = (Float) values[10];
  +       minBarWidth   = (Float) values[11];
  +       barMultiplier = (Float) values[12];
  +    }
  +
  +    @Override
  +    public Object saveState(FacesContext context)
  +    {
  +       Object[] values = new Object[13];
  +       
  +       values[0] = super.saveState(context);
  +       values[1] = type;
  +       values[2] = code;
  +       values[5] = xpos;
  +       values[6] = ypos;
  +       values[7] = rotDegrees;
  +       values[8] = altText;
  +       values[9] = barHeight;
  +       values[10] = textSize;
  +       values[11] = minBarWidth;
  +       values[12] = barMultiplier;
  +       
  +       return values;
  +    }
  +    
  +    
  +    @Override
       public Object getITextObject() {
           return image;
       }
  
  
  
  1.2       +32 -2     jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UICategoryChartBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UICategoryChartBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UICategoryChartBase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- UICategoryChartBase.java	8 May 2007 18:25:16 -0000	1.1
  +++ UICategoryChartBase.java	18 May 2007 17:54:23 -0000	1.2
  @@ -1,5 +1,7 @@
   package org.jboss.seam.pdf.ui;
   
  +import javax.faces.context.FacesContext;
  +
   import org.jfree.chart.plot.CategoryPlot;
   import org.jfree.chart.plot.Plot;
   import org.jfree.chart.renderer.category.CategoryItemRenderer;
  @@ -14,7 +16,6 @@
       private String rangeGridlinePaint;
       private String rangeGridlineStroke;      
       
  -    
       public String getDomainGridlinePaint() {
           return (String) valueBinding("domainGridlinePaint", domainGridlinePaint);
       }
  @@ -65,6 +66,35 @@
       
       
       @Override
  +    public void restoreState(FacesContext context, Object state)
  +    {
  +       Object[] values = (Object[]) state;
  +       super.restoreState(context, values[0]);             
  +       
  +       domainGridlinesVisible = (Boolean) values[1];
  +       domainGridlinePaint    = (String) values[2];
  +       domainGridlineStroke   = (String) values[3];
  +       rangeGridlinesVisible  = (Boolean) values[4];
  +       rangeGridlinePaint     = (String) values[5];
  +       rangeGridlineStroke    = (String) values[6];
  +    }
  +
  +    @Override
  +    public Object saveState(FacesContext context)
  +    {
  +       Object[] values = new Object[7];
  +
  +       values[1] = domainGridlinesVisible;
  +       values[2] = domainGridlinePaint;
  +       values[3] = domainGridlineStroke;
  +       values[4] = rangeGridlinesVisible;
  +       values[5] = rangeGridlinePaint;
  +       values[6] = rangeGridlineStroke;
  +
  +       return values;
  +    }
  +    
  +    @Override
       public void configurePlot(Plot plot) {
           super.configurePlot(plot);
           if (plot instanceof CategoryPlot) {
  
  
  
  1.10      +45 -2     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.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- UIChart.java	14 May 2007 18:27:56 -0000	1.9
  +++ UIChart.java	18 May 2007 17:54:23 -0000	1.10
  @@ -33,6 +33,7 @@
   {
       private Image image = null;
       private JFreeChart chart = null;
  +    private byte[] imageData;
       
       private float height = 300;
       private float width  = 400;    
  @@ -47,7 +48,7 @@
       private Float  plotForegroundAlpha;
       private String plotOutlineStroke; 
       private String plotOutlinePaint;
  -    private byte[] imageData;
  +    
       
       
       public void setHeight(float height) {
  @@ -130,6 +131,48 @@
           return (String) valueBinding(FacesContext.getCurrentInstance(), "plotOutlineStroke", plotOutlineStroke);
       }   
       
  +    
  +    @Override
  +    public void restoreState(FacesContext context, Object state)
  +    {
  +       Object[] values = (Object[]) state;
  +       super.restoreState(context, values[0]);
  +       
  +       height                = (Float) values[1];
  +       width                 = (Float) values[2];
  +       borderBackgroundPaint = (String) values[3];
  +       borderPaint           = (String) values[4];
  +       borderStroke          = (String) values[5];
  +       borderVisible         = (Boolean) values[6];       
  +       plotBackgroundPaint   = (String) values[7];
  +       plotBackgroundAlpha   = (Float) values[8];
  +       plotForegroundAlpha   = (Float) values[9];
  +       plotOutlineStroke     = (String) values[10]; 
  +       plotOutlinePaint      = (String) values[11];             
  +    }
  +
  +    @Override
  +    public Object saveState(FacesContext context)
  +    {
  +       Object[] values = new Object[12];
  +       
  +       values[0] = super.saveState(context);
  +       values[1] = height;
  +       values[2] = width;
  +       values[3] = borderBackgroundPaint;
  +       values[4] = borderPaint;
  +       values[5] = borderStroke;
  +       values[6] = borderVisible;
  +       values[7] = plotBackgroundPaint;
  +       values[8] = plotBackgroundAlpha;
  +       values[9] = plotForegroundAlpha;
  +       values[10] = plotOutlineStroke;
  +       values[11] = plotOutlinePaint;
  +       
  +       return values;
  +    }
  +    
  +    
       public static Paint findColor(String name) {
           UIComponent component = FacesContext.getCurrentInstance().getViewRoot().findComponent(name);
           
  
  
  
  1.5       +34 -0     jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIChartData.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIChartData.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIChartData.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- UIChartData.java	6 May 2007 04:53:13 -0000	1.4
  +++ UIChartData.java	18 May 2007 17:54:23 -0000	1.5
  @@ -71,6 +71,40 @@
           this.sectionPaint = sectionPaint;
       }
   
  +    
  +    @Override
  +    public void restoreState(FacesContext context, Object state)
  +    {
  +       Object[] values = (Object[]) state;
  +       super.restoreState(context, values[0]);
  +      
  +       key                  = (String) values[1];
  +       columnKey            = (String) values[2];
  +       rowKey               = (String) values[3];
  +       value                = (Number) values[4];
  +       explodedPercent      = (Float)  values[5];
  +       sectionPaint         = (String) values[6];
  +       sectionOutlinePaint  = (String) values[7];
  +       sectionOutlineStroke = (String) values[8];
  +    }
  +
  +    @Override
  +    public Object saveState(FacesContext context)
  +    {
  +       Object[] values = new Object[8];
  +
  +       values[1] = key;
  +       values[2] = columnKey;
  +       values[3] = rowKey;
  +       values[4] = explodedPercent;
  +       values[5] = sectionPaint;
  +       values[6] = sectionOutlinePaint;
  +       values[7] = sectionOutlineStroke;
  +       
  +       return values;
  +    }
  +    
  +    
       @Override
       public void encodeEnd(FacesContext context) 
           throws IOException
  
  
  
  1.3       +32 -0     jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIChartSeries.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIChartSeries.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIChartSeries.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UIChartSeries.java	8 May 2007 18:25:16 -0000	1.2
  +++ UIChartSeries.java	18 May 2007 17:54:23 -0000	1.3
  @@ -88,6 +88,38 @@
       }
   
       @Override
  +    public void restoreState(FacesContext context, Object state)
  +    {
  +       Object[] values = (Object[]) state;
  +       super.restoreState(context, values[0]);      
  +       
  +       key                   = (String) values[1];
  +       seriesPaint           = (String) values[2];
  +       seriesFillPaint       = (String) values[3];
  +       seriesOutlinePaint    = (String) values[4];
  +       seriesOutlineStroke   = (String)  values[5];
  +       seriesStroke          = (String) values[6];
  +       seriesVisible         = (Boolean) values[7];
  +       seriesVisibleInLegend = (Boolean) values[8];
  +    }
  +
  +    @Override
  +    public Object saveState(FacesContext context)
  +    {
  +       Object[] values = new Object[8];
  +
  +       values[1] = key;
  +       values[2] = seriesPaint;
  +       values[3] = seriesFillPaint;
  +       values[4] = seriesOutlinePaint;
  +       values[5] = seriesOutlineStroke;
  +       values[6] = seriesStroke;
  +       values[7] = seriesVisibleInLegend;
  +       
  +       return values;
  +    }
  +    
  +    @Override
       public void encodeEnd(FacesContext context) 
           throws IOException
       {
  
  
  
  1.6       +31 -1     jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UILineChart.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UILineChart.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UILineChart.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- UILineChart.java	9 May 2007 19:08:42 -0000	1.5
  +++ UILineChart.java	18 May 2007 17:54:23 -0000	1.6
  @@ -12,10 +12,11 @@
   public class UILineChart
       extends UICategoryChartBase 
   {
  +    CategoryDataset dataset;
  +
       String title;
       String domainAxisLabel;
       String rangeAxisLabel;
  -    CategoryDataset dataset;
       String orientation;
       
       boolean legend;
  @@ -71,6 +72,35 @@
       }
       
       @Override
  +    public void restoreState(FacesContext context, Object state)
  +    {
  +       Object[] values = (Object[]) state;
  +       super.restoreState(context, values[0]);      
  +       
  +       title           = (String) values[1];
  +       domainAxisLabel = (String) values[2];
  +       rangeAxisLabel  = (String) values[3];
  +       orientation     = (String) values[4];
  +       legend          = (Boolean) values[5];
  +       is3D            = (Boolean) values[6];
  +    }
  +
  +    @Override
  +    public Object saveState(FacesContext context)
  +    {
  +       Object[] values = new Object[6];
  +
  +       values[1] = title;
  +       values[2] = domainAxisLabel;
  +       values[3] = rangeAxisLabel;
  +       values[4] = orientation;
  +       values[5] = legend;
  +       values[6] = is3D;
  +
  +       return values;
  +    }
  +    
  +    @Override
       public void createDataset() {
           dataset = new DefaultCategoryDataset();
       }
  
  
  
  1.5       +65 -10    jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIPieChart.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIPieChart.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIPieChart.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- UIPieChart.java	17 May 2007 23:23:53 -0000	1.4
  +++ UIPieChart.java	18 May 2007 17:54:23 -0000	1.5
  @@ -226,6 +226,71 @@
       }   
   
       @Override
  +    public void restoreState(FacesContext context, Object state)
  +    {
  +       Object[] values = (Object[]) state;
  +       super.restoreState(context, values[0]);
  +       
  +       title = (String) values[1];
  +       label = (String) values[2];
  +       legend = (Boolean) values[3];
  +       is3D = (Boolean) values[4];
  +       labelLinkMargin = (Double) values[5];
  +       labelLinkPaint = (String) values[6];
  +       labelLinkStroke = (String) values[7];
  +       labelLinksVisible = (Boolean) values[8];
  +       labelOutlinePaint = (String) values[9];
  +       labelOutlineStroke = (String) values[10];
  +       labelShadowPaint = (String) values[11];
  +       labelPaint = (String) values[12];
  +       labelGap = (Double) values[13];
  +       labelBackgroundPaint = (String) values[14];
  +       startAngle = (Double) values[15];
  +       circular = (Boolean) values[16];
  +       direction = (String) values[17];
  +       sectionOutlinePaint = (String) values[18];
  +       sectionOutlineStroke = (String) values[19];
  +       sectionOutlinesVisible = (Boolean) values[20];
  +       baseSectionOutlinePaint = (String) values[21];
  +       baseSectionPaint = (String) values[22];
  +       baseSectionOutlineStroke = (String) values[23];
  +    }
  +
  +    @Override
  +    public Object saveState(FacesContext context)
  +    {
  +       Object[] values = new Object[24];
  +
  +       values[1] = title;
  +       values[2] = label;
  +       values[3] = legend;
  +       values[4] = is3D;
  +       values[5] = labelLinkMargin;
  +       values[6] = labelLinkPaint;
  +       values[7] = labelLinkStroke;
  +       values[8] = labelLinksVisible;
  +       values[9] = labelOutlinePaint;
  +       values[10] = labelOutlineStroke;
  +       values[11] = labelShadowPaint;
  +       values[12] = labelPaint;
  +       values[13] = labelGap;
  +       values[14] = labelBackgroundPaint;
  +       values[15] = startAngle;
  +       values[16] = circular;
  +       values[17] = direction;
  +       values[18] = sectionOutlinePaint;
  +       values[19] = sectionOutlineStroke;
  +       values[20] = sectionOutlinesVisible;
  +       values[21] = baseSectionOutlinePaint;
  +       values[22] = baseSectionPaint;
  +       values[23] = baseSectionOutlineStroke;
  +       
  +       return values;
  +    }
  +    
  +    
  +    
  +    @Override
       public void createDataset() {
           data = new DefaultPieDataset();
       }
  @@ -332,14 +397,4 @@
               return ChartFactory.createPieChart3D(getTitle(), data, legend, false, false);
           }
       }
  -
  -    @Override
  -    public void restoreState(FacesContext context, Object state) {
  -        super.restoreState(context, state);        
  -    }
  -
  -    @Override
  -    public Object saveState(FacesContext context) {
  -        return super.saveState(context);
  -    }
   }
  
  
  



More information about the jboss-cvs-commits mailing list