[svn-components] 1842 - packages/ImageConversion/trunk/src/exceptions [eZComponents: Trunk]

[Derick Rethans]

Author: Derick Rethans
Date: 2006-01-13 16:27:16 +0100 (Fri, 13 Jan 2006)
New Revision: 1842

Log:
- Fixed message formatting.

Modified:
   packages/ImageConversion/trunk/src/exceptions/file_not_processable.php
   packages/ImageConversion/trunk/src/exceptions/filter_failed.php
   packages/ImageConversion/trunk/src/exceptions/handler_not_available.php
   packages/ImageConversion/trunk/src/exceptions/invalid_reference.php
   packages/ImageConversion/trunk/src/exceptions/transformation.php

Modified: packages/ImageConversion/trunk/src/exceptions/file_not_processable.php
===================================================================
--- packages/ImageConversion/trunk/src/exceptions/file_not_processable.php      
2006-01-13 15:23:12 UTC (rev 1841)
+++ packages/ImageConversion/trunk/src/exceptions/file_not_processable.php      
2006-01-13 15:27:16 UTC (rev 1842)
@@ -18,7 +18,12 @@
 {
     function __construct( $file, $reason = null )
     {
-        parent::__construct( "Handler class <{$handlerClass}> not found." . ( 
$reason !== null ? " $reason" : "" ) );
+        $reasonPart = "";
+        if ( $reason )
+        {
+            $reasonPart = " $reason";
+        }
+        parent::__construct( "Handler class <{$handlerClass}> not 
found.{$reasonPart}" );
     }
 }
 

Modified: packages/ImageConversion/trunk/src/exceptions/filter_failed.php
===================================================================
--- packages/ImageConversion/trunk/src/exceptions/filter_failed.php     
2006-01-13 15:23:12 UTC (rev 1841)
+++ packages/ImageConversion/trunk/src/exceptions/filter_failed.php     
2006-01-13 15:27:16 UTC (rev 1842)
@@ -18,7 +18,12 @@
 {
     function __construct( $filterName, $reason = null )
     {
-        parent::__construct( "The filter <{$filterName}> failed." . ( $reason 
!== null ? " $reason" : "" ) );
+        $reasonPart = "";
+        if ( $reason )
+        {
+            $reasonPart = " $reason";
+        }
+        parent::__construct( "The filter <{$filterName}> failed.{$reasonPart}" 
);
     }
 }
 

Modified: 
packages/ImageConversion/trunk/src/exceptions/handler_not_available.php
===================================================================
--- packages/ImageConversion/trunk/src/exceptions/handler_not_available.php     
2006-01-13 15:23:12 UTC (rev 1841)
+++ packages/ImageConversion/trunk/src/exceptions/handler_not_available.php     
2006-01-13 15:27:16 UTC (rev 1842)
@@ -18,7 +18,12 @@
 {
     function __construct( $handlerClass, $reason = null )
     {
-        parent::__construct( "Handler class <{$handlerClass}> not found." . ( 
$reason !== null ? " $reason" : "" ) );
+        $reasonPart = "";
+        if ( $reason )
+        {
+            $reasonPart = " $reason";
+        }
+        parent::__construct( "Handler class <{$handlerClass}> not 
found.{$reasonPart}" );
     }
 }
 

Modified: packages/ImageConversion/trunk/src/exceptions/invalid_reference.php
===================================================================
--- packages/ImageConversion/trunk/src/exceptions/invalid_reference.php 
2006-01-13 15:23:12 UTC (rev 1841)
+++ packages/ImageConversion/trunk/src/exceptions/invalid_reference.php 
2006-01-13 15:27:16 UTC (rev 1842)
@@ -19,7 +19,12 @@
 {
     function __construct( $reason = null )
     {
-        parent::__construct( "No valid reference found for action." . ( 
$reason !== null ? " $reason" : "" ) );
+        $reasonPart = "";
+        if ( $reason )
+        {
+            $reasonPart = " $reason";
+        }
+        parent::__construct( "No valid reference found for 
action.{$reasonPart}" );
     }
 }
 

Modified: packages/ImageConversion/trunk/src/exceptions/transformation.php
===================================================================
--- packages/ImageConversion/trunk/src/exceptions/transformation.php    
2006-01-13 15:23:12 UTC (rev 1841)
+++ packages/ImageConversion/trunk/src/exceptions/transformation.php    
2006-01-13 15:27:16 UTC (rev 1842)
@@ -30,7 +30,7 @@
      * ezcImage* exception. The transformation exception deals as a collection 
      * container to catch all these exception at once.
      * 
-     * @var object(ezcImage*Exception)
+     * @var ezcImageException
      */
     public $parent;
     
@@ -45,7 +45,8 @@
     public function __construct( ezcImageException $e )
     {
         $this->parent = $e;
-        parent::__construct( "Transformation failed. <{$e->getMessage()}>.", 0 
);
+        $message = $e->getMessage();
+        parent::__construct( "Transformation failed. <{$message}>." );
     }
 
 }

-- 
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components