[Jifty-commit] r3430 - Jifty-DBI/trunk/lib/Jifty/DBI/Class

[jifty-commit at lists.jifty.org]

Author: clkao
Date: Sun Jun 10 20:37:20 2007
New Revision: 3430

Modified:
   Jifty-DBI/trunk/lib/Jifty/DBI/Class/Trigger.pm

Log:
Remove duplicated code.

Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Class/Trigger.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Class/Trigger.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Class/Trigger.pm	Sun Jun 10 20:37:20 2007
@@ -25,27 +25,18 @@
 
     my $triggers = __fetch_triggers($proto);
 
-    if ($#_ == 1 && ref($_[1]) eq 'CODE') { 
-	while (my($when, $code) = splice @_, 0, 2) {
-            __validate_triggerpoint($proto, $when);
-            Carp::croak('add_trigger() needs coderef') unless ref($code) eq 'CODE';
-            push @{$triggers->{$when}}, [$code, undef];
-        }
+    if ( $#_ == 1 && ref( $_[1] ) eq 'CODE' ) {
+        @_ = ( name => $_[0], callback => $_[1] );
     }
-    elsif (grep {'name'} @_) {
-        my %args = ( name => undef, callback => undef, abortable => undef, @_);
-        my $when= $args{'name'};
-        my $code = $args{'callback'};
-        my $abortable = $args{'abortable'};
-        __validate_triggerpoint($proto, $when);
-        Carp::croak('add_trigger() needs coderef') unless ref($code) eq 'CODE';
-        push @{$triggers->{$when}}, [$code, $abortable];
-
 
-    } else {
-        Carp::croak('add_trigger() needs coderef');
+    my %args = ( name => undef, callback => undef, abortable => undef, @_ );
+    my $when = $args{'name'};
+    my $code = $args{'callback'};
+    my $abortable = $args{'abortable'};
+    __validate_triggerpoint( $proto, $when );
+    Carp::croak('add_trigger() needs coderef') unless ref($code) eq 'CODE';
+    push @{ $triggers->{$when} }, [ $code, $abortable ];
 
-    }
     1;
 }