From 8d7422139a55477388fcd6a30a1ce41d83780e5e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 20 May 2017 21:40:25 +0200
Subject: [PATCH] HandleableProtocol-related stuff is not generic
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../classes/class_BaseFrameworkSystem.php     | 48 -------------------
 .../class_NoSocketRegisteredException.php     | 45 -----------------
 2 files changed, 93 deletions(-)
 delete mode 100644 framework/main/exceptions/socket/class_NoSocketRegisteredException.php

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 350c97fa..1ddc7cc9 100644
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -168,11 +168,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	private $parserInstance = NULL;
 
-	/**
-	 * A HandleableProtocol instance
-	 */
-	private $protocolInstance = NULL;
-
 	/**
 	 * A database wrapper instance
 	 */
@@ -303,11 +298,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	private $controllerName = '';
 
-	/**
-	 * Name of used protocol
-	 */
-	private $protocolName = 'invalid';
-
 	/**
 	 * Array with bitmasks and such for pack/unpack methods to support both
 	 * 32-bit and 64-bit systems
@@ -1137,25 +1127,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		return $this->parserInstance;
 	}
 
-	/**
-	 * Setter for HandleableProtocol instance
-	 *
-	 * @param	$protocolInstance	An instance of an HandleableProtocol
-	 * @return	void
-	 */
-	public final function setProtocolInstance (HandleableProtocol $protocolInstance) {
-		$this->protocolInstance = $protocolInstance;
-	}
-
-	/**
-	 * Getter for HandleableProtocol instance
-	 *
-	 * @return	$protocolInstance	An instance of an HandleableProtocol
-	 */
-	public final function getProtocolInstance () {
-		return $this->protocolInstance;
-	}
-
 	/**
 	 * Setter for DatabaseWrapper instance
 	 *
@@ -1614,25 +1585,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		return $this->controllerName;
 	}
 
-	/**
-	 * Getter for protocol name
-	 *
-	 * @return	$protocolName	Name of used protocol
-	 */
-	public final function getProtocolName () {
-		return $this->protocolName;
-	}
-
-	/**
-	 * Setter for protocol name
-	 *
-	 * @param	$protocolName	Name of used protocol
-	 * @return	void
-	 */
-	protected final function setProtocolName ($protocolName) {
-		$this->protocolName = $protocolName;
-	}
-
 	/**
 	 * Checks whether an object equals this object. You should overwrite this
 	 * method to implement own equality checks
diff --git a/framework/main/exceptions/socket/class_NoSocketRegisteredException.php b/framework/main/exceptions/socket/class_NoSocketRegisteredException.php
deleted file mode 100644
index 41d18986..00000000
--- a/framework/main/exceptions/socket/class_NoSocketRegisteredException.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-// Own namespace
-namespace CoreFramework\Socket;
-
-/**
- * This exception is thrown when the requested socket is not thrown
- *
- * @author		Roland Haeder <webmaster@shipsimu.org>
- * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
- * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.shipsimu.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 <http://www.gnu.org/licenses/>.
- */
-class NoSocketRegisteredException extends AbstractSocketException {
-	/**
-	 * A Constructor for this exception
-	 *
-	 * @param	$protocolInstance	An instance of a HandleableProtocol class
-	 * @param	$code				Error code
-	 * @return	void
-	 */
-	public function __construct (HandleableProtocol $protocolInstance, $code) {
-		// Construct the message
-		$message = sprintf('[%s:] Requested socket is not yet registered.',
-			$protocolInstance->__toString()
-		);
-
-		// Call parent exception constructor
-		parent::__construct($message, $code);
-	}
-
-}
-- 
2.30.2