X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=25e0986f07c910583695e597dd468e2c15b3be90;hb=447ec445d0342164ac4f0a141344d7760e3bf730;hp=02e04fe1b7367f8e93f4a966a88920bfcfdd177e;hpb=81fbc762e1dd894060f110da8f9ee244a53fa6b0;p=core.git

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 02e04fe1..25e0986f 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -5,7 +5,7 @@
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -116,7 +116,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	/**
 	 * Instance of the stacker
 	 */
-	private $stackerInstance = NULL;
+	private $stackInstance = NULL;
 
 	/**
 	 * A Compressor instance
@@ -129,7 +129,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	private $parserInstance = NULL;
 
 	/**
-	 * A ProtocolHandler instance
+	 * A HandleableProtocol instance
 	 */
 	private $protocolInstance = NULL;
 
@@ -193,6 +193,21 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	private $blockInstance = NULL;
 
+	/**
+	 * A Minable instance
+	 */
+	private $minableInstance = NULL;
+
+	/**
+	 * A FrameworkDirectory instance
+	 */
+	private $directoryInstance = NULL;
+
+	/**
+	 * Listener instance
+	 */
+	private $listenerInstance = NULL;
+
 	/**
 	 * Thousands separator
 	 */
@@ -208,6 +223,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	private $socketResource = FALSE;
 
+	/**
+	 * Regular expression to use for validation
+	 */
+	private $regularExpression = '';
+
 	/**
 	 * Package data
 	 */
@@ -953,20 +973,20 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	/**
 	 * Setter for stacker instance
 	 *
-	 * @param	$stackerInstance	An instance of an stacker
+	 * @param	$stackInstance	An instance of an stacker
 	 * @return	void
 	 */
-	public final function setStackerInstance (Stackable $stackerInstance) {
-		$this->stackerInstance = $stackerInstance;
+	public final function setStackInstance (Stackable $stackInstance) {
+		$this->stackInstance = $stackInstance;
 	}
 
 	/**
 	 * Getter for stacker instance
 	 *
-	 * @return	$stackerInstance	An instance of an stacker
+	 * @return	$stackInstance	An instance of an stacker
 	 */
-	public final function getStackerInstance () {
-		return $this->stackerInstance;
+	public final function getStackInstance () {
+		return $this->stackInstance;
 	}
 
 	/**
@@ -1008,19 +1028,19 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Setter for ProtocolHandler instance
+	 * Setter for HandleableProtocol instance
 	 *
-	 * @param	$protocolInstance	An instance of an ProtocolHandler
+	 * @param	$protocolInstance	An instance of an HandleableProtocol
 	 * @return	void
 	 */
-	public final function setProtocolInstance (ProtocolHandler $protocolInstance = NULL) {
+	public final function setProtocolInstance (HandleableProtocol $protocolInstance = NULL) {
 		$this->protocolInstance = $protocolInstance;
 	}
 
 	/**
-	 * Getter for ProtocolHandler instance
+	 * Getter for HandleableProtocol instance
 	 *
-	 * @return	$protocolInstance	An instance of an ProtocolHandler
+	 * @return	$protocolInstance	An instance of an HandleableProtocol
 	 */
 	public final function getProtocolInstance () {
 		return $this->protocolInstance;
@@ -1066,6 +1086,27 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		return $this->socketResource;
 	}
 
+	/**
+	 * Setter for regular expression
+	 *
+	 * @param	$regularExpression	A valid regular expression
+	 * @return	void
+	 */
+	public final function setRegularExpression ($regularExpression) {
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': regularExpression=' . $regularExpression . ',previous[' . gettype($this->regularExpression) . ']=' . $this->regularExpression);
+		$this->regularExpression = $regularExpression;
+	}
+
+	/**
+	 * Getter for regular expression
+	 *
+	 * @return	$regularExpression	A valid regular expression
+	 */
+	public final function getRegularExpression () {
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($this->__toString() . '::' . __FUNCTION__ . ': regularExpression[' . gettype($this->regularExpression) . ']=' . $this->regularExpression);
+		return $this->regularExpression;
+	}
+
 	/**
 	 * Setter for helper instance
 	 *
@@ -1239,19 +1280,19 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Setter for InputOutputPointer instance
+	 * Setter for FilePointer instance
 	 *
-	 * @param	$pointerInstance	An instance of an InputOutputPointer class
+	 * @param	$pointerInstance	An instance of an FilePointer class
 	 * @return	void
 	 */
-	protected final function setPointerInstance (InputOutputPointer $pointerInstance) {
+	protected final function setPointerInstance (FilePointer $pointerInstance) {
 		$this->pointerInstance = $pointerInstance;
 	}
 
 	/**
-	 * Getter for InputOutputPointer instance
+	 * Getter for FilePointer instance
 	 *
-	 * @return	$pointerInstance	An instance of an InputOutputPointer class
+	 * @return	$pointerInstance	An instance of an FilePointer class
 	 */
 	public final function getPointerInstance () {
 		return $this->pointerInstance;
@@ -1295,6 +1336,63 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		return $this->blockInstance;
 	}
 
+	/**
+	 * Setter for Minable instance
+	 *
+	 * @param	$minableInstance	A Minable instance
+	 * @return	void
+	 */
+	protected final function setMinableInstance (Minable $minableInstance) {
+		$this->minableInstance = $minableInstance;
+	}
+
+	/**
+	 * Getter for minable instance
+	 *
+	 * @return	$minableInstance	A Minable instance
+	 */
+	protected final function getMinableInstance () {
+		return $this->minableInstance;
+	}
+
+	/**
+	 * Setter for FrameworkDirectory instance
+	 *
+	 * @param	$directoryInstance	A FrameworkDirectoryPointer instance
+	 * @return	void
+	 */
+	protected final function setDirectoryInstance (FrameworkDirectory $directoryInstance) {
+		$this->directoryInstance = $directoryInstance;
+	}
+
+	/**
+	 * Getter for FrameworkDirectory instance
+	 *
+	 * @return	$directoryInstance	A FrameworkDirectory instance
+	 */
+	protected final function getDirectoryInstance () {
+		return $this->directoryInstance;
+	}
+
+	/**
+	 * Setter for listener instance
+	 *
+	 * @param	$listenerInstance	A Listenable instance
+	 * @return	void
+	 */
+	protected final function setListenerInstance (Listenable $listenerInstance) {
+		$this->listenerInstance = $listenerInstance;
+	}
+
+	/**
+	 * Getter for listener instance
+	 *
+	 * @return	$listenerInstance	A Listenable instance
+	 */
+	protected final function getListenerInstance () {
+		return $this->listenerInstance;
+	}
+
 	/**
 	 * Checks whether an object equals this object. You should overwrite this
 	 * method to implement own equality checks
@@ -1818,7 +1916,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			$fieldValue = $fieldArray[$fieldName];
 		} else {
 			// Missing field entry, may require debugging
-			self::createDebugInstance(__CLASS__)->debugOutput($this->__toString() . ':fieldname=' . $fieldName . ' not found!');
+			self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']:fieldName=' . $fieldName . ' not found!');
 		}
 
 		// Return it