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.
dont duplicate the code in method>>resources
authorClaus Gittinger <cg@exept.de>
Wed, 22 Apr 1998 10:35:39 +0200
changeset 1573 4b6ce12dff2b
parent 1572 17986c6f38bf
child 1574 f8a81b46f511
dont duplicate the code in method>>resources
SBrowser.st file | annotate | diff | comparison | revisions
SystemBrowser.st file | annotate | diff | comparison | revisions 
--- a/SBrowser.st	Wed Apr 22 10:33:34 1998 +0200
+++ b/SBrowser.st	Wed Apr 22 10:35:39 1998 +0200
@@ -664,59 +664,46 @@
         searchBlock := [:class :method :s | method hasResource]
     ] ifFalse:[
         searchBlock := [:class :method :s |
-                            |src parser rsrc val found|
+                            |rsrc val found|
 
                             found := false.
                             method hasResource ifTrue:[
-                                src := method source.
-                                src isNil ifTrue:[
-                                    found := true   "/ actually: dont know
-                                ] ifFalse:[
-                                    (src findString:'resource:') ~~ 0 ifTrue:[
-                                        parser := Parser
-                                                        parseMethod:src 
-                                                        in:class 
-                                                        ignoreErrors:true 
-                                                        ignoreWarnings:true.
-
-                                        rsrc := parser primitiveResources.
-                                        rsrc notNil ifTrue:[
-                                            aResourceSymbol isNil ifTrue:[
-                                                item isNil ifTrue:[
-                                                    found := true
-                                                ] ifFalse:[
-                                                    rsrc isCollection ifTrue:[
-                                                        rsrc keysAndValuesDo:[:rsrc :val |
-                                                            val isCollection ifTrue:[
-                                                                val do:[:v |
-                                                                    found := item match:v printString 
-                                                                ]
-                                                            ] ifFalse:[
-                                                                found := item match:val printString 
-                                                            ]
+                                rsrc := method resources.
+                                rsrc notNil ifTrue:[
+                                    aResourceSymbol isNil ifTrue:[
+                                        item isNil ifTrue:[
+                                            found := true
+                                        ] ifFalse:[
+                                            rsrc isCollection ifTrue:[
+                                                rsrc keysAndValuesDo:[:rsrc :val |
+                                                    val isCollection ifTrue:[
+                                                        val do:[:v |
+                                                            found := item match:v printString 
                                                         ]
                                                     ] ifFalse:[
-                                                        found := item match:rsrc printString
+                                                        found := item match:val printString 
                                                     ]
                                                 ]
                                             ] ifFalse:[
-                                                (rsrc includesKey:aResourceSymbol) ifTrue:[
-                                                    item isNil ifTrue:[
-                                                        found := true
+                                                found := item match:rsrc printString
+                                            ]
+                                        ]
+                                    ] ifFalse:[
+                                        (rsrc includesKey:aResourceSymbol) ifTrue:[
+                                            item isNil ifTrue:[
+                                                found := true
+                                            ] ifFalse:[
+                                                rsrc isCollection ifTrue:[
+                                                    val := rsrc at:aResourceSymbol.
+                                                    val isCollection ifTrue:[
+                                                        val do:[:v |
+                                                            found := item match:v printString 
+                                                        ]
                                                     ] ifFalse:[
-                                                        rsrc isCollection ifTrue:[
-                                                            val := rsrc at:aResourceSymbol.
-                                                            val isCollection ifTrue:[
-                                                                val do:[:v |
-                                                                    found := item match:v printString 
-                                                                ]
-                                                            ] ifFalse:[
-                                                                found := item match:val printString 
-                                                            ]
-                                                        ] ifFalse:[
-                                                            found := item match:rsrc printString
-                                                        ]
+                                                        found := item match:val printString 
                                                     ]
+                                                ] ifFalse:[
+                                                    found := item match:rsrc printString
                                                 ]
                                             ]
                                         ]
@@ -756,7 +743,7 @@
         title:'methods with a #style resource'
     "
 
-    "Modified: / 27.10.1997 / 17:32:43 / cg"
+    "Modified: / 22.4.1998 / 10:29:20 / cg"
 !
 
 browseForResource:aResourceSymbol in:aCollectionOfClasses title:title
@@ -1937,6 +1924,6 @@
 !SystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/SBrowser.st,v 1.83 1998-04-19 15:21:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/SBrowser.st,v 1.84 1998-04-22 08:35:39 cg Exp $'
 ! !
 SystemBrowser initialize!
--- a/SystemBrowser.st	Wed Apr 22 10:33:34 1998 +0200
+++ b/SystemBrowser.st	Wed Apr 22 10:35:39 1998 +0200
@@ -664,59 +664,46 @@
         searchBlock := [:class :method :s | method hasResource]
     ] ifFalse:[
         searchBlock := [:class :method :s |
-                            |src parser rsrc val found|
+                            |rsrc val found|
 
                             found := false.
                             method hasResource ifTrue:[
-                                src := method source.
-                                src isNil ifTrue:[
-                                    found := true   "/ actually: dont know
-                                ] ifFalse:[
-                                    (src findString:'resource:') ~~ 0 ifTrue:[
-                                        parser := Parser
-                                                        parseMethod:src 
-                                                        in:class 
-                                                        ignoreErrors:true 
-                                                        ignoreWarnings:true.
-
-                                        rsrc := parser primitiveResources.
-                                        rsrc notNil ifTrue:[
-                                            aResourceSymbol isNil ifTrue:[
-                                                item isNil ifTrue:[
-                                                    found := true
-                                                ] ifFalse:[
-                                                    rsrc isCollection ifTrue:[
-                                                        rsrc keysAndValuesDo:[:rsrc :val |
-                                                            val isCollection ifTrue:[
-                                                                val do:[:v |
-                                                                    found := item match:v printString 
-                                                                ]
-                                                            ] ifFalse:[
-                                                                found := item match:val printString 
-                                                            ]
+                                rsrc := method resources.
+                                rsrc notNil ifTrue:[
+                                    aResourceSymbol isNil ifTrue:[
+                                        item isNil ifTrue:[
+                                            found := true
+                                        ] ifFalse:[
+                                            rsrc isCollection ifTrue:[
+                                                rsrc keysAndValuesDo:[:rsrc :val |
+                                                    val isCollection ifTrue:[
+                                                        val do:[:v |
+                                                            found := item match:v printString 
                                                         ]
                                                     ] ifFalse:[
-                                                        found := item match:rsrc printString
+                                                        found := item match:val printString 
                                                     ]
                                                 ]
                                             ] ifFalse:[
-                                                (rsrc includesKey:aResourceSymbol) ifTrue:[
-                                                    item isNil ifTrue:[
-                                                        found := true
+                                                found := item match:rsrc printString
+                                            ]
+                                        ]
+                                    ] ifFalse:[
+                                        (rsrc includesKey:aResourceSymbol) ifTrue:[
+                                            item isNil ifTrue:[
+                                                found := true
+                                            ] ifFalse:[
+                                                rsrc isCollection ifTrue:[
+                                                    val := rsrc at:aResourceSymbol.
+                                                    val isCollection ifTrue:[
+                                                        val do:[:v |
+                                                            found := item match:v printString 
+                                                        ]
                                                     ] ifFalse:[
-                                                        rsrc isCollection ifTrue:[
-                                                            val := rsrc at:aResourceSymbol.
-                                                            val isCollection ifTrue:[
-                                                                val do:[:v |
-                                                                    found := item match:v printString 
-                                                                ]
-                                                            ] ifFalse:[
-                                                                found := item match:val printString 
-                                                            ]
-                                                        ] ifFalse:[
-                                                            found := item match:rsrc printString
-                                                        ]
+                                                        found := item match:val printString 
                                                     ]
+                                                ] ifFalse:[
+                                                    found := item match:rsrc printString
                                                 ]
                                             ]
                                         ]
@@ -756,7 +743,7 @@
         title:'methods with a #style resource'
     "
 
-    "Modified: / 27.10.1997 / 17:32:43 / cg"
+    "Modified: / 22.4.1998 / 10:29:20 / cg"
 !
 
 browseForResource:aResourceSymbol in:aCollectionOfClasses title:title
@@ -1937,6 +1924,6 @@
 !SystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.83 1998-04-19 15:21:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.84 1998-04-22 08:35:39 cg Exp $'
 ! !
 SystemBrowser initialize!
hg/stx-libtool