Merged 79cde29be713 and a80e78c59918
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 28 Jul 2014 11:49:53 +0100
changeset 3181 19acb606dd69
parent 3177 79cde29be713 (current diff)
parent 3180 a80e78c59918 (diff)
child 3182 2d3e5574157a
Merged 79cde29be713 and a80e78c59918
--- a/JavaClass.st	Fri Jul 25 09:23:02 2014 +0100
+++ b/JavaClass.st	Mon Jul 28 11:49:53 2014 +0100
@@ -825,9 +825,10 @@
 !
 
 nameWithoutNameSpacePrefix
-    ^ binaryName
-
-    "Created: 20.1.1997 / 13:05:30 / cg"
+    ^ self lastName
+
+    "Created: / 20-01-1997 / 13:05:30 / cg"
+    "Modified: / 25-07-2014 / 10:09:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 nameWithoutPrefix
--- a/JavaObject.st	Fri Jul 25 09:23:02 2014 +0100
+++ b/JavaObject.st	Mon Jul 28 11:49:53 2014 +0100
@@ -317,35 +317,6 @@
     ]
 ! !
 
-!JavaObject methodsFor:'inspecting'!
-
-inspectorExtraAttributes
-
-    | attrs nm |
-
-    attrs := super inspectorExtraAttributes.
-    nm := self class binaryName.
-    nm == #'java/lang/reflect/Method' ifTrue:[
-        VMInternalError handle:[:ex |
-            "/ happens when the method cannot be resolved
-        ] do:[
-            attrs at:'-method' put: (JavaVM reflection methodForJavaMethodObject: self).
-        ].
-        ^attrs.
-    ].
-    nm == #'java/lang/Class' ifTrue:[
-        VMInternalError handle:[:ex |
-            "/ happens when the class cannot be resolved
-        ] do:[
-            attrs at:'-class' put: (JavaVM reflection classForJavaClassObject: self).
-        ].
-        ^attrs.
-    ].
-    ^attrs
-
-    "Created: / 04-12-2011 / 19:28:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 08-10-2013 / 22:47:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
 
 !JavaObject methodsFor:'message sending'!
 
--- a/tools/JavaMapInspectorView.st	Fri Jul 25 09:23:02 2014 +0100
+++ b/tools/JavaMapInspectorView.st	Mon Jul 28 11:49:53 2014 +0100
@@ -47,12 +47,13 @@
 
     | cls |
     cls := inspectedObject class.
-    [ cls name startsWith: 'java/util/' ] whileFalse:[
+    [ cls binaryName startsWith: 'java/util/' ] whileFalse:[
         cls := cls superclass.
     ].
     ^cls.
 
     "Created: / 04-12-2011 / 17:02:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-07-2014 / 09:39:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 indexList