Index: xotcl/library/lib/mixinStrategy.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/lib/mixinStrategy.xotcl	(.../mixinStrategy.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/lib/mixinStrategy.xotcl	(.../mixinStrategy.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,92 +1,98 @@
-#$Id: mixinStrategy.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
-package provide xotcl::mixinStrategy 0.8
+#$Id: mixinStrategy.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+package provide xotcl::mixinStrategy 0.9
 
-@ @File { description {
-  These methods provide support for managing "strategies",  i.e. 
-  mixin-classes, where only one kind of a family of conformant 
-  mixins should be registered.
-  <@p>
-  Naming convertions for strategies:
-  All strategies must follow the naming convention 'kind=implementation'. 
-  Examples are the persistency strategy 'eager' specfied as 
-  'persistent=eager' or the persistency strategy 'lazy' (specified as
-  'persistent=lazy')
-}}
+package require XOTcl
 
-@ Object instproc mixinStrategy {strategy "Strategy to be added" } {
-  description {
-    This method adds or replaces a new strategy from the mixin
-    list. Strategies are named following the converntion mentioned 
-    above.
+namespace eval ::xotcl::mixinStrategy {
+  namespace import ::xotcl::*
+
+  @ @File { description {
+    These methods provide support for managing "strategies",  i.e. 
+    mixin-classes, where only one kind of a family of conformant 
+    mixins should be registered.
+    <@p>
+    Naming convertions for strategies:
+    All strategies must follow the naming convention 'kind=implementation'. 
+    Examples are the persistency strategy 'eager' specfied as 
+    'persistent=eager' or the persistency strategy 'lazy' (specified as
+    'persistent=lazy')
+  }}
+
+  @ Object instproc mixinStrategy {strategy "Strategy to be added" } {
+    description {
+      This method adds or replaces a new strategy from the mixin
+      list. Strategies are named following the convention mentioned 
+      above.
+    }
+    return "old strategy"
   }
-  return "old strategy"
-}
 
-Object instproc mixinStrategy {strategy} {
-  ::regexp {^([^:]+)=} $strategy _ kind
-  ::set mixins ""
-  ::set oldStrategy ""
-  foreach mixin [my info mixin] {
-    if {[::string match ::$kind=* $mixin]} {
-      ::lappend mixins $strategy
-      ::set oldStrategy $mixin
-    } else {
-      ::lappend mixins $mixin
+  Object instproc mixinStrategy {strategy} {
+    regexp {:?([^:=]+)=} $strategy _ kind
+    set mixins ""
+    set oldStrategy ""
+    foreach mixin [my info mixin] {
+      if {[string match *${kind}=* $mixin]} {
+	lappend mixins $strategy
+	set oldStrategy $mixin
+      } else {
+	lappend mixins $mixin
+      }
     }
+    if {$oldStrategy == ""} {
+      lappend mixins $strategy
+    }
+    my mixin $mixins
+    return $oldStrategy
   }
-  if {$oldStrategy == ""} {
-    ::lappend mixins $strategy
+
+  @ Object instproc mixinQueryStrategy {kind "strategy kind"} {
+    description {
+      This method searches the mixin list for a mixin of this
+      kind (starting with $kind=)
+    }
+    return "returns the maching strategy"
   }
-  my mixin $mixins
-  return $oldStrategy
-}
 
-@ Object instproc mixinQueryStrategy {kind "strategy kind"} {
-  description {
-    This method searches the mixin list for a mixin of this
-    kind (starting with $kind=)
+  Object instproc mixinQueryStrategy {kind} {
+    set m [my info mixin]
+    return [::lindex $m [::lsearch -glob $m $kind=*]]
   }
-  return "returns the maching strategy"
-}
 
-Object instproc mixinQueryStrategy {kind} {
-  set m [my info mixin]
-  return [::lindex $m [::lsearch -glob $m $kind=*]]
-}
+  @ Object instproc add {construct "(inst) 'filter' or 'mixin'" args "to be added"} {
+    description "add the specified (inst) 'filters' or 'mixins'"
+    return "empty"
+  }
 
-@ Object instproc add {construct "(inst) 'filter' or 'mixin'" args "to be added"} {
-  description "add the specified (inst) 'filters' or 'mixins'"
-  return "empty"
-}
-
-Object instproc add {kind args} {
-  if {$kind != {instfilter} && $kind != {instmixin} &&
-      $kind != {filter} && $kind != {mixin}} {
-    error "Usage: <object> [self proc] <instfilter|instmixin|filter|mixin> ..."
+  Object instproc add {kind args} {
+    if {$kind != {instfilter} && $kind != {instmixin} &&
+	$kind != {filter} && $kind != {mixin}} {
+      error "Usage: <object> [self proc] <instfilter|instmixin|filter|mixin> ..."
+    }
+    ::set classes [my info $kind]
+    eval ::lappend classes $args
+    my $kind $classes
+    #puts stderr "$kind of [self] are now: �[my info $kind]�"
   }
-  ::set classes [my info $kind]
-  eval ::lappend classes $args
-  my $kind $classes
-  #puts stderr "$kind of [self] are now: �[my info $kind]�"
-}
-@ Object instproc remove {construct "(inst) 'filter' or 'mixin'" args "to be removed"} {
-  description "remove the specified (inst) 'filters' or 'mixins'"
-  return "empty"
-}
-Object instproc remove {kind args} {
-  if {$kind != {instfilter} && $kind != {instmixin} &&
-      $kind != {filter} && $kind != {mixin}} {
-    error "Usage: <object> [self proc] <instfilter|instmixin|filter|mixin> ..."
+  @ Object instproc remove {construct "(inst) 'filter' or 'mixin'" args "to be removed"} {
+    description "remove the specified (inst) 'filters' or 'mixins'"
+    return "empty"
   }
-  ::set classes [my info $kind]
-  foreach c $args {
-    ::set pos [::lsearch $classes $c]
-    if {$pos == -1} { 
-      error "$kind �$c� could not be removed" 
-    } else {
-      set $classes [::lreplace $classes $pos $pos]
+  Object instproc remove {kind args} {
+    if {$kind != {instfilter} && $kind != {instmixin} &&
+	$kind != {filter} && $kind != {mixin}} {
+      error "Usage: <object> [self proc] <instfilter|instmixin|filter|mixin> ..."
     }
-  } 
-  my $kind $classes
-  # puts stderr "$kind of [self] are now: �[my info $kind]�"
+    ::set classes [my info $kind]
+    foreach c $args {
+      ::set pos [::lsearch $classes $c]
+      if {$pos == -1} { 
+	error "$kind �$c� could not be removed" 
+      } else {
+	set $classes [::lreplace $classes $pos $pos]
+      }
+    } 
+    my $kind $classes
+    # puts stderr "$kind of [self] are now: �[my info $kind]�"
+  }
 }