--- nfo/perl/libs/DesignPattern/Bridge.pm	2002/12/16 19:57:12	1.3
+++ nfo/perl/libs/DesignPattern/Bridge.pm	2003/01/20 16:55:15	1.4
@@ -1,7 +1,11 @@
 ## --------------------------------------------------------------------------------
-##  $Id: Bridge.pm,v 1.3 2002/12/16 19:57:12 joko Exp $
+##  $Id: Bridge.pm,v 1.4 2003/01/20 16:55:15 joko Exp $
 ## --------------------------------------------------------------------------------
 ##  $Log: Bridge.pm,v $
+##  Revision 1.4  2003/01/20 16:55:15  joko
+##  + sub mixinPackage
+##  + sub include
+##
 ##  Revision 1.3  2002/12/16 19:57:12  joko
 ##  + sub unload
 ##
@@ -100,13 +104,16 @@
     my $self = shift;
     my $modulename_load = shift;
 
+    my $self_modulename = ref $self;
     my $package = $self->_getPluginPackage($modulename_load);
     
     if ($meta->{loaded}->{$package}) {
       return 1;
     }
     
-    $logger->info( __PACKAGE__ . "->load: $package" );
+    #$logger->info( __PACKAGE__ . "->load: $package" );
+    #$logger->info( __PACKAGE__ . "->load: $self_modulename" );
+    $logger->debug( $self_modulename . "->load: $package\t[via " . __PACKAGE__ . "]" );
 
     # this is the module testing phase - use mixin doesn't seem to propagate errors by default
     eval("use $package;");
@@ -126,6 +133,17 @@
 
     # V2:
     # switch into foreign package and mixin plugin-module
+    $self->mixinPackage($package);
+
+    return 1;
+    
+  }
+
+  # TODO: maybe refactor to DesignPattern::Object? what about the '$logger'?
+  sub mixinPackage {
+    my $self = shift;
+    my $package = shift;
+    # switch into foreign package and mixin plugin-module
     my $self_classname = ref $self;
     eval("package $self_classname; use mixin '$package';");
     #eval("use mixin_all '$package';");
@@ -135,9 +153,6 @@
     } else {
       $meta->{loaded}->{$package} = 1;
     }
-
-    return 1;
-    
   }
 
   sub unload {
@@ -160,5 +175,14 @@
     my $self = shift;
     $self->_abstract_function('boot');
   }
+  
+  sub include {
+    my $self = shift;
+    my $includefile = shift;
+    my $package = shift;
+    # TODO: do better error-detection here / prevent dies under all circumstances!
+    require $includefile;
+    $self->mixinPackage($package) if $package;
+  }
 
 1;