More conventions than code added:

[shipsimu.git] / inc / classes / main / io / class_FileIoStream.php

diff --git a/inc/classes/main/io/class_FileIoStream.php b/inc/classes/main/io/class_FileIoStream.php
index c9833465a84dd6757a94e947795848c84ea39303..4c97338ac60a5f130c8ac3f202425d709602db23 100644 (file)
--- a/inc/classes/main/io/class_FileIoStream.php
+++ b/inc/classes/main/io/class_FileIoStream.php
@@ -2,11 +2,11 @@
 /**
  * An universal class for file input/output streams.
  *
- * @author             Roland Haeder <webmaster@mxchange.org>
+ * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.ship-simu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class FileIOStream extends BaseFrameworkSystem implements FileInputStreamer, FileOutputStreamer {
+class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, FileOutputStreamer {
        /**
         * Protected constructor
         */
@@ -30,10 +30,10 @@ class FileIOStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
                parent::__construct(__CLASS__);
 
                // Set part description
-               $this->setObjectDescription("Universal Datei-Ein-/Ausgabesystem");
+               $this->setObjectDescription("Universal file I/O stream system");
 
                // Create unique ID
-               $this->createUniqueID();
+               $this->generateUniqueId();
 
                // Clean-up a little
                $this->removeNumberFormaters();
@@ -44,11 +44,11 @@ class FileIOStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
         * Create a file IO stream. This is a class for performing all actions
         * on files like creating, deleting and loading them.
         *
-        * @return      $ioInstance     An instance of FileIOStream
+        * @return      $ioInstance     An instance of FileIoStream
         */
-       public final static function createFileIOStream () {
+       public final static function createFileIoStream () {
                // Create new instance
-               $ioInstance = new FileIOStream();
+               $ioInstance = new FileIoStream();
 
                // Return the instance
                return $ioInstance;
@@ -164,7 +164,7 @@ class FileIOStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
                                // Is the header (maybe) valid?
                                if (count($header) != 4) {
                                        // Throw an exception
-                                       throw new InvalidArrayCountException(array($this, "header", count($header), 4), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
+                                       throw new InvalidArrayCountException(array($this, 'header', count($header), 4), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
                                }
                        } elseif (substr($rawLine, 0, 5) == "@data") {
                                // Is a data line!
@@ -202,7 +202,7 @@ class FileIOStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
                // Was a header found?
                if (count($header) != 4) {
                        // Throw an exception
-                       throw new InvalidArrayCountException(array($this, "header", count($header), 4), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
+                       throw new InvalidArrayCountException(array($this, 'header', count($header), 4), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
                }
 
                // Decode all from Base64