- Renamed Dataset to DataSet

16 files changed, 57 insertions, 57 deletions

diff --git a/src/charts/line.php b/src/charts/line.php
index b0ba8c0..a4a8863 100644
--- a/src/charts/line.php
+++ b/src/charts/line.php
@@ -157,7 +157,7 @@ class ezcGraphLineChart extends ezcGraphChart
         $this->elements['yAxis']->calculateAxisBoundings();
 
         // Generate legend
-        $this->elements['legend']->generateFromDatasets( $this->data );
+        $this->elements['legend']->generateFromDataSets( $this->data );
 
         // Get boundings from parameters
         $this->options->width = $width;
diff --git a/src/charts/pie.php b/src/charts/pie.php
index f886c36..b34915d 100644
--- a/src/charts/pie.php
+++ b/src/charts/pie.php
@@ -27,16 +27,16 @@ class ezcGraphPieChart extends ezcGraphChart
      * 
      * @param string $name Name of dataset
      * @param mixed $values Values to create dataset with
-     * @throws ezcGraphTooManyDatasetExceptions
+     * @throws ezcGraphTooManyDataSetExceptions
      *          If too many datasets are created
-     * @return ezcGraphDataset
+     * @return ezcGraphDataSet
      */
     protected function addDataSet( $name, $values )
     {
         if ( count( $this->data ) >= 1 &&
              !isset( $this->data[$name] ) )
         {
-            throw new ezcGraphTooManyDatasetsExceptions( $name );
+            throw new ezcGraphTooManyDataSetsExceptions( $name );
         }
         else
         {
@@ -92,7 +92,7 @@ class ezcGraphPieChart extends ezcGraphChart
         $this->driver->options->height = $height;
 
         // Generate legend
-        $this->elements['legend']->generateFromDataset( reset( $this->data ) );
+        $this->elements['legend']->generateFromDataSet( reset( $this->data ) );
 
         // Get boundings from parameters
         $this->options->width = $width;
diff --git a/src/datasets/average.php b/src/datasets/average.php
index b0af528..7d9a662 100644
--- a/src/datasets/average.php
+++ b/src/datasets/average.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * File containing the abstract ezcGraphDatasetAverage class
+ * File containing the abstract ezcGraphDataSetAverage class
  *
  * @package Graph
  * @version //autogentag//
@@ -12,7 +12,7 @@
  *
  * @package Graph
  */
-class ezcGraphDatasetAverage extends ezcDataset 
+class ezcGraphDataSetAverage extends ezcDataSet 
 {
 
 }
diff --git a/src/datasets/base.php b/src/datasets/base.php
index b3c76c1..849f996 100644
--- a/src/datasets/base.php
+++ b/src/datasets/base.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * File containing the abstract ezcGraphDataset class
+ * File containing the abstract ezcGraphDataSet class
  *
  * @package Graph
  * @version //autogentag//
@@ -12,34 +12,34 @@
  *
  * @package Graph
  */
-class ezcGraphDataset implements ArrayAccess, Iterator
+class ezcGraphDataSet implements ArrayAccess, Iterator
 {
 
     /**
      * labels for dataset and dataset elements
      * 
-     * @var ezcGraphDatasetStringProperty
+     * @var ezcGraphDataSetStringProperty
      */
     protected $label;
 
     /**
      * Colors for dataset elements
      * 
-     * @var ezcGraphDatasetColorProperty
+     * @var ezcGraphDataSetColorProperty
      */
     protected $color;
 
     /**
      * Symbols for dataset elements
      * 
-     * @var ezcGraphDatasetIntProperty
+     * @var ezcGraphDataSetIntProperty
      */
     protected $symbol;
 
     /**
      * Status if dataset element is hilighted
      * 
-     * @var ezcGraphDatasetBooleanProperty
+     * @var ezcGraphDataSetBooleanProperty
      * @access protected
      */
     protected $highlight;
@@ -68,10 +68,10 @@ class ezcGraphDataset implements ArrayAccess, Iterator
 
     public function __construct()
     {
-        $this->label = new ezcGraphDatasetStringProperty( $this );
-        $this->color = new ezcGraphDatasetColorProperty( $this );
-        $this->symbol = new ezcGraphDatasetIntProperty( $this );
-        $this->highlight = new ezcGraphDatasetBooleanProperty( $this );
+        $this->label = new ezcGraphDataSetStringProperty( $this );
+        $this->color = new ezcGraphDataSetColorProperty( $this );
+        $this->symbol = new ezcGraphDataSetIntProperty( $this );
+        $this->highlight = new ezcGraphDataSetBooleanProperty( $this );
 
         $this->highlight->default = false;
     }
diff --git a/src/datasets/property/boolean.php b/src/datasets/property/boolean.php
index 318910d..5fad495 100644
--- a/src/datasets/property/boolean.php
+++ b/src/datasets/property/boolean.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * File containing the abstract ezcGraphDatasetBooleanProperty class
+ * File containing the abstract ezcGraphDataSetBooleanProperty class
  *
  * @package Graph
  * @version //autogentag//
@@ -12,7 +12,7 @@
  *
  * @package Graph
  */
-class ezcGraphDatasetBooleanProperty extends ezcGraphDatasetProperty
+class ezcGraphDataSetBooleanProperty extends ezcGraphDataSetProperty
 {
     /**
      * Converts value to an ezcGraphColor object
diff --git a/src/datasets/property/color.php b/src/datasets/property/color.php
index 4a9d8ba..c963e39 100644
--- a/src/datasets/property/color.php
+++ b/src/datasets/property/color.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * File containing the abstract ezcGraphDatasetColorProperty class
+ * File containing the abstract ezcGraphDataSetColorProperty class
  *
  * @package Graph
  * @version //autogentag//
@@ -12,7 +12,7 @@
  *
  * @package Graph
  */
-class ezcGraphDatasetColorProperty extends ezcGraphDatasetProperty
+class ezcGraphDataSetColorProperty extends ezcGraphDataSetProperty
 {
     /**
      * Converts value to an ezcGraphColor object
diff --git a/src/datasets/property/integer.php b/src/datasets/property/integer.php
index 28bf7b5..7497c30 100644
--- a/src/datasets/property/integer.php
+++ b/src/datasets/property/integer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * File containing the abstract ezcGraphDatasetIntProperty class
+ * File containing the abstract ezcGraphDataSetIntProperty class
  *
  * @package Graph
  * @version //autogentag//
@@ -12,7 +12,7 @@
  *
  * @package Graph
  */
-class ezcGraphDatasetIntProperty extends ezcGraphDatasetProperty
+class ezcGraphDataSetIntProperty extends ezcGraphDataSetProperty
 {
     /**
      * Converts value to an ezcGraphColor object
diff --git a/src/datasets/property/string.php b/src/datasets/property/string.php
index 98eb272..b893755 100644
--- a/src/datasets/property/string.php
+++ b/src/datasets/property/string.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * File containing the abstract ezcGraphDatasetStringProperty class
+ * File containing the abstract ezcGraphDataSetStringProperty class
  *
  * @package Graph
  * @version //autogentag//
@@ -12,7 +12,7 @@
  *
  * @package Graph
  */
-class ezcGraphDatasetStringProperty extends ezcGraphDatasetProperty
+class ezcGraphDataSetStringProperty extends ezcGraphDataSetProperty
 {
     /**
      * Converts value to an ezcGraphColor object
diff --git a/src/element/legend.php b/src/element/legend.php
index 1d8fe9e..952bfc1 100644
--- a/src/element/legend.php
+++ b/src/element/legend.php
@@ -117,7 +117,7 @@ class ezcGraphChartElementLegend extends ezcGraphChartElement
      * @param array $datasets 
      * @return void
      */
-    public function generateFromDatasets(array $datasets)
+    public function generateFromDataSets(array $datasets)
     {
         $this->labels = array();
         foreach ($datasets as $dataset)
@@ -135,10 +135,10 @@ class ezcGraphChartElementLegend extends ezcGraphChartElement
     /**
      * Generate legend from single dataset with on entry per data element 
      * 
-     * @param ezcGraphDataset $dataset 
+     * @param ezcGraphDataSet $dataset 
      * @return void
      */
-    public function generateFromDataset(ezcGraphDataset $dataset)
+    public function generateFromDataSet(ezcGraphDataSet $dataset)
     {
         $this->labels = array();
         foreach ($dataset as $label => $data)
diff --git a/src/exceptions/no_such_dataset.php b/src/exceptions/no_such_dataset.php
index 1346b3b..73093c9 100644
--- a/src/exceptions/no_such_dataset.php
+++ b/src/exceptions/no_such_dataset.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * File containing the ezcGraphNoSuchDatasetException class
+ * File containing the ezcGraphNoSuchDataSetException class
  *
  * @package Graph
  * @version //autogen//
@@ -14,7 +14,7 @@
  * @package Graph
  * @version //autogen//
  */
-class ezcGraphNoSuchDatasetException extends ezcGraphException
+class ezcGraphNoSuchDataSetException extends ezcGraphException
 {
     public function __construct( $name )
     {
diff --git a/src/exceptions/too_many_datasets.php b/src/exceptions/too_many_datasets.php
index 89e41b6..3578212 100644
--- a/src/exceptions/too_many_datasets.php
+++ b/src/exceptions/too_many_datasets.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * File containing the ezcGraphTooManyDatasetsExceptions class
+ * File containing the ezcGraphTooManyDataSetsExceptions class
  *
  * @package Graph
  * @version //autogen//
@@ -14,7 +14,7 @@
  * @package Graph
  * @version //autogen//
  */
-class ezcGraphTooManyDatasetsExceptions extends ezcGraphException
+class ezcGraphTooManyDataSetsExceptions extends ezcGraphException
 {
     public function __construct()
     {
diff --git a/src/exceptions/unknown_dataset_source.php b/src/exceptions/unknown_dataset_source.php
index 7641f2b..63beb52 100644
--- a/src/exceptions/unknown_dataset_source.php
+++ b/src/exceptions/unknown_dataset_source.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * File containing the ezcGraphUnknownDatasetSourceException class
+ * File containing the ezcGraphUnknownDataSetSourceException class
  *
  * @package Graph
  * @version //autogen//
@@ -14,7 +14,7 @@
  * @package Graph
  * @version //autogen//
  */
-class ezcGraphUnknownDatasetSourceException extends ezcGraphException
+class ezcGraphUnknownDataSetSourceException extends ezcGraphException
 {
     public function __construct( $source )
     {
diff --git a/src/graph_autoload.php b/src/graph_autoload.php
index 217f27e..6848661 100644
--- a/src/graph_autoload.php
+++ b/src/graph_autoload.php
@@ -63,17 +63,17 @@ return array(
     'ezcGraphChartElementNumericAxis'           => 'Graph/axis/numeric.php',
     'ezcGraphChartElementLabeledAxis'           => 'Graph/axis/labeled.php',
 
-    'ezcGraphDataset'                           => 'Graph/datasets/base.php',
-    'ezcGraphDatasetAverage'                    => 'Graph/datasets/average.php',
-    'ezcGraphDatasetProperty'                   => 'Graph/interfaces/dataset_property.php',
-    'ezcGraphDatasetColorProperty'              => 'Graph/datasets/property/color.php',
-    'ezcGraphDatasetStringProperty'             => 'Graph/datasets/property/string.php',
-    'ezcGraphDatasetIntProperty'                => 'Graph/datasets/property/integer.php',
-    'ezcGraphDatasetBooleanProperty'            => 'Graph/datasets/property/boolean.php',
+    'ezcGraphDataSet'                           => 'Graph/datasets/base.php',
+    'ezcGraphDataSetAverage'                    => 'Graph/datasets/average.php',
+    'ezcGraphDataSetProperty'                   => 'Graph/interfaces/dataset_property.php',
+    'ezcGraphDataSetColorProperty'              => 'Graph/datasets/property/color.php',
+    'ezcGraphDataSetStringProperty'             => 'Graph/datasets/property/string.php',
+    'ezcGraphDataSetIntProperty'                => 'Graph/datasets/property/integer.php',
+    'ezcGraphDataSetBooleanProperty'            => 'Graph/datasets/property/boolean.php',
     'ezcGraphNoSuchDataException'               => 'Graph/exceptions/no_such_data.php',
-    'ezcGraphNoSuchDatasetException'            => 'Graph/exceptions/no_such_dataset.php',
-    'ezcGraphTooManyDatasetsExceptions'         => 'Graph/exceptions/too_many_datasets.php',
-    'ezcGraphUnknownDatasetSourceException'     => 'Graph/exceptions/unknown_dataset_source.php',
+    'ezcGraphNoSuchDataSetException'            => 'Graph/exceptions/no_such_dataset.php',
+    'ezcGraphTooManyDataSetsExceptions'         => 'Graph/exceptions/too_many_datasets.php',
+    'ezcGraphUnknownDataSetSourceException'     => 'Graph/exceptions/unknown_dataset_source.php',
 
     'ezcGraphBoundings'                         => 'Graph/structs/boundings.php',
     'ezcGraphCoordinate'                        => 'Graph/structs/coordinate.php',
diff --git a/src/interfaces/chart.php b/src/interfaces/chart.php
index 2411fad..0bef62b 100644
--- a/src/interfaces/chart.php
+++ b/src/interfaces/chart.php
@@ -32,7 +32,7 @@ abstract class ezcGraphChart implements ArrayAccess
     /**
      * Contains the data of the chart
      * 
-     * @var array( ezcGraphDataset )
+     * @var array( ezcGraphDataSet )
      */
     protected $data = array();
 
@@ -190,13 +190,13 @@ abstract class ezcGraphChart implements ArrayAccess
      * 
      * @param string $name Name of dataset
      * @param mixed $values Values to create dataset with
-     * @throws ezcGraphTooManyDatasetExceptions
+     * @throws ezcGraphTooManyDataSetExceptions
      *          If too many datasets are created
-     * @return ezcGraphDataset
+     * @return ezcGraphDataSet
      */
     protected function addDataSet( $name, $values )
     {
-        $this->data[$name] = new ezcGraphDataset();
+        $this->data[$name] = new ezcGraphDataSet();
         
         if ( is_array($values) )
         {
@@ -212,7 +212,7 @@ abstract class ezcGraphChart implements ArrayAccess
         }
         else
         {
-            throw new ezcGraphUnknownDatasetSourceException( $values );
+            throw new ezcGraphUnknownDataSetSourceException( $values );
         }
     }
 
@@ -253,7 +253,7 @@ abstract class ezcGraphChart implements ArrayAccess
     {
         if ( !isset( $key ) )
         {
-            throw new ezcGraphNoSuchDatasetException( $key );
+            throw new ezcGraphNoSuchDataSetException( $key );
         }
 
         return $this->data[$key];
@@ -261,14 +261,14 @@ abstract class ezcGraphChart implements ArrayAccess
 
     public function offsetSet( $key, $value )
     {
-        return $this->addDataset( $key, $value );
+        return $this->addDataSet( $key, $value );
     }
 
     public function offsetUnset( $key )
     {
         if ( !isset( $key ) )
         {
-            throw new ezcGraphNoSuchDatasetException( $key );
+            throw new ezcGraphNoSuchDataSetException( $key );
         }
 
         unset( $this->data[$key] );
diff --git a/src/interfaces/dataset_property.php b/src/interfaces/dataset_property.php
index 53a4b56..4701b11 100644
--- a/src/interfaces/dataset_property.php
+++ b/src/interfaces/dataset_property.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * File containing the abstract ezcGraphDatasetProperty class
+ * File containing the abstract ezcGraphDataSetProperty class
  *
  * @package Graph
  * @version //autogentag//
@@ -12,7 +12,7 @@
  *
  * @package Graph
  */
-abstract class ezcGraphDatasetProperty implements ArrayAccess
+abstract class ezcGraphDataSetProperty implements ArrayAccess
 {
     /**
      * Default value for this property
@@ -32,7 +32,7 @@ abstract class ezcGraphDatasetProperty implements ArrayAccess
      * Contains a reference to the dataset to check for availability of data
      * keys
      * 
-     * @var ezcGraphDataset
+     * @var ezcGraphDataSet
      */
     protected $dataset;
 
@@ -46,7 +46,7 @@ abstract class ezcGraphDatasetProperty implements ArrayAccess
      */
     abstract protected function checkValue( &$value );
 
-    public function __construct( ezcGraphDataset $dataset )
+    public function __construct( ezcGraphDataSet $dataset )
     {
         $this->dataset = $dataset;
     }
diff --git a/src/interfaces/element.php b/src/interfaces/element.php
index ebb06a4..1a74316 100644
--- a/src/interfaces/element.php
+++ b/src/interfaces/element.php
@@ -204,7 +204,7 @@ abstract class ezcGraphChartElement extends ezcBaseOptions
                 }
                 break;
             default:
-                throw new ezcGraphNoSuchDatasetException( $propertyName );
+                throw new ezcGraphNoSuchDataSetException( $propertyName );
                 break;
         }
     }