Changeset 2200

Timestamp:

12/26/08 01:42:02 (3 years ago)

Author:

szabgab

Message:

better error handling in the various cases of plugin problems. put the call to the plugin methods in eval{} so they wont take down the whole application

File:

• trunk/Padre/lib/Padre/Plugin.pm (modified) (1 diff)

trunk/Padre/lib/Padre/Plugin.pm

@@ -345 +345 @@
         my $label = shift @$items;
         my $value = shift @$items;
-        if ( ref $value eq 'ARRAY' ) {
+        if (not defined $value) {
+            if ($label =~ /^---/) {
+                $menu->AppendSeparator;
+            } else {
+                Carp::cluck("Undefined value for label '$label'");
+            }
+        } elsif (not ref $value) {
+            Carp::cluck("Not reference '$value'");
+        } elsif ( ref $value eq 'ARRAY' ) {
             my $submenu = $self->_menu_plugins_submenu( $win, $value );
             $menu->Append( -1, $label, $submenu );
-        } else {
-            if($label =~ /^---/) {
-                $menu->AppendSeparator;
-            } else {
-                Wx::Event::EVT_MENU( $win, $menu->Append( -1, $label), $value );
-            }
+        } elsif (ref $value eq 'CODE') {
+            Wx::Event::EVT_MENU( $win, $menu->Append( -1, $label), sub { eval { $value->(@_) }; Carp::cluck($@) if $@; } );
+        } else {
+            Carp::cluck("Cannot deal with '$value' for label '$label'");
         }
     }