From d90e5850767bfef7a3307df1bca5cbaee21cbe64 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 14 Dec 2011 04:47:11 +0000 Subject: [PATCH] Renamed tue to conflicts with same exception in 'hub' project --- .gitattributes | 1 + .../state/class_InvalidStateException.php | 49 +----------------- .../class_UnresolveableStateException.php | 50 +++++++++++++++++++ 3 files changed, 52 insertions(+), 48 deletions(-) create mode 100644 inc/classes/exceptions/state/class_UnresolveableStateException.php diff --git a/.gitattributes b/.gitattributes index c2dc9ba6..98123c1c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -107,6 +107,7 @@ inc/classes/exceptions/stacker/class_NoStackerException.php svneol=native#text/p inc/classes/exceptions/state/.htaccess svneol=native#text/plain inc/classes/exceptions/state/class_InvalidStateException.php svneol=native#text/plain inc/classes/exceptions/state/class_InvalidStateInstanceException.php svneol=native#text/plain +inc/classes/exceptions/state/class_UnresolveableStateException.php svneol=native#text/plain inc/classes/exceptions/template/.htaccess svneol=native#text/plain inc/classes/exceptions/template/class_BasePathIsEmptyException.php svneol=native#text/plain inc/classes/exceptions/template/class_BasePathIsNoDirectoryException.php svneol=native#text/plain diff --git a/inc/classes/exceptions/state/class_InvalidStateException.php b/inc/classes/exceptions/state/class_InvalidStateException.php index fc19dd69..f551ef47 100644 --- a/inc/classes/exceptions/state/class_InvalidStateException.php +++ b/inc/classes/exceptions/state/class_InvalidStateException.php @@ -1,50 +1,3 @@ - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team - * @license GNU GPL 3.0 or any newer version - * @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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -class InvalidStateException extends FrameworkException { - /** - * The super constructor for all exceptions - * - * @param $msgArray An array with message parts - * @param $code An optional code for better debugging - * @return void - */ - public function __construct (array $msgArray, $code) { - // Prepare the message - $message = sprintf("[%s:%d] Cannot resolve state %s (class name: %s).", - $msgArray[0]->__toString(), - $this->getLine(), - $msgArray[1], - $msgArray[0]->getClassName() - ); - - // Set extra data - $this->setExtraData($msgArray[0]->getClassName() . ':' . $this->getLine()); - - // Call parent contructor with message - parent::__construct($message, $code); - } -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/classes/exceptions/state/class_UnresolveableStateException.php b/inc/classes/exceptions/state/class_UnresolveableStateException.php new file mode 100644 index 00000000..57dc43d8 --- /dev/null +++ b/inc/classes/exceptions/state/class_UnresolveableStateException.php @@ -0,0 +1,50 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class UnresolveableStateException extends FrameworkException { + /** + * The super constructor for all exceptions + * + * @param $msgArray An array with message parts + * @param $code An optional code for better debugging + * @return void + */ + public function __construct (array $msgArray, $code) { + // Prepare the message + $message = sprintf("[%s:%d] Cannot resolve state %s (class name: %s).", + $msgArray[0]->__toString(), + $this->getLine(), + $msgArray[1], + $msgArray[0]->getClassName() + ); + + // Set extra data + $this->setExtraData($msgArray[0]->getClassName() . ':' . $this->getLine()); + + // Call parent contructor with message + parent::__construct($message, $code); + } +} + +// [EOF] +?> -- 2.39.5