From 155a8c6712f3592b3971d9f418c489579c72e904 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 12 Aug 2011 22:56:25 +0200
Subject: [PATCH] Renamed option types

---
 ...peBoolean.class.php => BooleanOptionType.class.php} |  4 ++--
 ...lect.class.php => CustomselectOptionType.class.php} |  6 +++---
 ...tionTypeDate.class.php => DateOptionType.class.php} |  6 ++----
 ...onTypeFloat.class.php => FloatOptionType.class.php} |  5 ++---
 ...peInteger.class.php => IntegerOptionType.class.php} |  5 ++---
 ...elect.class.php => MultiselectOptionType.class.php} |  8 +++-----
 ...Password.class.php => PasswordOptionType.class.php} |  7 +++----
 ...tons.class.php => RadiobuttonsOptionType.class.php} | 10 ++++++----
 ...TypeSelect.class.php => SelectOptionType.class.php} |  5 ++---
 ...tionTypeText.class.php => TextOptionType.class.php} |  6 +++---
 ...Textarea.class.php => TextareaOptionType.class.php} |  5 ++---
 ...Timezone.class.php => TimezoneOptionType.class.php} |  6 +++---
 12 files changed, 33 insertions(+), 40 deletions(-)
 rename wcfsetup/install/files/lib/system/option/{OptionTypeBoolean.class.php => BooleanOptionType.class.php} (92%)
 rename wcfsetup/install/files/lib/system/option/{OptionTypeCustomselect.class.php => CustomselectOptionType.class.php} (84%)
 rename wcfsetup/install/files/lib/system/option/{OptionTypeDate.class.php => DateOptionType.class.php} (95%)
 rename wcfsetup/install/files/lib/system/option/{OptionTypeFloat.class.php => FloatOptionType.class.php} (86%)
 rename wcfsetup/install/files/lib/system/option/{OptionTypeInteger.class.php => IntegerOptionType.class.php} (74%)
 rename wcfsetup/install/files/lib/system/option/{OptionTypeMultiselect.class.php => MultiselectOptionType.class.php} (91%)
 rename wcfsetup/install/files/lib/system/option/{OptionTypePassword.class.php => PasswordOptionType.class.php} (73%)
 rename wcfsetup/install/files/lib/system/option/{OptionTypeRadiobuttons.class.php => RadiobuttonsOptionType.class.php} (89%)
 rename wcfsetup/install/files/lib/system/option/{OptionTypeSelect.class.php => SelectOptionType.class.php} (91%)
 rename wcfsetup/install/files/lib/system/option/{OptionTypeText.class.php => TextOptionType.class.php} (87%)
 rename wcfsetup/install/files/lib/system/option/{OptionTypeTextarea.class.php => TextareaOptionType.class.php} (78%)
 rename wcfsetup/install/files/lib/system/option/{OptionTypeTimezone.class.php => TimezoneOptionType.class.php} (85%)

diff --git a/wcfsetup/install/files/lib/system/option/OptionTypeBoolean.class.php b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
similarity index 92%
rename from wcfsetup/install/files/lib/system/option/OptionTypeBoolean.class.php
rename to wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
index 0c755add3b..39458dc3b9 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypeBoolean.class.php
+++ b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
@@ -6,7 +6,7 @@ use wcf\system\WCF;
 use wcf\util\StringUtil;
 
 /**
- * OptionTypeBoolean is an implementation of OptionType for boolean values.
+ * BooleanOptionType is an implementation of IOptionType for boolean values.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -15,7 +15,7 @@ use wcf\util\StringUtil;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypeBoolean extends AbstractOptionType implements ISearchableUserOption {
+class BooleanOptionType extends AbstractOptionType implements ISearchableUserOption {
 	/**
 	 * @see wcf\system\option\IOptionType::getFormElement()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/OptionTypeCustomselect.class.php b/wcfsetup/install/files/lib/system/option/CustomselectOptionType.class.php
similarity index 84%
rename from wcfsetup/install/files/lib/system/option/OptionTypeCustomselect.class.php
rename to wcfsetup/install/files/lib/system/option/CustomselectOptionType.class.php
index f7549ea375..1b56a94ca2 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypeCustomselect.class.php
+++ b/wcfsetup/install/files/lib/system/option/CustomselectOptionType.class.php
@@ -1,11 +1,11 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
-use wcf\system\option\OptionTypeSelect;
 use wcf\system\WCF;
 
 /**
- * OptionTypeSelect is an implementation of OptionType for 'select' tags with a text field for custom inputs.
+ * OptionTypeSelect is an implementation of IOptionType for 'select' tags with a
+ * text field for custom inputs.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -14,7 +14,7 @@ use wcf\system\WCF;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypeCustomselect extends OptionTypeSelect {
+class CustomselectOptionType extends SelectOptionType {
 	/**
 	 * @see wcf\system\option\IOptionType::getFormElement()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/OptionTypeDate.class.php b/wcfsetup/install/files/lib/system/option/DateOptionType.class.php
similarity index 95%
rename from wcfsetup/install/files/lib/system/option/OptionTypeDate.class.php
rename to wcfsetup/install/files/lib/system/option/DateOptionType.class.php
index b313b8dc6a..a03a057571 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypeDate.class.php
+++ b/wcfsetup/install/files/lib/system/option/DateOptionType.class.php
@@ -3,13 +3,11 @@ namespace wcf\system\option;
 use wcf\data\option\Option;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\UserInputException;
-use wcf\system\option\OptionType;
-use wcf\system\option\SearchableUserOption;
 use wcf\system\WCF;
 use wcf\util\DateUtil;
 
 /**
- * OptionTypeDate is an implementation of OptionType for date inputs.
+ * DateOptionType is an implementation of IOptionType for date inputs.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -18,7 +16,7 @@ use wcf\util\DateUtil;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypeDate extends AbstractOptionType implements ISearchableUserOption {
+class DateOptionType extends AbstractOptionType implements ISearchableUserOption {
 	protected $yearRequired = true;
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/OptionTypeFloat.class.php b/wcfsetup/install/files/lib/system/option/FloatOptionType.class.php
similarity index 86%
rename from wcfsetup/install/files/lib/system/option/OptionTypeFloat.class.php
rename to wcfsetup/install/files/lib/system/option/FloatOptionType.class.php
index a7a7896a5b..503ca5473b 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypeFloat.class.php
+++ b/wcfsetup/install/files/lib/system/option/FloatOptionType.class.php
@@ -1,11 +1,10 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
-use wcf\system\option\OptionTypeText;
 use wcf\system\WCF;
 
 /**
- * OptionTypeFloat is an implementation of OptionType for float fields.
+ * FloatOptionType is an implementation of IOptionType for float fields.
  *
  * @author	Tobias Friebel
  * @copyright	2001-2011 Tobias Friebel
@@ -14,7 +13,7 @@ use wcf\system\WCF;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypeFloat extends OptionTypeText {
+class FloatOptionType extends TextOptionType {
 	/**
 	 * @see wcf\system\option\IOptionType::getFormElement()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/OptionTypeInteger.class.php b/wcfsetup/install/files/lib/system/option/IntegerOptionType.class.php
similarity index 74%
rename from wcfsetup/install/files/lib/system/option/OptionTypeInteger.class.php
rename to wcfsetup/install/files/lib/system/option/IntegerOptionType.class.php
index 26be493e20..06ecd1fbdb 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypeInteger.class.php
+++ b/wcfsetup/install/files/lib/system/option/IntegerOptionType.class.php
@@ -1,10 +1,9 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
-use wcf\system\option\OptionTypeText;
 
 /**
- * OptionTypeText is an implementation of OptionType for integer fields.
+ * IntegerOptionType is an implementation of IOptionType for integer fields.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -13,7 +12,7 @@ use wcf\system\option\OptionTypeText;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypeInteger extends OptionTypeText {
+class IntegerOptionType extends TextOptionType {
 	/**
 	 * @see wcf\system\option\IOptionType::getData()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/OptionTypeMultiselect.class.php b/wcfsetup/install/files/lib/system/option/MultiselectOptionType.class.php
similarity index 91%
rename from wcfsetup/install/files/lib/system/option/OptionTypeMultiselect.class.php
rename to wcfsetup/install/files/lib/system/option/MultiselectOptionType.class.php
index 4bd0fe8b66..1db2609c93 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypeMultiselect.class.php
+++ b/wcfsetup/install/files/lib/system/option/MultiselectOptionType.class.php
@@ -2,15 +2,13 @@
 namespace wcf\system\option;
 use wcf\data\option\Option;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\option\OptionTypeSelect;
-use wcf\system\option\SearchableUserOption;
-use wcf\system\WCF;
 use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
 use wcf\util\ArrayUtil;
 use wcf\util\OptionUtil;
 
 /**
- * OptionTypeSelect is an implementation of OptionType for multiple 'select' tags.
+ * MultiselectOptionType is an implementation of IOptionType for multiple 'select' tags.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -19,7 +17,7 @@ use wcf\util\OptionUtil;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypeMultiselect extends OptionTypeSelect {
+class MultiselectOptionType extends SelectOptionType {
 	/**
 	 * @see wcf\system\option\IOptionType::getFormElement()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/OptionTypePassword.class.php b/wcfsetup/install/files/lib/system/option/PasswordOptionType.class.php
similarity index 73%
rename from wcfsetup/install/files/lib/system/option/OptionTypePassword.class.php
rename to wcfsetup/install/files/lib/system/option/PasswordOptionType.class.php
index ac14a6715b..a8aa0403c6 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypePassword.class.php
+++ b/wcfsetup/install/files/lib/system/option/PasswordOptionType.class.php
@@ -2,10 +2,9 @@
 namespace wcf\system\option;
 use wcf\data\option\Option;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\option\OptionTypeText;
 
 /**
- * OptionTypeText is an implementation of OptionType for 'input type="password"' tags.
+ * OptionTypeText is an implementation of IOptionType for 'input type="password"' tags.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -14,9 +13,9 @@ use wcf\system\option\OptionTypeText;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypePassword extends OptionTypeText {
+class PasswordOptionType extends TextOptionType {
 	/**
-	 * @see wcf\system\option\OptionTypeText::$inputType
+	 * @see wcf\system\option\TextOptionType::$inputType
 	 */
 	protected $inputType = 'password';
 	
diff --git a/wcfsetup/install/files/lib/system/option/OptionTypeRadiobuttons.class.php b/wcfsetup/install/files/lib/system/option/RadiobuttonsOptionType.class.php
similarity index 89%
rename from wcfsetup/install/files/lib/system/option/OptionTypeRadiobuttons.class.php
rename to wcfsetup/install/files/lib/system/option/RadiobuttonsOptionType.class.php
index 257e8a21cd..5677daee47 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypeRadiobuttons.class.php
+++ b/wcfsetup/install/files/lib/system/option/RadiobuttonsOptionType.class.php
@@ -2,14 +2,12 @@
 namespace wcf\system\option;
 use wcf\data\option\Option;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\option\OptionType;
-use wcf\system\option\SearchableUserOption;
 use wcf\system\WCF;
 use wcf\system\UserInputException;
 use wcf\util\StringUtil;
 
 /**
- * OptionTypeRadiobuttons is an implementation of OptionType for 'input type="radio"' tags.
+ * RadiobuttonsOptionType is an implementation of IOptionType for 'input type="radio"' tags.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -18,7 +16,11 @@ use wcf\util\StringUtil;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypeRadiobuttons extends AbstractOptionType implements ISearchableUserOption {
+class RadiobuttonsOptionType extends AbstractOptionType implements ISearchableUserOption {
+	/**
+	 * name of the template that contains the form element of this option type
+	 * @var	string
+	 */
 	public $templateName = 'optionTypeRadiobuttons';
 
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/OptionTypeSelect.class.php b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
similarity index 91%
rename from wcfsetup/install/files/lib/system/option/OptionTypeSelect.class.php
rename to wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
index a6377e35f0..00229c4950 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypeSelect.class.php
+++ b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
@@ -1,11 +1,10 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
-use wcf\system\option\OptionTypeRadiobuttons;
 use wcf\system\WCF;
 
 /**
- * OptionTypeSelect is an implementation of OptionType for 'select' tags.
+ * SelectOptionType is an implementation of IOptionType for 'select' tags.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -14,7 +13,7 @@ use wcf\system\WCF;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypeSelect extends OptionTypeRadiobuttons {
+class SelectOptionType extends RadiobuttonsOptionType {
 	/**
 	 * @see wcf\system\option\IOptionType::getFormElement()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/OptionTypeText.class.php b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
similarity index 87%
rename from wcfsetup/install/files/lib/system/option/OptionTypeText.class.php
rename to wcfsetup/install/files/lib/system/option/TextOptionType.class.php
index 381c7d6ede..c0ce5b9e58 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypeText.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
@@ -8,7 +8,7 @@ use wcf\system\WCF;
 use wcf\util\StringUtil;
 
 /**
- * OptionTypeText is an implementation of OptionType for 'input type="text"' tags.
+ * TextOptionType is an implementation of IOptionType for 'input type="text"' tags.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -17,7 +17,7 @@ use wcf\util\StringUtil;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypeText extends AbstractOptionType implements ISearchableUserOption {
+class TextOptionType extends AbstractOptionType implements ISearchableUserOption {
 	/**
 	 * input type
 	 * @var string
@@ -40,7 +40,7 @@ class OptionTypeText extends AbstractOptionType implements ISearchableUserOption
 	 * @see wcf\system\option\ISearchableUserOption::getSearchFormElement()
 	 */
 	public function getSearchFormElement(Option $option, $value) {
-		return $this->getFormElement($optionData, $value);
+		return $this->getFormElement($option, $value);
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/OptionTypeTextarea.class.php b/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
similarity index 78%
rename from wcfsetup/install/files/lib/system/option/OptionTypeTextarea.class.php
rename to wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
index 87a39ba2d6..082b0f1854 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypeTextarea.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
@@ -1,11 +1,10 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
-use wcf\system\option\OptionTypeText;
 use wcf\system\WCF;
 
 /**
- * OptionTypeTextarea is an implementation of OptionType for 'textarea' tags.
+ * TextareaOptionType is an implementation of IOptionType for 'textarea' tags.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -14,7 +13,7 @@ use wcf\system\WCF;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypeTextarea extends OptionTypeText {
+class TextareaOptionType extends TextOptionType {
 	/**
 	 * @see wcf\system\option\IOptionType::getFormElement()
 	 */
diff --git a/wcfsetup/install/files/lib/system/option/OptionTypeTimezone.class.php b/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
similarity index 85%
rename from wcfsetup/install/files/lib/system/option/OptionTypeTimezone.class.php
rename to wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
index cde2c56688..c8a1ea1b5c 100644
--- a/wcfsetup/install/files/lib/system/option/OptionTypeTimezone.class.php
+++ b/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
@@ -1,13 +1,13 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
-use wcf\system\option\OptionType;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
 use wcf\util\DateUtil;
 
 /**
- * OptionTypeTimezone is an implementation of OptionType for a select box, which list the available time zones.
+ * TimezoneOptionType is an implementation of IOptionType for a select box, which
+ * list the available time zones.
  *
  * @author	Marcel Werk
  * @copyright	2001-2011 WoltLab GmbH
@@ -16,7 +16,7 @@ use wcf\util\DateUtil;
  * @subpackage	system.option
  * @category 	Community Framework
  */
-class OptionTypeTimezone extends AbstractOptionType {
+class TimezoneOptionType extends AbstractOptionType {
 	/**
 	 * @see wcf\system\option\IOptionType::getFormElement()
 	 */
-- 
2.20.1