Merge jv
authorMerge Script
Tue, 19 Apr 2016 06:49:19 +0200
branchjv
changeset 3997 99c27816a240
parent 3994 2bd83eac0023 (current diff)
parent 3996 a7d64310f460 (diff)
child 3998 1495d559dc7c
Merge
ClassChange.st
MethodChange.st
--- a/ClassChange.st	Mon Apr 18 07:01:20 2016 +0200
+++ b/ClassChange.st	Tue Apr 19 06:49:19 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
@@ -212,10 +210,15 @@
 !
 
 className
-    "Returns class name of the class *without* namespace, but with
-     all owning classes (if the change class is a private class).
-     cg: this comment is wrong!! 
-     question: what is intended: what the comment says, or what the code does?"
+    "Returns class name of the class as it was present in the original change.
+     For changes from a file with namespace override, this will be the
+     className *without* toplevel namespace, but with all owning classes 
+     (if the change class is a private class).
+     For changes generated internally (by the browser), this will be the full name,
+     and the namespace override will be nil.
+     
+     cg: this is all very confusing and needs some cleanup.
+     However it will be done, any change here needs checks in all users of this code."
 
     ^ className
 
@@ -270,9 +273,9 @@
 !
 
 fullClassName
-    "Returns fully qualified class name, i.e., including namespace in which the
-     class should be installed (i.e., the override namespace (if any) rather than
-     original namespace (of any))"
+    "Returns the fully qualified class name, i.e., including namespace in which the
+     class should be installed 
+     (i.e., the override namespace (if any) rather than original namespace (of any))"
 
     |ns|
 
--- a/MethodChange.st	Mon Apr 18 07:01:20 2016 +0200
+++ b/MethodChange.st	Tue Apr 19 06:49:19 2016 +0200
@@ -116,11 +116,8 @@
 !
 
 className
-    ^classIsJava ifTrue:[
-        className
-    ] ifFalse:[
-        super className
-    ]
+    classIsJava == true ifTrue:[ ^ className].
+    ^ super className
 
     "Created: / 29-01-2013 / 14:21:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 30-01-2013 / 10:00:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"