From c05528d8f077e2e1deef7c09e550239a4c2887b1 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Wed, 16 Jan 2013 21:26:17 +0100 Subject: [PATCH] Removes double interface and improves interface names --- wcfsetup/install/files/js/WCF.js | 4 ++-- ...php => ILoadableContainerAction.class.php} | 6 ++--- ...s.php => IToggleContainerAction.class.php} | 6 ++--- .../data/category/CategoryAction.class.php | 8 +++---- .../ICollapsibleContentAction.class.php | 24 ------------------- 5 files changed, 12 insertions(+), 36 deletions(-) rename wcfsetup/install/files/lib/data/{ILoadableCollapsibleContainerAction.class.php => ILoadableContainerAction.class.php} (82%) rename wcfsetup/install/files/lib/data/{ICollapsibleContainerAction.class.php => IToggleContainerAction.class.php} (81%) delete mode 100644 wcfsetup/install/files/lib/system/user/collapsible/content/ICollapsibleContentAction.class.php diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index cb9529ca3c..7292161c0c 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -3553,7 +3553,7 @@ WCF.Collapsible.Remote = Class.extend({ this._proxy.setOption('data', { actionName: 'loadContainer', className: this._className, - interfaceName: 'wcf\\data\\ILoadableCollapsibleContainerAction', + interfaceName: 'wcf\\data\\ILoadableContainerAction', objectIDs: [ this._getObjectID($containerID) ], parameters: $.extend(true, { containerID: $containerID, @@ -3687,7 +3687,7 @@ WCF.Collapsible.SimpleRemote = WCF.Collapsible.Remote.extend({ this._proxy.setOption('data', { actionName: 'toggleContainer', className: this._className, - interfaceName: 'wcf\\data\\ICollapsibleContainerAction', + interfaceName: 'wcf\\data\\IToggleContainerAction', objectIDs: [ this._getObjectID($containerID) ], parameters: $.extend(true, { containerID: $containerID, diff --git a/wcfsetup/install/files/lib/data/ILoadableCollapsibleContainerAction.class.php b/wcfsetup/install/files/lib/data/ILoadableContainerAction.class.php similarity index 82% rename from wcfsetup/install/files/lib/data/ILoadableCollapsibleContainerAction.class.php rename to wcfsetup/install/files/lib/data/ILoadableContainerAction.class.php index 3db52ce323..cf93540e7a 100644 --- a/wcfsetup/install/files/lib/data/ILoadableCollapsibleContainerAction.class.php +++ b/wcfsetup/install/files/lib/data/ILoadableContainerAction.class.php @@ -6,13 +6,13 @@ namespace wcf\data; * whose content can be loaded via AJAX has to implement this interface. * * @author Matthias Schmidt - * @copyright 2001-2012 WoltLab GmbH + * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data * @category Community Framework */ -interface ILoadableCollapsibleContainerAction { +interface ILoadableContainerAction { /** * Toggles the container state of the relevant objects and loads their * content if necessary. @@ -20,7 +20,7 @@ interface ILoadableCollapsibleContainerAction { public function loadContainer(); /** - * Validates the "loadContainer" action. + * Validates the 'loadContainer' action. */ public function validateLoadContainer(); } diff --git a/wcfsetup/install/files/lib/data/ICollapsibleContainerAction.class.php b/wcfsetup/install/files/lib/data/IToggleContainerAction.class.php similarity index 81% rename from wcfsetup/install/files/lib/data/ICollapsibleContainerAction.class.php rename to wcfsetup/install/files/lib/data/IToggleContainerAction.class.php index c531b20bd1..aa160b164f 100644 --- a/wcfsetup/install/files/lib/data/ICollapsibleContainerAction.class.php +++ b/wcfsetup/install/files/lib/data/IToggleContainerAction.class.php @@ -6,20 +6,20 @@ namespace wcf\data; * has to implement this interface. * * @author Matthias Schmidt - * @copyright 2001-2012 WoltLab GmbH + * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data * @category Community Framework */ -interface ICollapsibleContainerAction { +interface IToggleContainerAction { /** * Toggles the container state of the relevant objects. */ public function toggleContainer(); /** - * Validates the "toggleContainer" action. + * Validates the 'toggleContainer' action. */ public function validateToggleContainer(); } diff --git a/wcfsetup/install/files/lib/data/category/CategoryAction.class.php b/wcfsetup/install/files/lib/data/category/CategoryAction.class.php index 04265450b6..7b3998f760 100644 --- a/wcfsetup/install/files/lib/data/category/CategoryAction.class.php +++ b/wcfsetup/install/files/lib/data/category/CategoryAction.class.php @@ -1,8 +1,8 @@ objects[0]->getProcessor()->getObjectTypeName('com.woltlab.wcf.collapsibleContent'); @@ -141,7 +141,7 @@ class CategoryAction extends AbstractDatabaseObjectAction implements ICollapsibl } /** - * @see wcf\data\ICollapsibleContainerAction::validateToggleContainer() + * @see wcf\data\IToggleContainerAction::validateToggleContainer() */ public function validateToggleContainer() { $this->validateUpdate(); diff --git a/wcfsetup/install/files/lib/system/user/collapsible/content/ICollapsibleContentAction.class.php b/wcfsetup/install/files/lib/system/user/collapsible/content/ICollapsibleContentAction.class.php deleted file mode 100644 index a59ae4e958..0000000000 --- a/wcfsetup/install/files/lib/system/user/collapsible/content/ICollapsibleContentAction.class.php +++ /dev/null @@ -1,24 +0,0 @@ - - * @package com.woltlab.wcf - * @subpackage system.user.collapsible.content - * @category Community Framework - */ -interface ICollapsibleContentAction { - /** - * Validates required parameters. - */ - public function validateLoadContainer(); - - /** - * Toggles the visibility of container content. - */ - public function loadContainer(); -} -- 2.20.1