[jboss-cvs] jboss-seam/examples/itext/src/org/jboss/seam/example/pdf ...

[Norman Richards]

  User: nrichards
  Date: 07/07/06 19:38:45

  Modified:    examples/itext/src/org/jboss/seam/example/pdf   Data.java
                        DynamicChart.java
  Log:
  configure dataset
  
  Revision  Changes    Path
  1.3       +2 -9      jboss-seam/examples/itext/src/org/jboss/seam/example/pdf/Data.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Data.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/itext/src/org/jboss/seam/example/pdf/Data.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Data.java	4 Jul 2007 19:07:06 -0000	1.2
  +++ Data.java	6 Jul 2007 23:38:45 -0000	1.3
  @@ -1,8 +1,6 @@
   package org.jboss.seam.example.pdf;
   
  -import java.util.ArrayList;
   import java.util.HashMap;
  -import java.util.List;
   import java.util.Map;
   
   public class Data {
  @@ -14,8 +12,7 @@
       String seriesFillPaint;
       String seriesOutlinePaint;
       String seriesOutlineStroke;
  -    String seriesStroke;;
  -    
  +    String seriesStroke;
       
       Map<String, Number> values = new HashMap<String, Number>();
   
  @@ -27,10 +24,6 @@
           this.id = id;
       }
   
  -    public List<String> getKeys() {
  -        return new ArrayList<String>(values.keySet());        
  -    }
  -    
       public Map<String,Number> getValues() {
           return values;
       }
  
  
  
  1.5       +43 -11    jboss-seam/examples/itext/src/org/jboss/seam/example/pdf/DynamicChart.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DynamicChart.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/itext/src/org/jboss/seam/example/pdf/DynamicChart.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- DynamicChart.java	4 Jul 2007 19:07:06 -0000	1.4
  +++ DynamicChart.java	6 Jul 2007 23:38:45 -0000	1.5
  @@ -11,6 +11,10 @@
   @Scope(ScopeType.SESSION)
   public class DynamicChart {
       private static final int CHART_RANGE = 50;
  +    private List<String> categories = new ArrayList<String>();
  +    private int nextSeries = 1;
  +    private int nextCategory = 1;
  +    
       Random random = new Random();
       
       List<Data> data = new ArrayList<Data>();
  @@ -286,6 +290,10 @@
       
       @Create
       public void initData() {
  +        newCategory();
  +        newCategory();
  +        newCategory();
  +
           newSeries();
           newSeries();
       }
  @@ -294,31 +302,46 @@
           return data;
       }
   
  +    public List<String> getCategories() {
  +        return categories;
  +    }
  +    
       public void removeSeries(String id) {
           System.out.println("REMOVE: " + id);
       }
       
       public void newSeries() {
  -        String newId = findUniqueId();
  +        String newId = findUniqueSeriesId();
  +        System.out.println("** series " + newId);
           Data set = new Data();
           set.setId(newId);
  -        set.addValue("first",  random.nextInt(CHART_RANGE));
  -        set.addValue("second", random.nextInt(CHART_RANGE));
  -        set.addValue("third",  random.nextInt(CHART_RANGE)); 
  +        
  +        for (String category: categories) {
  +            set.addValue(category,  random.nextInt(CHART_RANGE));
  +        }        
           
           data.add(set);
       }
   
  -    private String findUniqueId() {
  -        for (int num=1; true; num++) {
  -            String id = "Series " + num;
  -            if (isUniqueId(id)) {
  +    public void newCategory() {
  +        String newId = findUniqueCategoryId();
  +        categories.add(newId);
  +
  +        for (Data set: data) {
  +            set.addValue(newId,  random.nextInt(CHART_RANGE));
  +        }        
  +    }
  +
  +    private String findUniqueSeriesId() {
  +        while (true) {
  +            String id = "Series " + nextSeries++;
  +            if (isUniqueSeriesId(id)) {
                   return id;
               }
           }
       }
   
  -    private boolean isUniqueId(String id) {
  +    private boolean isUniqueSeriesId(String id) {
           for (Data item: data) {
               if (item.getId().equals(id)) {
                   return false;
  @@ -328,4 +351,13 @@
       }
       
   
  +    private String findUniqueCategoryId() {
  +        while (true) {
  +            String id = "Category " + nextCategory++;
  +            if (!categories.contains(id)) {
  +                return id;
  +            }
  +        }
  +    }
  +    
   }