X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fmain%2Ffilter%2Ftags%2Fclass_PackageAnnouncementTagFilter.php;h=7b992b654a75746835b3619d24c579974c4d9189;hb=73aff29b9bc78031853b0b8c0fe0a8e04f66ac29;hp=c17b239394173d38db3b22e58c1bdf21eb6249c1;hpb=a9c315c022840a31e051201a61078dcde368f389;p=hub.git

diff --git a/application/hub/main/filter/tags/class_PackageAnnouncementTagFilter.php b/application/hub/main/filter/tags/class_PackageAnnouncementTagFilter.php
index c17b23939..7b992b654 100644
--- a/application/hub/main/filter/tags/class_PackageAnnouncementTagFilter.php
+++ b/application/hub/main/filter/tags/class_PackageAnnouncementTagFilter.php
@@ -2,11 +2,11 @@
 /**
  * A AnnouncementTag filter for packages
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @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
@@ -33,12 +33,13 @@ class PackageAnnouncementTagFilter extends BaseNodeFilter implements FilterableP
 
 		// Init array
 		$this->dataXmlNodes = array(
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_EXTERNAL_IP => '',
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_INTERNAL_IP => '',
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_NODE_STATUS => '',
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_SESSION_ID  => '',
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_TCP_PORT    => 9060,
-			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_UDP_PORT    => 9060
+			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_EXTERNAL_ADDRESS => '',
+			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_INTERNAL_ADDRESS => '',
+			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_NODE_STATUS      => '',
+			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_NODE_MODE        => '',
+			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_NODE_ID          => '',
+			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_SESSION_ID       => '',
+			XmlAnnouncementTemplateEngine::ANNOUNCEMENT_DATA_PRIVATE_KEY_HASH => '',
 		);
 	}
 
@@ -79,13 +80,26 @@ class PackageAnnouncementTagFilter extends BaseNodeFilter implements FilterableP
 	 * XmlParserException       - If the XML message is damaged or not
 	 *                            well-formed
 	 *
-	 * @param	$messageContent		Raw message content
+	 * @param	$messageData		Raw message data array
 	 * @param	$packageInstance	An instance of a Receivable class
 	 * @return	void
 	 */
-	public function processMessage ($messageContent, Receivable $packageInstance) {
+	public function processMessage (array $messageData, Receivable $packageInstance) {
 		// Process message generic
-		$this->genericProcessMessage('announcement', $messageContent, $packageInstance);
+		$this->genericProcessMessage('announcement', $messageData, $packageInstance);
+	}
+
+	/**
+	 * Post-processes the stacked message. Do not call popNamed() as then no
+	 * other class can process the message.
+	 *
+	 * @param	$packageInstance	An instance of a Receivable class
+	 * @return	void
+	 * @throws	UnsupportedOperationException	If this method is called, please use processMessage() instead!
+	 */
+	public function postProcessMessage (Receivable $packageInstance) {
+		// Please don't call this method
+		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
 }