BrowserView.st
branchjv
changeset 12807 ba8c5416aa28
parent 12651 80720f8a6c70
parent 12746 2234f475b72f
child 13170 c9b815af5777
--- a/BrowserView.st	Tue May 28 22:46:27 2013 +0100
+++ b/BrowserView.st	Fri May 31 00:35:44 2013 +0100
@@ -79,7 +79,6 @@
 "
 ! !
 
-
 !BrowserView class methodsFor:'initialization'!
 
 initialize
@@ -129,7 +128,6 @@
     "Modified: / 27.10.1997 / 17:34:25 / cg"
 ! !
 
-
 !BrowserView class methodsFor:'class history'!
 
 addToClassHistory:aClass selector:aSelector
@@ -142,7 +140,6 @@
     SystemBrowser checkClassHistory
 ! !
 
-
 !BrowserView class methodsFor:'cleanup'!
 
 lowSpaceCleanup
@@ -159,7 +156,6 @@
     Icons := DefaultIcon := nil.
 ! !
 
-
 !BrowserView class methodsFor:'defaults'!
 
 changeHistoryMaxSize
@@ -233,7 +229,6 @@
     "Created: / 29.10.1997 / 03:32:43 / cg"
 ! !
 
-
 !BrowserView class methodsFor:'interface specs'!
 
 methodFilterSpec
@@ -616,7 +611,6 @@
       )
 ! !
 
-
 !BrowserView class methodsFor:'menu specs'!
 
 menuSpec
@@ -1675,14 +1669,12 @@
       )
 ! !
 
-
 !BrowserView class methodsFor:'resources'!
 
 classResources
     ^ SystemBrowser classResources
 ! !
 
-
 !BrowserView methodsFor:'change & update'!
 
 delayedUpdate:something with:someArgument from:changedObject
@@ -2094,7 +2086,6 @@
     "Modified: 26.3.1997 / 18:29:51 / cg"
 ! !
 
-
 !BrowserView methodsFor:'class category list menu'!
 
 browserClone
@@ -2924,7 +2915,7 @@
         (oldClass := currentClass) notNil ifTrue:[
             oldClassName := currentClass name.
             (oldClassName endsWith:'-old') ifTrue:[
-                oldClassName := oldClassName copyWithoutLast:4 "copyTo:(oldClassName size - 4)"
+                oldClassName := oldClassName copyButLast:4 "copyTo:(oldClassName size - 4)"
             ]
         ].
         oldMethodCategory := currentMethodCategory.
@@ -2960,7 +2951,6 @@
     "Modified: / 10.4.1998 / 12:25:38 / cg"
 ! !
 
-
 !BrowserView methodsFor:'class category source administration'!
 
 classCategoryCheckinEach
@@ -3417,7 +3407,6 @@
     "Modified (format): / 29-09-2011 / 16:09:52 / cg"
 ! !
 
-
 !BrowserView methodsFor:'class category stuff'!
 
 checkClassCategorySelected
@@ -3702,7 +3691,6 @@
     "Modified: / 27.7.1998 / 10:56:50 / cg"
 ! !
 
-
 !BrowserView methodsFor:'class history'!
 
 changeHistoryMenu
@@ -3900,7 +3888,6 @@
     self class classHistory:savedHistory.
 ! !
 
-
 !BrowserView methodsFor:'class list menu'!
 
 classClassInstVars
@@ -5153,7 +5140,7 @@
                 clsName := words first.
                 (clsName endsWith:' class') ifTrue:[
                     isMeta := true.
-                    clsName := clsName copyWithoutLast:6 "copyTo:(clsName size - 5)"
+                    clsName := clsName copyButLast:6 "copyTo:(clsName size - 5)"
                 ] ifFalse:[
                     isMeta := false
                 ].
@@ -5211,7 +5198,6 @@
     "Modified: 17.6.1997 / 13:32:40 / cg"
 ! !
 
-
 !BrowserView methodsFor:'class list source administration'!
 
 classCheckin
@@ -5473,7 +5459,7 @@
     fileName := fileNameHolder value withoutSpaces.
 
     (fileName endsWith:',v') ifTrue:[
-        fileName := fileName copyWithoutLast:2
+        fileName := fileName copyButLast:2
     ].
     (fileName endsWith:'.st') ifFalse:[
         fileName := fileName , '.st'
@@ -5761,7 +5747,6 @@
     "Modified: / 10.2.2000 / 14:14:09 / cg"
 ! !
 
-
 !BrowserView methodsFor:'class stuff'!
 
 allClasses
@@ -6795,7 +6780,7 @@
 
     str := aString.
     (aString endsWith:' class') ifTrue:[
-        str := aString copyWithoutLast:6.
+        str := aString copyButLast:6.
         meta := true
     ].
 
@@ -6937,7 +6922,6 @@
     "Modified: 10.1.1997 / 14:01:20 / cg"
 ! !
 
-
 !BrowserView methodsFor:'class-method list menu'!
 
 classMethodBrowse
@@ -7151,7 +7135,6 @@
     "Modified: / 7.8.1998 / 17:13:47 / cg"
 ! !
 
-
 !BrowserView methodsFor:'class-method stuff'!
 
 classFromClassMethodString:aString
@@ -7263,7 +7246,7 @@
     ].
 
     ((classString ~= 'Metaclass') and:[classString endsWith:' class']) ifTrue:[
-        classString := classString copyWithoutLast:6 "copyTo:(classString size - 5)".
+        classString := classString copyButLast:6 "copyTo:(classString size - 5)".
         meta := true.
     ] ifFalse:[
         meta := false.
@@ -7358,7 +7341,7 @@
 
     s := aString string withoutSpaces.
     (s endsWith:'???') ifTrue:[
-        s := s copyWithoutLast:3.    "/ kludge
+        s := s copyButLast:3.    "/ kludge
         s := s withoutSpaces.
     ].
     (s includes:${ ) ifTrue:[
@@ -7371,14 +7354,14 @@
     ].
 
     (s endsWith:' !!') ifTrue:[
-        s := s copyWithoutLast:2
+        s := s copyButLast:2
     ].
     (s endsWith:')') ifTrue:[
         s := aString copyTo:(aString lastIndexOf:$()-1.
         s := s withoutSpaces.
     ].
     (s endsWith:' !!') ifTrue:[
-        s := s copyWithoutLast:2
+        s := s copyButLast:2
     ].
     pos := s lastIndexOf:(Character space).
     s := s copyFrom:(pos + 1).
@@ -7440,7 +7423,6 @@
     "Modified: / 17.10.1998 / 11:30:35 / cg"
 ! !
 
-
 !BrowserView methodsFor:'event handling'!
 
 handlesKeyPress:key inView:view
@@ -7543,7 +7525,6 @@
     "Modified: / 18.4.1998 / 15:56:36 / cg"
 ! !
 
-
 !BrowserView methodsFor:'help'!
 
 helpTextFor:aComponent
@@ -7565,7 +7546,6 @@
     "Modified: 28.6.1997 / 15:00:18 / cg"
 ! !
 
-
 !BrowserView methodsFor:'initialization & release'!
 
 autoSearch:aString
@@ -7752,7 +7732,6 @@
     "Modified: 18.8.1997 / 15:19:50 / cg"
 ! !
 
-
 !BrowserView methodsFor:'initialize subviews'!
 
 createClassListViewIn:frame
@@ -8323,7 +8302,6 @@
     "Modified: / 25.10.1997 / 19:27:40 / cg"
 ! !
 
-
 !BrowserView methodsFor:'method category list menu'!
 
 createAccessMethodsFor:aCollectionOfInstVarNames withChange:withChange
@@ -8865,7 +8843,6 @@
                                     ]
 ! !
 
-
 !BrowserView methodsFor:'method category stuff'!
 
 asBrowserList:aList
@@ -9112,7 +9089,6 @@
     "Modified: 18.8.1997 / 15:44:38 / cg"
 ! !
 
-
 !BrowserView methodsFor:'method list menu'!
 
 commonTraceHelperWith:aSelector
@@ -10538,7 +10514,6 @@
     "Modified: / 12.1.1998 / 19:16:22 / cg"
 ! !
 
-
 !BrowserView methodsFor:'method stuff'!
 
 checkMethodSelected
@@ -10563,7 +10538,7 @@
     "/
     aMethod isWrapped ifTrue:[
         (s endsWith:' !!') ifTrue:[
-            s := s copyWithoutLast:2
+            s := s copyButLast:2
         ].
         aMethod isBreakpointed ifTrue:[
             icn := self stopIcon
@@ -10826,7 +10801,7 @@
                 (index == 0 
                  and:[cls isMeta
                  and:[cls name endsWith:' class']]) ifTrue:[
-                    index := classListView list indexOf:(cls name copyWithoutLast:6).
+                    index := classListView list indexOf:(cls name copyButLast:6).
                 ].
                 index ~~ 0 ifTrue:[
                     classListView attributeAt:index add:#bold.
@@ -11082,7 +11057,6 @@
     "Modified: 30.7.1997 / 15:55:06 / cg"
 ! !
 
-
 !BrowserView methodsFor:'misc'!
 
 beep
@@ -11379,7 +11353,6 @@
     "Modified: / 10.2.2000 / 14:15:03 / cg"
 ! !
 
-
 !BrowserView methodsFor:'namespace menu'!
 
 nameSpaceCheckInEach
@@ -11532,7 +11505,6 @@
     "Modified: / 3.2.1999 / 20:18:13 / cg"
 ! !
 
-
 !BrowserView methodsFor:'namespace stuff'!
 
 changeNameSpaceTo:nsName
@@ -11718,7 +11690,6 @@
     "Created: 8.1.1997 / 10:54:03 / cg"
 ! !
 
-
 !BrowserView methodsFor:'private'!
 
 askAndBrowseMethodCategory:title action:aBlock
@@ -12531,30 +12502,30 @@
 
     sel := codeView selection.
     sel notNil ifTrue:[
-	sel := sel asString withoutSeparators.
-	('*>>*' match:sel) ifTrue:[
-	    sep := $>
-	] ifFalse:[
-	    ('* *' match:sel) ifTrue:[
-		sep := Character space
-	    ]
-	].
-	sep notNil ifTrue:[
-	    "
-	     extract class/sel from selection
-	    "
-	    s := ReadStream on:sel.
-	    clsName := s upTo:sep.
-	    [s peek == sep] whileTrue:[s next].
-	    sel := s upToEnd.
-
-	    (clsName endsWith:' class') ifTrue:[
-		isMeta := true.
-		clsName := clsName copyWithoutLast:6 "copyTo:(clsName size - 5)"
-	    ] ifFalse:[
-		isMeta := false
-	    ].
-	]
+        sel := sel asString withoutSeparators.
+        ('*>>*' match:sel) ifTrue:[
+            sep := $>
+        ] ifFalse:[
+            ('* *' match:sel) ifTrue:[
+                sep := Character space
+            ]
+        ].
+        sep notNil ifTrue:[
+            "
+             extract class/sel from selection
+            "
+            s := ReadStream on:sel.
+            clsName := s upTo:sep.
+            [s peek == sep] whileTrue:[s next].
+            sel := s upToEnd.
+
+            (clsName endsWith:' class') ifTrue:[
+                isMeta := true.
+                clsName := clsName copyButLast:6 "copyTo:(clsName size - 5)"
+            ] ifFalse:[
+                isMeta := false
+            ].
+        ]
     ].
     aBlock value:clsName value:sel value:isMeta
 
@@ -12570,7 +12541,7 @@
     nm := aClassName.
     (nm endsWith:' class') ifTrue:[
         meta := true.
-        nm := nm copyWithoutLast:6.
+        nm := nm copyButLast:6.
     ].
     nameSym := nm asSymbol.
 
@@ -12594,7 +12565,7 @@
     ].
 
     (nm startsWith:'Smalltalk::') ifTrue:[
-        cls := environment classNamed:(nm copyFrom:'Smalltalk::' size + 1).
+        cls := environment classNamed:(nm withoutPrefix:'Smalltalk::').
         cls notNil ifTrue:[
             meta ifTrue:[^ cls theMetaclass].
             ^ cls
@@ -13016,7 +12987,7 @@
                 |cls|
 
                 Error handle:[:ex |
-                    ex signal == HaltInterrupt ifTrue:[
+                    ex creator == HaltInterrupt ifTrue:[
                         ex reject
                     ].
                     codeView error:ex description position:1 to:nil from:nil.
@@ -13273,7 +13244,6 @@
     "Created: 18.8.1997 / 15:41:52 / cg"
 ! !
 
-
 !BrowserView methodsFor:'private-defaults'!
 
 breakPointedIcon
@@ -13398,7 +13368,6 @@
     ^ self fetchIcon:#trace selector:#traceIcon
 ! !
 
-
 !BrowserView methodsFor:'private-queries'!
 
 hasClassCategorySelected
@@ -13522,7 +13491,6 @@
         and:[ variableListView selectionValue notNil ]]
 ! !
 
-
 !BrowserView methodsFor:'syntax coloring'!
 
 startSyntaxHighlightProcess
@@ -13710,7 +13678,6 @@
     "Modified: / 20.11.2001 / 00:38:09 / cg"
 ! !
 
-
 !BrowserView methodsFor:'unused'!
 
 listOfAllMethodCategoriesInHierarchy:aClass
@@ -13757,7 +13724,6 @@
     "Modified: 5.6.1996 / 11:42:12 / stefan"
 ! !
 
-
 !BrowserView methodsFor:'variable list menu'!
 
 allClassInstVarMods
@@ -14270,7 +14236,6 @@
     "Modified: 25.5.1996 / 12:26:07 / cg"
 ! !
 
-
 !BrowserView methodsFor:'variable stuff'!
 
 hilightEntryFor:entry
@@ -14582,11 +14547,10 @@
     "Modified: / 17.9.1998 / 13:45:02 / cg"
 ! !
 
-
 !BrowserView class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.842 2013-04-04 09:41:22 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.845 2013-05-07 15:29:00 cg Exp $'
 !
 
 version_HG