From d205c0918c3f32fda43b79e2f27613e27a560fba Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 12 Aug 2011 23:03:12 +0200
Subject: [PATCH] Renamed group option types

---
 ...Boolean.class.php => BooleanGroupOptionType.class.php} | 6 +++---
 ...peGroups.class.php => GroupsGroupOptionType.class.php} | 4 ++--
 .../lib/system/option/group/IGroupOptionType.class.php    | 2 +-
 ...class.php => InfiniteIntegerGroupOptionType.class.php} | 8 +++++---
 ...hp => InfiniteInverseIntegerGroupOptionType.class.php} | 4 ++--
 ...Integer.class.php => IntegerGroupOptionType.class.php} | 6 +++---
 ....class.php => InverseIntegerGroupOptionType.class.php} | 6 +++---
 ...onTypeText.class.php => TextGroupOptionType.class.php} | 6 +++---
 ...xtarea.class.php => TextareaGroupOptionType.class.php} | 6 +++---
 9 files changed, 25 insertions(+), 23 deletions(-)
 rename wcfsetup/install/files/lib/system/option/group/{GroupOptionTypeBoolean.class.php => BooleanGroupOptionType.class.php} (76%)
 rename wcfsetup/install/files/lib/system/option/group/{GroupOptionTypeGroups.class.php => GroupsGroupOptionType.class.php} (94%)
 rename wcfsetup/install/files/lib/system/option/group/{GroupOptionTypeInfiniteInteger.class.php => InfiniteIntegerGroupOptionType.class.php} (69%)
 rename wcfsetup/install/files/lib/system/option/group/{GroupOptionTypeInfiniteInverseInteger.class.php => InfiniteInverseIntegerGroupOptionType.class.php} (78%)
 rename wcfsetup/install/files/lib/system/option/group/{GroupOptionTypeInteger.class.php => IntegerGroupOptionType.class.php} (73%)
 rename wcfsetup/install/files/lib/system/option/group/{GroupOptionTypeInverseInteger.class.php => InverseIntegerGroupOptionType.class.php} (72%)
 rename wcfsetup/install/files/lib/system/option/group/{GroupOptionTypeText.class.php => TextGroupOptionType.class.php} (77%)
 rename wcfsetup/install/files/lib/system/option/group/{GroupOptionTypeTextarea.class.php => TextareaGroupOptionType.class.php} (77%)

diff --git a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeBoolean.class.php b/wcfsetup/install/files/lib/system/option/group/BooleanGroupOptionType.class.php
similarity index 76%
rename from wcfsetup/install/files/lib/system/option/group/GroupOptionTypeBoolean.class.php
rename to wcfsetup/install/files/lib/system/option/group/BooleanGroupOptionType.class.php
index 09bcbfad03..44b122f413 100644
--- a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeBoolean.class.php
+++ b/wcfsetup/install/files/lib/system/option/group/BooleanGroupOptionType.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\option\group;
-use wcf\system\option\OptionTypeBoolean;
+use wcf\system\option\BooleanOptionType;
 
 /**
- * GroupOptionTypeBoolean is an implementation of GroupOptionType for boolean values.
+ * BooleanGroupOptionType is an implementation of IGroupOptionType for boolean values.
  * The merge of option values returns true, if at least one value is true. Otherwise false.
  *
  * @author	Marcel Werk
@@ -13,7 +13,7 @@ use wcf\system\option\OptionTypeBoolean;
  * @subpackage	system.option.group
  * @category 	Community Framework
  */
-class GroupOptionTypeBoolean extends OptionTypeBoolean implements IGroupOptionType {
+class BooleanGroupOptionType extends BooleanOptionType implements IGroupOptionType {
 	/**
 	 * @see wcf\system\option\group\IGroupOptionType::merge()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeGroups.class.php b/wcfsetup/install/files/lib/system/option/group/GroupsGroupOptionType.class.php
similarity index 94%
rename from wcfsetup/install/files/lib/system/option/group/GroupOptionTypeGroups.class.php
rename to wcfsetup/install/files/lib/system/option/group/GroupsGroupOptionType.class.php
index 0203fc9da2..ffae580206 100644
--- a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeGroups.class.php
+++ b/wcfsetup/install/files/lib/system/option/group/GroupsGroupOptionType.class.php
@@ -7,7 +7,7 @@ use wcf\util\ArrayUtil;
 use wcf\util\StringUtil;
 
 /**
- * GroupOptionTypeGroups generates a select-list of all available user groups.
+ * GroupsGroupOptionType generates a select-list of all available user groups.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -16,7 +16,7 @@ use wcf\util\StringUtil;
  * @subpackage	system.option.group
  * @category 	Community Framework
  */
-class GroupOptionTypeGroups extends AbstractOptionType implements IGroupOptionType {
+class GroupsGroupOptionType extends AbstractOptionType implements IGroupOptionType {
 	/**
 	 * @see wcf\system\option\IOptionType::getFormElement()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/group/IGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/group/IGroupOptionType.class.php
index 8dc31f76dd..77a64cb6c6 100644
--- a/wcfsetup/install/files/lib/system/option/group/IGroupOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/group/IGroupOptionType.class.php
@@ -17,7 +17,7 @@ interface IGroupOptionType extends IOptionType {
 	 * Merges the different values of an option to a single value.
 	 * 
 	 * @param	array		$values
-	 * @return	mixed		$value
+	 * @return	mixed
 	 */
 	public function merge(array $values);
 }
diff --git a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInfiniteInteger.class.php b/wcfsetup/install/files/lib/system/option/group/InfiniteIntegerGroupOptionType.class.php
similarity index 69%
rename from wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInfiniteInteger.class.php
rename to wcfsetup/install/files/lib/system/option/group/InfiniteIntegerGroupOptionType.class.php
index 6b093c0c76..c88b2b2eee 100644
--- a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInfiniteInteger.class.php
+++ b/wcfsetup/install/files/lib/system/option/group/InfiniteIntegerGroupOptionType.class.php
@@ -2,8 +2,10 @@
 namespace wcf\system\option\group;
 
 /**
- * GroupOptionTypeInfiniteinteger is an implementation of GroupOptionType for integer values with the infinite option.
- * The merge of option values returns true, if at least one value is -1. Otherwise it returns the highest value.
+ * InfiniteIntegerGroupOptionType is an implementation of IGroupOptionType for
+ * integer values with the infinite option.
+ * The merge of option values returns true, if at least one value is -1. Otherwise
+ * it returns the highest value.
  * 
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -12,7 +14,7 @@ namespace wcf\system\option\group;
  * @subpackage	system.option.group
  * @category 	Community Framework
  */
-class GroupOptionTypeInfiniteInteger extends GroupOptionTypeInteger {
+class InfiniteIntegerGroupOptionType extends IntegerGroupOptionType {
 	/**
 	 * @see wcf\system\option\group\IGroupOptionType::merge()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInfiniteInverseInteger.class.php b/wcfsetup/install/files/lib/system/option/group/InfiniteInverseIntegerGroupOptionType.class.php
similarity index 78%
rename from wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInfiniteInverseInteger.class.php
rename to wcfsetup/install/files/lib/system/option/group/InfiniteInverseIntegerGroupOptionType.class.php
index cc2cd22054..18d24fbff6 100644
--- a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInfiniteInverseInteger.class.php
+++ b/wcfsetup/install/files/lib/system/option/group/InfiniteInverseIntegerGroupOptionType.class.php
@@ -2,7 +2,7 @@
 namespace wcf\system\option\group;
 
 /**
- * GroupOptionTypeInfiniteinverseinteger is an implementation of GroupOptionType for integer values.
+ * InfiniteInverseIntegerGroupOptionType is an implementation of IGroupOptionType for integer values.
  * The merge of option values returns -1 if all values are -1 otherwise the lowest value.
  *
  * @author	Marcel Werk
@@ -12,7 +12,7 @@ namespace wcf\system\option\group;
  * @subpackage	system.option.group
  * @category 	Community Framework
  */
-class GroupOptionTypeInfiniteInverseInteger extends GroupOptionTypeInverseinteger {
+class InfiniteInverseIntegerGroupOptionType extends InverseIntegerGroupOptionType {
 	/**
 	 * @see wcf\system\option\group\IGroupOptionType::merge()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInteger.class.php b/wcfsetup/install/files/lib/system/option/group/IntegerGroupOptionType.class.php
similarity index 73%
rename from wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInteger.class.php
rename to wcfsetup/install/files/lib/system/option/group/IntegerGroupOptionType.class.php
index b70913e119..c618038225 100644
--- a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInteger.class.php
+++ b/wcfsetup/install/files/lib/system/option/group/IntegerGroupOptionType.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\option\group;
-use wcf\system\option\OptionTypeInteger;
+use wcf\system\option\IntegerOptionType;
 
 /**
- * GroupOptionTypeInteger is an implementation of GroupOptionType for integer values.
+ * IntegerGroupOptionType is an implementation of IGroupOptionType for integer values.
  * The merge of option values returns the highest value.
  * 
  * @author	Marcel Werk
@@ -13,7 +13,7 @@ use wcf\system\option\OptionTypeInteger;
  * @subpackage	system.option.group
  * @category 	Community Framework
  */
-class GroupOptionTypeInteger extends OptionTypeInteger implements IGroupOptionType {
+class IntegerGroupOptionType extends IntegerOptionType implements IGroupOptionType {
 	/**
 	 * @see wcf\system\option\group\IGroupOptionType::merge()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInverseInteger.class.php b/wcfsetup/install/files/lib/system/option/group/InverseIntegerGroupOptionType.class.php
similarity index 72%
rename from wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInverseInteger.class.php
rename to wcfsetup/install/files/lib/system/option/group/InverseIntegerGroupOptionType.class.php
index 8169a75534..5f0192ad5f 100644
--- a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeInverseInteger.class.php
+++ b/wcfsetup/install/files/lib/system/option/group/InverseIntegerGroupOptionType.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\option\group;
-use wcf\system\option\OptionTypeInteger;
+use wcf\system\option\IntegerOptionType;
 
 /**
- * GroupOptionTypeInverseInteger is an implementation of GroupOptionType for integer values.
+ * InverseIntegerGroupOptionType is an implementation of IGroupOptionType for integer values.
  * The merge of option values returns the lowest value.
  *
  * @author	Marcel Werk
@@ -13,7 +13,7 @@ use wcf\system\option\OptionTypeInteger;
  * @subpackage	system.option.group
  * @category 	Community Framework
  */
-class GroupOptionTypeInverseInteger extends OptionTypeInteger implements IGroupOptionType {
+class InverseIntegerGroupOptionType extends IntegerOptionType implements IGroupOptionType {
 	/**
 	 * @see wcf\system\option\group\IGroupOptionType::merge()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeText.class.php b/wcfsetup/install/files/lib/system/option/group/TextGroupOptionType.class.php
similarity index 77%
rename from wcfsetup/install/files/lib/system/option/group/GroupOptionTypeText.class.php
rename to wcfsetup/install/files/lib/system/option/group/TextGroupOptionType.class.php
index 826b9746ad..c33c385e78 100644
--- a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeText.class.php
+++ b/wcfsetup/install/files/lib/system/option/group/TextGroupOptionType.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\option\group;
-use wcf\system\option\OptionTypeText;
+use wcf\system\option\TextOptionType;
 
 /**
- * GroupOptionTypeText is an implementation of GroupOptionType for text values.
+ * TextGroupOptionType is an implementation of IGroupOptionType for text values.
  * The merge of option values returns merge of all text values.
  * 
  * @author	Marcel Werk
@@ -13,7 +13,7 @@ use wcf\system\option\OptionTypeText;
  * @subpackage	system.option.group
  * @category 	Community Framework
  */
-class GroupOptionTypeText extends OptionTypeText implements IGroupOptionType {
+class TextGroupOptionType extends TextOptionType implements IGroupOptionType {
 	/**
 	 * @see wcf\system\option\group\IGroupOptionType::merge()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeTextarea.class.php b/wcfsetup/install/files/lib/system/option/group/TextareaGroupOptionType.class.php
similarity index 77%
rename from wcfsetup/install/files/lib/system/option/group/GroupOptionTypeTextarea.class.php
rename to wcfsetup/install/files/lib/system/option/group/TextareaGroupOptionType.class.php
index 5685a19d9e..5c35a90370 100644
--- a/wcfsetup/install/files/lib/system/option/group/GroupOptionTypeTextarea.class.php
+++ b/wcfsetup/install/files/lib/system/option/group/TextareaGroupOptionType.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\option\group;
-use wcf\system\option\OptionTypeTextarea;
+use wcf\system\option\TextareaOptionType;
 
 /**
- * GroupOptionTypeTextarea is an implementation of GroupOptionType for text values.
+ * TextareaGroupOptionType is an implementation of IGroupOptionType for text values.
  * The merge of option values returns merge of all text values.
  * 
  * @author	Marcel Werk
@@ -13,7 +13,7 @@ use wcf\system\option\OptionTypeTextarea;
  * @subpackage	system.option.group
  * @category 	Community Framework
  */
-class GroupOptionTypeTextarea extends OptionTypeTextarea implements IGroupOptionType {
+class TextareaGroupOptionType extends TextareaOptionType implements IGroupOptionType {
 	/**
 	 * @see wcf\system\option\group\IGroupOptionType::merge()
 	 */
-- 
2.20.1