# HG changeset patch
# User Jan Vrany <jan.vrany@fit.cvut.cz>
# Date 1442475018 -3600
# Node ID f5752c8cf010a3f55af8a7b73c2f712a058a6e76
# Parent  dd41c8e4337373d3131de9649717e3788d040a45# Parent  9bfce586253acdc40c901427ca8c2721a6dde126
Merge

diff -r dd41c8e43373 -r f5752c8cf010 Annotation.st
--- a/Annotation.st	Thu Sep 17 08:30:10 2015 +0100
+++ b/Annotation.st	Thu Sep 17 08:30:18 2015 +0100
@@ -190,10 +190,8 @@
     "Created: / 16-07-2010 / 11:31:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-resource: type value: value
-
-    ^Annotation::Resource new 
-        type: type value: value
+resource:type values:value 
+    ^ Annotation::Resource new type:type value:value
 
     "Created: / 16-07-2010 / 11:31:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -576,7 +574,7 @@
         key := #'resource:'.
         arguments := Array with:typeArg.
     ] ifFalse:[
-        key := #'resource:value:'.
+        key := #'resource:values:'.
         arguments := Array with:typeArg with:valueArg.
     ].
 !
@@ -691,15 +689,15 @@
 !Annotation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Annotation.st,v 1.20 2015-06-05 16:07:38 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Annotation.st,v 1.20 2015-06-05 16:07:38 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: Annotation.st,v 1.20 2015-06-05 16:07:38 stefan Exp $'
+    ^ '$Id$'
 ! !
 
 
diff -r dd41c8e43373 -r f5752c8cf010 Behavior.st
--- a/Behavior.st	Thu Sep 17 08:30:10 2015 +0100
+++ b/Behavior.st	Thu Sep 17 08:30:18 2015 +0100
@@ -3660,6 +3660,14 @@
     ^ self name ? '?'
 !
 
+nameSpace
+    "return the namespace I am contained in.
+     Not normally needed here, but added to allow for instances of anonymous behaviours
+     to be inspected or browsed."
+
+    ^ nil
+!
+
 nameWithArticle
     "return a string consisting of classname preceeded by an article.
      (dont expect me to write national variants for this ... :-)
diff -r dd41c8e43373 -r f5752c8cf010 Method.st
--- a/Method.st	Thu Sep 17 08:30:10 2015 +0100
+++ b/Method.st	Thu Sep 17 08:30:18 2015 +0100
@@ -3376,8 +3376,8 @@
     annotations isNil ifTrue:[^ self parseResources].
 
     resources := IdentityDictionary new.
-    self annotationsAt: #resource: orAt: #resource:value: do:[:annot|
-	resources at: annot type put: annot value ? true
+    self annotationsAt: #resource: orAt: #resource:values: do:[:annot|
+        resources at: annot type put: annot value ? true
     ].
     ^ resources