# HG changeset patch # User Claus Gittinger # Date 844117324 -7200 # Node ID 2ef5e22d8983b42ed6b7a6ee78807bfbd4483e30 # Parent d0dc66cf749989feabdedc25d45899af163d72e7 code cleanup (unused vars eliminated) diff -r d0dc66cf7499 -r 2ef5e22d8983 CBrowser.st --- a/CBrowser.st Mon Sep 30 22:59:44 1996 +0200 +++ b/CBrowser.st Mon Sep 30 23:02:04 1996 +0200 @@ -726,7 +726,7 @@ "compare a change with current version" |aStream chunk sawExcla parseTree thisClass cat oldSource newSource - parser sel oldMethod outcome showDiff d t1 t2 cls selector isLoaded + parser sel oldMethod outcome showDiff d t1 t2 selector isLoaded method| aStream := self streamForChange:changeNr. @@ -1530,7 +1530,7 @@ sourceOfMethodChange:changeNr "return a method-changes source code, or nil if its not a methodChange." - |aStream chunk sawExcla parseTree parser sourceChunk| + |aStream chunk sawExcla parseTree sourceChunk| aStream := self streamForChange:changeNr. aStream isNil ifTrue:[^ nil]. @@ -2316,5 +2316,5 @@ !ChangesBrowser class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/Attic/CBrowser.st,v 1.89 1996-09-10 18:19:08 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Attic/CBrowser.st,v 1.90 1996-09-30 21:00:59 cg Exp $' ! ! diff -r d0dc66cf7499 -r 2ef5e22d8983 ChangesBrowser.st --- a/ChangesBrowser.st Mon Sep 30 22:59:44 1996 +0200 +++ b/ChangesBrowser.st Mon Sep 30 23:02:04 1996 +0200 @@ -726,7 +726,7 @@ "compare a change with current version" |aStream chunk sawExcla parseTree thisClass cat oldSource newSource - parser sel oldMethod outcome showDiff d t1 t2 cls selector isLoaded + parser sel oldMethod outcome showDiff d t1 t2 selector isLoaded method| aStream := self streamForChange:changeNr. @@ -1530,7 +1530,7 @@ sourceOfMethodChange:changeNr "return a method-changes source code, or nil if its not a methodChange." - |aStream chunk sawExcla parseTree parser sourceChunk| + |aStream chunk sawExcla parseTree sourceChunk| aStream := self streamForChange:changeNr. aStream isNil ifTrue:[^ nil]. @@ -2316,5 +2316,5 @@ !ChangesBrowser class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.89 1996-09-10 18:19:08 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.90 1996-09-30 21:00:59 cg Exp $' ! ! diff -r d0dc66cf7499 -r 2ef5e22d8983 InspView.st --- a/InspView.st Mon Sep 30 22:59:44 1996 +0200 +++ b/InspView.st Mon Sep 30 23:02:04 1996 +0200 @@ -784,7 +784,7 @@ showSelection:lineNr "user clicked on an instvar - show value in workspace" - |val string| + |val| (hasMore and:[lineNr == listView list size]) ifTrue:[ "clicked on the '...' entry" @@ -856,5 +856,5 @@ !InspectorView class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/Attic/InspView.st,v 1.54 1996-06-28 14:12:31 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Attic/InspView.st,v 1.55 1996-09-30 21:01:16 cg Exp $' ! ! diff -r d0dc66cf7499 -r 2ef5e22d8983 InspectorView.st --- a/InspectorView.st Mon Sep 30 22:59:44 1996 +0200 +++ b/InspectorView.st Mon Sep 30 23:02:04 1996 +0200 @@ -784,7 +784,7 @@ showSelection:lineNr "user clicked on an instvar - show value in workspace" - |val string| + |val| (hasMore and:[lineNr == listView list size]) ifTrue:[ "clicked on the '...' entry" @@ -856,5 +856,5 @@ !InspectorView class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.54 1996-06-28 14:12:31 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.55 1996-09-30 21:01:16 cg Exp $' ! ! diff -r d0dc66cf7499 -r 2ef5e22d8983 Launcher.st --- a/Launcher.st Mon Sep 30 22:59:44 1996 +0200 +++ b/Launcher.st Mon Sep 30 23:02:04 1996 +0200 @@ -96,8 +96,6 @@ "return the launcher running on the current screen. (for access via addMenu/ removeMenu)" - |screen| - OpenLaunchers do:[:aLauncher | aLauncher window graphicsDevice == Screen current ifTrue:[ ^ aLauncher @@ -407,7 +405,7 @@ objectModuleDialog |allModules moduleNames allObjects methodObjects methodNames - cObjects cObjectNames cFunctionNames + cObjects cObjectNames otherObjects otherObjectNames box l handles unloadButton list1 list2 listView1 listView2 @@ -423,6 +421,9 @@ showCObjects := canDoIt asValue. showOthers := canDoIt asValue. + list1 := SelectionInList new. + list2 := SelectionInList new. + moduleListUpdater := [ |l| @@ -486,9 +487,6 @@ unloadButton disable. ]. - list1 := SelectionInList new. - list2 := SelectionInList new. - showBuiltIn onChangeSend:#value to:moduleListUpdater. showModules onChangeSend:#value to:moduleListUpdater. showMethods onChangeSend:#value to:moduleListUpdater. @@ -841,8 +839,8 @@ |box warnings warnSTX warnUnderscore warnOldStyle allowUnderscore immutableArrays warnSTXBox warnUnderscoreBox warnOldStyleBox warnCommonMistakes warnCommonMistakesBox stcCompilation compilationList stcCompilationOptions stcIncludes stcDefines stcOptions - stcLibraries stcLibraryPath historyLines sourceMode catchRedefs keepSourceOptions keepSource - foldConstants constantFoldingOptions constantFolding justInTimeCompilation + stcLibraries stcLibraryPath historyLines catchRedefs keepSourceOptions keepSource + constantFoldingOptions constantFolding justInTimeCompilation warnEnabler check component oldIndent t supportsJustInTimeCompilation y| warnings := Compiler warnings asValue. @@ -1100,8 +1098,8 @@ displaySettings |box sizes sizeNames sizeList sizeX sizeY deepIcons - isColorMonitor useFixPalette dither idx ditherStyles ditherSyms ditherList - check y component oldIndent commandList screen visual| + isColorMonitor useFixPalette idx ditherStyles ditherSyms ditherList + y component screen visual| sizeNames := #( '9'' (212mm x 160mm) GAS plasma/LCD' @@ -1341,6 +1339,7 @@ list1 := SelectionInList with:listOfRawKeys. list1 onChangeSend:#showFunction to:selectionForwarder. + list2 := SelectionInList with:listOfFunctions. list2 onChangeSend:#showRawKey to:selectionForwarder. list2 onChangeSend:#value to:macroForwarder. @@ -1438,7 +1437,7 @@ ! memorySettings - |box check igcLimit igcFreeLimit igcFreeAmount newSpaceSize + |box igcLimit igcFreeLimit igcFreeAmount newSpaceSize compressLimit oldIncr component fields| @@ -1791,13 +1790,13 @@ printerSettings |box possiblePrinters possibleTypes printerType printCommand - possiblePageFormats pageFormat landscape format updater + pageFormat landscape updater formatLabel formatComponent landscapeLabel landscapeComponent topMargin leftMargin rightMargin bottomMargin unitList unit - topMarginLabel topMarginComponent leftMarginLabel leftMarginComponent - rightMarginLabel rightMarginComponent - bottomMarginLabel bottomMarginComponent supportsColor supportsColorComponent - check y y1 commandListPop component oldIndent commandList row| + topMarginComponent leftMarginComponent + rightMarginComponent + bottomMarginComponent supportsColor supportsColorComponent + y y1 commandListPop component commandList row| possiblePrinters := PrinterStream withAllSubclasses asArray. possibleTypes := possiblePrinters collect:[:cls | cls printerTypeName]. @@ -3294,7 +3293,7 @@ !Launcher methodsFor:'private'! fontBoxForEncoding:encodingMatch - |box defaultFont y b + |box y b labelDef buttonDef listDef menuDef textDef models labels allOfThem filter| @@ -3423,7 +3422,7 @@ "for now (since style & language settings currently do not affect living views ...)" - |contents fontPref enc fontList newDefault newLauncher| + |contents fontPref enc newLauncher| fontPref := self class classResources at:'PREFERRED_FONT_ENCODING'. enc := MenuView defaultFont encoding. @@ -3488,5 +3487,5 @@ !Launcher class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.193 1996-09-30 20:40:18 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.194 1996-09-30 21:01:34 cg Exp $' ! ! diff -r d0dc66cf7499 -r 2ef5e22d8983 SBrowser.st --- a/SBrowser.st Mon Sep 30 22:59:44 1996 +0200 +++ b/SBrowser.st Mon Sep 30 23:02:04 1996 +0200 @@ -390,7 +390,7 @@ "launch a browser for all methods which ahve a particular (or any, ifNil) resource in aCollectionOfClasses" - |sel browser searchBlock| + |browser searchBlock| searchBlock := [:class :method :s | |src parser rsrc| @@ -839,7 +839,7 @@ browseSuperCallsIn:aCollectionOfClasses title:title "launch a browser for all super sends in aCollectionOfClasses" - |sel browser searchBlock| + |browser searchBlock| searchBlock := [:class :method :s | |src parser| @@ -1433,6 +1433,6 @@ !SystemBrowser class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/Attic/SBrowser.st,v 1.67 1996-07-15 10:01:30 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Attic/SBrowser.st,v 1.68 1996-09-30 21:02:04 cg Exp $' ! ! SystemBrowser initialize! diff -r d0dc66cf7499 -r 2ef5e22d8983 SystemBrowser.st --- a/SystemBrowser.st Mon Sep 30 22:59:44 1996 +0200 +++ b/SystemBrowser.st Mon Sep 30 23:02:04 1996 +0200 @@ -390,7 +390,7 @@ "launch a browser for all methods which ahve a particular (or any, ifNil) resource in aCollectionOfClasses" - |sel browser searchBlock| + |browser searchBlock| searchBlock := [:class :method :s | |src parser rsrc| @@ -839,7 +839,7 @@ browseSuperCallsIn:aCollectionOfClasses title:title "launch a browser for all super sends in aCollectionOfClasses" - |sel browser searchBlock| + |browser searchBlock| searchBlock := [:class :method :s | |src parser| @@ -1433,6 +1433,6 @@ !SystemBrowser class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.67 1996-07-15 10:01:30 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.68 1996-09-30 21:02:04 cg Exp $' ! ! SystemBrowser initialize!