X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Ftests%2Fclass_ApplicationHelper.php;h=5224a07e997704a4a254f7c5471cabdf3c249b10;hb=513812814a5a17022d414727e5a4c6d0823fe5f6;hp=008bda16236d71432d82befac927f74d24857e3b;hpb=2b4f4b88ec5f9d385110e800494c680e164b5a36;p=core.git

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index 008bda16..5224a07e 100644
--- a/application/tests/class_ApplicationHelper.php
+++ b/application/tests/class_ApplicationHelper.php
@@ -10,6 +10,7 @@ use Org\Mxchange\CoreFramework\Loader\ClassLoader;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
+use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
 
 /**
  * A class holding general data about the application and some methods for
@@ -34,7 +35,7 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -51,26 +52,6 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable {
-	/**
-	 * The version number of this application
-	 */
-	private $appVersion = '';
-
-	/**
-	 * The human-readable name for this application
-	 */
-	private $appName = '';
-
-	/**
-	 * The short uni*-like name for this application
-	 */
-	private $shortName = '';
-
-	/**
-	 * An instance of this class
-	 */
-	private static $selfInstance = NULL;
-
 	/**
 	 * Private constructor
 	 *
@@ -88,71 +69,13 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 	 */
 	public static final function getSelfInstance () {
 		// Is the instance there?
-		if (is_null(self::$selfInstance)) {
-			self::$selfInstance = new ApplicationHelper();
-		} // END - if
+		if (is_null(self::getApplicationInstance())) {
+			// Then set it
+			self::setApplicationInstance(new ApplicationHelper());
+		}
 
 		// Return the instance
-		return self::$selfInstance;
-	}
-
-	/**
-	 * Getter for the version number
-	 *
-	 * @return	$appVersion	The application's version number
-	 */
-	public final function getAppVersion () {
-		return $this->appVersion;
-	}
-	/**
-	 * Setter for the version number
-	 *
-	 * @param	$appVersion	The application's version number
-	 * @return	void
-	 */
-	public final function setAppVersion ($appVersion) {
-		// Cast and set it
-		$this->appVersion = (string) $appVersion;
-	}
-
-	/**
-	 * Getter for human-readable name
-	 *
-	 * @return	$appName	The application's human-readable name
-	 */
-	public final function getAppName () {
-		return $this->appName;
-	}
-
-	/**
-	 * Setter for human-readable name
-	 *
-	 * @param	$appName	The application's human-readable name
-	 * @return	void
-	 */
-	public final function setAppName ($appName) {
-		// Cast and set it
-		$this->appName = (string) $appName;;
-	}
-
-	/**
-	 * Getter for short uni*-like name
-	 *
-	 * @return	$shortName	The application's short uni*-like name
-	 */
-	public final function getAppShortName () {
-		return $this->shortName;
-	}
-
-	/**
-	 * Setter for short uni*-like name
-	 *
-	 * @param	$shortName	The application's short uni*-like name
-	 * @return	void
-	 */
-	public final function setAppShortName ($shortName) {
-		// Cast and set it
-		$this->shortName = (string) $shortName;
+		return self::getApplicationInstance();
 	}
 
 	/**
@@ -215,12 +138,12 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 
 			// Set it in request
 			$requestInstance->setRequestElement('command', $commandName);
-		} // END - if
+		}
 
 		// Get a controller resolver
 		$resolverClass = sprintf(
 			'Org\Mxchange\CoreFramework\Tests\Resolver\Controller\%s',
-			self::convertToClassName(sprintf(
+			StringUtils::convertToClassName(sprintf(
 				'%s_%s_controller_resolver',
 				$this->getAppShortName(),
 				FrameworkBootstrap::getRequestTypeFromSystem()
@@ -251,7 +174,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 		// Walk through all messages
 		foreach ($messageList as $message) {
 			exit(__METHOD__ . ':MSG:' . $message);
-		} // END - foreach
+		}
 	}
 
 	/**