cvsuser     02/10/25 12:50:19

  Modified:    App-Widget/lib/App Widget.pm
               App-Widget/lib/App/Widget AppFrame.pm Button.pm DataTable.pm
                        DateDropDowns.pm DateField.pm DualListSelect.pm
                        HierView.pm ImageButton.pm RepositoryEditor.pm
                        SelectorView.pm TabSet.pm TabbedAppFrame.pm
                        TabbedView.pm Template.pm TextField.pm TreeView.pm
                        ValidatedTextField.pm
  Log:
  got everything working with App-Context
  
  Revision  Changes    Path
  1.2       +85 -21    p5ee/App-Widget/lib/App/Widget.pm
  
  Index: Widget.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- Widget.pm 12 Oct 2002 03:13:08 -0000      1.1
  +++ Widget.pm 25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,16 @@
   
   ######################################################################
  -## $Id: Widget.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: Widget.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
  +package App::Context;
  +
  +# add a convenience function to the App::Context package
  +sub widget { my $self = shift; return $self->service("SessionObject",@_); }
  +sub template_engine { my $self = shift; return $self->service("TemplateEngine",@_); 
}
  +
   package App::Widget;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App::SessionObject;
   @ISA = ( "App::SessionObject" );
  @@ -30,36 +36,33 @@
   =cut
   
   #############################################################################
  -# display()
  +# Method: content()
   #############################################################################
   
  -# I'm not sure whether an HTML widget should have a display() method.
  -# HTML widgets do not have the power to display themselves.
  -# They can only render themselves as HTML.
  -# If the Context decides this should be sent to the browser, that is
  -# its choice and not an action of the widget itself.
  -# However, this is a convenient place to put protections agains exceptions.
  -# Perhaps it should be called something else, but it definitely has a role.
  +=head2 content()
   
  -=head2 display()
  -
  -    * Signature: $text = $widget->display();
  +    * Signature: $content = $self->content();
       * Param:     void
  -    * Return:    $text              text
  -    * Throws:    App::Exception::Widget
  +    * Return:    $content   any
  +    * Throws:    App::Exception
       * Since:     0.01
   
  -    Sample Usage:
  -
  -    $text = $widget->display();
  +    $content = $so->content();
  +    if (ref($content)) {
  +        App::Reference->print($content);
  +        print "\n";
  +    }
  +    else {
  +        print $content, "\n";
  +    }
   
   =cut
   
  -sub display {
  +sub content {
       my $self = shift;
   
       my ($html);
  -    $self->{context}->dbgprint("App::Widget(", $self->{name}, ")->display()")
  +    $self->{context}->dbgprint("App::Widget(", $self->{name}, ")->content()")
           if ($App::DEBUG && $self->{context}->dbg(1));
   
       eval {
  @@ -95,7 +98,68 @@
   </table>
   EOF
       }
  -    return $html;
  +
  +    my ($title, $bodyoptions, $w, $var, $value, $context_body, $context_head);
  +
  +    $title = "Widget";
  +    $bodyoptions = "";
  +    if (ref($self)) {
  +        $title = $self->get("title");
  +        $title = $self->get("name") if (!$title);
  +        foreach $var ('bgcolor', 'text', 'link', 'vlink', 'alink',
  +                      'leftmargin', 'topmargin', 'rightmargin', 'bottommargin', 
'class') {
  +            $value = $self->get($var);
  +            if (defined $value && $value ne "") {
  +                $bodyoptions .= " $var=\"$value\"";
  +            }
  +            elsif ($var eq "bgcolor") {
  +                $bodyoptions .= " $var=\"#ffffff\"";
  +            }
  +        }
  +    }
  +
  +    $context_head = "";
  +    $context_body = "";
  +    #$context_head = $self->{context}->head_html();
  +    #$context_body = $self->{context}->body_html(\%main::conf);
  +
  +    my $content = <<EOF;
  +<html>
  +<head>
  +<title>${title}</title>
  +$context_head</head>
  +<body${bodyoptions}>
  +<form method="POST">
  +$context_body
  +$html
  +</form>
  +</body>
  +</html>
  +EOF
  +
  +    return $content;
  +}
  +
  +#############################################################################
  +# content_type()
  +#############################################################################
  +
  +=head2 content_type()
  +
  +    * Signature: $content_type = $service->content_type();
  +    * Param:     void
  +    * Return:    $content_type   string
  +    * Throws:    App::Exception
  +    * Since:     0.01
  +
  +    Sample Usage:
  +
  +    $content_type = $service->content_type();
  +
  +=cut
  +
  +sub content_type {
  +    'text/html';
   }
   
   #############################################################################
  
  
  
  1.2       +12 -12    p5ee/App-Widget/lib/App/Widget/AppFrame.pm
  
  Index: AppFrame.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/AppFrame.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- AppFrame.pm       12 Oct 2002 03:13:08 -0000      1.1
  +++ AppFrame.pm       25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: AppFrame.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: AppFrame.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::AppFrame;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget;
  @@ -139,29 +139,29 @@
       if (1) {     # view as table
   
           $menu            = $context->widget("$name.menu",
  -                               widgetClass => "App::Widget::Menu",
  -                           )->display();
  +                               sessionObjectClass => "App::Widget::Menu",
  +                           )->html();
   
           $toolbar         = $context->widget("$name.toolbar",
  -                               widgetClass => "App::Widget::Toolbar",
  -                           )->display();
  +                               sessionObjectClass => "App::Widget::Toolbar",
  +                           )->html();
   
           $screentoolbar   = $context->widget("$name.screentoolbar",
  -                               widgetClass => "App::Widget::Toolbar",
  -                           )->display();
  +                               sessionObjectClass => "App::Widget::Toolbar",
  +                           )->html();
   
           $selector_widget = $context->widget("$name.selector",
  -                               widgetClass => "App::Widget::SelectorView",
  +                               sessionObjectClass => "App::Widget::SelectorView",
                              );
   
  -        $selector        = $selector_widget->display();
  +        $selector        = $selector_widget->html();
           $screen_wname    = $selector_widget->get_selected("wname");
   
           if ($screen_wname) {
               $screen_widget     = $context->widget($screen_wname);
               $screentitle_value = $selector_widget->get_selected("value");
               $screentitle_value = $screen_widget->label() if (!$screentitle_value);
  -            $screen            = $screen_widget->display();
  +            $screen            = $screen_widget->html();
               $screen_bgcolor    = $screen_widget->get("bgcolor");
               $screen_bgcolor    = "#ffffff" if (!defined $screen_bgcolor);
           }
  @@ -180,7 +180,7 @@
           #    -bgcolor   => "#888888",
           #);
           #$screentitle_bgcolor = $screentitle_widget->get("bgcolor");
  -        #$screentitle = $screentitle_widget->display();
  +        #$screentitle = $screentitle_widget->html();
   
           $screentitle_bgcolor = "#888888";
           $screentitle = "<font face=verdana,geneva,arial,sans-serif size=+1 
color=#ffffff>$screentitle_value</font>";
  
  
  
  1.2       +3 -7      p5ee/App-Widget/lib/App/Widget/Button.pm
  
  Index: Button.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/Button.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- Button.pm 12 Oct 2002 03:13:08 -0000      1.1
  +++ Button.pm 25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: Button.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: Button.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::Button;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget;
  @@ -22,7 +22,7 @@
   
      $name = "get_data";
      $w = App::Widget::Button->new($name);
  -   print $w->display();
  +   print $w->html();
   
   =cut
   
  @@ -83,10 +83,6 @@
       my $name = $self->{name};
       my $label = $self->html_escape($self->{label});
       return "<input type=\"submit\" name=\"app.event.${name}.click\" 
value=\"$label\"/>";
  -}
  -
  -sub display {
  -    $_[0]->html;
   }
   
   1;
  
  
  
  1.2       +43 -43    p5ee/App-Widget/lib/App/Widget/DataTable.pm
  
  Index: DataTable.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/DataTable.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- DataTable.pm      12 Oct 2002 03:13:08 -0000      1.1
  +++ DataTable.pm      25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: DataTable.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: DataTable.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::DataTable;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget;
  @@ -22,7 +22,7 @@
   
      $name = "get_data";
      $w = App::Widget::DataTable->new($name);
  -   print $w->display();
  +   print $w->html();
   
   =cut
   
  @@ -629,61 +629,61 @@
               $html .= "<table border=\"0\" cellspacing=\"0\" 
cellpadding=\"5\"><tr><td>\n";
               $html .= "<table border=\"0\" cellspacing=\"0\" 
cellpadding=\"3\"><tr><td valign=\"middle\" nowrap>&nbsp;\n";
               $html .= $context->widget("$name.view",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            #volatile => 1,
                            label => 'View',
                            height => 17,
                            width => 50,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
               $html .= " ";
               if ($editable) {
                   $html .= $context->widget("$name.edit",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            #volatile => 1,
                            label => 'Edit',
                            height => 17,
                            width => 50,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
                   $html .= " ";
               }
               $html .= "    &nbsp;</td><td nowrap";
               $html .= " bgcolor=\"$headingBgcolor\"" if ($headingBgcolor);
               $html .= ">$elem_begin&nbsp;\n";
               $html .= $context->widget("$name.prev",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            #volatile => 1,
                            label => '<< Prev',
                            height => 17,
                            width => 70,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
               $html .= "\n Start Row:";
               $html .= $context->widget("$name.startrow",
  -                         widgetClass => "App::Widget::TextField",
  +                         sessionObjectClass => "App::Widget::TextField",
                            size => 4,
                            maxlength => 12,
  -                     )->display();
  +                     )->html();
               $html .= " Num Rows:";
               $html .= $context->widget("$name.maxrows",
  -                         widgetClass => "App::Widget::TextField",
  +                         sessionObjectClass => "App::Widget::TextField",
                            size => 4,
                            maxlength => 12,
  -                     )->display();
  +                     )->html();
               $html .= "\n";
               $html .= $context->widget("$name.next",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            #volatile => 1,
                            label => 'Next >>',
                            height => 17,
                            width => 70,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
               $html .= "&nbsp;$elem_end</td></tr></table>\n";
               $html .= "</td></tr></table>\n";
           }
  @@ -692,40 +692,40 @@
               $html .= "<table border=\"0\" cellspacing=\"0\" 
cellpadding=\"3\"><tr>\n";
               $html .= "<td>\n";
               $html .= $context->widget("$name.save",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            #volatile => 1,
                            label => 'Save',
                            height => 17,
                            width => 50,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
               $html .= "</td>\n";
               $html .= "<td>\n";
               $html .= $context->widget("$name.add",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            #volatile => 1,
                            label => 'Add Rows',
                            height => 17,
                            width => 85,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
               $html .= "</td>\n";
               $html .= "<td>\n";
               $html .= $context->widget("$name.delete",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            #volatile => 1,
                            label => 'Delete Rows',
                            height => 17,
                            width => 85,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
               $html .= "</td>\n";
               #$html .= "<td>\n";
               #$html .= $context->widget("$name.confirm",
  -            #             widgetClass => "App::Widget::RadioButtonSet",
  +            #             sessionObjectClass => "App::Widget::RadioButtonSet",
               #             #volatile => 1,
               #             values => [ "no_confirm", "confirm", "auto_confirm" ],
               #             labels => {
  @@ -733,7 +733,7 @@
               #                 "confirm" => "Confirm Changes",
               #                 "auto_confirm" => "Auto-Confirm",
               #             },
  -            #         )->display();
  +            #         )->html();
               #$html .= "</td>\n";
               $html .= "</tr></table>\n";
           }
  @@ -749,7 +749,7 @@
   
                   for ($col = 0; $col < $numcols; $col++) {
                       $elem = $context->widget("$name.sort$col",
  -                                widgetClass => "App::Widget::ImageButton",
  +                                sessionObjectClass => "App::Widget::ImageButton",
                                   imageScript => 'button',
                                   #volatile => 1,
                                   label => 'Up|Dn',
  @@ -757,7 +757,7 @@
                                   width => 50,
                                   bevel => 2,
                                   args => $col,
  -                            )->display();
  +                            )->html();
                       $html .= "  <td>$elem</td>\n";
                   }
                   $html .= "</tr>\n";
  @@ -772,16 +772,16 @@
                   for ($col = 0; $col < $numcols; $col++) {
                       $column = $columns->[$col];
                       #$elem = $context->widget("$name\{filter}{$column}",
  -                    #            widgetClass => "App::Widget::TextField",
  +                    #            sessionObjectClass => "App::Widget::TextField",
                       #            size => 5,
                       #            maxwidth => 99,
  -                    #        )->display();
  +                    #        )->html();
                       $w = $context->widget("$name\{filter}{$column}",
  -                                widgetClass => "App::Widget::TextField",
  +                                sessionObjectClass => "App::Widget::TextField",
                                   size => 5,
                                   maxwidth => 99,
                            );
  -                    $elem = $w->display();
  +                    $elem = $w->html();
                       $html .= "  <td>$elem_begin$elem$elem_end</td>\n";
                   }
                   $html .= "</tr>\n";
  @@ -796,8 +796,8 @@
               for ($col = 0; $col < $numcols; $col++) {
                   $column = $columns->[$col];
                   $elem = $context->widget("$name\{columnSelected}{$column}",
  -                            widgetClass => "App::Widget::Checkbox",
  -                        )->display();
  +                            sessionObjectClass => "App::Widget::Checkbox",
  +                        )->html();
                   $html .= "  <td bgcolor=\"#ffaaaa\" valign=\"bottom\" 
align=\"center\">$elem</td>\n";
               }
               $html .= "</tr>\n";
  @@ -834,7 +834,7 @@
               foreach $rowaction (@select_actions) {
                   %args = (
                       override => 1,
  -                    widgetClass => "App::Widget::ImageButton",
  +                    sessionObjectClass => "App::Widget::ImageButton",
                       imageScript => 'button',
                       volatile => 1,
                       height => 17,
  @@ -849,7 +849,7 @@
                   }
                   $html .= $context->widget("$name.${rowaction}", %args, 
                                args => "{${name}" . "{rowSelected}}"
  -                         )->display();
  +                         )->html();
                   $html .= "<br>\n" if ($rowaction ne 
$select_actions[$#select_actions]);
               }
               $html .= "</td>\n";
  @@ -866,7 +866,7 @@
               foreach $rowaction (@single_select_actions) {
                   %args = (
                       override => 1,
  -                    widgetClass => "App::Widget::ImageButton",
  +                    sessionObjectClass => "App::Widget::ImageButton",
                       imageScript => 'button',
                       volatile => 1,
                       height => 17,
  @@ -881,7 +881,7 @@
                   }
                   $html .= $context->widget("$name.${rowaction}", %args, 
                                args => "{${name}" . "{rowSingleSelected}}"
  -                         )->display();
  +                         )->html();
                   $html .= "<br>\n" if ($rowaction ne 
$single_select_actions[$#select_actions]);
               }
               $html .= "</td>\n";
  @@ -962,18 +962,18 @@
           if ($rowSelectable) {
               $html .= "  <td bgcolor=\"#ffaaaa\" valign=\"middle\" 
align=\"center\">\n";
               $html .= $context->widget("$name\{rowSelected}{$key}",
  -                         widgetClass => "App::Widget::Checkbox",
  -                     )->display();
  +                         sessionObjectClass => "App::Widget::Checkbox",
  +                     )->html();
               $html .= "  </td>\n";
           }
   
           if ($rowSingleSelectable) {
               $html .= "  <td bgcolor=\"#ffaaaa\" valign=\"middle\" 
align=\"center\">\n";
               $html .= $context->widget("$name\{rowSingleSelected}",
  -                         widgetClass => "App::Widget::RadioButton",
  +                         sessionObjectClass => "App::Widget::RadioButton",
                            override => 1,
                            value => $key,
  -                     )->display();
  +                     )->html();
               $html .= "  </td>\n";
           }
   
  @@ -983,7 +983,7 @@
               foreach $rowaction (@row_actions) {
                   %args = (
                       override => 1,
  -                    widgetClass => "App::Widget::ImageButton",
  +                    sessionObjectClass => "App::Widget::ImageButton",
                       imageScript => 'button',
                       volatile => 1,
                       height => 17,
  @@ -996,7 +996,7 @@
                           $args{$_} = $rowactiondef->{$_};
                       }
                   }
  -                $html .= $context->widget("$name.${rowaction}", %args, args => 
$key)->display();
  +                $html .= $context->widget("$name.${rowaction}", %args, args => 
$key)->html();
               }
               $html .= "</td>\n";
           }
  @@ -1033,7 +1033,7 @@
                   }
                   $html .= "  <td $td_row_attrib$td_col_attrib>${elem_begin}";
                   $html .= $context->widget("$name\{editdata}{$key}{$column}",
  -                             widgetClass => "App::Widget::TextField",
  +                             sessionObjectClass => "App::Widget::TextField",
                                size => $column_length[$col]+2,   # add 2 just to give 
some visual space
                                maxlength => 99,
                                backgroundColor => "#ffaaaa",
  @@ -1041,7 +1041,7 @@
                                borderWidth => "1px",
                                padding => 0,
                                @edit_style,
  -                         )->display();
  +                         )->html();
                   $html .= "$elem_end</td>\n";
               }
               else {
  
  
  
  1.2       +8 -8      p5ee/App-Widget/lib/App/Widget/DateDropDowns.pm
  
  Index: DateDropDowns.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/DateDropDowns.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- DateDropDowns.pm  12 Oct 2002 03:13:08 -0000      1.1
  +++ DateDropDowns.pm  25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: DateDropDowns.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: DateDropDowns.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::DateDropDowns;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App::Widget::StylizableContainer;
   @ISA = ( "App::Widget::StylizableContainer" );
  @@ -75,12 +75,12 @@
       # NOTE: container is inferred by the naming convention
       #       otherwise, I should include "container => $name," line
       $context->widget("${name}.day",  # note: container is inferred
  -        widgetClass => "App::Widget::Select",
  +        sessionObjectClass => "App::Widget::Select",
           values => \@dayvalues,
       );
   
       $context->widget("${name}.month",
  -        widgetClass => "App::Widget::Select",
  +        sessionObjectClass => "App::Widget::Select",
           values => \@monthvalues,
           labels => \%monthlabels,
       );
  @@ -89,7 +89,7 @@
       $begin_year = $self->{beginYear} || 1980;
       $end_year   = $self->{endYear}   || 2010;
       $context->widget("${name}.year",
  -        widgetClass => "App::Widget::Select",
  +        sessionObjectClass => "App::Widget::Select",
           values => [ $begin_year .. $end_year ],
       );
   }
  @@ -184,9 +184,9 @@
       $self->split_date();
   
       return 
  -        $context->widget("${name}.day")->display() .
  -        $context->widget("${name}.month")->display() .
  -        $context->widget("${name}.year")->display() .
  +        $context->widget("${name}.day")->html() .
  +        $context->widget("${name}.month")->html() .
  +        $context->widget("${name}.year")->html() .
           $self->callback_event_tag("change");
   }
   
  
  
  
  1.2       +3 -3      p5ee/App-Widget/lib/App/Widget/DateField.pm
  
  Index: DateField.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/DateField.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- DateField.pm      12 Oct 2002 03:13:08 -0000      1.1
  +++ DateField.pm      25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: DateField.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: DateField.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::DateField;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget::TextField;
  @@ -25,7 +25,7 @@
      $w = $context->widget($name);
      # OR ...
      $w = $context->widget($name,
  -      widgetClass => "App::Widget::DateField",
  +      sessionObjectClass => "App::Widget::DateField",
         size  => 8,                 # from HTML spec
         maxlength => 18,            # from HTML spec
         style => "mystyle",         # from HTML to support CSS
  
  
  
  1.2       +16 -16    p5ee/App-Widget/lib/App/Widget/DualListSelect.pm
  
  Index: DualListSelect.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/DualListSelect.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- DualListSelect.pm 12 Oct 2002 03:13:08 -0000      1.1
  +++ DualListSelect.pm 25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: DualListSelect.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: DualListSelect.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::DualListSelect;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App::Widget::StylizableContainer;
   @ISA = ( "App::Widget::StylizableContainer" );
  @@ -131,14 +131,14 @@
       my ($sel_button, $unsel_button, $up_button, $dn_button);
   
       $unsel_list = $context->widget("${name}_unsel",
  -        widgetClass => "App::Widget::Select",
  +        sessionObjectClass => "App::Widget::Select",
           values => \@unsel_list,
           labels => $labels,
           @select_attribs
       )->html();
   
       $sel_list = $context->widget("${name}_sel",
  -        widgetClass => "App::Widget::Select",
  +        sessionObjectClass => "App::Widget::Select",
           values => \@sel_list,
           labels => $labels,
           @select_attribs
  @@ -146,28 +146,28 @@
   
       if ($self->{noimagebuttons}) {
           $sel_button = $context->widget("${name}_sel_button",
  -            widgetClass => "App::Widget::Button",
  +            sessionObjectClass => "App::Widget::Button",
               label       => " >> ",
               event       => "select",
               eventTarget => $name,
           )->html();
   
           $unsel_button = $context->widget("${name}_unsel_button",
  -            widgetClass => "App::Widget::Button",
  +            sessionObjectClass => "App::Widget::Button",
               label       => " << ",
               event       => "unselect",
               eventTarget => $name,
           )->html();
   
           $up_button = $context->widget("${name}_up_button",
  -            widgetClass => "App::Widget::Button",
  +            sessionObjectClass => "App::Widget::Button",
               label       => " Up ",
               event       => "move_up",
               eventTarget => $name,
           )->html();
   
           $dn_button = $context->widget("${name}_dn_button",
  -            widgetClass => "App::Widget::Button",
  +            sessionObjectClass => "App::Widget::Button",
               label       => " Dn ",
               event       => "move_down",
               eventTarget => $name,
  @@ -175,44 +175,44 @@
       }
       else {
           $sel_button = $context->widget("${name}_sel_button",
  -            widgetClass => "App::Widget::ImageButton",
  +            sessionObjectClass => "App::Widget::ImageButton",
               image       => "images/DualListSelect/rtarrow.gif",
               height      => "19",
               width       => "19",
               label       => "Select",
               event       => "select",
               eventTarget => $name,
  -        )->display();
  +        )->html();
       
           $unsel_button = $context->widget("${name}_unsel_button",
  -            widgetClass => "App::Widget::ImageButton",
  +            sessionObjectClass => "App::Widget::ImageButton",
               image       => "images/DualListSelect/lfarrow.gif",
               height      => "19",
               width       => "19",
               label       => "Unselect",
               event       => "unselect",
               eventTarget => $name,
  -        )->display();
  +        )->html();
       
           $up_button = $context->widget("${name}_up_button",
  -            widgetClass => "App::Widget::ImageButton",
  +            sessionObjectClass => "App::Widget::ImageButton",
               image       => "images/DualListSelect/uparrow.gif",
               height      => "19",
               width       => "19",
               label       => "Up",
               event       => "move_up",
               eventTarget => $name,
  -        )->display();
  +        )->html();
       
           $dn_button = $context->widget("${name}_dn_button",
  -            widgetClass => "App::Widget::ImageButton",
  +            sessionObjectClass => "App::Widget::ImageButton",
               image       => "images/DualListSelect/dnarrow.gif",
               height      => "19",
               width       => "19",
               label       => "Down",
               event       => "move_down",
               eventTarget => $name,
  -        )->display();
  +        )->html();
       }
   
       $var_hidden = $self->callback_event_tag("restore");
  
  
  
  1.2       +3 -3      p5ee/App-Widget/lib/App/Widget/HierView.pm
  
  Index: HierView.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/HierView.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- HierView.pm       12 Oct 2002 03:13:08 -0000      1.1
  +++ HierView.pm       25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: HierView.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: HierView.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::HierView;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget;
  @@ -22,7 +22,7 @@
   
      $name = "tree";
      $w = App::Widget::HierView->new($name);
  -   print $w->display();
  +   print $w->html();
   
   =cut
   
  
  
  
  1.2       +3 -3      p5ee/App-Widget/lib/App/Widget/ImageButton.pm
  
  Index: ImageButton.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/ImageButton.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- ImageButton.pm    12 Oct 2002 03:13:08 -0000      1.1
  +++ ImageButton.pm    25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: ImageButton.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: ImageButton.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::ImageButton;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget;
  @@ -22,7 +22,7 @@
   
      $name = "get_data";
      $w = App::Widget::ImageButton->new($name);
  -   print $w->display();
  +   print $w->html();
   
   =cut
   
  
  
  
  1.2       +45 -45    p5ee/App-Widget/lib/App/Widget/RepositoryEditor.pm
  
  Index: RepositoryEditor.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/RepositoryEditor.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- RepositoryEditor.pm       12 Oct 2002 03:13:08 -0000      1.1
  +++ RepositoryEditor.pm       25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,6 +1,6 @@
   
   ######################################################################
  -## $Id: RepositoryEditor.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: RepositoryEditor.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   ## x TODO: add "summary" feature
   ## x TODO: add cross-tabulation
  @@ -32,7 +32,7 @@
   ## x TODO: add default {summary} formula as sum(COL)            (for numbers)
   
   package App::Widget::RepositoryEditor;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget;
  @@ -99,7 +99,7 @@
       $self->{columns} = [] if (!defined $self->{columns});
   
       $context->widget("${name}_datatable",
  -        widgetClass => "App::Widget::DataTable",
  +        sessionObjectClass => "App::Widget::DataTable",
           scrollable  => 1,
           sortable    => 1,
           filterable  => 1,
  @@ -228,7 +228,7 @@
       $mode    = $self->get("mode","");
   
       if ($mode eq "edit" || $mode eq "view") {
  -        return $context->widget("${name}_datatable")->display();
  +        return $context->widget("${name}_datatable")->html();
       }
       else {
           return $self->mk_criteria_html();
  @@ -263,93 +263,93 @@
       my ($columns, $params);
   
       $view          = $context->widget("$name.view",
  -                         widgetClass => "App::Widget::TextField",
  +                         sessionObjectClass => "App::Widget::TextField",
                            size => 20,
                            maxwidth => 99,
  -                     )->display();
  +                     )->html();
   
       $saveas_view   = $context->widget("$name.saveas_view",
  -                         widgetClass => "App::Widget::TextField",
  +                         sessionObjectClass => "App::Widget::TextField",
                            size => 20,
                            maxwidth => 99,
  -                     )->display();
  +                     )->html();
   
       $new_table     = $context->widget("$name.new_table",
  -                         widgetClass => "App::Widget::Select",
  +                         sessionObjectClass => "App::Widget::Select",
                            values => $table_names,
                            labels => $table_label_hashref,
  -                     )->display();
  +                     )->html();
   
       $self->set_default("maxrows",25);
   
       $maxrows       = $context->widget("$name.maxrows",
  -                         widgetClass => "App::Widget::TextField",
  +                         sessionObjectClass => "App::Widget::TextField",
                            size => 4,
                            maxlength => 99,
  -                     )->display();
  +                     )->html();
   
       $open_button   = $context->widget("$name.open_button",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            label => "Open",
                            height => 17,
                            width => 50,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
   
       $save_button   = $context->widget("$name.save_button",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            label => "Save",
                            height => 17,
                            width => 50,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
   
       $delete_button = $context->widget("$name.delete_button",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            label => "Delete",
                            height => 17,
                            width => 50,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
   
       $saveas_button = $context->widget("$name.saveas_button",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            label => "Save As",
                            height => 17,
                            width => 50,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
   
       $view_button   = $context->widget("$name.view_button",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            label => "View",
                            height => 17,
                            width => 50,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
   
       $edit_button   = $context->widget("$name.edit_button",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            label => 'Edit',
                            height => 17,
                            width => 50,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
   
       $select_button = $context->widget("$name.select_button",
  -                         widgetClass => "App::Widget::ImageButton",
  +                         sessionObjectClass => "App::Widget::ImageButton",
                            imageScript => 'button',
                            label => "Select Table",
                            height => 17,
                            width => 100,
                            bevel => 2,
  -                     )->display();
  +                     )->html();
   
       $columns       = $self->column_selection_html();
       $params        = $self->param_selection_html();
  @@ -413,7 +413,7 @@
       $column_labels = $rep->get_column_labels($table);
       $column_menu = $context->widget("$name.columns",
           override => 1,
  -        widgetClass => "App::Widget::Select",
  +        sessionObjectClass => "App::Widget::Select",
           values => $columns,
           labels => $column_labels,
           size => 8,
  @@ -426,26 +426,26 @@
       for ($i = 0; $i < 5; $i++) {
   
           $order_menu[$i]    = $context->widget("$name\{ordercols}[$i]",
  -                                 widgetClass => "App::Widget::Select",
  +                                 sessionObjectClass => "App::Widget::Select",
                                    values => $columns,
                                    labels => $column_labels,
                                    size => 1,
                                    nullable => 1,
  -                             )->display();
  +                             )->html();
   
           $dir_menu[$i]      = $context->widget("$name\{directions}[$i]",
  -                                 widgetClass => "App::Widget::Select",
  +                                 sessionObjectClass => "App::Widget::Select",
                                    values => [ '', 'UP', 'DOWN', ],
                                    labels => { '' => '', 'UP' => 'Up', 'DOWN' => 
'Down', },
  -                             )->display();
  +                             )->html();
   
           $summ_checkbox[$i] = $context->widget("$name\{summarize}[$i]",
  -                                 widgetClass => "App::Widget::Checkbox",
  -                             )->display();
  +                                 sessionObjectClass => "App::Widget::Checkbox",
  +                             )->html();
   
           $xtab_checkbox[$i] = $context->widget("$name\{crosstabulate}[$i]",
  -                                 widgetClass => "App::Widget::Checkbox",
  -                             )->display();
  +                                 sessionObjectClass => "App::Widget::Checkbox",
  +                             )->html();
       }
   
       my ($fontbegin, $fontend);
  @@ -522,39 +522,39 @@
       );
   
       $critsense_menu = $context->widget("$name.critsense",
  -        widgetClass => "App::Widget::Select",
  +        sessionObjectClass => "App::Widget::Select",
           values => \@critsense,
           labels => \%critsense,
  -    )->display();
  +    )->html();
   
       my (@param_menu, @param_min, @param_max, @param_contains, $i);
   
       for ($i = 0; $i < 5; $i++) {
   
           $param_menu[$i]    = $context->widget("$name\{param}[$i]",
  -                                 widgetClass => "App::Widget::Select",
  +                                 sessionObjectClass => "App::Widget::Select",
                                    values => $columns,
                                    labels => $column_labels,
                                    nullable => 1,
  -                             )->display();
  +                             )->html();
   
           $param_min[$i]     = $context->widget("$name\{param_min}[$i]",
  -                                 widgetClass => "App::Widget::TextField",
  +                                 sessionObjectClass => "App::Widget::TextField",
                                    size => 8,
                                    maxlength => 99,
  -                             )->display();
  +                             )->html();
   
           $param_max[$i]     = $context->widget("$name\{param_max}[$i]",
  -                                 widgetClass => "App::Widget::TextField",
  +                                 sessionObjectClass => "App::Widget::TextField",
                                    size => 8,
                                    maxlength => 99,
  -                             )->display();
  +                             )->html();
   
           $param_contains[$i]= $context->widget("$name\{param_contains}[$i]",
  -                                 widgetClass => "App::Widget::TextField",
  +                                 sessionObjectClass => "App::Widget::TextField",
                                    size => 8,
                                    maxlength => 99,
  -                             )->display();
  +                             )->html();
       }
   
       my ($fontbegin, $fontend);
  
  
  
  1.2       +7 -7      p5ee/App-Widget/lib/App/Widget/SelectorView.pm
  
  Index: SelectorView.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/SelectorView.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- SelectorView.pm   12 Oct 2002 03:13:08 -0000      1.1
  +++ SelectorView.pm   25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: SelectorView.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: SelectorView.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::SelectorView;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget::HierView;
  @@ -22,7 +22,7 @@
   
      $name = "get_data";
      $w = App::Widget::SelectorView->new($name);
  -   print $w->display();
  +   print $w->html();
   
   =cut
   
  @@ -105,7 +105,7 @@
                   $label = $node->{$nodenumber}{value} if (!defined $label);
                   $label = "" if (!defined $label);
                   $html .= $context->widget("$name.button$nodenumber",
  -                    widgetClass => "App::Widget::ImageButton",
  +                    sessionObjectClass => "App::Widget::ImageButton",
                       imageScript => "button",
                       volatile    => 1,
                       height      => "19",
  @@ -115,7 +115,7 @@
                       eventTarget => $name,
                       event       => "open_exclusively",
                       args        => $nodenumber,
  -                )->display();
  +                )->html();
                   $html .= "<br>\n";
   
               }
  @@ -137,7 +137,7 @@
   
                   $html .= "<p>";
                   $html .= $context->widget("$name.button$nodelabel",
  -                    widgetClass => "App::Widget::ImageButton",
  +                    sessionObjectClass => "App::Widget::ImageButton",
                       image       => "images/SelectorView/$icon",
                       height      => "36",
                       width       => "36",
  @@ -145,7 +145,7 @@
                       event       => "select",
                       eventTarget => $name,
                       args        => $nodenumber,
  -                )->display();
  +                )->html();
                   $html .= "<br>$label\n";
               }
   
  
  
  
  1.2       +4 -4      p5ee/App-Widget/lib/App/Widget/TabSet.pm
  
  Index: TabSet.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/TabSet.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- TabSet.pm 12 Oct 2002 03:13:08 -0000      1.1
  +++ TabSet.pm 25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: TabSet.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: TabSet.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::TabSet;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget;
  @@ -137,15 +137,15 @@
       if (1) {     # view as table
   
           $selector_widget = $context->widget("$name.selector",
  -                               widgetClass => "App::Widget::TabbedView",
  +                               sessionObjectClass => "App::Widget::TabbedView",
                              );
   
  -        $selector        = $selector_widget->display();
  +        $selector        = $selector_widget->html();
           $screen_wname    = $selector_widget->get_selected("wname");
   
           if ($screen_wname) {
               $screen_widget     = $context->widget($screen_wname);
  -            $screen            = $screen_widget->display();
  +            $screen            = $screen_widget->html();
               $screen_bgcolor    = $screen_widget->get("bgcolor","#cccccc");
           }
           else {
  
  
  
  1.2       +11 -11    p5ee/App-Widget/lib/App/Widget/TabbedAppFrame.pm
  
  Index: TabbedAppFrame.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/TabbedAppFrame.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- TabbedAppFrame.pm 12 Oct 2002 03:13:08 -0000      1.1
  +++ TabbedAppFrame.pm 25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: TabbedAppFrame.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: TabbedAppFrame.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::TabbedAppFrame;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget;
  @@ -139,30 +139,30 @@
       if (1) {     # view as table
   
           $menu            = $context->widget("$name.menu",
  -                               widgetClass => "App::Widget::Menu",
  -                           )->display();
  +                               sessionObjectClass => "App::Widget::Menu",
  +                           )->html();
   
           $toolbar         = $context->widget("$name.toolbar",
  -                               widgetClass => "App::Widget::Toolbar",
  -                           )->display();
  +                               sessionObjectClass => "App::Widget::Toolbar",
  +                           )->html();
   
           $screentoolbar   = $context->widget("$name.screentoolbar",
  -                               widgetClass => "App::Widget::Toolbar",
  -                           )->display();
  +                               sessionObjectClass => "App::Widget::Toolbar",
  +                           )->html();
   
           $selector_widget = $context->widget("$name.selector",
  -                               widgetClass => "App::Widget::SelectorView",
  +                               sessionObjectClass => "App::Widget::SelectorView",
                              );
   
           $selector_bgcolor = "#cccccc";
  -        $selector        = $selector_widget->display();
  +        $selector        = $selector_widget->html();
           $screen_wname    = $selector_widget->get_selected("wname");
   
           if ($screen_wname) {
               $screen_widget     = $context->widget($screen_wname);
               $screentitle_value = $selector_widget->get_selected("value");
               $screentitle_value = $screen_widget->label() if (!$screentitle_value);
  -            $screen            = $screen_widget->display();
  +            $screen            = $screen_widget->html();
               $screen_bgcolor    = $screen_widget->get("bgcolor");
               $screen_bgcolor    = "#ffffff" if (!defined $screen_bgcolor);
           }
  @@ -181,7 +181,7 @@
           #    -bgcolor   => "#888888",
           #);
           #$screentitle_bgcolor = $screentitle_widget->get("bgcolor");
  -        #$screentitle = $screentitle_widget->display();
  +        #$screentitle = $screentitle_widget->html();
   
           $screentitle_bgcolor = "#888888";
           $screentitle = "<font face=verdana,geneva,arial,sans-serif size=+1 
color=#ffffff>$screentitle_value</font>";
  
  
  
  1.2       +5 -5      p5ee/App-Widget/lib/App/Widget/TabbedView.pm
  
  Index: TabbedView.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/TabbedView.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- TabbedView.pm     12 Oct 2002 03:13:08 -0000      1.1
  +++ TabbedView.pm     25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: TabbedView.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: TabbedView.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::TabbedView;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget::HierView;
  @@ -22,7 +22,7 @@
   
      $name = "get_data";
      $w = App::Widget::TabbedView->new($name);
  -   print $w->display();
  +   print $w->html();
   
   =cut
   
  @@ -91,7 +91,7 @@
               $label = "" if (!defined $label);
   
               $w = $context->widget("$name.button$nodenumber",
  -                widgetClass => "App::Widget::ImageButton",
  +                sessionObjectClass => "App::Widget::ImageButton",
                   imageScript => "button",
                   volatile    => 1,
                   height      => "19",
  @@ -110,7 +110,7 @@
               else {
                   $w->set("selected", 0);
               }
  -            $html .= $w->display();
  +            $html .= $w->html();
               $html .= "<!--\n    -->";
   
               $nodeidx++;
  
  
  
  1.2       +3 -3      p5ee/App-Widget/lib/App/Widget/Template.pm
  
  Index: Template.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/Template.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- Template.pm       12 Oct 2002 03:13:08 -0000      1.1
  +++ Template.pm       25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: Template.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: Template.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::Template;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App::Widget;
   @ISA = ( "App::Widget" );
  @@ -77,7 +77,7 @@
       my ($html, $template_name, $template_engine);
   
       $self->{context}->dbgprint("App::Widget::Template(",
  -            $self->{name}, ")->display()")
  +            $self->{name}, ")->html()")
           if ($App::DEBUG && $self->{context}->dbg(1));
   
       $name = $self->{name};
  
  
  
  1.2       +3 -3      p5ee/App-Widget/lib/App/Widget/TextField.pm
  
  Index: TextField.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/TextField.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- TextField.pm      12 Oct 2002 03:13:08 -0000      1.1
  +++ TextField.pm      25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: TextField.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: TextField.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::TextField;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget::Stylizable;
  @@ -25,7 +25,7 @@
      $w = $context->widget($name);
      # OR ...
      $w = $context->widget($name,
  -      widgetClass => "App::Widget::TextField",
  +      sessionObjectClass => "App::Widget::TextField",
         size  => 8,                 # from HTML spec
         maxlength => 18,            # from HTML spec
         tabindex => 1,              # from HTML spec
  
  
  
  1.2       +3 -3      p5ee/App-Widget/lib/App/Widget/TreeView.pm
  
  Index: TreeView.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/TreeView.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- TreeView.pm       12 Oct 2002 03:13:08 -0000      1.1
  +++ TreeView.pm       25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: TreeView.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: TreeView.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::TreeView;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget::HierView;
  @@ -22,7 +22,7 @@
   
      $name = "get_data";
      $w = App::Widget::TreeView->new($name);
  -   print $w->display();
  +   print $w->html();
   
   =cut
   
  
  
  
  1.2       +3 -3      p5ee/App-Widget/lib/App/Widget/ValidatedTextField.pm
  
  Index: ValidatedTextField.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/ValidatedTextField.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- ValidatedTextField.pm     12 Oct 2002 03:13:08 -0000      1.1
  +++ ValidatedTextField.pm     25 Oct 2002 19:50:19 -0000      1.2
  @@ -1,10 +1,10 @@
   
   ######################################################################
  -## $Id: ValidatedTextField.pm,v 1.1 2002/10/12 03:13:08 spadkins Exp $
  +## $Id: ValidatedTextField.pm,v 1.2 2002/10/25 19:50:19 spadkins Exp $
   ######################################################################
   
   package App::Widget::ValidatedTextField;
  -$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
  +$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
   
   use App;
   use App::Widget::TextField;
  @@ -25,7 +25,7 @@
      $w = $context->widget($name);
      # OR ...
      $w = $context->widget($name,
  -      widgetClass => "App::Widget::ValidatedTextField",
  +      sessionObjectClass => "App::Widget::ValidatedTextField",
         size  => 8,                 # from HTML spec
         maxlength => 18,            # from HTML spec
         tabindex => 1,              # from HTML spec
  
  
  


Reply via email to