Continued:

[city.git] / application / city / classes / class_BaseCitySystem.php

diff --git a/application/city/classes/class_BaseCitySystem.php b/application/city/classes/class_BaseCitySystem.php
index f52a55a892a253ea44d8995a2ac89788282efe15..13d1a29e50a0a314fc42606ee5fb83882f6f62c5 100644 (file)
--- a/application/city/classes/class_BaseCitySystem.php
+++ b/application/city/classes/class_BaseCitySystem.php
@@ -1,10 +1,19 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Generic;
+
+// Import application-specific stuff
+use Org\Mxchange\City\Helper\CityHelper;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general city (simulation) system class
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2015 City Developer Team
+ * @copyright  Copyright (c) 2015, 2016 City Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -21,7 +30,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 BaseCitySystem extends BaseFrameworkSystem {
+abstract class BaseCitySystem extends BaseFrameworkSystem {
        // Exception codes
        const EXCEPTION_UNSUPPORTED_ERROR_HANDLER     = 0x900;
        const EXCEPTION_BASE64_ENCODING_NOT_MODULO_4  = 0x901;
@@ -40,7 +49,7 @@ class BaseCitySystem extends BaseFrameworkSystem {
         * @param       $className      Name of the class
         * @return      void
         */
-       protected function __construct ($className) {
+       protected function __construct (string $className) {
                // Call parent constructor
                parent::__construct($className);
        }
@@ -63,29 +72,4 @@ class BaseCitySystem extends BaseFrameworkSystem {
        protected final function setCityInstance (CityHelper $cityInstance) {
                $this->cityInstance = $cityInstance;
        }
-
-       /**
-        * "Getter" for a printable state name
-        *
-        * @return      $stateName      Name of the city's state in a printable format
-        */
-       public final function getPrintableState () {
-               // Default is 'null'
-               $stateName = 'null';
-
-               // Get the state instance
-               $stateInstance = $this->getStateInstance();
-
-               // Is it an instance of Stateable?
-               if ($stateInstance instanceof Stateable) {
-                       // Then use that state name
-                       $stateName = $stateInstance->getStateName();
-               } // END - if
-
-               // Return result
-               return $stateName;
-       }
 }
-
-// [EOF]
-?>