Removes double interface and improves interface names

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index cb9529ca3cbd3a7161dd8f1c68a67af48ffa4874..7292161c0c1f06203bb2227dbe718a50a340987d 100755 (executable)
--- 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/ICollapsibleContainerAction.class.php b/wcfsetup/install/files/lib/data/ICollapsibleContainerAction.class.php
deleted file mode 100644 (file)
index c531b20..0000000
--- a/wcfsetup/install/files/lib/data/ICollapsibleContainerAction.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-namespace wcf\data;
-
-/**
- * Every database object action whose objects represent a collapsible container
- * has to implement this interface.
- * 
- * @author     Matthias Schmidt
- * @copyright  2001-2012 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage data
- * @category   Community Framework
- */
-interface ICollapsibleContainerAction {
-       /**
-        * Toggles the container state of the relevant objects.
-        */
-       public function toggleContainer();
-       
-       /**
-        * Validates the "toggleContainer" action.
-        */
-       public function validateToggleContainer();
-}

diff --git a/wcfsetup/install/files/lib/data/ILoadableCollapsibleContainerAction.class.php b/wcfsetup/install/files/lib/data/ILoadableCollapsibleContainerAction.class.php
deleted file mode 100644 (file)
index 3db52ce..0000000
--- a/wcfsetup/install/files/lib/data/ILoadableCollapsibleContainerAction.class.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-namespace wcf\data;
-
-/**
- * Every database object action whose objects represent a collapsible container
- * whose content can be loaded via AJAX has to implement this interface.
- * 
- * @author     Matthias Schmidt
- * @copyright  2001-2012 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage data
- * @category   Community Framework
- */
-interface ILoadableCollapsibleContainerAction {
-       /**
-        * Toggles the container state of the relevant objects and loads their
-        * content if necessary.
-        */
-       public function loadContainer();
-       
-       /**
-        * Validates the "loadContainer" action.
-        */
-       public function validateLoadContainer();
-}

diff --git a/wcfsetup/install/files/lib/data/ILoadableContainerAction.class.php b/wcfsetup/install/files/lib/data/ILoadableContainerAction.class.php
new file mode 100644 (file)
index 0000000..cf93540
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/ILoadableContainerAction.class.php
@@ -0,0 +1,26 @@
+<?php
+namespace wcf\data;
+
+/**
+ * Every database object action whose objects represent a collapsible container
+ * whose content can be loaded via AJAX has to implement this interface.
+ * 
+ * @author     Matthias Schmidt
+ * @copyright  2001-2013 WoltLab GmbH
+ * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package    com.woltlab.wcf
+ * @subpackage data
+ * @category   Community Framework
+ */
+interface ILoadableContainerAction {
+       /**
+        * Toggles the container state of the relevant objects and loads their
+        * content if necessary.
+        */
+       public function loadContainer();
+       
+       /**
+        * Validates the 'loadContainer' action.
+        */
+       public function validateLoadContainer();
+}

diff --git a/wcfsetup/install/files/lib/data/IToggleContainerAction.class.php b/wcfsetup/install/files/lib/data/IToggleContainerAction.class.php
new file mode 100644 (file)
index 0000000..aa160b1
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/IToggleContainerAction.class.php
@@ -0,0 +1,25 @@
+<?php
+namespace wcf\data;
+
+/**
+ * Every database object action whose objects represent a collapsible container
+ * has to implement this interface.
+ * 
+ * @author     Matthias Schmidt
+ * @copyright  2001-2013 WoltLab GmbH
+ * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package    com.woltlab.wcf
+ * @subpackage data
+ * @category   Community Framework
+ */
+interface IToggleContainerAction {
+       /**
+        * Toggles the container state of the relevant objects.
+        */
+       public function toggleContainer();
+       
+       /**
+        * 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 04265450b6755ac0e2246ac0e376c2ca0ce96894..7b3998f76034cc4db85d415f9879c43ba62ea969 100644 (file)
--- a/wcfsetup/install/files/lib/data/category/CategoryAction.class.php
+++ b/wcfsetup/install/files/lib/data/category/CategoryAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\category;
 use wcf\data\AbstractDatabaseObjectAction;
-use wcf\data\ICollapsibleContainerAction;
 use wcf\data\ISortableAction;
+use wcf\data\IToggleContainerAction;
 use wcf\data\IToggleAction;
 use wcf\system\category\CategoryHandler;
 use wcf\system\exception\PermissionDeniedException;
@@ -21,7 +21,7 @@ use wcf\system\WCF;
  * @subpackage data.category
  * @category   Community Framework
  */
-class CategoryAction extends AbstractDatabaseObjectAction implements ICollapsibleContainerAction, ISortableAction, IToggleAction {
+class CategoryAction extends AbstractDatabaseObjectAction implements ISortableAction, IToggleAction, IToggleContainerAction {
        /**
         * categorized object type
         * @var wcf\data\object\type\ObjectType
@@ -54,7 +54,7 @@ class CategoryAction extends AbstractDatabaseObjectAction implements ICollapsibl
        }
        
        /**
-        * @see wcf\data\ICollapsibleContainerAction::toggleContainer()
+        * @see wcf\data\IToggleContainerAction::toggleContainer()
         */
        public function toggleContainer() {
                $collapsibleObjectTypeName = $this->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 (file)
index a59ae4e..0000000
--- a/wcfsetup/install/files/lib/system/user/collapsible/content/ICollapsibleContentAction.class.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-namespace wcf\system\user\collapsible\content;
-
-/**
- * Provides basic methods to toggle container content.
- * 
- * @author     Alexander Ebert
- * @copyright  2001-2012 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @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();
-}