Index: feeds.api.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/feeds.api.php,v
retrieving revision 1.16
diff -u -p -r1.16 feeds.api.php
--- feeds.api.php	15 Sep 2010 18:28:33 -0000	1.16
+++ feeds.api.php	19 Oct 2010 20:58:17 -0000
@@ -96,7 +96,7 @@ function hook_feeds_plugins() {
  */
 function hook_feeds_after_parse(FeedsImporter $importer, FeedsSource $source) {
   // For example, set title of imported content:
-  $source->batch->setTitle('Import number '. my_module_import_id());
+  $source->batch->title = 'Import number '. my_module_import_id();
 }
 
 /**
Index: includes/FeedsBatch.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/includes/FeedsBatch.inc,v
retrieving revision 1.15
diff -u -p -r1.15 FeedsBatch.inc
--- includes/FeedsBatch.inc	7 Sep 2010 17:29:36 -0000	1.15
+++ includes/FeedsBatch.inc	19 Oct 2010 20:58:17 -0000
@@ -93,12 +93,11 @@ class FeedsBatch {
  * FeedsFileBatch or FeedsHTTPBatch) or provide its own as a direct or indirect
  * extension of FeedsImportBatch.
  *
- * A Parser must populate a FeedsImportBatch object through the set methods upon
- * parse(). For instance:
+ * A Parser must populate a FeedsImportBatch object upon parse(). For instance:
  *
  * @code
- * $batch->setItems($parsed_rows);
- * $batch->setTitle('My imported document');
+ * $batch->items = $parsed_rows;
+ * $batch->title = 'My imported document';
  * @endcode
  *
  * Finally, a processor can work off the information produced on the parsing
@@ -142,13 +141,13 @@ class FeedsBatch {
  * @see FeedsHTTPBatch
  */
 class FeedsImportBatch extends FeedsBatch {
-  protected $title;
-  protected $description;
-  protected $link;
-  protected $items;
-  protected $raw;
-  protected $feed_nid;
   protected $current_item;
+  public $title;
+  public $description;
+  public $link;
+  public $items;
+  public $raw;
+  public $feed_nid;
   public $created;
   public $updated;
 
@@ -170,6 +169,10 @@ class FeedsImportBatch extends FeedsBatc
   }
 
   /**
+   * @deprecated
+   *   This method is deprecated. Access directly instead. For example:
+   *   $raw = $batch->raw;
+   *
    * @return
    *   The raw content from the source as a string.
    *
@@ -203,6 +206,10 @@ class FeedsImportBatch extends FeedsBatc
   }
 
   /**
+   * @deprecated
+   *   This method is deprecated. Access directly instead. For example:
+   *   $node = node_load($batch->feed_nid);
+   *
    * Return the feed node related to this batch object.
    */
   public function feedNode() {
@@ -212,6 +219,10 @@ class FeedsImportBatch extends FeedsBatc
   }
 
   /**
+   * @deprecated
+   *   This method is deprecated. Access directly instead. For example:
+   *   $title = $batch->title;
+   *
    * @return
    *   A string that is the feed's title.
    */
@@ -220,6 +231,10 @@ class FeedsImportBatch extends FeedsBatc
   }
 
   /**
+   * @deprecated
+   *   This method is deprecated. Access directly instead. For example:
+   *   $description = $batch->description;
+   *
    * @return
    *   A string that is the feed's description.
    */
@@ -228,6 +243,10 @@ class FeedsImportBatch extends FeedsBatc
   }
 
   /**
+   * @deprecated
+   *   This method is deprecated. Access directly instead. For example:
+   *   $link = $batch->link;
+   *
    * @return
    *   A string that is the link to the feed's site (not the actual URL of the
    *   feed). Falls back to URL if not available.
@@ -260,6 +279,10 @@ class FeedsImportBatch extends FeedsBatc
 
   /**
    * Set title.
+   *
+   * @deprecated
+   *   This method is deprecated. Access directly instead. For example:
+   *   $batch->title = $title;
    */
   public function setTitle($title) {
     $this->title = $title;
@@ -267,6 +290,10 @@ class FeedsImportBatch extends FeedsBatc
 
   /**
    * Set description.
+   *
+   * @deprecated
+   *   This method is deprecated. Access directly instead. For example:
+   *   $batch->description = $description;
    */
   public function setDescription($description) {
     $this->description = $description;
@@ -274,6 +301,10 @@ class FeedsImportBatch extends FeedsBatc
 
   /**
    * Set link.
+   *
+   * @deprecated
+   *   This method is deprecated. Access directly instead. For example:
+   *   $batch->link = $link;
    */
   public function setLink($link) {
     $this->link = $link;
@@ -282,6 +313,10 @@ class FeedsImportBatch extends FeedsBatc
   /**
    * Set items.
    *
+   * @deprecated
+   *   This method is deprecated. Access directly instead. For example:
+   *   $batch->items = $items;
+   *
    * @param $items
    *   An array of the items in the feed. Cannot be NULL.
    */
@@ -291,6 +326,10 @@ class FeedsImportBatch extends FeedsBatc
 
   /**
    * Add an item.
+   *
+   * @deprecated
+   *   This method is deprecated. Access directly instead. For example:
+   *   $batch->items[] = $item;
    */
   public function addItem($item) {
     $this->items[] = $item;
@@ -298,6 +337,10 @@ class FeedsImportBatch extends FeedsBatc
 
   /**
    * Get number of items.
+   *
+   * @deprecated
+   *   This method is deprecated. Access directly instead. For example:
+   *   $count = count($batch->items);
    */
   public function getItemCount() {
     return count($this->items);
Index: mappers/locale.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/mappers/locale.inc,v
retrieving revision 1.2
diff -u -p -r1.2 locale.inc
--- mappers/locale.inc	7 Sep 2010 18:42:09 -0000	1.2
+++ mappers/locale.inc	19 Oct 2010 20:58:17 -0000
@@ -27,7 +27,7 @@ function locale_feeds_parser_sources_alt
  * Callback, returns specific locale settings of the parent feed node.
  */
 function locale_feeds_get_source(FeedsImportBatch $batch, $key) {
-  if ($node = $batch->feedNode()) {
+  if ($node = node_load($batch->feed_nid)) {
     return $node->language;
   }
 }
Index: mappers/og.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/mappers/og.inc,v
retrieving revision 1.1
diff -u -p -r1.1 og.inc
--- mappers/og.inc	7 Sep 2010 17:29:36 -0000	1.1
+++ mappers/og.inc	19 Oct 2010 20:58:17 -0000
@@ -23,7 +23,7 @@ function og_feeds_parser_sources_alter(&
  * Callback, returns OG of feed node.
  */
 function og_feeds_get_source(FeedsImportBatch $batch, $key) {
-  if ($node = $batch->feedNode()) {
+  if ($node = node_load($batch->feed_nid)) {
     if (in_array($node->type, og_get_types('group'))) {
       return array(
         $node->nid => $node->nid,
Index: mappers/taxonomy.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/mappers/taxonomy.inc,v
retrieving revision 1.11
diff -u -p -r1.11 taxonomy.inc
--- mappers/taxonomy.inc	16 Sep 2010 18:28:24 -0000	1.11
+++ mappers/taxonomy.inc	19 Oct 2010 20:58:17 -0000
@@ -25,7 +25,7 @@ function taxonomy_feeds_parser_sources_a
  * Callback, returns taxonomy from feed node.
  */
 function taxonomy_feeds_get_source(FeedsImportBatch $batch, $key) {
-  if ($node = $batch->feedNode()) {
+  if ($node = node_load($batch->feed_nid)) {
     $terms = taxonomy_node_get_terms($node);
     $vocabulary = taxonomy_get_vocabulary(str_replace('parent:taxonomy:', '', $key));
     $result = array();
Index: plugins/FeedsCSVParser.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsCSVParser.inc,v
retrieving revision 1.16
diff -u -p -r1.16 FeedsCSVParser.inc
--- plugins/FeedsCSVParser.inc	16 Sep 2010 19:03:27 -0000	1.16
+++ plugins/FeedsCSVParser.inc	19 Oct 2010 20:58:17 -0000
@@ -26,14 +26,14 @@ class FeedsCSVParser extends FeedsParser
     $parser->setColumnNames($header);
 
     // Populate batch.
-    $batch->setItems($this->parseItems($parser, $iterator));
+    $batch->items = $this->parseItems($parser, $iterator);
   }
 
   /**
    * Get first line and use it for column names, convert them to lower case.
    * Be aware that the $parser and iterator objects can be modified in this
    * function since they are passed in by reference
-   * 
+   *
    * @param ParserCSV $parser
    * @param ParserCSVIterator $iterator
    * @return
Index: plugins/FeedsNodeProcessor.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsNodeProcessor.inc,v
retrieving revision 1.51.2.1
diff -u -p -r1.51.2.1 FeedsNodeProcessor.inc
--- plugins/FeedsNodeProcessor.inc	17 Sep 2010 13:46:30 -0000	1.51.2.1
+++ plugins/FeedsNodeProcessor.inc	19 Oct 2010 20:58:17 -0000
@@ -28,7 +28,7 @@ class FeedsNodeProcessor extends FeedsPr
     // Keep track of processed items in this pass, set total number of items.
     $processed = 0;
     if (!$batch->getTotal(FEEDS_PROCESSING)) {
-      $batch->setTotal(FEEDS_PROCESSING, $batch->getItemCount());
+      $batch->setTotal(FEEDS_PROCESSING, count($batch->items));
     }
 
     while ($item = $batch->shiftItem()) {
Index: plugins/FeedsOPMLParser.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsOPMLParser.inc,v
retrieving revision 1.6
diff -u -p -r1.6 FeedsOPMLParser.inc
--- plugins/FeedsOPMLParser.inc	7 Sep 2010 17:29:36 -0000	1.6
+++ plugins/FeedsOPMLParser.inc	19 Oct 2010 20:58:17 -0000
@@ -16,9 +16,9 @@ class FeedsOPMLParser extends FeedsParse
    */
   public function parse(FeedsImportBatch $batch, FeedsSource $source) {
     feeds_include_library('opml_parser.inc', 'opml_parser');
-    $result = opml_parser_parse($batch->getRaw());
-    $batch->setTitle($result['title']);
-    $batch->setItems($result['items']);
+    $result = opml_parser_parse($batch->raw);
+    $batch->title = $result['title'];
+    $batch->items = $result['items'];
   }
 
   /**
Index: plugins/FeedsParser.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsParser.inc,v
retrieving revision 1.22.2.2
diff -u -p -r1.22.2.2 FeedsParser.inc
--- plugins/FeedsParser.inc	25 Sep 2010 16:47:01 -0000	1.22.2.2
+++ plugins/FeedsParser.inc	19 Oct 2010 20:58:18 -0000
@@ -82,7 +82,7 @@ abstract class FeedsParser extends Feeds
    * @see FeedsCSVParser::getSourceElement().
    */
   public function getSourceElement(FeedsImportBatch $batch, $element_key) {
-    if (($node = $batch->feedNode()) && $element_key == 'parent:uid') {
+    if (($node = node_load($batch->feed_nid)) && $element_key == 'parent:uid') {
       return $node->uid;
     }
     $item = $batch->currentItem();
Index: plugins/FeedsSimplePieParser.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsSimplePieParser.inc,v
retrieving revision 1.14
diff -u -p -r1.14 FeedsSimplePieParser.inc
--- plugins/FeedsSimplePieParser.inc	16 Sep 2010 18:31:50 -0000	1.14
+++ plugins/FeedsSimplePieParser.inc	19 Oct 2010 20:58:18 -0000
@@ -65,7 +65,7 @@ class FeedsSimplePieParser extends Feeds
 
     // Initialize SimplePie.
     $parser = new SimplePie();
-    $parser->set_raw_data($batch->getRaw());
+    $parser->set_raw_data($batch->raw);
     $parser->set_stupidly_fast(TRUE);
     $parser->encode_instead_of_strip(FALSE);
     // @todo Is caching effective when we pass in raw data?
@@ -74,9 +74,9 @@ class FeedsSimplePieParser extends Feeds
     $parser->init();
 
     // Construct the standard form of the parsed feed
-    $batch->setTitle(html_entity_decode(($title = $parser->get_title()) ? $title : $this->createTitle($parser->get_description())));
-    $batch->setDescription($parser->get_description());
-    $batch->setLink(html_entity_decode($parser->get_link()));
+    $batch->title = html_entity_decode(($title = $parser->get_title()) ? $title : $this->createTitle($parser->get_description()));
+    $batch->description = $parser->get_description();
+    $batch->link = html_entity_decode($parser->get_link());
 
     $items_num = $parser->get_item_quantity();
     for ($i = 0; $i < $items_num; $i++) {
@@ -136,7 +136,7 @@ class FeedsSimplePieParser extends Feeds
       $this->parseExtensions($item, $simplepie_item);
       $item['raw'] = $simplepie_item->data;
 
-      $batch->addItem($item);
+      $batch->items[] = $item;
     }
     // Release parser.
     unset($parser);
Index: plugins/FeedsSitemapParser.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsSitemapParser.inc,v
retrieving revision 1.3
diff -u -p -r1.3 FeedsSitemapParser.inc
--- plugins/FeedsSitemapParser.inc	7 Sep 2010 17:29:36 -0000	1.3
+++ plugins/FeedsSitemapParser.inc	19 Oct 2010 20:58:18 -0000
@@ -13,7 +13,7 @@ class FeedsSitemapParser extends FeedsPa
     $tz = date_default_timezone_get();
     date_default_timezone_set('GMT');
     // Yes, using a DOM parser is a bit inefficient, but will do for now
-    $xml = new SimpleXMLElement($batch->getRaw());
+    $xml = new SimpleXMLElement($batch->raw);
     foreach ($xml->url as $url) {
       $item = array('url' => (string) $url->loc);
       if ($url->lastmod) {
@@ -25,7 +25,7 @@ class FeedsSitemapParser extends FeedsPa
       if ($url->priority) {
         $item['priority'] = $url->priority;
       }
-      $batch->addItem($item);
+      $batch->items[] = $item;
     }
     date_default_timezone_set($tz);
   }
Index: plugins/FeedsSyndicationParser.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsSyndicationParser.inc,v
retrieving revision 1.17
diff -u -p -r1.17 FeedsSyndicationParser.inc
--- plugins/FeedsSyndicationParser.inc	8 Sep 2010 20:15:19 -0000	1.17
+++ plugins/FeedsSyndicationParser.inc	19 Oct 2010 20:58:18 -0000
@@ -13,10 +13,10 @@ class FeedsSyndicationParser extends Fee
    */
   public function parse(FeedsImportBatch $batch, FeedsSource $source) {
     feeds_include_library('common_syndication_parser.inc', 'common_syndication_parser');
-    $result = common_syndication_parser_parse($batch->getRaw());
-    $batch->setTitle($result['title']);
-    $batch->setDescription($result['description']);
-    $batch->setLink($result['link']);
+    $result = common_syndication_parser_parse($batch->raw);
+    $batch->title = $result['title'];
+    $batch->description = $result['description'];
+    $batch->link = $result['link'];
     if (is_array($result['items'])) {
       foreach ($result['items'] as $item) {
         if (isset($item['geolocations'])) {
@@ -24,7 +24,7 @@ class FeedsSyndicationParser extends Fee
             $item['geolocations'][$k] = new FeedsGeoTermElement($v);
           }
         }
-        $batch->addItem($item);
+        $batch->items[] = $item;
       }
     }
   }