Method.st
branchjv
changeset 18011 deb0c3355881
parent 18006 4e8f3d37bdbf
parent 14595 5c27c812055b
child 18033 c90d8fdd805d
--- a/Method.st	Thu Dec 20 11:48:59 2012 +0000
+++ b/Method.st	Sat Jan 19 01:30:00 2013 +0000
@@ -450,6 +450,10 @@
     "Modified: / 01-06-2012 / 23:03:57 / cg"
 !
 
+getMclass
+    ^ mclass 
+!
+
 getPackage
     "return the package-ID of the method"
 
@@ -537,14 +541,14 @@
      which means that the method is not namespaced).
     "
 
-    | nsA lang |
+    | nsA prefix |
 
     nsA := self annotationAt: #namespace:.
-    nsA ifNotNil:[^nsA nameSpace].
-
-    ^(lang := self programmingLanguage) isSmalltalk
-        ifTrue:[nil]
-        ifFalse:[lang].
+    nsA notNil ifTrue:[^nsA nameSpace].
+
+    prefix := self programmingLanguage defaultSelectorNameSpacePrefix.
+    (prefix isNil or:[prefix = 'Smalltalk']) ifTrue:[ ^ nil].
+    ^ prefix
 
     "
         (Method >> #nameSpace) nameSpace
@@ -627,11 +631,13 @@
 !
 
 package
-    "return the package-ID of the method (nil is translated to noProject here)"
+    "return the package-symbol of the method (nil is translated to noProject here)"
 
     |cls|
 
     package notNil ifTrue:[ ^ package ].
+
+    "/ get it from my class
     (cls := self mclass) isNil ifTrue:[
         ^ PackageId noProjectID.
     ].
@@ -965,7 +971,6 @@
     "Modified (format): / 18-11-2011 / 14:47:06 / cg"
 ! !
 
-
 !Method methodsFor:'accessing-visibility'!
 
 isIgnored
@@ -1060,7 +1065,9 @@
 #endif
 %}.
     ^ false
-!
+! !
+
+!Method privateMethodsFor:'accessing-visibility'!
 
 primSetPrivacy:aSymbol
     "set the methods access rights (privacy) from a symbol;
@@ -1103,7 +1110,9 @@
     ^ true
 
     "Modified: 27.8.1995 / 22:58:08 / claus"
-!
+! !
+
+!Method methodsFor:'accessing-visibility'!
 
 privacy
     "return a symbol describing the methods access rights (privacy);
@@ -2134,7 +2143,6 @@
         ].
     ].
 
-
     "/
     "/ nope - ask my class for the source (this also invokes the SCMgr)
     "/
@@ -2228,7 +2236,6 @@
     ^ nil
 
     "Modified: / 26-11-2006 / 22:33:38 / cg"
-    "Modified: / 12-10-2011 / 18:20:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 setLookupObject: lookup
@@ -3572,7 +3579,6 @@
     "Created: / 23-07-2012 / 11:16:36 / cg"
 ! !
 
-
 !Method methodsFor:'trap methods'!
 
 makeInvalid
@@ -3809,16 +3815,11 @@
 !Method class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.402 2012/11/25 09:53:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.405 2012-12-17 10:49:26 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic/Method.st,v 1.402 2012/11/25 09:53:30 cg Exp §'
-!
-
-version_HG
-
-    ^ '$Changeset: <not expanded> $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.405 2012-12-17 10:49:26 cg Exp $'
 !
 
 version_SVN