[Schmitzm-commits] r218 - in trunk/src/schmitzm/jfree: chart/style feature/style resource/images

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-07-14 10:22:37 +0200 (Tue, 14 Jul 2009)
New Revision: 218

Added:
   trunk/src/schmitzm/jfree/resource/images/ChartType_AREA.png
Modified:
   trunk/src/schmitzm/jfree/chart/style/BasicChartStyle.java
   trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java
   trunk/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java
   trunk/src/schmitzm/jfree/resource/images/ChartType_BAR.png
   trunk/src/schmitzm/jfree/resource/images/ChartType_PIE.png
Log:
* Zwei Aufgaben im neuen ChartStyle Code gel?\195?\182st (damit ich mich gut eindenken kann)
* Mehr Chart-Icons

Modified: trunk/src/schmitzm/jfree/chart/style/BasicChartStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/chart/style/BasicChartStyle.java	2009-07-13 21:56:13 UTC (rev 217)
+++ trunk/src/schmitzm/jfree/chart/style/BasicChartStyle.java	2009-07-14 08:22:37 UTC (rev 218)
@@ -89,7 +89,7 @@
    * @param tooltips flag whether toolstips are generated
    * @param urls     flag whether URLs are generated
    */
-  public BasicChartStyle(String id, ChartType type, boolean stacked,  boolean stepped,
+  public BasicChartStyle(String id, ChartType type, boolean stacked, boolean stepped,
                          PlotOrientation orientation,
                          String title,   String xTitle,    String yTitle,
                          boolean legend, boolean tooltips, boolean urls) {
@@ -126,8 +126,8 @@
       default: throwUnsupportedTypeException();
     }
     super.setType(type);
-  }
-
+  }
+  
   /**
    * Returns whether the chart is stacked.
    * @return {@code false} for line charts

Modified: trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java	2009-07-13 21:56:13 UTC (rev 217)
+++ trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java	2009-07-14 08:22:37 UTC (rev 218)
@@ -88,7 +88,7 @@
   public static class Dummy extends AbstractChartStyle implements FeatureChartStyle {
     /** Holds the attributes needed to specify the chart data
      *  from feature collection. */
-    protected List<String> attrNames = null;
+    protected String[] attrNames = null;
     
     /**
      * Creates a new dummy. This constructor is protected so that only derived
@@ -99,7 +99,11 @@
      */
     protected Dummy(String id, int attrCount) {
       super(id);
-      this.attrNames = new ArrayList<String>(attrCount);
+      this.attrNames = new String[attrCount];
+      
+      /**
+       * Filling the ArrayList 
+       */
     }
     
     /**
@@ -107,7 +111,7 @@
      * from feature collection.
      */
     public int getAttributeCount() {
-      return attrNames.size();
+      return attrNames.length;
     }
 
     /**
@@ -119,7 +123,7 @@
      * @see ChartStyle#RANGE_AXIS2
      */
     public String getAttributeName(int idx) {
-      return attrNames.get(idx);
+      return attrNames[idx];
     }
 
     /**
@@ -132,7 +136,7 @@
      * @see ChartStyle#RANGE_AXIS2
      */
     public void setAttributeName(int idx, String attrName) {
-      attrNames.set(idx, attrName);
+      attrNames[idx] = attrName;
     }
 
     /**

Modified: trunk/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java	2009-07-13 21:56:13 UTC (rev 217)
+++ trunk/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java	2009-07-14 08:22:37 UTC (rev 218)
@@ -38,6 +38,7 @@
    */
   public FeatureScatterChartStyle(String id) {
     super(id);
+    dummyFeatureChartStyle = new Dummy(id,2);
   }
 
   /**

Added: trunk/src/schmitzm/jfree/resource/images/ChartType_AREA.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/schmitzm/jfree/resource/images/ChartType_AREA.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Modified: trunk/src/schmitzm/jfree/resource/images/ChartType_BAR.png
===================================================================
(Binary files differ)

Modified: trunk/src/schmitzm/jfree/resource/images/ChartType_PIE.png
===================================================================
(Binary files differ)