Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged in jv's chenges
authorClaus Gittinger <cg@exept.de>
Wed, 05 Feb 2014 20:08:49 +0100
changeset 13874 5a3848faf8a2
parent 13873 a1fe5117acc1
child 13875 a1e9ad9d39eb
merged in jv's chenges
Tools_MethodCategoryList.st file | annotate | diff | comparison | revisions 
--- a/Tools_MethodCategoryList.st	Wed Feb 05 20:08:47 2014 +0100
+++ b/Tools_MethodCategoryList.st	Wed Feb 05 20:08:49 2014 +0100
@@ -417,18 +417,8 @@
     refetch := [:oldClass | 
                     |nm cls newClass|
 
-                    "/ Sigh, special care has to be taken for Java classes as
-                    "/ for them, !!!!!! (Smalltalk at: javaClass name) ~~ javaClass !!!!!!
                     nm := oldClass theNonMetaclass name.
-                    oldClass theNonMetaclass isJavaClass ifTrue:[
-                        "/ Can't use JavaVM>>classNamed:definedBy: for Java classes because environment
-                        "/ could not be Java class. Do a full search instead, sigh...
-                        newClass := environment allClasses 
-                                    detect:[:each|each isJavaClass and:[each name == oldClass theNonMetaclass name and:[each classLoader == oldClass theNonMetaclass classLoader]]]
-                                    ifNone:[nil].                        
-                    ] ifFalse:[
-                        newClass := Smalltalk at:nm
-                    ].
+                    newClass := Smalltalk at:nm.
 
                     oldClass isMeta ifTrue:[
                         newClass isNil ifTrue:[
@@ -453,7 +443,7 @@
     ].
 
     "Modified: / 06-07-2011 / 11:44:13 / cg"
-    "Modified: / 06-09-2013 / 18:05:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-10-2013 / 01:19:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 delayedUpdate:something with:aParameter from:changedObject
@@ -821,7 +811,7 @@
     (methods conform:[:aMethod | aMethod isMethod]) ifFalse:[^ false].
 
     cat := self categoryAtTargetPointOf:aDropContext.
-    (cat isNil or:[ self class isPseudoCategory:cat]) ifTrue:[^ false].
+    cat isNil ifTrue:[^ false].
 
     (methods contains:[:aMethod | aMethod category ~= cat]) ifFalse:[^ false].
     ^ true
@@ -855,7 +845,7 @@
     (methods conform:[:something | something isMethod]) ifFalse:[^ self].
 
     cat := self categoryAtTargetPointOf:aDropContext.
-    (cat notNil and:[(self class isPseudoCategory:cat) not]) ifTrue:[
+    cat notNil ifTrue:[
         self masterApplication moveMethods:methods toProtocol:cat.
     ].
 
@@ -2101,11 +2091,11 @@
 !MethodCategoryList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.97 2013-09-06 18:39:19 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.98 2014-02-05 19:08:49 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.97 2013-09-06 18:39:19 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.98 2014-02-05 19:08:49 cg Exp $'
 ! !
hg/stx-libtool