From a725942c177bb446103f3aceab2efadcf453fc31 Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Mon, 22 Feb 2010 12:50:24 -0600
Subject: [PATCH] override BUILDARGS instead of new

---
 lib/WebGUI/FormBuilder.pm                |  4 ++--
 lib/WebGUI/FormBuilder/Fieldset.pm       |  4 ++--
 lib/WebGUI/FormBuilder/Role/HasFields.pm | 21 +++++++++++++--------
 lib/WebGUI/FormBuilder/Tab.pm            |  4 ++--
 lib/WebGUI/FormBuilder/Tabset.pm         |  4 ++--
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/lib/WebGUI/FormBuilder.pm b/lib/WebGUI/FormBuilder.pm
index 9ff9b17ee..7fa9df592 100644
--- a/lib/WebGUI/FormBuilder.pm
+++ b/lib/WebGUI/FormBuilder.pm
@@ -56,10 +56,10 @@ other possible value is "application/x-www-form-urlencoded".
 
 =cut
 
-sub new {
+sub BUILDARGS {
     my ( $class, $session, %properties ) = @_;
     $properties{ session    } = $session;
-    return $class->SUPER::new( %properties );
+    return \%properties;
 }
 
 #----------------------------------------------------------------------------
diff --git a/lib/WebGUI/FormBuilder/Fieldset.pm b/lib/WebGUI/FormBuilder/Fieldset.pm
index 8a1211321..a9faf4c88 100644
--- a/lib/WebGUI/FormBuilder/Fieldset.pm
+++ b/lib/WebGUI/FormBuilder/Fieldset.pm
@@ -59,11 +59,11 @@ Optional. A synonym for C<label>.
 
 =cut
 
-sub new {
+sub BUILDARGS {
     my ( $class, $session, %properties ) = @_;
     $properties{ session } = $session;
     $properties{ label } ||= delete $properties{ legend };
-    return $class->SUPER::new( %properties );
+    return \%properties;
 }
 
 sub getFooter {
diff --git a/lib/WebGUI/FormBuilder/Role/HasFields.pm b/lib/WebGUI/FormBuilder/Role/HasFields.pm
index c7b0e20d3..d24b9a02f 100644
--- a/lib/WebGUI/FormBuilder/Role/HasFields.pm
+++ b/lib/WebGUI/FormBuilder/Role/HasFields.pm
@@ -2,6 +2,7 @@ package WebGUI::FormBuilder::Role::HasFields;
 
 use strict;
 use Moose::Role;
+use Try::Tiny;
 
 requires 'session', 'pack', 'unpack';
 
@@ -47,14 +48,18 @@ sub addField {
     }
     else {
         # Is $type a class name?
-        eval { WebGUI::Pluggable::load( $type ) };
-        if ( $@ ) {
-            eval { WebGUI::Pluggable::load( "WebGUI::Form::" . ucfirst( $type ) ) };
-            if ( $@ ) {
-                $self->session->error("Could not load field type '$type'. Try loading it manually." );
-                confess "Could not load field type '$type'. Try loading it manually.";
-            }
-            $type = "WebGUI::Form::" . ucfirst( $type );
+        my $file    = $type;
+        $file =~ s{::}{/}g;
+        $file .= ".pm";
+
+        # Load the class
+        # Try to load the WebGUI Field first in case we conveniently overlap with a common name
+        # (like Readonly)
+        if ( $INC{'WebGUI/Form/'.$file} || try { require 'WebGUI/Form/' . $file } ) {
+            $type = 'WebGUI::Form::' . $type;
+        }
+        elsif ( !$INC{$file} && !try { require $file; } ) {
+            confess sprintf "Could not load form control class %s", $type;
         }
         $field = $type->new( $self->session, { @properties } );
     }
diff --git a/lib/WebGUI/FormBuilder/Tab.pm b/lib/WebGUI/FormBuilder/Tab.pm
index b64555366..e61c2dc65 100644
--- a/lib/WebGUI/FormBuilder/Tab.pm
+++ b/lib/WebGUI/FormBuilder/Tab.pm
@@ -53,10 +53,10 @@ Optional. A label for the tab.
 
 =cut
 
-sub new {
+sub BUILDARGS {
     my ( $class, $session, %properties ) = @_;
     $properties{ session } = $session;
-    return $class->SUPER::new( %properties );
+    return \%properties;
 }
 
 #----------------------------------------------------------------------------
diff --git a/lib/WebGUI/FormBuilder/Tabset.pm b/lib/WebGUI/FormBuilder/Tabset.pm
index 32b46115a..91bc9683a 100644
--- a/lib/WebGUI/FormBuilder/Tabset.pm
+++ b/lib/WebGUI/FormBuilder/Tabset.pm
@@ -43,10 +43,10 @@ The name of the tabset. Required.
 
 =cut
 
-sub new {
+sub BUILDARGS {
     my ( $class, $session, %properties ) = @_;
     $properties{ session    } = $session;
-    return $class->SUPER::new( %properties );
+    return \%properties;
 }
 
 #----------------------------------------------------------------------------