Refactoring

git-svn-id: http://php-reader.googlecode.com/svn/branches/zend@158 51a70ab9-7547-0410-9469-37e369ee0574

src/Zend/Media/Id3/DateFrame.php

@@ -103,9 +103,9 @@ abstract class Zend_Media_Id3_DateFrame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $this->setEncoding(Zend_Media_Id3_Encoding::ISO88591);
-        parent::_writeFrame($writer);
+        parent::_writeData($writer);
     }
 }

src/Zend/Media/Id3/Frame.php

@@ -138,18 +138,24 @@ abstract class Zend_Media_Id3_Frame extends Zend_Media_Id3_Object
             if ($this->getOption('version', 4) < 4) {
                 $this->_size = $this->_reader->readUInt32BE();
                 $flags = $this->_reader->readUInt16BE();
-                if (($flags & 0x8000) == 0x8000)
+                if (($flags & 0x8000) == 0x8000) {
                     $this->_flags |= self::DISCARD_ON_TAGCHANGE;
-                if (($flags & 0x4000) == 0x4000)
+                }
+                if (($flags & 0x4000) == 0x4000) {
                     $this->_flags |= self::DISCARD_ON_FILECHANGE;
-                if (($flags & 0x2000) == 0x2000)
+                }
+                if (($flags & 0x2000) == 0x2000) {
                     $this->_flags |= self::READ_ONLY;
-                if (($flags & 0x80) == 0x80)
+                }
+                if (($flags & 0x80) == 0x80) {
                     $this->_flags |= self::COMPRESSION;
-                if (($flags & 0x40) == 0x40)
+                }
+                if (($flags & 0x40) == 0x40) {
                     $this->_flags |= self::ENCRYPTION;
-                if (($flags & 0x20) == 0x20)
+                }
+                if (($flags & 0x20) == 0x20) {
                     $this->_flags |= self::GROUPING_IDENTITY;
+                }
             }
 
             /* ID3v2.4.0 size and flags */
@@ -248,7 +254,7 @@ abstract class Zend_Media_Id3_Frame extends Zend_Media_Id3_Object
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    abstract protected function _writeFrame($writer);
+    abstract protected function _writeData($writer);
 
     /**
      * Writes the frame data with the header.
@@ -286,7 +292,7 @@ abstract class Zend_Media_Id3_Frame extends Zend_Media_Id3_Object
             $flags = $this->_flags;
         }
 
-        $this->_writeFrame($buffer = new Zend_Io_StringWriter());
+        $this->_writeData($buffer = new Zend_Io_StringWriter());
         $data = $buffer->toString();
         $size = $this->_size = strlen($data);
 

src/Zend/Media/Id3/Frame/Aenc.php

@@ -168,7 +168,7 @@ final class Zend_Media_Id3_Frame_Aenc extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeString8($this->_owner, 1)
                ->writeUInt16BE($this->_previewStart)

src/Zend/Media/Id3/Frame/Apic.php

@@ -265,7 +265,7 @@ final class Zend_Media_Id3_Frame_Apic extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding)
                ->writeString8($this->_mimeType, 1)

src/Zend/Media/Id3/Frame/Comm.php

@@ -128,7 +128,7 @@ final class Zend_Media_Id3_Frame_Comm extends Zend_Media_Id3_LanguageTextFrame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding)
                ->write($this->_language);

src/Zend/Media/Id3/Frame/Comr.php

@@ -455,7 +455,7 @@ final class Zend_Media_Id3_Frame_Comr extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding)
                ->write($this->_currency)

src/Zend/Media/Id3/Frame/Encr.php

@@ -156,7 +156,7 @@ final class Zend_Media_Id3_Frame_Encr extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeString8($this->_owner, 1)
                ->writeInt8($this->_method)

src/Zend/Media/Id3/Frame/Equ2.php

@@ -183,7 +183,7 @@ final class Zend_Media_Id3_Frame_Equ2 extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeInt8($this->_interpolation)
                ->writeString8($this->_device, 1);

src/Zend/Media/Id3/Frame/Equa.php

@@ -121,7 +121,7 @@ final class Zend_Media_Id3_Frame_Equa extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeInt8(16);
         foreach ($this->_adjustments as $frequency => $adjustment) {

src/Zend/Media/Id3/Frame/Etco.php

@@ -157,7 +157,7 @@ final class Zend_Media_Id3_Frame_Etco extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_format);
         foreach ($this->_events as $timestamp => $type) {

src/Zend/Media/Id3/Frame/Geob.php

@@ -236,7 +236,7 @@ final class Zend_Media_Id3_Frame_Geob extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding)
                ->writeString8($this->_mimeType, 1);

src/Zend/Media/Id3/Frame/Grid.php

@@ -151,7 +151,7 @@ final class Zend_Media_Id3_Frame_Grid extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeString8($this->_owner, 1)
                ->writeUInt8($this->_group)

src/Zend/Media/Id3/Frame/Ipls.php

@@ -171,7 +171,7 @@ final class Zend_Media_Id3_Frame_Ipls extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding);
         foreach ($this->_people as $entry) {

src/Zend/Media/Id3/Frame/Link.php

@@ -179,7 +179,7 @@ final class Zend_Media_Id3_Frame_Link extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeString8(substr($this->_target, 0, 4), 4)
                ->writeString8($this->_url, 1)

src/Zend/Media/Id3/Frame/Mcdi.php

@@ -95,7 +95,7 @@ final class Zend_Media_Id3_Frame_Mcdi extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->write($this->_data);
     }

src/Zend/Media/Id3/Frame/Owne.php

@@ -234,7 +234,7 @@ final class Zend_Media_Id3_Frame_Owne extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding)
                ->write($this->_currency)

src/Zend/Media/Id3/Frame/Pcnt.php

@@ -99,7 +99,7 @@ final class Zend_Media_Id3_Frame_Pcnt extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         if ($this->_counter > 4294967295) {
             $writer->writeInt64BE($this->_counter); // UInt64

src/Zend/Media/Id3/Frame/Popm.php

@@ -163,7 +163,7 @@ final class Zend_Media_Id3_Frame_Popm extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeString8($this->_owner, 1)
                ->writeInt8($this->_rating);

src/Zend/Media/Id3/Frame/Poss.php

@@ -121,7 +121,7 @@ final class Zend_Media_Id3_Frame_Poss extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_format)
                ->writeUInt32BE($this->_position);

src/Zend/Media/Id3/Frame/Priv.php

@@ -117,7 +117,7 @@ final class Zend_Media_Id3_Frame_Priv extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeString8($this->_owner, 1)
                ->write($this->_data);

src/Zend/Media/Id3/Frame/Rbuf.php

@@ -178,7 +178,7 @@ final class Zend_Media_Id3_Frame_Rbuf extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $tmp = new Zend_Io_StringWriter();
         $tmp->writeUInt32BE($this->_bufferSize);

src/Zend/Media/Id3/Frame/Rva2.php

@@ -189,7 +189,7 @@ final class Zend_Media_Id3_Frame_Rva2 extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeString8($this->_device, 1);
         foreach ($this->_adjustments as $channel) {

src/Zend/Media/Id3/Frame/Rvad.php

@@ -188,7 +188,7 @@ final class Zend_Media_Id3_Frame_Rvad extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeInt8($flags = 0);
         if ($this->_adjustments[self::right] > 0)

src/Zend/Media/Id3/Frame/Rvrb.php

@@ -315,7 +315,7 @@ final class Zend_Media_Id3_Frame_Rvrb extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt16BE($this->_reverbLeft)
                ->writeUInt16BE($this->_reverbRight)

src/Zend/Media/Id3/Frame/Seek.php

@@ -88,7 +88,7 @@ final class Zend_Media_Id3_Frame_Seek extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeInt32BE($this->_minOffset);
     }

src/Zend/Media/Id3/Frame/Sign.php

@@ -115,7 +115,7 @@ final class Zend_Media_Id3_Frame_Sign extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_group)
                ->write($this->_signature);

src/Zend/Media/Id3/Frame/Sylt.php

@@ -329,7 +329,7 @@ final class Zend_Media_Id3_Frame_SYLT extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding)
                ->write($this->_language)

src/Zend/Media/Id3/Frame/Sytc.php

@@ -141,7 +141,7 @@ final class Zend_Media_Id3_Frame_Sytc extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_format);
         foreach ($this->_events as $timestamp => $tempo) {

src/Zend/Media/Id3/Frame/Tsrc.php

@@ -196,11 +196,11 @@ final class Zend_Media_Id3_Frame_Tsrc extends Zend_Media_Id3_TextFrame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $this->setText
             ($this->_country . $this->_registrant . $this->_year .
              $this->_uniqueNumber, Zend_Media_Id3_Encoding::ISO88591);
-        parent::_writeFrame($writer);
+        parent::_writeData($writer);
     }
 }

src/Zend/Media/Id3/Frame/Txxx.php

@@ -117,7 +117,7 @@ final class Zend_Media_Id3_Frame_Txxx extends Zend_Media_Id3_TextFrame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding);
         switch ($this->_encoding) {

src/Zend/Media/Id3/Frame/Unknown.php

@@ -43,6 +43,6 @@ final class Zend_Media_Id3_Frame_Unknown extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {}
 }

src/Zend/Media/Id3/Frame/Uslt.php

@@ -127,7 +127,7 @@ final class Zend_Media_Id3_Frame_Uslt extends Zend_Media_Id3_LanguageTextFrame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding)
                ->write($this->_language);

src/Zend/Media/Id3/Frame/Wxxx.php

@@ -157,7 +157,7 @@ final class Zend_Media_Id3_Frame_Wxxx extends Zend_Media_Id3_LinkFrame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding);
         switch ($this->_encoding) {

src/Zend/Media/Id3/LanguageTextFrame.php

@@ -201,7 +201,7 @@ abstract class Zend_Media_Id3_LanguageTextFrame extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding)
                ->write($this->_language);

src/Zend/Media/Id3/LinkFrame.php

@@ -85,7 +85,7 @@ abstract class Zend_Media_Id3_LinkFrame extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->write($this->_link);
     }

src/Zend/Media/Id3/NumberFrame.php

@@ -85,9 +85,9 @@ abstract class Zend_Media_Id3_NumberFrame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $this->setEncoding(Zend_Media_Id3_Encoding::ISO88591);
-        parent::_writeFrame($writer);
+        parent::_writeData($writer);
     }
 }

src/Zend/Media/Id3/TextFrame.php

@@ -170,7 +170,7 @@ abstract class Zend_Media_Id3_TextFrame extends Zend_Media_Id3_Frame
      * @param Zend_Io_Writer $writer The writer object.
      * @return void
      */
-    protected function _writeFrame($writer)
+    protected function _writeData($writer)
     {
         $writer->writeUInt8($this->_encoding);
         switch ($this->_encoding) {