[TASK] Fix CGL issues on class names in system extension form
authorOliver Hader <oliver@typo3.org>
Tue, 2 Aug 2011 12:39:10 +0000 (14:39 +0200)
committerOliver Hader <oliver@typo3.org>
Mon, 19 Sep 2011 18:39:11 +0000 (20:39 +0200)
Change-Id: Ic41b317fdb608dcc5630859168d3d5674bfe0593
Resolves: #28679
Reviewed-on: http://review.typo3.org/4024
Reviewed-by: Xavier Perseguers
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
263 files changed:
typo3/sysext/form/ChangeLog
typo3/sysext/form/Classes/Common.php
typo3/sysext/form/Classes/Controller/Form.php
typo3/sysext/form/Classes/Controller/Wizard.php
typo3/sysext/form/Classes/Domain/Factory/JsonToTyposcript.php
typo3/sysext/form/Classes/Domain/Factory/Typoscript.php
typo3/sysext/form/Classes/Domain/Factory/TyposcriptToJson.php
typo3/sysext/form/Classes/Domain/Model/Additional/Abstract.php
typo3/sysext/form/Classes/Domain/Model/Additional/Additional.php
typo3/sysext/form/Classes/Domain/Model/Additional/Error.php
typo3/sysext/form/Classes/Domain/Model/Additional/Interface.php
typo3/sysext/form/Classes/Domain/Model/Additional/Label.php
typo3/sysext/form/Classes/Domain/Model/Additional/Legend.php
typo3/sysext/form/Classes/Domain/Model/Additional/Mandatory.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Abstract.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Accept.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Acceptcharset.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Accesskey.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Action.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Alt.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Attributes.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Checked.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Class.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Cols.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Dir.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Disabled.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Enctype.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Id.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Interface.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Label.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Lang.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Maxlength.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Method.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Multiple.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Name.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Readonly.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Rows.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Selected.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Size.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Src.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Style.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Tabindex.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Title.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Type.php
typo3/sysext/form/Classes/Domain/Model/Attributes/Value.php
typo3/sysext/form/Classes/Domain/Model/Content.php
typo3/sysext/form/Classes/Domain/Model/Element/Abstract.php
typo3/sysext/form/Classes/Domain/Model/Element/Button.php
typo3/sysext/form/Classes/Domain/Model/Element/Checkbox.php
typo3/sysext/form/Classes/Domain/Model/Element/Checkboxgroup.php
typo3/sysext/form/Classes/Domain/Model/Element/Container.php
typo3/sysext/form/Classes/Domain/Model/Element/Content.php
typo3/sysext/form/Classes/Domain/Model/Element/Fieldset.php
typo3/sysext/form/Classes/Domain/Model/Element/Fileupload.php
typo3/sysext/form/Classes/Domain/Model/Element/Hidden.php
typo3/sysext/form/Classes/Domain/Model/Element/Imagebutton.php
typo3/sysext/form/Classes/Domain/Model/Element/Optgroup.php
typo3/sysext/form/Classes/Domain/Model/Element/Option.php
typo3/sysext/form/Classes/Domain/Model/Element/Password.php
typo3/sysext/form/Classes/Domain/Model/Element/Radio.php
typo3/sysext/form/Classes/Domain/Model/Element/Radiogroup.php
typo3/sysext/form/Classes/Domain/Model/Element/Reset.php
typo3/sysext/form/Classes/Domain/Model/Element/Select.php
typo3/sysext/form/Classes/Domain/Model/Element/Submit.php
typo3/sysext/form/Classes/Domain/Model/Element/Textarea.php
typo3/sysext/form/Classes/Domain/Model/Element/Textline.php
typo3/sysext/form/Classes/Domain/Model/Form.php
typo3/sysext/form/Classes/Domain/Model/JSON/Button.php
typo3/sysext/form/Classes/Domain/Model/JSON/Checkbox.php
typo3/sysext/form/Classes/Domain/Model/JSON/Checkboxgroup.php
typo3/sysext/form/Classes/Domain/Model/JSON/Container.php
typo3/sysext/form/Classes/Domain/Model/JSON/Element.php
typo3/sysext/form/Classes/Domain/Model/JSON/Fieldset.php
typo3/sysext/form/Classes/Domain/Model/JSON/Fileupload.php
typo3/sysext/form/Classes/Domain/Model/JSON/Form.php
typo3/sysext/form/Classes/Domain/Model/JSON/Header.php
typo3/sysext/form/Classes/Domain/Model/JSON/Hidden.php
typo3/sysext/form/Classes/Domain/Model/JSON/Name.php
typo3/sysext/form/Classes/Domain/Model/JSON/Password.php
typo3/sysext/form/Classes/Domain/Model/JSON/Radio.php
typo3/sysext/form/Classes/Domain/Model/JSON/Radiogroup.php
typo3/sysext/form/Classes/Domain/Model/JSON/Reset.php
typo3/sysext/form/Classes/Domain/Model/JSON/Select.php
typo3/sysext/form/Classes/Domain/Model/JSON/Submit.php
typo3/sysext/form/Classes/Domain/Model/JSON/Textarea.php
typo3/sysext/form/Classes/Domain/Model/JSON/Textline.php
typo3/sysext/form/Classes/Domain/Repository/Content.php
typo3/sysext/form/Classes/Exception/General.php
typo3/sysext/form/Classes/Exception/Loader.php
typo3/sysext/form/Classes/System/Elementcounter/Elementcounter.php
typo3/sysext/form/Classes/System/Filter/Alphabetic.php
typo3/sysext/form/Classes/System/Filter/Alphanumeric.php
typo3/sysext/form/Classes/System/Filter/Currency.php
typo3/sysext/form/Classes/System/Filter/Digit.php
typo3/sysext/form/Classes/System/Filter/Filter.php
typo3/sysext/form/Classes/System/Filter/Integer.php
typo3/sysext/form/Classes/System/Filter/Interface.php
typo3/sysext/form/Classes/System/Filter/Lowercase.php
typo3/sysext/form/Classes/System/Filter/Regexp.php
typo3/sysext/form/Classes/System/Filter/Removexss.php
typo3/sysext/form/Classes/System/Filter/Stripnewlines.php
typo3/sysext/form/Classes/System/Filter/Titlecase.php
typo3/sysext/form/Classes/System/Filter/Trim.php
typo3/sysext/form/Classes/System/Filter/Uppercase.php
typo3/sysext/form/Classes/System/Layout/Layout.php
typo3/sysext/form/Classes/System/Loader/Loader.php
typo3/sysext/form/Classes/System/Localization/Localization.php
typo3/sysext/form/Classes/System/Postprocessor/Mail.php
typo3/sysext/form/Classes/System/Postprocessor/Postprocessor.php
typo3/sysext/form/Classes/System/Request/Request.php
typo3/sysext/form/Classes/System/Validate/Abstract.php
typo3/sysext/form/Classes/System/Validate/Alphabetic.php
typo3/sysext/form/Classes/System/Validate/Alphanumeric.php
typo3/sysext/form/Classes/System/Validate/Between.php
typo3/sysext/form/Classes/System/Validate/Date.php
typo3/sysext/form/Classes/System/Validate/Digit.php
typo3/sysext/form/Classes/System/Validate/Email.php
typo3/sysext/form/Classes/System/Validate/Equals.php
typo3/sysext/form/Classes/System/Validate/Fileallowedtypes.php
typo3/sysext/form/Classes/System/Validate/Filemaximumsize.php
typo3/sysext/form/Classes/System/Validate/Fileminimumsize.php
typo3/sysext/form/Classes/System/Validate/Float.php
typo3/sysext/form/Classes/System/Validate/Greaterthan.php
typo3/sysext/form/Classes/System/Validate/Inarray.php
typo3/sysext/form/Classes/System/Validate/Integer.php
typo3/sysext/form/Classes/System/Validate/Interface.php
typo3/sysext/form/Classes/System/Validate/Ip.php
typo3/sysext/form/Classes/System/Validate/Length.php
typo3/sysext/form/Classes/System/Validate/Lessthan.php
typo3/sysext/form/Classes/System/Validate/Regexp.php
typo3/sysext/form/Classes/System/Validate/Required.php
typo3/sysext/form/Classes/System/Validate/Uri.php
typo3/sysext/form/Classes/System/Validate/Validate.php
typo3/sysext/form/Classes/View/Confirmation/Additional/Additional.php
typo3/sysext/form/Classes/View/Confirmation/Additional/Label.php
typo3/sysext/form/Classes/View/Confirmation/Additional/Legend.php
typo3/sysext/form/Classes/View/Confirmation/Confirmation.php
typo3/sysext/form/Classes/View/Confirmation/Element/Abstract.php
typo3/sysext/form/Classes/View/Confirmation/Element/Checkbox.php
typo3/sysext/form/Classes/View/Confirmation/Element/Checkboxgroup.php
typo3/sysext/form/Classes/View/Confirmation/Element/Container.php
typo3/sysext/form/Classes/View/Confirmation/Element/Fieldset.php
typo3/sysext/form/Classes/View/Confirmation/Element/Fileupload.php
typo3/sysext/form/Classes/View/Confirmation/Element/Optgroup.php
typo3/sysext/form/Classes/View/Confirmation/Element/Option.php
typo3/sysext/form/Classes/View/Confirmation/Element/Radio.php
typo3/sysext/form/Classes/View/Confirmation/Element/Radiogroup.php
typo3/sysext/form/Classes/View/Confirmation/Element/Select.php
typo3/sysext/form/Classes/View/Confirmation/Element/Textarea.php
typo3/sysext/form/Classes/View/Confirmation/Element/Textline.php
typo3/sysext/form/Classes/View/Form/Additional/Additional.php
typo3/sysext/form/Classes/View/Form/Additional/Error.php
typo3/sysext/form/Classes/View/Form/Additional/Label.php
typo3/sysext/form/Classes/View/Form/Additional/Legend.php
typo3/sysext/form/Classes/View/Form/Additional/Mandatory.php
typo3/sysext/form/Classes/View/Form/Element/Abstract.php
typo3/sysext/form/Classes/View/Form/Element/Button.php
typo3/sysext/form/Classes/View/Form/Element/Checkbox.php
typo3/sysext/form/Classes/View/Form/Element/Checkboxgroup.php
typo3/sysext/form/Classes/View/Form/Element/Container.php
typo3/sysext/form/Classes/View/Form/Element/Content.php
typo3/sysext/form/Classes/View/Form/Element/Fieldset.php
typo3/sysext/form/Classes/View/Form/Element/Fileupload.php
typo3/sysext/form/Classes/View/Form/Element/Hidden.php
typo3/sysext/form/Classes/View/Form/Element/Imagebutton.php
typo3/sysext/form/Classes/View/Form/Element/Optgroup.php
typo3/sysext/form/Classes/View/Form/Element/Option.php
typo3/sysext/form/Classes/View/Form/Element/Password.php
typo3/sysext/form/Classes/View/Form/Element/Radio.php
typo3/sysext/form/Classes/View/Form/Element/Radiogroup.php
typo3/sysext/form/Classes/View/Form/Element/Reset.php
typo3/sysext/form/Classes/View/Form/Element/Select.php
typo3/sysext/form/Classes/View/Form/Element/Submit.php
typo3/sysext/form/Classes/View/Form/Element/Textarea.php
typo3/sysext/form/Classes/View/Form/Element/Textline.php
typo3/sysext/form/Classes/View/Form/Form.php
typo3/sysext/form/Classes/View/Mail/Html/Additional/Additional.php
typo3/sysext/form/Classes/View/Mail/Html/Additional/Label.php
typo3/sysext/form/Classes/View/Mail/Html/Additional/Legend.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Abstract.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Checkbox.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Checkboxgroup.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Container.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Fieldset.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Fileupload.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Hidden.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Optgroup.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Option.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Radio.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Radiogroup.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Select.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Textarea.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Textline.php
typo3/sysext/form/Classes/View/Mail/Html/Html.php
typo3/sysext/form/Classes/View/Mail/Mail.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Abstract.php [new file with mode: 0644]
typo3/sysext/form/Classes/View/Mail/Plain/Element/Checkbox.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Checkboxgroup.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Container.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Element.php [deleted file]
typo3/sysext/form/Classes/View/Mail/Plain/Element/Fieldset.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Fileupload.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Hidden.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Optgroup.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Option.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Radio.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Radiogroup.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Select.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Textarea.php
typo3/sysext/form/Classes/View/Mail/Plain/Element/Textline.php
typo3/sysext/form/Classes/View/Mail/Plain/Plain.php
typo3/sysext/form/Classes/View/Wizard/Load.php
typo3/sysext/form/Classes/View/Wizard/Save.php
typo3/sysext/form/Classes/View/Wizard/Wizard.php
typo3/sysext/form/Documentation/Tests/Attributes/button.txt
typo3/sysext/form/Documentation/Tests/Attributes/checkbox.txt
typo3/sysext/form/Documentation/Tests/Attributes/checkboxgroup.txt
typo3/sysext/form/Documentation/Tests/Attributes/fieldset.txt
typo3/sysext/form/Documentation/Tests/Attributes/hidden.txt
typo3/sysext/form/Documentation/Tests/Attributes/imagebutton.txt
typo3/sysext/form/Documentation/Tests/Attributes/optgroup.txt
typo3/sysext/form/Documentation/Tests/Attributes/option.txt
typo3/sysext/form/Documentation/Tests/Attributes/password.txt
typo3/sysext/form/Documentation/Tests/Attributes/radio.txt
typo3/sysext/form/Documentation/Tests/Attributes/radiogroup.txt
typo3/sysext/form/Documentation/Tests/Attributes/reset.txt
typo3/sysext/form/Documentation/Tests/Attributes/select.txt
typo3/sysext/form/Documentation/Tests/Attributes/submit.txt
typo3/sysext/form/Documentation/Tests/Attributes/textarea.txt
typo3/sysext/form/Documentation/Tests/Attributes/textline.txt
typo3/sysext/form/Documentation/Tests/Filter/alphabetic.txt
typo3/sysext/form/Documentation/Tests/Filter/alphanumeric.txt
typo3/sysext/form/Documentation/Tests/Filter/currency.txt
typo3/sysext/form/Documentation/Tests/Filter/digit.txt
typo3/sysext/form/Documentation/Tests/Filter/integer.txt
typo3/sysext/form/Documentation/Tests/Filter/lowercase.txt
typo3/sysext/form/Documentation/Tests/Filter/regexp.txt
typo3/sysext/form/Documentation/Tests/Filter/stripnewlines.txt
typo3/sysext/form/Documentation/Tests/Filter/titlecase.txt
typo3/sysext/form/Documentation/Tests/Filter/trim.txt
typo3/sysext/form/Documentation/Tests/Filter/uppercase.txt
typo3/sysext/form/Documentation/Tests/Request/checkbox.txt
typo3/sysext/form/Documentation/Tests/Request/option.txt
typo3/sysext/form/Documentation/Tests/Request/radio.txt
typo3/sysext/form/Documentation/Tests/Validation/alphabetic.txt
typo3/sysext/form/Documentation/Tests/Validation/alphanumeric.txt
typo3/sysext/form/Documentation/Tests/Validation/between.txt
typo3/sysext/form/Documentation/Tests/Validation/combined.txt
typo3/sysext/form/Documentation/Tests/Validation/date.txt
typo3/sysext/form/Documentation/Tests/Validation/digit.txt
typo3/sysext/form/Documentation/Tests/Validation/email.txt
typo3/sysext/form/Documentation/Tests/Validation/equals.txt
typo3/sysext/form/Documentation/Tests/Validation/float.txt
typo3/sysext/form/Documentation/Tests/Validation/greaterthan.txt
typo3/sysext/form/Documentation/Tests/Validation/inarray.txt
typo3/sysext/form/Documentation/Tests/Validation/integer.txt
typo3/sysext/form/Documentation/Tests/Validation/ip.txt
typo3/sysext/form/Documentation/Tests/Validation/length.txt
typo3/sysext/form/Documentation/Tests/Validation/lessthan.txt
typo3/sysext/form/Documentation/Tests/Validation/regexp.txt
typo3/sysext/form/Documentation/Tests/Validation/required.txt
typo3/sysext/form/Documentation/Tests/Validation/uri.txt
typo3/sysext/form/ext_autoload.php

index aa64238..27ef1fd 100644 (file)
 2008-12-28  Patrick Broens  <patrick@patrickbroens.nl>
 
        * Mainly changes in views
-       
+
 2008-12-27  Patrick Broens  <patrick@patrickbroens.nl>
 
        * Changing the views
 2008-12-24  Patrick Broens  <patrick@patrickbroens.nl>
 
        * Big changes in views and models
-       
+
 2008-12-22  Patrick Broens  <patrick@patrickbroens.nl>
 
        * deleting old files in model
 
        * Added filters alphabetic, alphanumeric, currency, digit, integer, lowercase, stripnewlines, titlecase, trim, uppercase
        * Changing the models for configuration without Typoscript
-       
+
 2008-12-16  Patrick Broens  <patrick@patrickbroens.nl>
 
        * Added class.tx_form_requesthandler
        * Some cleaning up, checking the javadoc comments and moving methods to abstract classes in view objects
        * Adapting views, adding error and mandatory parts, cleaning up
 
-2008-12-02  Patrick Broens  <patrick@patrickbroens.nl> 
-       
+2008-12-02  Patrick Broens  <patrick@patrickbroens.nl>
+
        * Making the element views
        * Updated views, code cleaning
-       
+
 2008-12-01  Patrick Broens  <patrick@patrickbroens.nl>
 
        * Start of FORM project. Basic groundwork of MVC
index dfb23bd..5c88b94 100644 (file)
@@ -103,7 +103,7 @@ class tx_form_Common implements t3lib_Singleton {
                foreach($this->getFormObjects() as $formObject) {
                        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['cObjTypeAndClass'][] = array(
                                $formObject,
-                               'EXT:form/Classes/Controller/Form.php:&tx_form_controller_form'
+                               'EXT:form/Classes/Controller/Form.php:&tx_form_Controller_Form'
                        );
                }
 
index 55ee49f..1c55dce 100644 (file)
@@ -33,7 +33,7 @@
  * @license http://www.gnu.org/copyleft/gpl.html
  * @version $Id$
  */
-class tx_form_controller_form {
+class tx_form_Controller_Form {
 
        /**
         * The TypoScript array
@@ -43,22 +43,22 @@ class tx_form_controller_form {
        protected $typoscript = array();
 
        /**
-        * @var tx_form_domain_factory_typoscript
+        * @var tx_form_Domain_Factory_Typoscript
         */
        protected $typoscriptFactory;
 
        /**
-        * @var tx_form_system_localization
+        * @var tx_form_System_Localization
         */
        protected $localizationHandler;
 
        /**
-        * @var tx_form_system_request
+        * @var tx_form_System_Request
         */
        protected $requestHandler;
 
        /**
-        * @var tx_form_system_validate
+        * @var tx_form_System_Validate
         */
        protected $validate;
 
@@ -70,12 +70,12 @@ class tx_form_controller_form {
         */
        public function initialize($typoscript) {
                t3lib_div::makeInstance(
-                       'tx_form_system_localization',
+                       'tx_form_System_Localization',
                        'LLL:EXT:form/Resources/Private/Language/locallang_controller.xml'
                );
 
-               $this->typoscriptFactory = t3lib_div::makeInstance('tx_form_domain_factory_typoscript');
-               $this->localizationHandler = t3lib_div::makeInstance('tx_form_system_localization');
+               $this->typoscriptFactory = t3lib_div::makeInstance('tx_form_Domain_Factory_Typoscript');
+               $this->localizationHandler = t3lib_div::makeInstance('tx_form_System_Localization');
                $this->requestHandler = $this->typoscriptFactory->setRequestHandler($typoscript);
                $this->validate = $this->typoscriptFactory->setRules($typoscript);
 
@@ -201,8 +201,8 @@ class tx_form_controller_form {
 
                $form = $this->typoscriptFactory->buildModelFromTyposcript($this->typoscript);
 
-               /** @var $view tx_form_view_form */
-               $view = t3lib_div::makeInstance('tx_form_view_form', $form);
+               /** @var $view tx_form_View_Form */
+               $view = t3lib_div::makeInstance('tx_form_View_Form', $form);
 
                return $view->get();
        }
@@ -248,9 +248,9 @@ class tx_form_controller_form {
                        $confirmationTyposcript = $this->typoscript['confirmation.'];
                }
 
-               /** @var $view tx_form_view_confirmation */
+               /** @var $view tx_form_View_Confirmation */
                $view = t3lib_div::makeInstance(
-                       'tx_form_view_confirmation',
+                       'tx_form_View_Confirmation',
                        $form,
                        $confirmationTyposcript
                );
@@ -273,9 +273,9 @@ class tx_form_controller_form {
                        $postProcessorTypoScript = $this->typoscript['postProcessor.'];
                }
 
-               /** @var $postProcessor tx_form_system_postprocessor */
+               /** @var $postProcessor tx_form_System_Postprocessor */
                $postProcessor = t3lib_div::makeInstance(
-                       'tx_form_system_postprocessor',
+                       'tx_form_System_Postprocessor',
                        $form,
                        $postProcessorTypoScript
                );
index a30bd8d..97886f5 100644 (file)
@@ -36,7 +36,7 @@ require($BACK_PATH . 'template.php');
  * @license http://www.gnu.org/copyleft/gpl.html
  * @version $Id$
  */
-class tx_form_controller_wizard {
+class tx_form_Controller_Wizard {
        /**
         * Dispatch on action
         *
@@ -65,11 +65,11 @@ class tx_form_controller_wizard {
         * @return void
         */
        protected function indexAction() {
-               /** @var $repository tx_form_domain_repository_content */
-               $repository = t3lib_div::makeInstance('tx_form_domain_repository_content');
+               /** @var $repository tx_form_Domain_Repository_Content */
+               $repository = t3lib_div::makeInstance('tx_form_Domain_Repository_Content');
 
-               /** @var $view tx_form_view_wizard_wizard */
-               $view = t3lib_div::makeInstance('tx_form_view_wizard_wizard');
+               /** @var $view tx_form_View_Wizard_Wizard */
+               $view = t3lib_div::makeInstance('tx_form_View_Wizard_Wizard');
                $view->setRepository($repository);
                $view->render();
        }
@@ -82,11 +82,11 @@ class tx_form_controller_wizard {
         * @return void
         */
        protected function saveAction() {
-               /** @var $repository tx_form_domain_repository_content */
-               $repository = t3lib_div::makeInstance('tx_form_domain_repository_content');
+               /** @var $repository tx_form_Domain_Repository_Content */
+               $repository = t3lib_div::makeInstance('tx_form_Domain_Repository_Content');
 
-               /** @var $view tx_form_view_wizard_save */
-               $view = t3lib_div::makeInstance('tx_form_view_wizard_save');
+               /** @var $view tx_form_View_Wizard_Save */
+               $view = t3lib_div::makeInstance('tx_form_View_Wizard_Save');
                $view->setRepository($repository);
                $view->render();
        }
@@ -99,17 +99,17 @@ class tx_form_controller_wizard {
         * @return void
         */
        protected function loadAction() {
-               /** @var $repository tx_form_domain_repository_content */
-               $repository = t3lib_div::makeInstance('tx_form_domain_repository_content');
+               /** @var $repository tx_form_Domain_Repository_Content */
+               $repository = t3lib_div::makeInstance('tx_form_Domain_Repository_Content');
 
-               /** @var $view tx_form_view_wizard_load */
-               $view = t3lib_div::makeInstance('tx_form_view_wizard_load');
+               /** @var $view tx_form_View_Wizard_Load */
+               $view = t3lib_div::makeInstance('tx_form_View_Wizard_Load');
                $view->setRepository($repository);
                $view->render();
        }
 }
 
-/** @var $wizard tx_form_controller_wizard */
-$wizard = t3lib_div::makeInstance('tx_form_controller_wizard');
+/** @var $wizard tx_form_Controller_Wizard */
+$wizard = t3lib_div::makeInstance('tx_form_Controller_Wizard');
 $wizard->dispatch();
 ?>
\ No newline at end of file
index e73bea0..7b1a1af 100644 (file)
@@ -31,7 +31,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_factory_jsontotyposcript {
+class tx_form_Domain_Factory_JsonToTyposcript {
        /**
         * Internal counter for the elements
         *
index 385b040..3bdfd06 100644 (file)
@@ -32,7 +32,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_factory_typoscript implements t3lib_Singleton {
+class tx_form_Domain_Factory_Typoscript implements t3lib_Singleton {
 
        /**
         * Constructor
@@ -147,9 +147,9 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
                $class = strtolower((string) $class);
 
                if($class === 'form') {
-                       $className = 'tx_form_domain_model_' . $class;
+                       $className = 'tx_form_Domain_Model_' . ucfirst($class);
                } else {
-                       $className = 'tx_form_domain_model_element_' . $class;
+                       $className = 'tx_form_Domain_Model_Element_' . ucfirst($class);
                }
 
                $object = t3lib_div::makeInstance($className);
@@ -274,10 +274,10 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
         * Set the layout handler
         *
         * @param array $typoscript TypoScript
-        * @return tx_form_system_layout The layout handler
+        * @return tx_form_System_Layout The layout handler
         */
        public function setLayoutHandler($typoscript) {
-               $layoutHandler = t3lib_div::makeInstance('tx_form_system_layout'); // singleton
+               $layoutHandler = t3lib_div::makeInstance('tx_form_System_Layout'); // singleton
                $layoutHandler->setLayout($typoscript['layout.']);
 
                return $layoutHandler;
@@ -287,14 +287,14 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
         * Set the request handler
         *
         * @param array $typoscript TypoScript
-        * @return tx_form_system_request The request handler
+        * @return tx_form_System_Request The request handler
         */
        public function setRequestHandler($typoscript) {
                $prefix = isset($typoscript['prefix']) ? $typoscript['prefix'] : '';
                $method = isset($typoscript['method']) ? $typoscript['method'] : '';
 
-               /** @var $requestHandler tx_form_system_request */
-               $requestHandler = t3lib_div::makeInstance('tx_form_system_request'); // singleton
+               /** @var $requestHandler tx_form_System_Request */
+               $requestHandler = t3lib_div::makeInstance('tx_form_System_Request'); // singleton
                $requestHandler->setPrefix($prefix);
                $requestHandler->setMethod($method);
                $requestHandler->storeFiles();
@@ -308,11 +308,11 @@ class tx_form_domain_factory_typoscript implements t3lib_Singleton {
         * Makes the validation object and adds rules to it
         *
         * @param array $typoscript TypoScript
-        * @return tx_form_system_validate The validation object
+        * @return tx_form_System_Validate The validation object
         */
        public function setRules($typoscript) {
                $rulesTyposcript = isset($typoscript['rules.']) ? $typoscript['rules.'] : NULL;
-               $rulesClass = t3lib_div::makeInstance('tx_form_system_validate', $rulesTyposcript); // singleton
+               $rulesClass = t3lib_div::makeInstance('tx_form_System_Validate', $rulesTyposcript); // singleton
 
                if (is_array($rulesTyposcript)) {
                        $keys = t3lib_TStemplate::sortedKeyList($rulesTyposcript);
index 930a929..45f51da 100644 (file)
@@ -31,7 +31,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_factory_typoscripttojson {
+class tx_form_Domain_Factory_TyposcriptToJson {
        /**
         * Constructor
         *
@@ -63,7 +63,7 @@ class tx_form_domain_factory_typoscripttojson {
         */
        public function createElement($class, array $arguments = array()) {
                $class = strtolower((string) $class);
-               $className = 'tx_form_domain_model_json_' . $class;
+               $className = 'tx_form_Domain_Model_Json_' . ucfirst($class);
 
                $this->addValidationRules($arguments);
 
index 971bfba..70b4cee 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-abstract class tx_form_domain_model_additional_abstract {
+abstract class tx_form_Domain_Model_Additional_Abstract {
 
        /**
         * Additional value
index 127dfb0..005b149 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_additional_additional {
+class tx_form_Domain_Model_Additional_Additional {
 
        /**
         * Array with the additional objects of the element
@@ -52,11 +52,11 @@ class tx_form_domain_model_additional_additional {
         * @param string $class Name of the additional
         * @param mixed $value Typoscript configuration to construct value
         * @param string $type Typoscript content object
-        * @return tx_form_domain_model_additional
+        * @return tx_form_Domain_Model_Additional
         */
        public function addAdditional($class, $type, $value) {
                $class = strtolower((string) $class);
-               $className = 'tx_form_domain_model_additional_' . $class;
+               $className = 'tx_form_Domain_Model_Additional_' . ucfirst($class);
 
                $this->additional[$class] = t3lib_div::makeInstance($className, $type, $value);
 
index e4b0c64..8a553f6 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_additional_error extends tx_form_domain_model_additional_abstract implements tx_form_domain_model_additional_interface {
+class tx_form_Domain_Model_Additional_Error extends tx_form_Domain_Model_Additional_Abstract implements tx_form_Domain_Model_Additional_Interface {
 
        /**
         * Constructor
index 4eb9a72..6f86ed7 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-interface tx_form_domain_model_additional_interface {
+interface tx_form_Domain_Model_Additional_Interface {
 
        /**
         * Return the value of the object
index e39fc30..0a42f9f 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_additional_label extends tx_form_domain_model_additional_abstract implements tx_form_domain_model_additional_interface {
+class tx_form_Domain_Model_Additional_Label extends tx_form_Domain_Model_Additional_Abstract implements tx_form_Domain_Model_Additional_Interface {
 
        /**
         * Constructor
index df70834..2f34e87 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_additional_legend extends tx_form_domain_model_additional_abstract implements tx_form_domain_model_additional_interface {
+class tx_form_Domain_Model_Additional_Legend extends tx_form_Domain_Model_Additional_Abstract implements tx_form_Domain_Model_Additional_Interface {
 
        /**
         * Constructor
index 1fdea5f..39e5b2f 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_additional_mandatory extends tx_form_domain_model_additional_abstract implements tx_form_domain_model_additional_interface {
+class tx_form_Domain_Model_Additional_Mandatory extends tx_form_Domain_Model_Additional_Abstract implements tx_form_Domain_Model_Additional_Interface {
 
        /**
         * Constructor
index c6aa0ae..28aacd1 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-abstract class tx_form_domain_model_attributes_abstract {
+abstract class tx_form_Domain_Model_Attributes_Abstract {
 
        /**
         * The value of the attribute
index c9b4976..f215e0a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_accept extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Accept extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 0b37d4b..421a996 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_acceptcharset extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Acceptcharset extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 10ffb91..42e107d 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_accesskey extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Accesskey extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 4fa5c52..835f2af 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_action extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Action extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 8ff6dfb..cf9031d 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_alt extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Alt extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index c0efc37..d9aa5e9 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_attributes {
+class tx_form_Domain_Model_Attributes_Attributes {
 
        /**
         * The attributes of the element
@@ -61,8 +61,8 @@ class tx_form_domain_model_attributes_attributes {
        public function __construct($elementId) {
                $this->elementId = (integer) $elementId;
                $this->localCobj = t3lib_div::makeInstance('tslib_cObj');
-               $this->localizationHandler = t3lib_div::makeInstance('tx_form_system_localization');
-               $this->requestHandler = t3lib_div::makeInstance('tx_form_system_request');
+               $this->localizationHandler = t3lib_div::makeInstance('tx_form_System_Localization');
+               $this->requestHandler = t3lib_div::makeInstance('tx_form_System_Request');
        }
 
        /**
@@ -70,11 +70,11 @@ class tx_form_domain_model_attributes_attributes {
         *
         * @param string $class Name of the attribute
         * @param mixed $value Typoscript configuration to construct value
-        * @return tx_form_domain_model_attributes
+        * @return tx_form_Domain_Model_Attributes
         */
        public function addAttribute($class, $value) {
                $class = strtolower((string) $class);
-               $className = 'tx_form_domain_model_attributes_' . $class;
+               $className = 'tx_form_Domain_Model_Attributes_' . ucfirst($class);
 
                $this->attributes[$class] = t3lib_div::makeInstance($className, $value, $this->elementId);
 
@@ -85,7 +85,7 @@ class tx_form_domain_model_attributes_attributes {
         * Remove an attribute object from the attribute array
         *
         * @param string $class Name of the attribute
-        * @return tx_form_domain_model_attributes
+        * @return tx_form_Domain_Model_Attributes
         */
        public function removeAttribute($class) {
                unset($this->attributes[$class]);
index 9fe80b7..9d0c7c0 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_checked extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Checked extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index a91e722..01b6d63 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_class extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Class extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index c06902d..d8e11a7 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_cols extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Cols extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index b380327..a0c52e9 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_dir extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Dir extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index cabca64..8c9b126 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_disabled extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Disabled extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 09cae89..beefa6a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_enctype extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Enctype extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 809bc76..5e4fee8 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_id extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Id extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
@@ -55,7 +55,7 @@ class tx_form_domain_model_attributes_id extends tx_form_domain_model_attributes
        public function getValue() {
                $value = (string) $this->value;
 
-               if($this->elementClassName === 'tx_form_domain_model_form') {
+               if($this->elementClassName === 'tx_form_Domain_Model_Form') {
                        if(empty($value)) {
                                $value = 'form-' . $GLOBALS['TSFE']->id;
                        }
index bd43d99..3652464 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-interface tx_form_domain_model_attributes_interface {
+interface tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Return attribute value, probably run through filter
index e252d56..fb07f29 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_label extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Label extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index c0734ff..b91f3a8 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_lang extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Lang extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 6e5e06b..e542db2 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_maxlength extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Maxlength extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index e50cdb9..732fc35 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_method extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Method extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 04b84ea..16b0784 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_multiple extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Multiple extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 6922d9f..2abf6a9 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_name extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Name extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Addition to the name value
@@ -95,7 +95,7 @@ class tx_form_domain_model_attributes_name extends tx_form_domain_model_attribut
                $value = $this->getValueWithoutPrefix();
 
                if($this->returnValueWithoutPrefix === FALSE) {
-                       $requestHandler = t3lib_div::makeInstance('tx_form_system_request');
+                       $requestHandler = t3lib_div::makeInstance('tx_form_System_Request');
                        $attribute = $requestHandler->getPrefix() . '[' . $value . ']' . $this->addition;
                } else {
                        $attribute = $value;
@@ -109,7 +109,7 @@ class tx_form_domain_model_attributes_name extends tx_form_domain_model_attribut
         * This is necessarry in some cases like a multiple select box
         *
         * @param string $addition The additional string
-        * @return tx_form_domain_model_attributes_name
+        * @return tx_form_Domain_Model_Attributes_Name
         */
        public function setAddition($addition) {
                $this->addition = (string) $addition;
index 729654b..56292a7 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_readonly extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Readonly extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 47bccdf..79c5c96 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_rows extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Rows extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 4ea167e..8e7da0d 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_selected extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Selected extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index ceefb02..cdf7fa7 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_size extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Size extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 2da96b6..e26426d 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_src extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Src extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 71b87e2..de9e358 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_style extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Style extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 82c1ba4..442d292 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_tabindex extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Tabindex extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 26435b8..5e5a1e7 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_title extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Title extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index a3674fb..acc7c48 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_type extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Type extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        protected $allowedValues = array(
                'text',
index 91e2b7e..c7ca845 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_attributes_value extends tx_form_domain_model_attributes_abstract implements tx_form_domain_model_attributes_interface {
+class tx_form_Domain_Model_Attributes_Value extends tx_form_Domain_Model_Attributes_Abstract implements tx_form_Domain_Model_Attributes_Interface {
 
        /**
         * Constructor
index 4bcc583..58a182b 100644 (file)
@@ -32,7 +32,7 @@
  * @license http://www.gnu.org/copyleft/gpl.html
  * @version $Id$
  */
-class tx_form_domain_model_content {
+class tx_form_Domain_Model_Content {
 
        /**
         * The uid
index 28c4eaf..221a56c 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-abstract class tx_form_domain_model_element_abstract {
+abstract class tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Internal Id of the element
@@ -56,14 +56,14 @@ abstract class tx_form_domain_model_element_abstract {
        /**
         * Attribute object
         *
-        * @var tx_form_domain_model_attributes
+        * @var tx_form_Domain_Model_Attributes
         */
        protected $attributes;
 
        /**
         * Additional object
         *
-        * @var tx_form_domain_model_additional
+        * @var tx_form_Domain_Model_Additional
         */
        protected $additional;
 
@@ -122,9 +122,9 @@ abstract class tx_form_domain_model_element_abstract {
         */
        public function __construct() {
                $this->localCobj = t3lib_div::makeInstance('tslib_cObj');
-               $this->requestHandler = t3lib_div::makeInstance('tx_form_system_request');
-               $this->validateClass = t3lib_div::makeInstance('tx_form_system_validate');
-               $this->elementCounter = t3lib_div::makeInstance('tx_form_system_elementcounter');
+               $this->requestHandler = t3lib_div::makeInstance('tx_form_System_Request');
+               $this->validateClass = t3lib_div::makeInstance('tx_form_System_Validate');
+               $this->elementCounter = t3lib_div::makeInstance('tx_form_System_Elementcounter');
                $this->setElementId();
                $this->createAttributes();
                $this->createAdditional();
@@ -310,10 +310,10 @@ abstract class tx_form_domain_model_element_abstract {
        /**
         * Load the attributes object
         *
-        * @return tx_form_domain_model_attributes
+        * @return tx_form_Domain_Model_Attributes
         */
        protected function createAttributes() {
-               $className = 'tx_form_domain_model_attributes_attributes';
+               $className = 'tx_form_Domain_Model_Attributes_Attributes';
 
                $this->attributes = t3lib_div::makeInstance($className, $this->elementId);
        }
@@ -429,7 +429,7 @@ abstract class tx_form_domain_model_element_abstract {
         * @return void
         */
        protected function createAdditional() {
-               $className = 'tx_form_domain_model_additional_additional';
+               $className = 'tx_form_Domain_Model_Additional_Additional';
 
                $this->additional = t3lib_div::makeInstance($className);
        }
@@ -451,7 +451,7 @@ abstract class tx_form_domain_model_element_abstract {
         * @return void
         */
        protected function createFilter() {
-               $this->filter = t3lib_div::makeInstance('tx_form_system_filter');
+               $this->filter = t3lib_div::makeInstance('tx_form_System_Filter');
        }
 
        /**
index 312abe6..e05691a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_button extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Button extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
@@ -80,10 +80,10 @@ class tx_form_domain_model_element_button extends tx_form_domain_model_element_a
         *
         * @param string $value Value to display on button
         * @return void
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#setValue()
+        * @see tx_form_Domain_Model_Element::setValue()
         */
        public function setValue($value = '') {
-               $localizationHandler = t3lib_div::makeInstance('tx_form_system_localization');
+               $localizationHandler = t3lib_div::makeInstance('tx_form_System_Localization');
 
                $oldValue = $this->getAttributeValue('value');
                if(empty($oldValue)) {
index 4bb67ab..f509b2b 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_checkbox extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Checkbox extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
@@ -89,7 +89,7 @@ class tx_form_domain_model_element_checkbox extends tx_form_domain_model_element
         *
         * @return object
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#checkFilterAndSetIncomingDataFromRequest()
+        * @see tx_form_Domain_Model_Element::checkFilterAndSetIncomingDataFromRequest()
         */
        public function checkFilterAndSetIncomingDataFromRequest() {
                if ($this->value === '') {
index 579e372..b4aa507 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_checkboxgroup extends tx_form_domain_model_element_fieldset {
+class tx_form_Domain_Model_Element_Checkboxgroup extends tx_form_Domain_Model_Element_Fieldset {
 
        /**
         * Constructor
index 70ec40e..484b54b 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_container extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Container extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Child elements of this object
index 0c8d694..7338994 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_content extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Content extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
index 09322f9..f3ab8fb 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_fieldset extends tx_form_domain_model_element_container {
+class tx_form_Domain_Model_Element_Fieldset extends tx_form_Domain_Model_Element_Container {
 
        /**
         * Allowed attributes for this object
index 1f7932a..e3a4a74 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_fileupload extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Fileupload extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
index ca7c28e..5c30c5a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_hidden extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Hidden extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
@@ -72,7 +72,7 @@ class tx_form_domain_model_element_hidden extends tx_form_domain_model_element_a
         *
         * @return object
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#checkFilterAndSetIncomingDataFromRequest()
+        * @see tx_form_Domain_Model_Element::checkFilterAndSetIncomingDataFromRequest()
         */
        public function checkFilterAndSetIncomingDataFromRequest() {
                if($this->requestHandler->has($this->getName())) {
index 0051406..d1bfc3b 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_imagebutton extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Imagebutton extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
index 7615419..e0c9ea8 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_optgroup extends tx_form_domain_model_element_container {
+class tx_form_Domain_Model_Element_Optgroup extends tx_form_Domain_Model_Element_Container {
 
        /**
         * Allowed attributes for this object
@@ -77,7 +77,7 @@ class tx_form_domain_model_element_optgroup extends tx_form_domain_model_element
         * @param string $parentName Name of the parent
         * @return object The element object
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#setParent()
+        * @see tx_form_Domain_Model_Element::setParent()
         */
        public function setParentName($parentName) {
                foreach($this->elements as $element) {
index cc141b7..86fb75b 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_option extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Option extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
@@ -89,7 +89,7 @@ class tx_form_domain_model_element_option extends tx_form_domain_model_element_a
         * @param string $parentName Name of the parent
         * @return object The element object
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#setParent()
+        * @see tx_form_Domain_Model_Element::setParent()
         */
        public function setParentName($parentName) {
                $this->parentName = $parentName;
@@ -106,7 +106,7 @@ class tx_form_domain_model_element_option extends tx_form_domain_model_element_a
         *
         * @return object
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#checkFilterAndSetIncomingDataFromRequest()
+        * @see tx_form_Domain_Model_Element::checkFilterAndSetIncomingDataFromRequest()
         */
        public function checkFilterAndSetIncomingDataFromRequest() {
                if ($this->value === '') {
index 5ca7019..82f9150 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_password extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Password extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
@@ -82,7 +82,7 @@ class tx_form_domain_model_element_password extends tx_form_domain_model_element
         *
         * @return object
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#checkFilterAndSetIncomingDataFromRequest()
+        * @see tx_form_Domain_Model_Element::checkFilterAndSetIncomingDataFromRequest()
         */
        public function checkFilterAndSetIncomingDataFromRequest() {
                if($this->requestHandler->has($this->getName())) {
index 26d856d..d3f123a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_radio extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Radio extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
@@ -89,7 +89,7 @@ class tx_form_domain_model_element_radio extends tx_form_domain_model_element_ab
         *
         * @return object
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#checkFilterAndSetIncomingDataFromRequest()
+        * @see tx_form_Domain_Model_Element::checkFilterAndSetIncomingDataFromRequest()
         */
        public function checkFilterAndSetIncomingDataFromRequest() {
                if ($this->value === '') {
index a2b9c94..69427be 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_radiogroup extends tx_form_domain_model_element_fieldset {
+class tx_form_Domain_Model_Element_Radiogroup extends tx_form_Domain_Model_Element_Fieldset {
 
        /**
         * Constructor
index 0478c84..ab69f74 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_reset extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Reset extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
@@ -80,10 +80,10 @@ class tx_form_domain_model_element_reset extends tx_form_domain_model_element_ab
         *
         * @param string $value Value to display on button
         * @return void
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#setValue()
+        * @see tx_form_Domain_Model_Element::setValue()
         */
        public function setValue($value = '') {
-               $localizationHandler = t3lib_div::makeInstance('tx_form_system_localization');
+               $localizationHandler = t3lib_div::makeInstance('tx_form_System_Localization');
 
                        // value not set from typoscript
                $oldValue = $this->getAttributeValue('value');
index ed06e40..cd5bd1c 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_select extends tx_form_domain_model_element_container {
+class tx_form_Domain_Model_Element_Select extends tx_form_Domain_Model_Element_Container {
 
        /**
         * Allowed attributes for this object
index b46e6cd..2698d72 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_submit extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Submit extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
@@ -80,10 +80,10 @@ class tx_form_domain_model_element_submit extends tx_form_domain_model_element_a
         *
         * @param string $value Value to display on button
         * @return void
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#setValue()
+        * @see tx_form_Domain_Model_Element::setValue()
         */
        public function setValue($value = '') {
-               $localizationHandler = t3lib_div::makeInstance('tx_form_system_localization');
+               $localizationHandler = t3lib_div::makeInstance('tx_form_System_Localization');
 
                        // value not set from typoscript
                $oldValue = $this->getAttributeValue('value');
index ee95a38..64584b8 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_textarea extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Textarea extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
@@ -89,7 +89,7 @@ class tx_form_domain_model_element_textarea extends tx_form_domain_model_element
         *
         * @return object
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#checkFilterAndSetIncomingDataFromRequest()
+        * @see tx_form_Domain_Model_Element::checkFilterAndSetIncomingDataFromRequest()
         */
        public function checkFilterAndSetIncomingDataFromRequest() {
                if($this->requestHandler->has($this->getName())) {
index 805bf0d..51dd356 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_element_textline extends tx_form_domain_model_element_abstract {
+class tx_form_Domain_Model_Element_Textline extends tx_form_Domain_Model_Element_Abstract {
 
        /**
         * Allowed attributes for this object
@@ -82,7 +82,7 @@ class tx_form_domain_model_element_textline extends tx_form_domain_model_element
         *
         * @return object
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/model/element/tx_form_domain_model_element#checkFilterAndSetIncomingDataFromRequest()
+        * @see tx_form_Domain_Model_Element::checkFilterAndSetIncomingDataFromRequest()
         */
        public function checkFilterAndSetIncomingDataFromRequest() {
                if($this->requestHandler->has($this->getName())) {
index c89aadc..1260931 100644 (file)
@@ -32,7 +32,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_form extends tx_form_domain_model_element_container {
+class tx_form_Domain_Model_Form extends tx_form_Domain_Model_Element_Container {
 
        /**
         * Allowed attributes for this object
index 72db019..80fe153 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_button extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Button extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
index c20e1e0..5f7bf8f 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_checkbox extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Checkbox extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
index b7e6da8..bda4d73 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_checkboxgroup extends tx_form_domain_model_json_fieldset {
+class tx_form_Domain_Model_JSON_Checkboxgroup extends tx_form_Domain_Model_JSON_Fieldset {
        /**
         * The ExtJS xtype of the element
         *
@@ -82,7 +82,7 @@ class tx_form_domain_model_json_checkboxgroup extends tx_form_domain_model_json_
         * @param array $parameters Configuration array
         * @return void
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see tx_form_domain_model_json_fieldset::setParameters()
+        * @see tx_form_Domain_Model_Json_Fieldset::setParameters()
         */
        public function setParameters($parameters) {
                parent::setParameters($parameters);
index f6b8419..9eb6c17 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_container extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Container extends tx_form_Domain_Model_JSON_Element {
        /**
         * The items within this container
         *
index 95b897d..8a2195b 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
index ef0ebbd..a053593 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_fieldset extends tx_form_domain_model_json_container {
+class tx_form_Domain_Model_JSON_Fieldset extends tx_form_Domain_Model_JSON_Container {
        /**
         * The ExtJS xtype of the element
         *
@@ -77,7 +77,7 @@ class tx_form_domain_model_json_fieldset extends tx_form_domain_model_json_conta
         * @param array $parameters Configuration array
         * @return void
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see tx_form_domain_model_json_element::setParameters()
+        * @see tx_form_Domain_Model_Json_Element::setParameters()
         */
        public function setParameters($parameters) {
                parent::setParameters($parameters);
index 798e8ec..494a014 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_fileupload extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Fileupload extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
index 625e504..c0f3c31 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_form extends tx_form_domain_model_json_container {
+class tx_form_Domain_Model_JSON_Form extends tx_form_Domain_Model_JSON_Container {
        /**
         * The ExtJS xtype of the element
         *
@@ -83,7 +83,7 @@ class tx_form_domain_model_json_form extends tx_form_domain_model_json_container
         * @param array $parameters Configuration array
         * @return void
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see tx_form_domain_model_json_container::setParameters()
+        * @see tx_form_Domain_Model_Json_Container::setParameters()
         */
        public function setParameters($parameters) {
                parent::setParameters($parameters);
index fa41655..ef182c0 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_header extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Header extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
@@ -79,7 +79,7 @@ class tx_form_domain_model_json_header extends tx_form_domain_model_json_element
         * @param array $parameters Configuration array
         * @return void
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see tx_form_domain_model_json_element::setParameters()
+        * @see tx_form_Domain_Model_Json_Element::setParameters()
         */
        public function setParameters($parameters) {
                parent::setParameters($parameters);
index 1456c23..43e3158 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_hidden extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Hidden extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
index bd3060a..ff7ec99 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_name extends tx_form_domain_model_json_fieldset {
+class tx_form_Domain_Model_JSON_Name extends tx_form_Domain_Model_JSON_Fieldset {
        /**
         * The ExtJS xtype of the element
         *
@@ -82,7 +82,7 @@ class tx_form_domain_model_json_name extends tx_form_domain_model_json_fieldset
         * @param array $parameters Configuration array
         * @return void
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see tx_form_domain_model_json_fieldset::setParameters()
+        * @see tx_form_Domain_Model_Json_Fieldset::setParameters()
         */
        public function setParameters($parameters) {
                parent::setParameters($parameters);
index 1d19d81..cf4925b 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_password extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Password extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
index aa7c25c..65fcec3 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_radio extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Radio extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
index 6f1abd6..4adf2dc 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_radiogroup extends tx_form_domain_model_json_fieldset {
+class tx_form_Domain_Model_JSON_Radiogroup extends tx_form_Domain_Model_JSON_Fieldset {
        /**
         * The ExtJS xtype of the element
         *
@@ -82,7 +82,7 @@ class tx_form_domain_model_json_radiogroup extends tx_form_domain_model_json_fie
         * @param array $parameters Configuration array
         * @return void
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see tx_form_domain_model_json_fieldset::setParameters()
+        * @see tx_form_Domain_Model_Json_Fieldset::setParameters()
         */
        public function setParameters($parameters) {
                parent::setParameters($parameters);
index abc623a..21df720 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_reset extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Reset extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
index 7e20e8f..e053285 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_select extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Select extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
@@ -88,7 +88,7 @@ class tx_form_domain_model_json_select extends tx_form_domain_model_json_element
         * @param array $parameters Configuration array
         * @return void
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see tx_form_domain_model_json_element::setParameters()
+        * @see tx_form_Domain_Model_Json_Element::setParameters()
         */
        public function setParameters($parameters) {
                parent::setParameters($parameters);
index 39245bf..dbfc187 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_submit extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Submit extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
index 8a34a1d..b2e1586 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_textarea extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Textarea extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
index deaa477..404c399 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_domain_model_json_textline extends tx_form_domain_model_json_element {
+class tx_form_Domain_Model_JSON_Textline extends tx_form_Domain_Model_JSON_Element {
        /**
         * The ExtJS xtype of the element
         *
index 095103d..e0a4729 100644 (file)
@@ -24,7 +24,7 @@
 ***************************************************************/
 
 /**
- * Repository for tx_form_domain_model_content
+ * Repository for tx_form_Domain_Model_Content
  *
  * @category Repository
  * @package TYPO3
  * @license http://www.gnu.org/copyleft/gpl.html
  * @version $Id$
  */
-class tx_form_domain_repository_content {
+class tx_form_Domain_Repository_Content {
        /**
         * Get the referenced record from the database
         *
         * Using the GET or POST variable 'P'
         *
-        * @return mixed|tx_form_domain_model_content if found, FALSE if not
+        * @return mixed|tx_form_Domain_Model_Content if found, FALSE if not
         */
        public function getRecord() {
                $record = FALSE;
@@ -54,8 +54,8 @@ class tx_form_domain_repository_content {
                        $typoScriptParser = t3lib_div::makeInstance('t3lib_tsparser');
                        $typoScriptParser->parse($row['bodytext']);
 
-                       /** @var $record tx_form_domain_model_content */
-                       $record = t3lib_div::makeInstance('tx_form_domain_model_content');
+                       /** @var $record tx_form_Domain_Model_Content */
+                       $record = t3lib_div::makeInstance('tx_form_Domain_Model_Content');
                        $record->setUid($row['uid']);
                        $record->setPageId($row['pid']);
                        $record->setTyposcript($typoScriptParser->setup);
@@ -91,8 +91,8 @@ class tx_form_domain_repository_content {
                $parameters = t3lib_div::_GP('P');
                $success = FALSE;
 
-               /** @var $converter tx_form_domain_factory_jsontotyposcript */
-               $converter = t3lib_div::makeInstance('tx_form_domain_factory_jsontotyposcript');
+               /** @var $converter tx_form_Domain_Factory_JsonToTyposcript */
+               $converter = t3lib_div::makeInstance('tx_form_Domain_Factory_JsonToTyposcript');
                $typoscript = $converter->convert($json);
 
                if ($typoscript) {
@@ -128,8 +128,8 @@ class tx_form_domain_repository_content {
                if ($record) {
                        $typoscript = $record->getTyposcript();
 
-                       /** @var $converter tx_form_domain_factory_typoscripttojson */
-                       $converter = t3lib_div::makeInstance('tx_form_domain_factory_typoscripttojson');
+                       /** @var $converter tx_form_Domain_Factory_TyposcriptToJson */
+                       $converter = t3lib_div::makeInstance('tx_form_Domain_Factory_TyposcriptToJson');
                        $json = $converter->convert($typoscript);
                }
 
index 0146b1e..ac9d0f7 100644 (file)
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
 
-class tx_form_exception_general extends Exception {
+class tx_form_Exception_General extends Exception {
 
        function __construct() {
                parent::__construct('general error', 1000);
        }
 
        function _toString() {
-               return "tx_form_exception_general at line {$this->getLine()} on {$this->getFile()} Message: {$this->getMessage()}";
+               return "tx_form_Exception_General at line {$this->getLine()} on {$this->getFile()} Message: {$this->getMessage()}";
        }
 }
 ?>
\ No newline at end of file
index 0071368..8d404be 100644 (file)
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
 
-class tx_form_exception_loader extends Exception {
+class tx_form_Exception_Loader extends Exception {
 
        function __construct() {
                parent::__construct('file not found', 1100);
        }
 
        function _toString() {
-               return "tx_form_exception_loader at line {$this->getLine()} on {$this->getFile()} Message: {$this->getMessage()}";
+               return "tx_form_Exception_Loader at line {$this->getLine()} on {$this->getFile()} Message: {$this->getMessage()}";
        }
 }
 ?>
\ No newline at end of file
index 1cdae38..8666382 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_elementcounter implements t3lib_Singleton {
+class tx_form_System_Elementcounter implements t3lib_Singleton {
 
        /**
         * Counter
index abbe4d2..b225272 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_alphabetic implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Alphabetic implements tx_form_System_Filter_Interface {
 
        /**
         * Allow whitespace
index 7525590..8b5819a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_alphanumeric implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Alphanumeric implements tx_form_System_Filter_Interface {
 
        /**
         * Allow whitespace
index 1559bf0..ea44497 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_currency implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Currency implements tx_form_System_Filter_Interface {
 
        /**
         * Separator between group of thousands
@@ -62,7 +62,7 @@ class tx_form_system_filter_currency implements tx_form_system_filter_interface
         * Set the decimal point character
         *
         * @param string $decimalsPoint Character used for decimal point
-        * @return tx_form_filter_currency
+        * @return tx_form_Filter_Currency
         */
        public function setDecimalsPoint($decimalsPoint = '.') {
                if(empty($decimalsPoint)) {
@@ -78,7 +78,7 @@ class tx_form_system_filter_currency implements tx_form_system_filter_interface
         * Set the thousand separator character
         *
         * @param string $thousandSeparator Character used for thousand separator
-        * @return tx_form_filter_currency
+        * @return tx_form_Filter_Currency
         */
        public function setThousandSeparator($thousandSeparator = ',') {
                if(empty($thousandSeparator)) {
index 7fbf2dc..9a34da9 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_digit implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Digit implements tx_form_System_Filter_Interface {
 
        /**
         * Constructor
index a258ac1..e5da46a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter implements tx_form_system_filter_interface {
+class tx_form_System_Filter implements tx_form_System_Filter_Interface {
 
        /**
         * Array with filter objects to use
@@ -57,7 +57,7 @@ class tx_form_system_filter implements tx_form_system_filter_interface {
         *
         * @param string $class Name of the filter
         * @param mixed $value Typoscript configuration
-        * @return tx_form_filter
+        * @return tx_form_Filter
         */
        public function addFilter($filter) {
                $this->filters[] = (object) $filter;
@@ -75,7 +75,7 @@ class tx_form_system_filter implements tx_form_system_filter_interface {
         */
        public function makeFilter($class, $arguments = array()) {
                $class = strtolower((string) $class);
-               $className = 'tx_form_system_filter_' . $class;
+               $className = 'tx_form_System_Filter_' . ucfirst($class);
 
                $filter = t3lib_div::makeInstance($className, $arguments);
 
@@ -108,7 +108,7 @@ class tx_form_system_filter implements tx_form_system_filter_interface {
         */
        public static function get($class, $value, array $arguments = array()) {
                $class = strtolower((string) $class);
-               $className = 'tx_form_system_filter_' . $class;
+               $className = 'tx_form_System_Filter_' . ucfirst($class);
 
                $object = t3lib_div::makeInstance($className, $arguments);
 
index bea39b4..46ce09a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_integer implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Integer implements tx_form_System_Filter_Interface {
 
        /**
         * Constructor
index 0265d80..a743745 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-interface tx_form_system_filter_interface {
+interface tx_form_System_Filter_Interface {
 
        /**
         * Return filtered value
index 96a5ddd..3394da7 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_lowercase implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Lowercase implements tx_form_System_Filter_Interface {
 
        /**
         * Constructor
index 7ceecf7..df39e80 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_regexp implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Regexp implements tx_form_System_Filter_Interface {
 
        /**
         * Regular expression for filter
index cbe4a8e..4987365 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_removexss implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Removexss implements tx_form_System_Filter_Interface {
 
        /**
         * Constructor
index 63839c1..ac950ee 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_stripnewlines implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Stripnewlines implements tx_form_System_Filter_Interface {
 
        /**
         * Constructor
index bd08e7d..68b3e5c 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_titlecase implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Titlecase implements tx_form_System_Filter_Interface {
 
        /**
         * Constructor
index c70cac1..de47b82 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_trim implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Trim implements tx_form_System_Filter_Interface {
 
        /**
         * Characters used by trim filter
@@ -54,7 +54,7 @@ class tx_form_system_filter_trim implements tx_form_system_filter_interface {
         * in addition to the default trim characters
         *
         * @param  string $characterList
-        * @return tx_form_filter_trim
+        * @return tx_form_Filter_Trim
         */
        public function setCharacterList($characterList) {
                $this->characterList = $characterList;
index dfa3741..e1a5ef9 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_filter_uppercase implements tx_form_system_filter_interface {
+class tx_form_System_Filter_Uppercase implements tx_form_System_Filter_Interface {
 
        /**
         * Constructor
index eb4cca7..64e2ad6 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_layout implements t3lib_Singleton {
+class tx_form_System_Layout implements t3lib_Singleton {
 
        /**
         * Layout array from form configuration
@@ -75,7 +75,7 @@ class tx_form_system_layout implements t3lib_Singleton {
         * Overrides the default layout configuration for one or more elements
         *
         * @param array $layout The layout array
-        * @return tx_form_system_layout
+        * @return tx_form_System_Layout
         */
        public function setLayout($layout = array()) {
                if(!empty($layout)) {
@@ -91,7 +91,7 @@ class tx_form_system_layout implements t3lib_Singleton {
         *
         * @param string $elementName Type of object
         * @param string $layout XML containing layout for element
-        * @return tx_form_system_layout
+        * @return tx_form_System_Layout
         */
        public function setLayoutByElement($elementName, $layout) {
                $this->layout[$elementName] = (string) $layout;
index 96061b8..c91132f 100644 (file)
@@ -21,7 +21,6 @@
 *
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
-require_once(t3lib_extMgm::extPath('form') . 'Classes/Exception/class.tx_form_exception_loader.php');
 
 /**
  * Static methods for loading classes
@@ -30,7 +29,7 @@ require_once(t3lib_extMgm::extPath('form') . 'Classes/Exception/class.tx_form_ex
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_loader {
+class tx_form_System_Loader {
 
        /**
         * Loads a file from a classname
@@ -58,7 +57,7 @@ class tx_form_system_loader {
                include_once(t3lib_extMgm::extPath('form') . $file);
 
                if (!class_exists($className, FALSE)) {
-                       throw new tx_form_exception_loader ('File "' . $file . '" not found. Class "' . $className . '" does not exist.');
+                       throw new tx_form_Exception_Loader ('File "' . $file . '" not found. Class "' . $className . '" does not exist.');
                }
 
                return $className;
index e2b44fb..df0d44a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_localization implements t3lib_Singleton {
+class tx_form_System_Localization implements t3lib_Singleton {
 
        /**
         * File reference to the local language file
index c55204a..17c77eb 100644 (file)
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_postprocessor_mail {
+class tx_form_System_Postprocessor_Mail {
 
        /**
         * Constructor
         *
-        * @param $form tx_form_domain_model_form Form domain model
+        * @param $form tx_form_Domain_Model_Form Form domain model
         * @param $typoscript array Post processor TypoScript settings
         * @return void
         */
-       public function __construct(tx_form_domain_model_form $form, array $typoScript) {
+       public function __construct(tx_form_Domain_Model_Form $form, array $typoScript) {
                $this->form = $form;
                $this->typoScript = $typoScript;
                $this->mailMessage = t3lib_div::makeInstance('t3lib_mail_Message');
-               $this->requestHandler = t3lib_div::makeInstance('tx_form_system_request');
+               $this->requestHandler = t3lib_div::makeInstance('tx_form_System_Request');
        }
 
        /**
@@ -227,7 +227,7 @@ class tx_form_system_postprocessor_mail {
         */
        protected function setHtmlContent() {
                $view = t3lib_div::makeInstance(
-                       'tx_form_view_mail_html',
+                       'tx_form_View_Mail_Html',
                        $this->form,
                        $this->typoScript
                );
@@ -244,7 +244,7 @@ class tx_form_system_postprocessor_mail {
         */
        protected function setPlainContent() {
                $view = t3lib_div::makeInstance(
-                       'tx_form_view_mail_plain',
+                       'tx_form_View_Mail_Plain',
                        $this->form
                );
                $plainContent = $view->render();
@@ -274,7 +274,7 @@ class tx_form_system_postprocessor_mail {
         */
        protected function render() {
                $view = t3lib_div::makeInstance(
-                       'tx_form_view_mail',
+                       'tx_form_View_Mail',
                        $this->mailMessage,
                        $this->typoScript
                );
@@ -307,7 +307,7 @@ class tx_form_system_postprocessor_mail {
                $values = $this->requestHandler->getByMethod();
 
                foreach ($formElements as $element) {
-                       if (is_a($element, 'tx_form_domain_model_element_fileupload')) {
+                       if (is_a($element, 'tx_form_Domain_Model_Element_Fileupload')) {
                                $elementName = $element->getName();
                                if (is_array($values[$elementName])) {
                                        if (file_exists($values[$elementName]['tempFilename'])) {
index d8758f1..4bfd402 100644 (file)
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_postprocessor {
+class tx_form_System_Postprocessor {
 
        /**
         * Constructor
         *
-        * @param $form tx_form_domain_model_form Form domain model
+        * @param $form tx_form_Domain_Model_Form Form domain model
         * @param $typoscript array Post processor TypoScript settings
         * @return void
         */
-       public function __construct(tx_form_domain_model_form $form, array $typoScript) {
+       public function __construct(tx_form_Domain_Model_Form $form, array $typoScript) {
                $this->form = $form;
                $this->typoScript = $typoScript;
        }
@@ -57,7 +57,7 @@ class tx_form_system_postprocessor {
                if (is_array($this->typoScript)) {
                        $keys = t3lib_TStemplate::sortedKeyList($this->typoScript);
                        foreach ($keys as $key) {
-                               $className = 'tx_form_system_postprocessor_' . strtolower($this->typoScript[$key]);
+                               $className = 'tx_form_System_Postprocessor_' . ucfirst(strtolower($this->typoScript[$key]));
                                if (intval($key) && !strstr($key, '.')) {
                                        if(isset($this->typoScript[$key . '.'])) {
                                                $processorArguments = $this->typoScript[$key . '.'];
index ee072fd..e3e8a1c 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_request implements t3lib_Singleton {
+class tx_form_System_Request implements t3lib_Singleton {
 
        /**
         * Prefix for the name attributes
index fcdfc44..7b91aa7 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-abstract class tx_form_system_validate_abstract implements tx_form_system_validate_interface {
+abstract class tx_form_System_Validate_Abstract implements tx_form_System_Validate_Interface {
 
        /**
         * The name of the field for the rule
@@ -68,14 +68,14 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
        /**
         * Localization handler object
         *
-        * @var tx_form_localizationhandler
+        * @var tx_form_Localizationhandler
         */
        protected $localizationHandler;
 
        /**
         * Request handler object
         *
-        * @var tx_form_requesthandler
+        * @var tx_form_Requesthandler
         */
        protected $requestHandler;
 
@@ -94,8 +94,8 @@ abstract class tx_form_system_validate_abstract implements tx_form_system_valida
         */
        public function __construct($arguments) {
                $this->localCobj = t3lib_div::makeInstance('tslib_cObj');
-               $this->requestHandler = t3lib_div::makeInstance('tx_form_system_request');
-               $this->localizationHandler = t3lib_div::makeInstance('tx_form_system_localization');
+               $this->requestHandler = t3lib_div::makeInstance('tx_form_System_Request');
+               $this->localizationHandler = t3lib_div::makeInstance('tx_form_System_Localization');
                $this->setFieldName($arguments['element']);
                $this->setMessage($arguments['message.'], $arguments['message']);
                $this->setShowMessage($arguments['showMessage']);
index 3fa7c5f..b4a0ad3 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_alphabetic extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Alphabetic extends tx_form_System_Validate_Abstract {
 
        /**
         * Allow white space in the submitted value
@@ -41,7 +41,7 @@ class tx_form_system_validate_alphabetic extends tx_form_system_validate_abstrac
        /**
         * Alphabetic filter used for validation
         *
-        * @var tx_form_filter_alphabetic
+        * @var tx_form_Filter_Alphabetic
         */
        protected $filter;
 
@@ -62,13 +62,13 @@ class tx_form_system_validate_alphabetic extends tx_form_system_validate_abstrac
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
                        $value = $this->requestHandler->getByMethod($this->fieldName);
                        if ($this->filter === NULL) {
-                               $className = 'tx_form_system_filter_alphabetic';
+                               $className = 'tx_form_System_Filter_Alphabetic';
                                $this->filter = t3lib_div::makeInstance($className);
                        }
 
@@ -103,7 +103,7 @@ class tx_form_system_validate_alphabetic extends tx_form_system_validate_abstrac
         *
         * @return string The local language message label
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/validate/tx_form_system_validate_abstract#_getLocalLanguageLabel()
+        * @see tx_form_System_Validate_Abstract::_getLocalLanguageLabel()
         */
        protected function getLocalLanguageLabel() {
                $label = get_class($this) . '.message';
index 5a4e344..07b9bc5 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_alphanumeric extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Alphanumeric extends tx_form_System_Validate_Abstract {
 
        /**
         * Allow white space in the submitted value
@@ -55,13 +55,13 @@ class tx_form_system_validate_alphanumeric extends tx_form_system_validate_abstr
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
                        $value = $this->requestHandler->getByMethod($this->fieldName);
                        if ($this->filter === NULL) {
-                               $className = 'tx_form_system_filter_alphanumeric';
+                               $className = 'tx_form_System_Filter_Alphanumeric';
                                $this->filter = t3lib_div::makeInstance($className);
                        }
 
@@ -96,7 +96,7 @@ class tx_form_system_validate_alphanumeric extends tx_form_system_validate_abstr
         *
         * @return string The local language message label
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/validate/tx_form_system_validate_abstract#_getLocalLanguageLabel()
+        * @see tx_form_System_Validate_Abstract::_getLocalLanguageLabel()
         */
        protected function getLocalLanguageLabel() {
                $label = get_class($this) . '.message';
index 8c5ef1c..534c611 100644 (file)
@@ -30,7 +30,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_between extends tx_form_system_validate_abstract implements tx_form_system_validate_interface {
+class tx_form_System_Validate_Between extends tx_form_System_Validate_Abstract implements tx_form_System_Validate_Interface {
 
        /**
         * Minimum value
@@ -72,7 +72,7 @@ class tx_form_system_validate_between extends tx_form_system_validate_abstract i
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
@@ -136,7 +136,7 @@ class tx_form_system_validate_between extends tx_form_system_validate_abstract i
         *
         * @return string The local language message label
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/validate/tx_form_system_validate_abstract#_getLocalLanguageLabel()
+        * @see tx_form_System_Validate_Abstract::_getLocalLanguageLabel()
         */
        protected function getLocalLanguageLabel($type) {
                $label = get_class($this) . '.' . $type;
index c12bc8e..02a19b7 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_date extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Date extends tx_form_System_Validate_Abstract {
 
        /**
         * strftime format for date
@@ -55,7 +55,7 @@ class tx_form_system_validate_date extends tx_form_system_validate_abstract {
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 9e6b04b..9c90bbb 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_digit extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Digit extends tx_form_System_Validate_Abstract {
 
        /**
         * Constructor
@@ -46,13 +46,13 @@ class tx_form_system_validate_digit extends tx_form_system_validate_abstract {
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
                        $value = $this->requestHandler->getByMethod($this->fieldName);
                        if ($this->filter === NULL) {
-                               $className = 'tx_form_system_filter_digit';
+                               $className = 'tx_form_System_Filter_Digit';
                                $this->filter = t3lib_div::makeInstance($className);
                        }
 
index 77fa2cc..7bc0345 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_email extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Email extends tx_form_System_Validate_Abstract {
 
        /**
         * Constructor
@@ -46,7 +46,7 @@ class tx_form_system_validate_email extends tx_form_system_validate_abstract {
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 3429c32..f4a4e6a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_equals extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Equals extends tx_form_System_Validate_Abstract {
 
        /**
         * Field to compare with value
@@ -55,7 +55,7 @@ class tx_form_system_validate_equals extends tx_form_system_validate_abstract {
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 52007e4..80e0e10 100644 (file)
@@ -30,7 +30,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_fileallowedtypes extends tx_form_system_validate_abstract implements tx_form_system_validate_interface {
+class tx_form_System_Validate_Fileallowedtypes extends tx_form_System_Validate_Abstract implements tx_form_System_Validate_Interface {
 
        /**
         * The allowed types
@@ -56,7 +56,7 @@ class tx_form_system_validate_fileallowedtypes extends tx_form_system_validate_a
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 62af4fc..d063049 100644 (file)
@@ -30,7 +30,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_filemaximumsize extends tx_form_system_validate_abstract implements tx_form_system_validate_interface {
+class tx_form_System_Validate_Filemaximumsize extends tx_form_System_Validate_Abstract implements tx_form_System_Validate_Interface {
 
        /**
         * Maximum value
@@ -56,7 +56,7 @@ class tx_form_system_validate_filemaximumsize extends tx_form_system_validate_ab
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 7e8761d..d2f93bf 100644 (file)
@@ -30,7 +30,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_fileminimumsize extends tx_form_system_validate_abstract implements tx_form_system_validate_interface {
+class tx_form_System_Validate_Fileminimumsize extends tx_form_System_Validate_Abstract implements tx_form_System_Validate_Interface {
 
        /**
         * Minimum value
@@ -56,7 +56,7 @@ class tx_form_system_validate_fileminimumsize extends tx_form_system_validate_ab
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index a1b85f8..9982728 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_float extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Float extends tx_form_System_Validate_Abstract {
 
        /**
         * Constructor
@@ -46,7 +46,7 @@ class tx_form_system_validate_float extends tx_form_system_validate_abstract {
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 2146215..9aca661 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_greaterthan extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Greaterthan extends tx_form_System_Validate_Abstract {
 
        /**
         * Minimum value
@@ -55,7 +55,7 @@ class tx_form_system_validate_greaterthan extends tx_form_system_validate_abstra
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 77b9d56..3faa5c9 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_inarray extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Inarray extends tx_form_System_Validate_Abstract {
 
        /**
         * Haystack to search in
@@ -63,7 +63,7 @@ class tx_form_system_validate_inarray extends tx_form_system_validate_abstract {
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 8f9cf84..248a484 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_integer extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Integer extends tx_form_System_Validate_Abstract {
 
        /**
         * Constructor
@@ -46,7 +46,7 @@ class tx_form_system_validate_integer extends tx_form_system_validate_abstract {
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 9243bac..9124bfe 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-interface tx_form_system_validate_interface {
+interface tx_form_System_Validate_Interface {
 
        /**
         * Set the fieldName
index 536dc2a..15b188f 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_ip extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Ip extends tx_form_System_Validate_Abstract {
 
        /**
         * Constructor
@@ -46,7 +46,7 @@ class tx_form_system_validate_ip extends tx_form_system_validate_abstract {
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 3a595a1..531dcc8 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_length extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Length extends tx_form_System_Validate_Abstract {
 
        /**
         * Minimum value
@@ -63,7 +63,7 @@ class tx_form_system_validate_length extends tx_form_system_validate_abstract {
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
@@ -116,7 +116,7 @@ class tx_form_system_validate_length extends tx_form_system_validate_abstract {
         *
         * @return string The local language message label
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/validate/tx_form_system_validate_abstract#_getLocalLanguageLabel()
+        * @see tx_form_System_Validate_Abstract::_getLocalLanguageLabel()
         */
        protected function getLocalLanguageLabel($type) {
                $label = get_class($this) . '.' . $type;
index dcafd82..1f80653 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_lessthan extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Lessthan extends tx_form_System_Validate_Abstract {
 
        /**
         * Maximum value
@@ -55,7 +55,7 @@ class tx_form_system_validate_lessthan extends tx_form_system_validate_abstract
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index a982762..9b149dc 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_regexp extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Regexp extends tx_form_System_Validate_Abstract {
 
        /**
         * Regular expression for rule
@@ -55,7 +55,7 @@ class tx_form_system_validate_regexp extends tx_form_system_validate_abstract {
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 4da30b4..a4fbe5d 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_required extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Required extends tx_form_System_Validate_Abstract {
 
        /**
         * Constructor
@@ -46,7 +46,7 @@ class tx_form_system_validate_required extends tx_form_system_validate_abstract
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index be0f6ac..e7112ae 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate_uri extends tx_form_system_validate_abstract {
+class tx_form_System_Validate_Uri extends tx_form_System_Validate_Abstract {
 
        /**
         * Constructor
@@ -46,7 +46,7 @@ class tx_form_system_validate_uri extends tx_form_system_validate_abstract {
         *
         * @return boolean
         * @author Patrick Broens <patrick@patrickbroens.nl>
-        * @see typo3/sysext/form/interfaces/tx_form_system_validate_interface#isValid()
+        * @see tx_form_System_Validate_Interface::isValid()
         */
        public function isValid() {
                if($this->requestHandler->has($this->fieldName)) {
index 52562e6..9d1eead 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_system_validate implements t3lib_Singleton {
+class tx_form_System_Validate implements t3lib_Singleton {
 
        /**
         * Validation objects to use
@@ -70,7 +70,7 @@ class tx_form_system_validate implements t3lib_Singleton {
         */
        public function createRule($class, $arguments = array()) {
                $class = strtolower((string) $class);
-               $className = 'tx_form_system_validate_' . $class;
+               $className = 'tx_form_System_Validate_' . ucfirst($class);
 
                $rule = t3lib_div::makeInstance($className, $arguments);
 
@@ -84,7 +84,7 @@ class tx_form_system_validate implements t3lib_Singleton {
         * @param object $rule Rule object
         * @param string $fieldName Field name the rule belongs to
         * @param boolean $breakOnError Break the rule chain when TRUE
-        * @return tx_form_validate
+        * @return tx_form_Validate
         */
        public function addRule($rule, $fieldName, $breakOnError = FALSE) {
                $this->rules[] = array(
index 4acd02b..f70faca 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_additional extends tx_form_view_confirmation_element_abstract {
+class tx_form_View_Confirmation_Additional extends tx_form_View_Confirmation_Element_Abstract {
 
        /**
         * The model for the current object
@@ -54,8 +54,9 @@ class tx_form_view_confirmation_additional extends tx_form_view_confirmation_ele
         * @return string The value of the additional
         */
        public function getAdditionalValue() {
-               $type = preg_replace('/.*_([^_]*)$/', "$1", get_class($this), 1);
-               return htmlspecialchars($this->model->getAdditionalValue($type));
+               return htmlspecialchars($this->model->getAdditionalValue(
+                       $this->getLastPartOfClassName(TRUE)
+               ));
        }
 }
 ?>
\ No newline at end of file
index 6879e33..be69c35 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_additional_label extends tx_form_view_confirmation_additional {
+class tx_form_View_Confirmation_Additional_Label extends tx_form_View_Confirmation_Additional {
 
        /**
         * Default layout of this object
index 1d2abda..3f08436 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_additional_legend extends tx_form_view_confirmation_additional {
+class tx_form_View_Confirmation_Additional_Legend extends tx_form_View_Confirmation_Additional {
 
        /**
         * Default layout of this object
index c25c6c2..9137d19 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation extends tx_form_view_confirmation_element_container {
+class tx_form_View_Confirmation extends tx_form_View_Confirmation_Element_Container {
 
        /**
         * Default layout of this object
@@ -49,7 +49,7 @@ class tx_form_view_confirmation extends tx_form_view_confirmation_element_contai
        /**
         * The localization handler
         *
-        * @var tx_form_system_localization
+        * @var tx_form_System_Localization
         */
        protected $localizationHandler;
 
@@ -65,10 +65,10 @@ class tx_form_view_confirmation extends tx_form_view_confirmation_element_contai
         *
         * @return void
         */
-       public function __construct(tx_form_domain_model_form $model, array $typoscript) {
+       public function __construct(tx_form_Domain_Model_Form $model, array $typoscript) {
                $this->localCobj = t3lib_div::makeInstance('tslib_cObj');
                $this->localizationHandler = t3lib_div::makeInstance(
-                       'tx_form_system_localization'
+                       'tx_form_System_Localization'
                );
                $this->typoscript = $typoscript;
                parent::__construct($model);
@@ -77,10 +77,10 @@ class tx_form_view_confirmation extends tx_form_view_confirmation_element_contai
        /**
         * Set the data for the FORM tag
         *
-        * @param tx_form_domain_model_form $formModel The model of the form
+        * @param tx_form_Domain_Model_Form $formModel The model of the form
         * @return void
         */
-       public function setData(tx_form_domain_model_form $model) {
+       public function setData(tx_form_Domain_Model_Form $model) {
                $this->model = (object) $model;
        }
 
@@ -139,7 +139,7 @@ class tx_form_view_confirmation extends tx_form_view_confirmation_element_contai
        }
 
        protected function getConfirmationButtons() {
-               $requestHandler = t3lib_div::makeInstance('tx_form_system_request');
+               $requestHandler = t3lib_div::makeInstance('tx_form_System_Request');
                $prefix = $requestHandler->getPrefix();
                $action = $this->localCobj->getTypoLink_URL($GLOBALS['TSFE']->id);
 
index a378bb9..944ffdc 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-abstract class tx_form_view_confirmation_element_abstract {
+abstract class tx_form_View_Confirmation_Element_Abstract {
 
        /**
         * The model for the current object
@@ -107,7 +107,7 @@ abstract class tx_form_view_confirmation_element_abstract {
                                                        }
                                                        break;
                                                case 'label':
-                                                       if(!strstr(get_class($this), '_additional_')) {
+                                                       if(!strstr(get_class($this), '_Additional_')) {
                                                                if($this->model->additionalIsSet($nodeName)) {
                                                                        $this->replaceNodeWithFragment($dom, $node, $this->getAdditional('label'));
                                                                }
@@ -119,7 +119,7 @@ abstract class tx_form_view_confirmation_element_abstract {
                                                        }
                                                        break;
                                                case 'legend':
-                                                       if(!strstr(get_class($this), '_additional_')) {
+                                                       if(!strstr(get_class($this), '_Additional_')) {
                                                                if($this->model->additionalIsSet($nodeName)) {
                                                                        $this->replaceNodeWithFragment($dom, $node, $this->getAdditional('legend'));
                                                                }
@@ -211,26 +211,31 @@ abstract class tx_form_view_confirmation_element_abstract {
         * @return string HTML string of the layout to use for this element
         */
        public function getLayout($type) {
-               $layoutHandler = t3lib_div::makeInstance('tx_form_system_layout');
+               /** @var $layoutHandler tx_form_System_Layout */
+               $layoutHandler = t3lib_div::makeInstance('tx_form_System_Layout');
 
                switch($type) {
                        case 'element':
                                $layoutDefault = $this->layout;
-                               $configurationKey = 'layout';
-                               $objectClass = get_class($this);
-                               $type = preg_replace('/.*_([^_]*)$/', "$1", $objectClass, 1);
-
-                               $layout = $layoutHandler->getLayoutByObject($type, $layoutDefault);
+                               $layout = $layoutHandler->getLayoutByObject(
+                                       $this->getLastPartOfClassName(TRUE),
+                                       $layoutDefault
+                               );
                                break;
                        case 'elementWrap':
                                $layoutDefault = $this->elementWrap;
-                               $elementWrap = $layoutHandler->getLayoutByObject($type, $layoutDefault);
-
+                               $elementWrap = $layoutHandler->getLayoutByObject(
+                                       $type,
+                                       $layoutDefault
+                               );
                                $layout = str_replace('<element />', $this->getLayout('element'), $elementWrap);
                                break;
                        case 'containerWrap':
                                $layoutDefault = $this->containerWrap;
-                               $layout = $layoutHandler->getLayoutByObject($type, $layoutDefault);
+                               $layout = $layoutHandler->getLayoutByObject(
+                                       $type,
+                                       $layoutDefault
+                               );
                                break;
                }
 
@@ -311,7 +316,7 @@ abstract class tx_form_view_confirmation_element_abstract {
         */
        protected function createAdditional($class) {
                $class = strtolower((string) $class);
-               $className = 'tx_form_view_confirmation_additional_' . $class;
+               $className = 'tx_form_View_Confirmation_Additional_' . ucfirst($class);
 
                return t3lib_div::makeInstance($className, $this->model);
        }
@@ -362,5 +367,22 @@ abstract class tx_form_view_confirmation_element_abstract {
        public function noWrap() {
                return $this->noWrap;
        }
+
+       /**
+        * Gets the last part of the current object's class name.
+        * e.g. for 'tx_form_View_Confirmation_Additional' it will be 'Additional'
+        *
+        * @param boolean $lowercase Whether to convert to lowercase
+        * @return string
+        */
+       protected function getLastPartOfClassName($lowercase = FALSE) {
+               $lastPart = preg_replace('/.*_([^_]*)$/', '${1}', get_class($this), 1);
+
+               if ($lowercase) {
+                       $lastPart = strtolower($lastPart);
+               }
+
+               return $lastPart;
+       }
 }
 ?>
\ No newline at end of file
index 9d31b7b..f1254bc 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_checkbox extends tx_form_view_confirmation_element_abstract {
+class tx_form_View_Confirmation_Element_Checkbox extends tx_form_View_Confirmation_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_confirmation_element_checkbox extends tx_form_view_confirmati
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_checkbox $model Model for this element
+        * @param tx_form_Domain_Model_Element_Checkbox $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_checkbox $model) {
+       public function __construct(tx_form_Domain_Model_Element_Checkbox $model) {
                parent::__construct($model);
        }
 }
index 92409c5..4dbfbeb 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_checkboxgroup extends tx_form_view_confirmation_element_fieldset {
+class tx_form_View_Confirmation_Element_Checkboxgroup extends tx_form_View_Confirmation_Element_Fieldset {
 
        /**
         * Default layout of this object
@@ -46,10 +46,10 @@ class tx_form_view_confirmation_element_checkboxgroup extends tx_form_view_confi
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_checkboxgroup $model Model for this element
+        * @param tx_form_Domain_Model_Element_Checkboxgroup $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_checkboxgroup $model) {
+       public function __construct(tx_form_Domain_Model_Element_Checkboxgroup $model) {
                parent::__construct($model);
        }
 }
index 6bf650e..f0feff9 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_container extends tx_form_view_confirmation_element_abstract {
+class tx_form_View_Confirmation_Element_Container extends tx_form_View_Confirmation_Element_Abstract {
 
        /**
         * Default layout of the container
@@ -96,9 +96,9 @@ class tx_form_view_confirmation_element_container extends tx_form_view_confirmat
                $childElement = NULL;
 
                $modelChildClass = get_class($modelChild);
-               $class = preg_replace('/.*_([^_]*)$/', "$1", $modelChildClass, 1);
+               $class = preg_replace('/.*_([^_]*)$/', '${1}', $modelChildClass, 1);
 
-               $className = 'tx_form_view_confirmation_element_' . $class;
+               $className = 'tx_form_View_Confirmation_Element_' . ucfirst($class);
 
                if (class_exists($className)) {
                        $childElement = t3lib_div::makeInstance($className, $modelChild);
index ac94510..05069e9 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_fieldset extends tx_form_view_confirmation_element_container {
+class tx_form_View_Confirmation_Element_Fieldset extends tx_form_View_Confirmation_Element_Container {
 
        /**
         * Default layout of this object
@@ -46,10 +46,10 @@ class tx_form_view_confirmation_element_fieldset extends tx_form_view_confirmati
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_fieldset $model Model for this element
+        * @param tx_form_Domain_Model_Element_Fieldset $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_fieldset $model) {
+       public function __construct(tx_form_Domain_Model_Element_Fieldset $model) {
                parent::__construct($model);
        }
 }
index 666eefb..22ebde2 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_fileupload extends tx_form_view_confirmation_element_abstract {
+class tx_form_View_Confirmation_Element_Fileupload extends tx_form_View_Confirmation_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_confirmation_element_fileupload extends tx_form_view_confirma
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_fileupload $model Model for this element
+        * @param tx_form_Domain_Model_Element_Fileupload $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_fileupload $model) {
+       public function __construct(tx_form_Domain_Model_Element_Fileupload $model) {
                parent::__construct($model);
        }
 }
index 3975f0b..acbad81 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_optgroup extends tx_form_view_confirmation_element_container {
+class tx_form_View_Confirmation_Element_Optgroup extends tx_form_View_Confirmation_Element_Container {
 
        /**
         * Default layout of this object
@@ -51,10 +51,10 @@ class tx_form_view_confirmation_element_optgroup extends tx_form_view_confirmati
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_optgroup $model Model for this element
+        * @param tx_form_Domain_Model_Element_Optgroup $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_optgroup $model) {
+       public function __construct(tx_form_Domain_Model_Element_Optgroup $model) {
                parent::__construct($model);
        }
 }
index eeec3b3..23cdeba 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_option extends tx_form_view_confirmation_element_abstract {
+class tx_form_View_Confirmation_Element_Option extends tx_form_View_Confirmation_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -43,10 +43,10 @@ class tx_form_view_confirmation_element_option extends tx_form_view_confirmation
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_option $model Model for this element
+        * @param tx_form_Domain_Model_Element_Option $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_option $model) {
+       public function __construct(tx_form_Domain_Model_Element_Option $model) {
                parent::__construct($model);
        }
 }
index 9d40546..c77ede3 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_radio extends tx_form_view_confirmation_element_abstract {
+class tx_form_View_Confirmation_Element_Radio extends tx_form_View_Confirmation_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_confirmation_element_radio extends tx_form_view_confirmation_
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_radio $model Model for this element
+        * @param tx_form_Domain_Model_Element_Radio $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_radio $model) {
+       public function __construct(tx_form_Domain_Model_Element_Radio $model) {
                parent::__construct($model);
        }
 }
index 69072a9..fbff7ab 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_radiogroup extends tx_form_view_confirmation_element_fieldset {
+class tx_form_View_Confirmation_Element_Radiogroup extends tx_form_View_Confirmation_Element_Fieldset {
 
        /**
         * Default layout of this object
@@ -46,10 +46,10 @@ class tx_form_view_confirmation_element_radiogroup extends tx_form_view_confirma
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_radiogroup $model Model for this element
+        * @param tx_form_Domain_Model_Element_Radiogroup $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_radiogroup $model) {
+       public function __construct(tx_form_Domain_Model_Element_Radiogroup $model) {
                parent::__construct($model);
        }
 }
index e666dd0..f066a90 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_select extends tx_form_view_confirmation_element_container {
+class tx_form_View_Confirmation_Element_Select extends tx_form_View_Confirmation_Element_Container {
 
        /**
         * Default layout of this object
@@ -46,10 +46,10 @@ class tx_form_view_confirmation_element_select extends tx_form_view_confirmation
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_select $model Model for this element
+        * @param tx_form_Domain_Model_Element_Select $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_select $model) {
+       public function __construct(tx_form_Domain_Model_Element_Select $model) {
                parent::__construct($model);
        }
 }
index 541e987..53ace1e 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_textarea extends tx_form_view_confirmation_element_abstract {
+class tx_form_View_Confirmation_Element_Textarea extends tx_form_View_Confirmation_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_confirmation_element_textarea extends tx_form_view_confirmati
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_textarea $model Model for this element
+        * @param tx_form_Domain_Model_Element_Textarea $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_textarea $model) {
+       public function __construct(tx_form_Domain_Model_Element_Textarea $model) {
                parent::__construct($model);
        }
 }
index cd0ea02..3cffd3f 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_confirmation_element_textline extends tx_form_view_confirmation_element_abstract {
+class tx_form_View_Confirmation_Element_Textline extends tx_form_View_Confirmation_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_confirmation_element_textline extends tx_form_view_confirmati
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_textline $model Model for this element
+        * @param tx_form_Domain_Model_Element_Textline $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_textline $model) {
+       public function __construct(tx_form_Domain_Model_Element_Textline $model) {
                parent::__construct($model);
        }
 }
index 52b841c..4f58301 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_additional extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Additional extends tx_form_View_Form_Element_Abstract {
 
        /**
         * The model for the current object
@@ -54,8 +54,12 @@ class tx_form_view_form_additional extends tx_form_view_form_element_abstract {
         * @return string The value of the additional
         */
        public function getAdditionalValue() {
-               $type = preg_replace('/.*_([^_]*)$/', "$1", get_class($this), 1);
-               return htmlspecialchars($this->model->getAdditionalValue($type), ENT_QUOTES);
+               return htmlspecialchars(
+                       $this->model->getAdditionalValue(
+                               $this->getLastPartOfClassName(TRUE)
+                       ),
+                       ENT_QUOTES
+               );
        }
 }
 ?>
\ No newline at end of file
index aa0d947..67e057e 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_additional_error extends tx_form_view_form_additional {
+class tx_form_View_Form_Additional_Error extends tx_form_View_Form_Additional {
 
        /**
         * Default layout of this object
index 4864721..99b94e9 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_additional_label extends tx_form_view_form_additional {
+class tx_form_View_Form_Additional_Label extends tx_form_View_Form_Additional {
 
        /**
         * Default layout of this object
index 2572354..db78ba7 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_additional_legend extends tx_form_view_form_additional {
+class tx_form_View_Form_Additional_Legend extends tx_form_View_Form_Additional {
 
        /**
         * Default layout of this object
index 8f54b84..cc0a773 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_additional_mandatory extends tx_form_view_form_additional {
+class tx_form_View_Form_Additional_Mandatory extends tx_form_View_Form_Additional {
 
        /**
         * Default layout of this object
index 3e3b2f2..b21df67 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-abstract class tx_form_view_form_element_abstract {
+abstract class tx_form_View_Form_Element_Abstract {
 
        /**
         * The model for the current object
@@ -106,7 +106,7 @@ abstract class tx_form_view_form_element_abstract {
                                                        $this->setAttributes($node);
                                                        break;
                                                case 'label':
-                                                       if(!strstr(get_class($this), '_additional_')) {
+                                                       if(!strstr(get_class($this), '_Additional_')) {
                                                                if($this->model->additionalIsSet($nodeName)) {
                                                                        $this->replaceNodeWithFragment($dom, $node, $this->getAdditional('label'));
                                                                }
@@ -120,7 +120,7 @@ abstract class tx_form_view_form_element_abstract {
                                                        }
                                                        break;
                                                case 'legend':
-                                                       if(!strstr(get_class($this), '_additional_')) {
+                                                       if(!strstr(get_class($this), '_Additional_')) {
                                                                if($this->model->additionalIsSet($nodeName)) {
                                                                        $this->replaceNodeWithFragment($dom, $node, $this->getAdditional('legend'));
                                                                }
@@ -206,16 +206,16 @@ abstract class tx_form_view_form_element_abstract {
         * @return string HTML string of the layout to use for this element
         */
        public function getLayout($type) {
-               $layoutHandler = t3lib_div::makeInstance('tx_form_system_layout');
+               /** @var $layoutHandler tx_form_System_Layout */
+               $layoutHandler = t3lib_div::makeInstance('tx_form_System_Layout');
 
                switch($type) {
                        case 'element':
                                $layoutDefault = $this->layout;
-                               $configurationKey = 'layout';
                                $objectClass = get_class($this);
-                               $type = preg_replace('/.*_([^_]*)$/', "$1", $objectClass, 1);
+                               $type = $this->getLastPartOfClassName(TRUE);
 
-                               if(strstr($objectClass, '_additional_')) {
+                               if(strstr($objectClass, '_Additional_')) {
                                        $additionalModel = $this->model->getAdditionalObjectByKey($type);
                                        $layoutOverride = $additionalModel->getLayout();
                                } else {
@@ -313,7 +313,7 @@ abstract class tx_form_view_form_element_abstract {
         */
        protected function createAdditional($class) {
                $class = strtolower((string) $class);
-               $className = 'tx_form_view_form_additional_' . $class;
+               $className = 'tx_form_View_Form_Additional_' . ucfirst($class);
 
                return t3lib_div::makeInstance($className, $this->model);
        }
@@ -363,5 +363,22 @@ abstract class tx_form_view_form_element_abstract {
        public function noWrap() {
                return $this->noWrap;
        }
+
+       /**
+        * Gets the last part of the current object's class name.
+        * e.g. for 'tx_form_View_Confirmation_Additional' it will be 'Additional'
+        *
+        * @param boolean $lowercase Whether to convert to lowercase
+        * @return string
+        */
+       protected function getLastPartOfClassName($lowercase = FALSE) {
+               $lastPart = preg_replace('/.*_([^_]*)$/', '${1}', get_class($this), 1);
+
+               if ($lowercase) {
+                       $lastPart = strtolower($lastPart);
+               }
+
+               return $lastPart;
+       }
 }
 ?>
\ No newline at end of file
index ed37b81..9c85aa2 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_button extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Button extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_form_element_button extends tx_form_view_form_element_abstrac
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_button $model Model for this element
+        * @param tx_form_Domain_Model_Element_Button $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_button $model) {
+       public function __construct(tx_form_Domain_Model_Element_Button $model) {
                parent::__construct($model);
        }
 }
index b4dbfe3..a309e37 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_checkbox extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Checkbox extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_form_element_checkbox extends tx_form_view_form_element_abstr
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_checkbox $model Model for this element
+        * @param tx_form_Domain_Model_Element_Checkbox $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_checkbox $model) {
+       public function __construct(tx_form_Domain_Model_Element_Checkbox $model) {
                parent::__construct($model);
        }
 }
index 16b4a52..ae6a89c 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_checkboxgroup extends tx_form_view_form_element_fieldset {
+class tx_form_View_Form_Element_Checkboxgroup extends tx_form_View_Form_Element_Fieldset {
 
        /**
         * Default layout of this object
@@ -46,10 +46,10 @@ class tx_form_view_form_element_checkboxgroup extends tx_form_view_form_element_
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_checkboxgroup $model Model for this element
+        * @param tx_form_Domain_Model_Element_Checkboxgroup $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_checkboxgroup $model) {
+       public function __construct(tx_form_Domain_Model_Element_Checkboxgroup $model) {
                parent::__construct($model);
        }
 }
index 8bac747..98fe0f1 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_container extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Container extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of the container
@@ -84,9 +84,9 @@ class tx_form_view_form_element_container extends tx_form_view_form_element_abst
         */
        public function createChildElementFromModel($modelChild) {
                $modelChildClass = get_class($modelChild);
-               $class = preg_replace('/.*_([^_]*)$/', "$1", $modelChildClass, 1);
+               $class = preg_replace('/.*_([^_]*)$/', '${1}', $modelChildClass, 1);
 
-               $className = 'tx_form_view_form_element_' . $class;
+               $className = 'tx_form_View_Form_Element_' . ucfirst($class);
 
                $childElement = t3lib_div::makeInstance($className, $modelChild);
 
index 7d5bebf..fdcd7f6 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_content extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Content extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -43,10 +43,10 @@ class tx_form_view_form_element_content extends tx_form_view_form_element_abstra
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_content $model Model for this element
+        * @param tx_form_Domain_Model_Element_Content $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_content $model) {
+       public function __construct(tx_form_Domain_Model_Element_Content $model) {
                parent::__construct($model);
        }
 }
index d628eaf..e56bfab 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_fieldset extends tx_form_view_form_element_container {
+class tx_form_View_Form_Element_Fieldset extends tx_form_View_Form_Element_Container {
 
        /**
         * Default layout of this object
@@ -46,10 +46,10 @@ class tx_form_view_form_element_fieldset extends tx_form_view_form_element_conta
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_fieldset $model Model for this element
+        * @param tx_form_Domain_Model_Element_Fieldset $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_fieldset $model) {
+       public function __construct(tx_form_Domain_Model_Element_Fieldset $model) {
                parent::__construct($model);
        }
 }
index 299b0c1..366f0cd 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_fileupload extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Fileupload extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_form_element_fileupload extends tx_form_view_form_element_abs
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_fileupload $model Model for this element
+        * @param tx_form_Domain_Model_Element_Fileupload $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_fileupload $model) {
+       public function __construct(tx_form_Domain_Model_Element_Fileupload $model) {
                parent::__construct($model);
        }
 }
index 516d800..b134ae8 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_hidden extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Hidden extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -43,10 +43,10 @@ class tx_form_view_form_element_hidden extends tx_form_view_form_element_abstrac
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_hidden $model Model for this element
+        * @param tx_form_Domain_Model_Element_Hidden $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_hidden $model) {
+       public function __construct(tx_form_Domain_Model_Element_Hidden $model) {
                parent::__construct($model);
        }
 }
index c61417c..793a00e 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_imagebutton extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Imagebutton extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_form_element_imagebutton extends tx_form_view_form_element_ab
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_imagebutton $model Model for this element
+        * @param tx_form_Domain_Model_Element_Imagebutton $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_imagebutton $model) {
+       public function __construct(tx_form_Domain_Model_Element_Imagebutton $model) {
                parent::__construct($model);
        }
 }
index 3cdfc68..e880a23 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_optgroup extends tx_form_view_form_element_container {
+class tx_form_View_Form_Element_Optgroup extends tx_form_View_Form_Element_Container {
 
        /**
         * Default layout of this object
@@ -53,10 +53,10 @@ class tx_form_view_form_element_optgroup extends tx_form_view_form_element_conta
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_optgroup $model Model for this element
+        * @param tx_form_Domain_Model_Element_Optgroup $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_optgroup $model) {
+       public function __construct(tx_form_Domain_Model_Element_Optgroup $model) {
                parent::__construct($model);
        }
 }
index 3487f5c..93f8f0a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_option extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Option extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -51,10 +51,10 @@ class tx_form_view_form_element_option extends tx_form_view_form_element_abstrac
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_option $model Model for this element
+        * @param tx_form_Domain_Model_Element_Option $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_option $model) {
+       public function __construct(tx_form_Domain_Model_Element_Option $model) {
                parent::__construct($model);
        }
 }
index c13a98b..597232e 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_password extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Password extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_form_element_password extends tx_form_view_form_element_abstr
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_password $model Model for this element
+        * @param tx_form_Domain_Model_Element_Password $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_password $model) {
+       public function __construct(tx_form_Domain_Model_Element_Password $model) {
                parent::__construct($model);
        }
 }
index 27bccff..a61be44 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_radio extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Radio extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_form_element_radio extends tx_form_view_form_element_abstract
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_radio $model Model for this element
+        * @param tx_form_Domain_Model_Element_Radio $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_radio $model) {
+       public function __construct(tx_form_Domain_Model_Element_Radio $model) {
                parent::__construct($model);
        }
 }
index d9cfea8..305ff59 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_radiogroup extends tx_form_view_form_element_fieldset {
+class tx_form_View_Form_Element_Radiogroup extends tx_form_View_Form_Element_Fieldset {
 
        /**
         * Default layout of this object
@@ -46,10 +46,10 @@ class tx_form_view_form_element_radiogroup extends tx_form_view_form_element_fie
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_radiogroup $model Model for this element
+        * @param tx_form_Domain_Model_Element_Radiogroup $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_radiogroup $model) {
+       public function __construct(tx_form_Domain_Model_Element_Radiogroup $model) {
                parent::__construct($model);
        }
 }
index c0515f1..fbc3eeb 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_reset extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Reset extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_form_element_reset extends tx_form_view_form_element_abstract
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_reset $model Model for this element
+        * @param tx_form_Domain_Model_Element_Reset $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_reset $model) {
+       public function __construct(tx_form_Domain_Model_Element_Reset $model) {
                parent::__construct($model);
        }
 }
index 2e67645..79a50e1 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_select extends tx_form_view_form_element_container {
+class tx_form_View_Form_Element_Select extends tx_form_View_Form_Element_Container {
 
        /**
         * Default layout of this object
@@ -46,10 +46,10 @@ class tx_form_view_form_element_select extends tx_form_view_form_element_contain
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_select $model Model for this element
+        * @param tx_form_Domain_Model_Element_Select $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_select $model) {
+       public function __construct(tx_form_Domain_Model_Element_Select $model) {
                parent::__construct($model);
        }
 }
index 61e28eb..11238e6 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_submit extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Submit extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_form_element_submit extends tx_form_view_form_element_abstrac
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_submit $model Model for this element
+        * @param tx_form_Domain_Model_Element_Submit $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_submit $model) {
+       public function __construct(tx_form_Domain_Model_Element_Submit $model) {
                parent::__construct($model);
        }
 }
index 6ca56bb..606025f 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_textarea extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Textarea extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_form_element_textarea extends tx_form_view_form_element_abstr
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_textarea $model Model for this element
+        * @param tx_form_Domain_Model_Element_Textarea $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_textarea $model) {
+       public function __construct(tx_form_Domain_Model_Element_Textarea $model) {
                parent::__construct($model);
        }
 }
index ba1f1ba..5075eb1 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form_element_textline extends tx_form_view_form_element_abstract {
+class tx_form_View_Form_Element_Textline extends tx_form_View_Form_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -44,10 +44,10 @@ class tx_form_view_form_element_textline extends tx_form_view_form_element_abstr
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_textline $model Model for this element
+        * @param tx_form_Domain_Model_Element_Textline $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_textline $model) {
+       public function __construct(tx_form_Domain_Model_Element_Textline $model) {
                parent::__construct($model);
        }
 }
index 76281e3..ad37433 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_form extends tx_form_view_form_element_container {
+class tx_form_View_Form extends tx_form_View_Form_Element_Container {
 
        /**
         * Default layout of this object
@@ -46,17 +46,17 @@ class tx_form_view_form extends tx_form_view_form_element_container {
         *
         * @return void
         */
-       public function __construct(tx_form_domain_model_form $model) {
+       public function __construct(tx_form_Domain_Model_Form $model) {
                parent::__construct($model);
        }
 
        /**
         * Set the data for the FORM tag
         *
-        * @param tx_form_domain_model_form $formModel The model of the form
+        * @param tx_form_Domain_Model_Form $formModel The model of the form
         * @return void
         */
-       public function setData(tx_form_domain_model_form $model) {
+       public function setData(tx_form_Domain_Model_Form $model) {
                $this->model = (object) $model;
        }
 
index 9b07135..96db7ab 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_additional extends tx_form_view_mail_html_element_abstract {
+class tx_form_View_Mail_Html_Additional extends tx_form_View_Mail_Html_Element_Abstract {
 
        /**
         * The model for the current object
@@ -54,8 +54,12 @@ class tx_form_view_mail_html_additional extends tx_form_view_mail_html_element_a
         * @return string The value of the additional
         */
        public function getAdditionalValue() {
-               $type = preg_replace('/.*_([^_]*)$/', "$1", get_class($this), 1);
-               return htmlspecialchars($this->model->getAdditionalValue($type), ENT_QUOTES);
+               return htmlspecialchars(
+                       $this->model->getAdditionalValue(
+                               $this->getLastPartOfClassName(TRUE)
+                       ),
+                       ENT_QUOTES
+               );
        }
 }
 ?>
\ No newline at end of file
index c64e88f..06e9193 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_additional_label extends tx_form_view_mail_html_additional {
+class tx_form_View_Mail_Html_Additional_Label extends tx_form_View_Mail_Html_Additional {
 
        /**
         * Default layout of this object
index 7783347..49d42e1 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_additional_legend extends tx_form_view_mail_html_additional {
+class tx_form_View_Mail_Html_Additional_Legend extends tx_form_View_Mail_Html_Additional {
 
        /**
         * Default layout of this object
index 1f2f105..f6d4995 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-abstract class tx_form_view_mail_html_element_abstract {
+abstract class tx_form_View_Mail_Html_Element_Abstract {
 
        /**
         * The model for the current object
@@ -107,7 +107,7 @@ abstract class tx_form_view_mail_html_element_abstract {
                                                        }
                                                        break;
                                                case 'label':
-                                                       if(!strstr(get_class($this), '_additional_')) {
+                                                       if(!strstr(get_class($this), '_Additional_')) {
                                                                if($this->model->additionalIsSet($nodeName)) {
                                                                        $this->replaceNodeWithFragment($dom, $node, $this->getAdditional('label'));
                                                                } else {
@@ -118,7 +118,7 @@ abstract class tx_form_view_mail_html_element_abstract {
                                                        $deleteNode = TRUE;
                                                        break;
                                                case 'legend':
-                                                       if(!strstr(get_class($this), '_additional_')) {
+                                                       if(!strstr(get_class($this), '_Additional_')) {
                                                                if($this->model->additionalIsSet($nodeName)) {
                                                                        $this->replaceNodeWithFragment($dom, $node, $this->getAdditional('legend'));
                                                                }
@@ -208,26 +208,31 @@ abstract class tx_form_view_mail_html_element_abstract {
         * @return string HTML string of the layout to use for this element
         */
        public function getLayout($type) {
-               $layoutHandler = t3lib_div::makeInstance('tx_form_system_layout');
+               /** @var $layoutHandler tx_form_System_Layout */
+               $layoutHandler = t3lib_div::makeInstance('tx_form_System_Layout');
 
                switch($type) {
                        case 'element':
                                $layoutDefault = $this->layout;
-                               $configurationKey = 'layout';
-                               $objectClass = get_class($this);
-                               $type = preg_replace('/.*_([^_]*)$/', "$1", $objectClass, 1);
-
-                               $layout = $layoutHandler->getLayoutByObject($type, $layoutDefault);
+                               $layout = $layoutHandler->getLayoutByObject(
+                                       $this->getLastPartOfClassName(TRUE),
+                                       $layoutDefault
+                               );
                                break;
                        case 'elementWrap':
                                $layoutDefault = $this->elementWrap;
-                               $elementWrap = $layoutHandler->getLayoutByObject($type, $layoutDefault);
-
+                               $elementWrap = $layoutHandler->getLayoutByObject(
+                                       $type,
+                                       $layoutDefault
+                               );
                                $layout = str_replace('<element />', $this->getLayout('element'), $elementWrap);
                                break;
                        case 'containerWrap':
                                $layoutDefault = $this->containerWrap;
-                               $layout = $layoutHandler->getLayoutByObject($type, $layoutDefault);
+                               $layout = $layoutHandler->getLayoutByObject(
+                                       $type,
+                                       $layoutDefault
+                               );
                                break;
                }
 
@@ -308,7 +313,7 @@ abstract class tx_form_view_mail_html_element_abstract {
         */
        protected function createAdditional($class) {
                $class = strtolower((string) $class);
-               $className = 'tx_form_view_mail_html_additional_' . $class;
+               $className = 'tx_form_View_Mail_Html_Additional_' . ucfirst($class);
 
                return t3lib_div::makeInstance($className, $this->model);
        }
@@ -359,5 +364,22 @@ abstract class tx_form_view_mail_html_element_abstract {
        public function noWrap() {
                return $this->noWrap;
        }
+
+       /**
+        * Gets the last part of the current object's class name.
+        * e.g. for 'tx_form_View_Confirmation_Additional' it will be 'Additional'
+        *
+        * @param boolean $lowercase Whether to convert to lowercase
+        * @return string
+        */
+       protected function getLastPartOfClassName($lowercase = FALSE) {
+               $lastPart = preg_replace('/.*_([^_]*)$/', '${1}', get_class($this), 1);
+
+               if ($lowercase) {
+                       $lastPart = strtolower($lastPart);
+               }
+
+               return $lastPart;
+       }
 }
 ?>
\ No newline at end of file
index fbae2d3..766b5ef 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_element_checkbox extends tx_form_view_mail_html_element_abstract {
+class tx_form_View_Mail_Html_Element_Checkbox extends tx_form_View_Mail_Html_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -48,10 +48,10 @@ class tx_form_view_mail_html_element_checkbox extends tx_form_view_mail_html_ele
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_checkbox $model Model for this element
+        * @param tx_form_Domain_Model_Element_Checkbox $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_checkbox $model) {
+       public function __construct(tx_form_Domain_Model_Element_Checkbox $model) {
                parent::__construct($model);
        }
 }
index e2e711c..9fa17f6 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_element_checkboxgroup extends tx_form_view_mail_html_element_fieldset {
+class tx_form_View_Mail_Html_Element_Checkboxgroup extends tx_form_View_Mail_Html_Element_Fieldset {
 
        /**
         * Default layout of this object
@@ -48,10 +48,10 @@ class tx_form_view_mail_html_element_checkboxgroup extends tx_form_view_mail_htm
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_checkboxgroup $model Model for this element
+        * @param tx_form_Domain_Model_Element_Checkboxgroup $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_checkboxgroup $model) {
+       public function __construct(tx_form_Domain_Model_Element_Checkboxgroup $model) {
                parent::__construct($model);
        }
 }
index 7ce2e06..4e5b3cb 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_element_container extends tx_form_view_mail_html_element_abstract {
+class tx_form_View_Mail_Html_Element_Container extends tx_form_View_Mail_Html_Element_Abstract {
 
        /**
         * Default layout of the container
@@ -93,9 +93,9 @@ class tx_form_view_mail_html_element_container extends tx_form_view_mail_html_el
                $childElement = NULL;
 
                $modelChildClass = get_class($modelChild);
-               $class = preg_replace('/.*_([^_]*)$/', "$1", $modelChildClass, 1);
+               $class = preg_replace('/.*_([^_]*)$/', '${1}', $modelChildClass, 1);
 
-               $className = 'tx_form_view_mail_html_element_' . $class;
+               $className = 'tx_form_View_Mail_Html_Element_' . ucfirst($class);
 
                if (class_exists($className)) {
                        $childElement = t3lib_div::makeInstance($className, $modelChild);
index ee5c085..495a41e 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_element_fieldset extends tx_form_view_mail_html_element_container {
+class tx_form_View_Mail_Html_Element_Fieldset extends tx_form_View_Mail_Html_Element_Container {
 
        /**
         * Default layout of this object
@@ -56,10 +56,10 @@ class tx_form_view_mail_html_element_fieldset extends tx_form_view_mail_html_ele
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_fieldset $model Model for this element
+        * @param tx_form_Domain_Model_Element_Fieldset $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_fieldset $model) {
+       public function __construct(tx_form_Domain_Model_Element_Fieldset $model) {
                parent::__construct($model);
        }
 }
index a7507f9..80ab02a 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_element_fileupload extends tx_form_view_mail_html_element_abstract {
+class tx_form_View_Mail_Html_Element_Fileupload extends tx_form_View_Mail_Html_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -48,10 +48,10 @@ class tx_form_view_mail_html_element_fileupload extends tx_form_view_mail_html_e
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_fileupload $model Model for this element
+        * @param tx_form_Domain_Model_Element_Fileupload $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_fileupload $model) {
+       public function __construct(tx_form_Domain_Model_Element_Fileupload $model) {
                parent::__construct($model);
        }
 }
index 1459a8a..9799832 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_element_hidden extends tx_form_view_mail_html_element_abstract {
+class tx_form_View_Mail_Html_Element_Hidden extends tx_form_View_Mail_Html_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -50,10 +50,10 @@ class tx_form_view_mail_html_element_hidden extends tx_form_view_mail_html_eleme
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_hidden $model Model for this element
+        * @param tx_form_Domain_Model_Element_Hidden $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_hidden $model) {
+       public function __construct(tx_form_Domain_Model_Element_Hidden $model) {
                parent::__construct($model);
        }
 }
index 11c3174..e2638a7 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_element_optgroup extends tx_form_view_mail_html_element_container {
+class tx_form_View_Mail_Html_Element_Optgroup extends tx_form_View_Mail_Html_Element_Container {
 
        /**
         * Default layout of this object
@@ -51,10 +51,10 @@ class tx_form_view_mail_html_element_optgroup extends tx_form_view_mail_html_ele
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_optgroup $model Model for this element
+        * @param tx_form_Domain_Model_Element_Optgroup $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_optgroup $model) {
+       public function __construct(tx_form_Domain_Model_Element_Optgroup $model) {
                parent::__construct($model);
        }
 }
index 5b74afa..3ada5e6 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_element_option extends tx_form_view_mail_html_element_abstract {
+class tx_form_View_Mail_Html_Element_Option extends tx_form_View_Mail_Html_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -53,10 +53,10 @@ class tx_form_view_mail_html_element_option extends tx_form_view_mail_html_eleme
        /**
         * Constructor
         *
-        * @param tx_form_domain_model_element_option $model Model for this element
+        * @param tx_form_Domain_Model_Element_Option $model Model for this element
         * @return void
         */
-       public function __construct(tx_form_domain_model_element_option $model) {
+       public function __construct(tx_form_Domain_Model_Element_Option $model) {
                parent::__construct($model);
        }
 }
index 5469b2e..f84a7bc 100644 (file)
@@ -29,7 +29,7 @@
  * @package TYPO3
  * @subpackage form
  */
-class tx_form_view_mail_html_element_radio extends tx_form_view_mail_html_element_abstract {
+class tx_form_View_Mail_Html_Element_Radio extends tx_form_View_Mail_Html_Element_Abstract {
 
        /**
         * Default layout of this object
@@ -48,10 +48,10 @@ class tx_form_view_mail_html_element_radio extends tx_form_view_mail_html_elemen
        /**
         * Constructor
         *
-        * @param tx_form_<