Move get/set/update into Asset.pm.

lib/WebGUI/Asset.pm

@@ -2885,5 +2885,158 @@ sub www_widgetView {
         return $self->outputWidgetMarkup($width, $height, $templateId, $styleTemplateId);
 }
 
+#-------------------------------------------------------------------
+
+=head2 get ( [ $name ] )
+
+    $obj->get('someProperty');
+
+    # or:
+
+    $obj->get(); # get all properties
+
+Generic accessor for this object's properties.
+
+Classic WebGUI get/set style methods.
+This role is automatically included in all Definition objects.
+
+=head3 $name
+
+If $name is defined, and is an attribute of the object, it returns the
+value of the attribute.  If $name is not an attribute, then it returns
+undef.
+
+If $name is not defined, it returns a hashref of all attributes.
+
+=cut
+
+sub get {
+    my $self = shift;
+    if (@_) {
+        my $property = shift;
+        if ($self->meta->find_attribute_by_name($property)) {
+            return $self->$property;
+        }
+        return undef;
+    }
+    my %properties = map { $_ => scalar $self->$_ } $self->meta->get_all_attributes_list;
+    return \%properties;
+}
+
+#-------------------------------------------------------------------
+
+=head2 set ( dataSpec )
+
+    $obj->set({ someProperty => 'someValue' });
+
+Generic setter for this object's properties.
+
+=head3 dataSpec
+
+Accepts either a hash, or a hash reference, of data to set in the object.  If the key
+is not an attribute of the object, then it is silently ignored.
+
+=cut
+
+sub set {
+    my $self = shift;
+    my $properties = @_ % 2 ? shift : { @_ };
+    my @orderedProperties = $self->getProperties;
+    KEY: for my $property ( @orderedProperties ) {
+        next KEY unless exists $properties->{$property};
+        $self->$property($properties->{$property});
+    }
+    return 1;
+}
+
+#-------------------------------------------------------------------
+
+=head2 update ( dataSpec )
+
+Combines the actions of setting data in the object and writing the data.
+
+=head3 dataSpec
+
+See L<set>.
+
+=cut
+
+
+sub update {
+    my $self = shift;
+    $self->set(@_);
+    if ($self->can('write')) {
+        $self->write;
+    }
+    return 1;
+}
+
+#-------------------------------------------------------------------
+
+=head2 getFormProperties ( $name )
+
+Returns the form properties for the requested property.  Handles resolving i18n and
+calling subroutines for values.
+
+Each subroutine is invoked as a method of the object, and is passed the entire set of
+form properties and the name of the property.
+
+i18n is allowed in the label, subtext and hoverHelp options, and is specified by passing
+an array reference.
+
+    label => [ 'key', 'namespace' ],
+
+If the array reference has more than two elements, getFormProperties will pass the retrieved
+i18n key to sprintf, with the extra elements as arguments.
+
+    label => [ 'key', 'namespace', 'extra' ],
+
+becomes
+
+    label => sprintf($i18n->get('label', 'namespace'), 'extra'),
+
+=head3 $name
+
+The name of the property to return.
+
+=cut
+
+sub getFormProperties {
+    my $self     = shift;
+    my $property = $self->meta->find_attribute_by_name(@_);
+    my $form     = $property->form;
+    PROPERTY: while (my ($property_name, $property_value) = each %{ $form }) {
+        next PROPERTY unless ref $property_value;
+        if (($property_name eq 'label' || $property_name eq 'hoverHelp' || $property_name eq 'subtext') and ref $property_value eq 'ARRAY') {
+            my ($label, $namespace, @arguments) = @{ $property_value };
+            my $text = WebGUI::International->new($self->session)->get($label, $namespace);
+            if (@arguments) {
+                $text = sprintf $text, @arguments;
+            }
+            $form->{$property_name} =  $text;
+        }
+        elsif (ref $property_value eq 'CODE') {
+            $form->{$property_name} = $self->$property_value($property, $property_name);
+        }
+    }
+    return $form;
+}
+
+#-------------------------------------------------------------------
+
+=head2 getProperties ( )
+
+Returns a list of the names of all properties of the object, as set by the Definition.
+
+=cut
+
+sub getProperties {
+    my $self = shift;
+    return $self->meta->get_all_property_list;
+}
+
+
+#-------------------------------------------------------------------
+
 __PACKAGE__->meta->make_immutable;
 1;

lib/WebGUI/Definition.pm

@@ -83,10 +83,10 @@ sub init_meta {
                 class           => ['WebGUI::Definition::Meta::Class'],
             },
         );
-        Moose::Util::apply_all_roles(
-            $for_class,
-            'WebGUI::Definition::Role::Object',
-        );
+        #Moose::Util::apply_all_roles(
+        #    $for_class,
+        #    'WebGUI::Definition::Role::Object',
+        #);
     }
     else {
         Moose::Util::MetaRole::apply_metaroles(