# HG changeset patch # User Jan Vrany # Date 1348776500 -3600 # Node ID 6921627a8c27927a486f91d44c73559c158a926e # Parent 893fad8d458abc054e1b9b2f8eb6dafe21bfede3 Merged with /trunk diff -r 893fad8d458a -r 6921627a8c27 AbstractLauncherApplication.st --- a/AbstractLauncherApplication.st Tue Sep 18 11:39:12 2012 +0100 +++ b/AbstractLauncherApplication.st Thu Sep 27 21:08:20 2012 +0100 @@ -616,7 +616,7 @@ genLabel := [:v | - |app appName busyOrNot sensor pending| + |app appName busyOrNot sensor pending process| app := v application. appName := (app isNil @@ -626,7 +626,12 @@ (sensor := v windowGroup sensor) notNil ifTrue:[ (pending := sensor pendingEvent) notNil ifTrue:[ (Timestamp now - pending timeStamp) > 1 ifTrue:[ - busyOrNot := ' [busy]' allBold colorizeAllWith:Color red + ((process := v windowGroup process) notNil and:[ process isDebugged]) ifTrue:[ + busyOrNot := ' [debug]' + ] ifFalse:[ + busyOrNot := ' [busy]' + ]. + busyOrNot := busyOrNot allBold colorizeAllWith:Color red ] ] ]. @@ -3031,7 +3036,7 @@ fullDebugSupport := ObjectMemory fullSingleStepSupport. ] ifFalse:[ justInTimeCompilation := false. - fullDebugSupport := (Compiler lineNumberInfo == #full) asValue. + fullDebugSupport := (ParserFlags fullLineNumberInfo) asValue. ]. justInTimeCompilation := justInTimeCompilation asValue. fullDebugSupport := fullDebugSupport asValue. @@ -3257,11 +3262,7 @@ Compiler allowReservedWordsAsSelectors:allowReservedWordsAsSelectors value. Compiler arraysAreImmutable:immutableArrays value. - fullDebugSupport value ifTrue:[ - Compiler lineNumberInfo:#full. - ] ifFalse:[ - Compiler lineNumberInfo:true - ]. + ParserFlags lineNumberInfo:(fullDebugSupport value ifTrue:[#full] ifFalse:[true]). ParserFlags stcCompilation:(stcCompilationOptions at:stcCompilation selectionIndex). Compiler foldConstants:(constantFoldingOptions at:constantFolding selectionIndex). @@ -3282,9 +3283,10 @@ " self compilerSettings " - "Modified: / 10.9.1995 / 19:19:18 / claus" - "Modified: / 9.9.1996 / 22:42:47 / stefan" - "Modified: / 5.11.1998 / 14:25:59 / cg" + + "Modified: / 10-09-1995 / 19:19:18 / claus" + "Modified: / 09-09-1996 / 22:42:47 / stefan" + "Modified: / 26-09-2012 / 14:16:39 / cg" ! displaySettings @@ -6973,13 +6975,13 @@ !AbstractLauncherApplication class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.416 2012/07/27 07:53:54 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.418 2012/09/26 12:58:16 cg Exp $' ! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.416 2012/07/27 07:53:54 cg Exp §' + ^ '§Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.418 2012/09/26 12:58:16 cg Exp §' ! version_SVN - ^ '$Id: AbstractLauncherApplication.st 8048 2012-09-07 17:28:09Z vranyj1 $' + ^ '$Id: AbstractLauncherApplication.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 AbstractSettingsApplication.st --- a/AbstractSettingsApplication.st Tue Sep 18 11:39:12 2012 +0100 +++ b/AbstractSettingsApplication.st Thu Sep 27 21:08:20 2012 +0100 @@ -1551,7 +1551,7 @@ self supportsJustInTimeCompilation ifTrue:[ self fullDebugSupport value:(ObjectMemory fullSingleStepSupport ? false) ] ifFalse:[ - self fullDebugSupport value:(Compiler lineNumberInfo == #full) + self fullDebugSupport value:(ParserFlags fullLineNumberInfo) ]. self supportsJustInTimeCompilation ifTrue:[ @@ -1562,7 +1562,7 @@ self warnAboutMissingMethodComment value:(UserPreferences current enforceComment). - "Modified: / 17-07-2010 / 14:48:38 / cg" + "Modified: / 26-09-2012 / 14:16:32 / cg" ! basicSaveSettings @@ -1570,11 +1570,7 @@ writeAspects:(self simpleAspects) to:ParserFlags. - self fullDebugSupport value ifTrue:[ - Compiler lineNumberInfo:#full. - ] ifFalse:[ - Compiler lineNumberInfo:true - ]. + ParserFlags lineNumberInfo:(self fullDebugSupport value ifTrue:[#full] ifFalse:[true]). Compiler foldConstants:(self class constantFoldingOptions at:self constantFoldingSelection value). @@ -1590,7 +1586,7 @@ UserPreferences current enforceComment:(self warnAboutMissingMethodComment value). - "Modified: / 17-07-2010 / 14:48:57 / cg" + "Modified: / 26-09-2012 / 13:32:34 / cg" ! reenableSuppressedWarnings @@ -1831,11 +1827,13 @@ self supportsJustInTimeCompilation ifTrue:[ fullDebugSupport := (ObjectMemory fullSingleStepSupport ? false) asValue. ] ifFalse:[ - fullDebugSupport := (Compiler lineNumberInfo == #full) asValue. + fullDebugSupport := (ParserFlags fullLineNumberInfo) asValue. ]. fullDebugSupport onChangeSend:#updateModifiedChannel to:self. ]. ^ fullDebugSupport. + + "Modified: / 26-09-2012 / 14:16:27 / cg" ! justInTimeCompilation @@ -2055,7 +2053,7 @@ hasChangedAspectIn:(self simpleAspects) asComparedTo:ParserFlags) ifTrue:[^ true]. - ((self supportsJustInTimeCompilation value ifTrue:[ObjectMemory fullSingleStepSupport ? false] ifFalse:[Compiler lineNumberInfo == #full]) ~= self fullDebugSupport value) ifTrue:[^ true]. + ((self supportsJustInTimeCompilation value ifTrue:[ObjectMemory fullSingleStepSupport ? false] ifFalse:[ParserFlags fullLineNumberInfo]) ~= self fullDebugSupport value) ifTrue:[^ true]. ((Compiler foldConstants) ~= (self class constantFoldingOptions at:self constantFoldingSelection value)) ifTrue:[^ true]. ((ObjectMemory justInTimeCompilation ? false) ~= self justInTimeCompilation value) ifTrue:[^ true]. @@ -2063,7 +2061,7 @@ ^ false - "Modified: / 17-07-2010 / 14:48:07 / cg" + "Modified: / 26-09-2012 / 14:16:14 / cg" ! supportsJustInTimeCompilation @@ -17790,13 +17788,13 @@ !AbstractSettingsApplication class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.444 2012/08/26 17:26:11 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.445 2012/09/26 12:17:44 cg Exp $' ! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.444 2012/08/26 17:26:11 cg Exp §' + ^ '§Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.445 2012/09/26 12:17:44 cg Exp §' ! version_SVN - ^ '$Id: AbstractSettingsApplication.st 8048 2012-09-07 17:28:09Z vranyj1 $' -! ! + ^ '$Id: AbstractSettingsApplication.st 8059 2012-09-27 20:08:20Z vranyj1 $' +! ! diff -r 893fad8d458a -r 6921627a8c27 AbstractSourceCodeManagementSettingsAppl.st --- a/AbstractSourceCodeManagementSettingsAppl.st Tue Sep 18 11:39:12 2012 +0100 +++ b/AbstractSourceCodeManagementSettingsAppl.st Thu Sep 27 21:08:20 2012 +0100 @@ -44,9 +44,9 @@ Not all managers will probably provide the same set of functions; time will show, if such an abstraction is possible - (the way source code management systems organize their code is different, some - keep individual per-class version numbers (CVS, RCS, Store) others keep an overall - (configuration-) id (SVN). + (the way source code management systems organize their code is different, + some keep individual per-class version numbers (CVS, RCS, SVN) + others keep an overall (configuration-) id (SVN, Git and Hg). " ! ! @@ -243,13 +243,13 @@ !AbstractSourceCodeManagementSettingsAppl class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/AbstractSourceCodeManagementSettingsAppl.st,v 1.19 2012/08/09 08:59:08 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/AbstractSourceCodeManagementSettingsAppl.st,v 1.20 2012/09/26 16:16:47 cg Exp $' ! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/AbstractSourceCodeManagementSettingsAppl.st,v 1.19 2012/08/09 08:59:08 cg Exp §' + ^ '§Header: /cvs/stx/stx/libtool/AbstractSourceCodeManagementSettingsAppl.st,v 1.20 2012/09/26 16:16:47 cg Exp §' ! version_SVN - ^ '$Id: AbstractSourceCodeManagementSettingsAppl.st 8048 2012-09-07 17:28:09Z vranyj1 $' + ^ '$Id: AbstractSourceCodeManagementSettingsAppl.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 ChangesBrowser.st --- a/ChangesBrowser.st Tue Sep 18 11:39:12 2012 +0100 +++ b/ChangesBrowser.st Thu Sep 27 21:08:20 2012 +0100 @@ -3069,6 +3069,9 @@ cls isLoaded ifTrue:[ ^ true. ]. + (classesNotToBeAutoloaded includes:#all) ifTrue:[ + ^ false. + ]. (classesNotToBeAutoloaded includes:cls) ifTrue:[ ^ false. ]. @@ -3076,15 +3079,22 @@ autoloadAsRequired value == true ifTrue:[ answer := true ] ifFalse:[ - answer := (self confirmWithCancel:(resources + answer := Dialog + confirmWithCancel:(resources stringWithCRs:'%1 is an autoloaded class.\I can only compare the methods source if its loaded first.\\Shall the class be loaded now ?' - with:cls name allBold)). - ]. - - answer isNil ifTrue:[ - "cancel the operation" - AbortAllOperationRequest raise. - "not reached" + with:cls name allBold) + labels:(resources array:#('Cancel' 'No for All' 'No' 'Yes')) + values:#(nil #never false true) + default:4. + answer isNil ifTrue:[ + "cancel the operation" + AbortAllOperationRequest raise. + "not reached" + ]. + answer == #never ifTrue:[ + classesNotToBeAutoloaded add:#all. + ^ false. + ]. ]. answer ifTrue:[ @@ -6452,13 +6462,13 @@ !ChangesBrowser class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.431 2012/07/27 07:56:36 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.432 2012/09/19 10:31:18 stefan Exp $' ! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.431 2012/07/27 07:56:36 cg Exp §' + ^ '§Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.432 2012/09/19 10:31:18 stefan Exp §' ! version_SVN - ^ '$Id: ChangesBrowser.st 8048 2012-09-07 17:28:09Z vranyj1 $' + ^ '$Id: ChangesBrowser.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 DebugView.st --- a/DebugView.st Tue Sep 18 11:39:12 2012 +0100 +++ b/DebugView.st Thu Sep 27 21:08:20 2012 +0100 @@ -1897,8 +1897,8 @@ 'DebugView [warning]: cannot restart selected context' errorPrintCR ] - "Created: / 16.11.2001 / 17:23:17 / cg" - "Modified: / 17.11.2001 / 23:37:09 / cg" + "Created: / 16-11-2001 / 17:23:17 / cg" + "Modified: / 26-09-2012 / 15:09:52 / cg" ! exit_return @@ -3038,6 +3038,34 @@ ! +releaseDebuggee + "We have to be careful to release all refs to the debuggee, + because we may be in the cache. + Otherwise, the GC will not be able to release it" + + busy := false. + + codeView acceptAction:nil. + codeView doItAction:nil. + codeView contents:nil. + + receiverInspector release. + contextInspector release. + inspectedProcess := nil. + contextArray := nil. + ((exitAction == #restart) or:[exitAction == #return]) ifFalse:[ + selectedContext := nil. + ]. + actualContext := firstContext := nil. + steppedContext := wrapperContext := nil. + catchBlock := nil. + grabber := nil. + self autoUpdateOff. + + "Created: / 10-07-1997 / 14:57:51 / stefan" + "Modified: / 26-09-2012 / 15:08:21 / cg" +! + setLabelFor:aMessage in:aProcess |l lines processNameOrNil pidOrNil osPidString| @@ -6088,32 +6116,6 @@ "Created: 10.7.1997 / 15:22:43 / stefan" ! -releaseDebuggee - "We have to be careful to release all refs to the debuggee, - because we may be in the cache. - Otherwise, the GC will not be able to release it" - - busy := false. - - codeView acceptAction:nil. - codeView doItAction:nil. - codeView contents:nil. - - receiverInspector release. - contextInspector release. - inspectedProcess := nil. - contextArray := nil. - selectedContext := actualContext := firstContext := nil. - steppedContext := wrapperContext := nil. - catchBlock := nil. - grabber := nil. - self autoUpdateOff. - - "Created: / 10.7.1997 / 14:57:51 / stefan" - "Modified: / 10.7.1997 / 15:50:38 / stefan" - "Modified: / 17.11.2001 / 22:58:17 / cg" -! - uncacheMyself "do not remember myself any longer for next debug session" @@ -6936,8 +6938,8 @@ ]. catchBlock := nil. - "Created: / 24.11.1995 / 20:33:45 / cg" - "Modified: / 18.11.2001 / 01:04:17 / cg" + "Created: / 24-11-1995 / 20:33:45 / cg" + "Modified: / 26-09-2012 / 15:03:39 / cg" ! ! !DebugView methodsFor:'user interaction'! @@ -8008,15 +8010,15 @@ !DebugView class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.554 2012/07/27 21:49:49 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.556 2012/09/26 13:10:09 cg Exp $' ! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/DebugView.st,v 1.554 2012/07/27 21:49:49 cg Exp §' + ^ '§Header: /cvs/stx/stx/libtool/DebugView.st,v 1.556 2012/09/26 13:10:09 cg Exp §' ! version_SVN - ^ '$Id: DebugView.st 8048 2012-09-07 17:28:09Z vranyj1 $' + ^ '$Id: DebugView.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! DebugView initialize! diff -r 893fad8d458a -r 6921627a8c27 DictionaryInspectorView.st --- a/DictionaryInspectorView.st Tue Sep 18 11:39:12 2012 +0100 +++ b/DictionaryInspectorView.st Thu Sep 27 21:08:20 2012 +0100 @@ -198,6 +198,7 @@ ). ]. + items := items , (self sortOrderItems). items := items , #( ('-') ('Update' doUpdate ) @@ -232,7 +233,7 @@ ^ m. - "Modified: / 01-07-2010 / 10:53:08 / cg" + "Modified: / 26-09-2012 / 13:20:59 / cg" ! ! !DictionaryInspectorView methodsFor:'menu actions'! @@ -528,13 +529,16 @@ ifFalse:[ k displayString] ]. + sortOrder == #alphabetical ifTrue:[ + keyList sort:[:a :b | a string < b string]. + ]. ^ keyList keysAndValuesCollect:[:idx :nm | self listEntryForName:nm value:(self indexedValueAtIndex:idx) ]. - ^ keyList + "/ ^ keyList - "Modified: / 16-05-2012 / 19:07:57 / cg" + "Modified: / 26-09-2012 / 13:22:08 / cg" "Modified: / 06-07-2012 / 10:36:20 / Jan Vrany " ! @@ -658,13 +662,13 @@ !DictionaryInspectorView class methodsFor:'documentation'! version - ^ '$Id: DictionaryInspectorView.st 8012 2012-07-06 11:44:18Z vranyj1 $' + ^ '$Header: /cvs/stx/stx/libtool/DictionaryInspectorView.st,v 1.77 2012/09/26 12:19:04 cg Exp $' ! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/DictionaryInspectorView.st,v 1.76 2012/05/16 17:08:54 cg Exp §' + ^ '§Header: /cvs/stx/stx/libtool/DictionaryInspectorView.st,v 1.77 2012/09/26 12:19:04 cg Exp §' ! version_SVN - ^ '$Id: DictionaryInspectorView.st 8012 2012-07-06 11:44:18Z vranyj1 $' + ^ '$Id: DictionaryInspectorView.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 InspectorView.st --- a/InspectorView.st Tue Sep 18 11:39:12 2012 +0100 +++ b/InspectorView.st Thu Sep 27 21:08:20 2012 +0100 @@ -2220,28 +2220,7 @@ (value isNumber or:[value isBoolean]) ifTrue:[ ^ self basicDisplayStringForValue:value "value printString" ]. - (value isSymbol) ifTrue:[ - ^ value storeString - ]. - (value isCharacter) ifTrue:[ - (value codePoint <= 16r7f) ifTrue:[ - ^ value storeString,(' "16r%1 %2"' bindWith:(value codePoint hexPrintString) with:value codePoint) - ]. - ^ value storeString,(' "%1"' bindWith:(value codePoint)) - ]. - value isString ifTrue:[ - ^ value storeString contractTo:30. - ]. - value isColor ifTrue:[ - ^ value htmlPrintString - ]. - value isNil ifTrue:[ - ^ 'nil' - ]. - (value isClass and:[value name notEmptyOrNil]) ifTrue:[ - ^ value name - ]. - ^ value classNameWithArticle "nil" + ^ value inspectorValueStringInListFor:self "Created: / 13-06-2012 / 12:50:26 / cg" ! @@ -2621,12 +2600,19 @@ ^ list keysAndValuesCollect:[:idx :nm | - self listEntryForName:nm value:(self indexedValueAtIndex: idx) + | val | + + [ + val := self indexedValueAtIndex: idx + ] on:Error do:[ + val := '** ERROR **' + ]. + self listEntryForName:nm value:val ]. - ^ list. - - "Modified: / 22-08-2012 / 19:19:05 / cg" +"/ ^ list. + + "Modified: / 21-09-2012 / 11:18:28 / cg" "Modified: / 06-07-2012 / 10:37:19 / Jan Vrany " ! @@ -3334,13 +3320,13 @@ !InspectorView class methodsFor:'documentation'! version - ^ '$Id: InspectorView.st 8050 2012-09-07 19:27:32Z vranyj1 $' + ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.280 2012/09/24 10:34:43 cg Exp $' ! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.278 2012/08/23 11:45:48 cg Exp §' + ^ 'Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.280 2012/09/24 10:34:43 cg Exp ' ! version_SVN - ^ '$Id: InspectorView.st 8050 2012-09-07 19:27:32Z vranyj1 $' + ^ '$Id: InspectorView.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 NewLauncher.st --- a/NewLauncher.st Tue Sep 18 11:39:12 2012 +0100 +++ b/NewLauncher.st Thu Sep 27 21:08:20 2012 +0100 @@ -713,7 +713,7 @@ 'Open a terminal view (aka xterm)' #toolsWorkspace -'Open a Workspace for evaluating smalltalk expressions' +'Open a Workspace for evaluating smalltalk expressions.\The first click opens the customizable MyWorkspace.' #windows 'Window functions' @@ -779,7 +779,7 @@ 'Enable coverage statistic gathering in all processes (global covarage analysis)' ) - "Modified: / 09-08-2012 / 05:08:24 / cg" + "Modified: / 21-09-2012 / 10:59:33 / cg" ! ! !NewLauncher class methodsFor:'interface specs'! @@ -4974,13 +4974,13 @@ !NewLauncher class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.442 2012/09/09 17:29:23 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.443 2012/09/21 09:01:39 cg Exp $' ! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.442 2012/09/09 17:29:23 cg Exp §' + ^ '§Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.443 2012/09/21 09:01:39 cg Exp §' ! version_SVN - ^ '$Id: NewLauncher.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: NewLauncher.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__BrowserList.st --- a/Tools__BrowserList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__BrowserList.st Thu Sep 27 21:08:20 2012 +0100 @@ -1816,5 +1816,5 @@ ! version_SVN - ^ '$Id: Tools__BrowserList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__BrowserList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__ClassCategoryList.st --- a/Tools__ClassCategoryList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__ClassCategoryList.st Thu Sep 27 21:08:20 2012 +0100 @@ -915,7 +915,7 @@ !ClassCategoryList class methodsFor:'documentation'! version - ^ '$Id: Tools__ClassCategoryList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ClassCategoryList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! version_CVS @@ -923,6 +923,6 @@ ! version_SVN - ^ '$Id: Tools__ClassCategoryList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ClassCategoryList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__ClassChecker.st --- a/Tools__ClassChecker.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__ClassChecker.st Thu Sep 27 21:08:20 2012 +0100 @@ -916,7 +916,7 @@ !ClassChecker class methodsFor:'documentation'! version - ^ '$Id: Tools__ClassChecker.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ClassChecker.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! version_CVS @@ -924,5 +924,5 @@ ! version_SVN - ^ '$Id: Tools__ClassChecker.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ClassChecker.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__ClassGeneratorList.st --- a/Tools__ClassGeneratorList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__ClassGeneratorList.st Thu Sep 27 21:08:20 2012 +0100 @@ -513,7 +513,7 @@ !ClassGeneratorList class methodsFor:'documentation'! version - ^ '$Id: Tools__ClassGeneratorList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ClassGeneratorList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! version_CVS @@ -521,5 +521,5 @@ ! version_SVN - ^ '$Id: Tools__ClassGeneratorList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ClassGeneratorList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__ClassList.st --- a/Tools__ClassList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__ClassList.st Thu Sep 27 21:08:20 2012 +0100 @@ -2050,5 +2050,5 @@ ! version_SVN - ^ '$Id: Tools__ClassList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ClassList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__FullMethodCategoryList.st --- a/Tools__FullMethodCategoryList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__FullMethodCategoryList.st Thu Sep 27 21:08:20 2012 +0100 @@ -123,9 +123,9 @@ !FullMethodCategoryList class methodsFor:'documentation'! version - ^ '$Id: Tools__FullMethodCategoryList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__FullMethodCategoryList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! version_SVN - ^ '$Id: Tools__FullMethodCategoryList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__FullMethodCategoryList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__HierarchicalClassCategoryList.st --- a/Tools__HierarchicalClassCategoryList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__HierarchicalClassCategoryList.st Thu Sep 27 21:08:20 2012 +0100 @@ -402,7 +402,7 @@ !HierarchicalClassCategoryList class methodsFor:'documentation'! version - ^ '$Id: Tools__HierarchicalClassCategoryList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__HierarchicalClassCategoryList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! version_CVS @@ -410,5 +410,5 @@ ! version_SVN - ^ '$Id: Tools__HierarchicalClassCategoryList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__HierarchicalClassCategoryList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__HierarchicalClassList.st --- a/Tools__HierarchicalClassList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__HierarchicalClassList.st Thu Sep 27 21:08:20 2012 +0100 @@ -308,11 +308,11 @@ !HierarchicalClassList class methodsFor:'documentation'! version - ^ '$Id: Tools__HierarchicalClassList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__HierarchicalClassList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! version_SVN - ^ '$Id: Tools__HierarchicalClassList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__HierarchicalClassList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! HierarchicalClassList initialize! diff -r 893fad8d458a -r 6921627a8c27 Tools__HierarchicalProjectList.st --- a/Tools__HierarchicalProjectList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__HierarchicalProjectList.st Thu Sep 27 21:08:20 2012 +0100 @@ -518,7 +518,7 @@ !HierarchicalProjectList class methodsFor:'documentation'! version - ^ '$Id: Tools__HierarchicalProjectList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__HierarchicalProjectList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! version_CVS @@ -526,5 +526,5 @@ ! version_SVN - ^ '$Id: Tools__HierarchicalProjectList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__HierarchicalProjectList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__ImplementingClassList.st --- a/Tools__ImplementingClassList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__ImplementingClassList.st Thu Sep 27 21:08:20 2012 +0100 @@ -117,9 +117,9 @@ !ImplementingClassList class methodsFor:'documentation'! version - ^ '$Id: Tools__ImplementingClassList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ImplementingClassList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! version_SVN - ^ '$Id: Tools__ImplementingClassList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ImplementingClassList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__ImplementingMethodList.st --- a/Tools__ImplementingMethodList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__ImplementingMethodList.st Thu Sep 27 21:08:20 2012 +0100 @@ -287,9 +287,9 @@ !ImplementingMethodList class methodsFor:'documentation'! version - ^ '$Id: Tools__ImplementingMethodList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ImplementingMethodList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! version_SVN - ^ '$Id: Tools__ImplementingMethodList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ImplementingMethodList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__InheritanceClassList.st --- a/Tools__InheritanceClassList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__InheritanceClassList.st Thu Sep 27 21:08:20 2012 +0100 @@ -187,9 +187,9 @@ !InheritanceClassList class methodsFor:'documentation'! version - ^ '$Id: Tools__InheritanceClassList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__InheritanceClassList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! version_SVN - ^ '$Id: Tools__InheritanceClassList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__InheritanceClassList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__MethodCategoryList.st --- a/Tools__MethodCategoryList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__MethodCategoryList.st Thu Sep 27 21:08:20 2012 +0100 @@ -2023,7 +2023,7 @@ ! version_SVN - ^ '$Id: Tools__MethodCategoryList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__MethodCategoryList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! MethodCategoryList::CachedMethodInfo initialize! diff -r 893fad8d458a -r 6921627a8c27 Tools__MethodList.st --- a/Tools__MethodList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__MethodList.st Thu Sep 27 21:08:20 2012 +0100 @@ -1803,5 +1803,5 @@ ! version_SVN - ^ '$Id: Tools__MethodList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__MethodList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__NamespaceList.st --- a/Tools__NamespaceList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__NamespaceList.st Thu Sep 27 21:08:20 2012 +0100 @@ -559,5 +559,5 @@ ! version_SVN - ^ '$Id: Tools__NamespaceList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__NamespaceList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__NavigationState.st --- a/Tools__NavigationState.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__NavigationState.st Thu Sep 27 21:08:20 2012 +0100 @@ -1673,5 +1673,5 @@ ! version_SVN - ^ '$Id: Tools__NavigationState.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__NavigationState.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__NavigatorCanvas.st --- a/Tools__NavigatorCanvas.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__NavigatorCanvas.st Thu Sep 27 21:08:20 2012 +0100 @@ -6933,5 +6933,5 @@ ! version_SVN - ^ '$Id: Tools__NavigatorCanvas.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__NavigatorCanvas.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__NavigatorModel.st --- a/Tools__NavigatorModel.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__NavigatorModel.st Thu Sep 27 21:08:20 2012 +0100 @@ -351,7 +351,7 @@ ! version_SVN - ^ '$Id: Tools__NavigatorModel.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__NavigatorModel.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! NavigatorModel initialize! diff -r 893fad8d458a -r 6921627a8c27 Tools__NewSystemBrowser.st --- a/Tools__NewSystemBrowser.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__NewSystemBrowser.st Thu Sep 27 21:08:20 2012 +0100 @@ -8442,71 +8442,71 @@ ^ #(Menu - ( - (MenuItem - label: 'Class' - itemValue: classMenuNewClass - translateLabel: true - ) - (MenuItem - enabled: hasSingleClassSelectedHolder - label: 'Subclass' - itemValue: classMenuNewSubclass - translateLabel: true - ) - (MenuItem - label: '-' - ) - (MenuItem - label: 'Smalltalk Class Slice' - nameKey: classNewSmalltalkSlice - translateLabel: true - submenuChannel: classNewSmalltalkSlice - isMenuSlice: true - ) - (MenuItem - label: 'Ruby Class Slice' - nameKey: classNewRubyClassSlice - translateLabel: true - submenuChannel: classNewRubyClassSlice - isMenuSlice: true - ) - (MenuItem - label: 'JavaScript Class Slice' - nameKey: classNewJavaScriptClassSlice - translateLabel: true - submenuChannel: classNewJavaScriptClassSlice - isMenuSlice: true - ) - (MenuItem - label: 'Groovy Class Slice' - nameKey: classNewGroovyClassSlice - translateLabel: true - submenuChannel: classNewGroovyClassSlice - isMenuSlice: true - ) - (MenuItem - label: 'Lisp Class Slice' - nameKey: classNewLispClassSlice - translateLabel: true - submenuChannel: classNewLispClassSlice - isMenuSlice: true - ) - (MenuItem - label: 'Haskell Class Slice' - nameKey: classNewHaskellClassSlice - translateLabel: true - submenuChannel: classNewHaskellClassSlice - isMenuSlice: true - ) - (MenuItem - label: 'PLSQL Class Slice' - nameKey: classNewPLSQLClassSlice - translateLabel: true - submenuChannel: classNewPLSQLClassSlice - isMenuSlice: true - ) - (MenuItem + ( + (MenuItem + label: 'Class' + itemValue: classMenuNewClass + translateLabel: true + ) + (MenuItem + enabled: hasSingleClassSelectedHolder + label: 'Subclass' + itemValue: classMenuNewSubclass + translateLabel: true + ) + (MenuItem + label: '-' + ) + (MenuItem + label: 'Smalltalk Class Slice' + nameKey: classNewSmalltalkSlice + translateLabel: true + submenuChannel: classNewSmalltalkSlice + isMenuSlice: true + ) + (MenuItem + label: 'Ruby Class Slice' + nameKey: classNewRubyClassSlice + translateLabel: true + submenuChannel: classNewRubyClassSlice + isMenuSlice: true + ) + (MenuItem + label: 'JavaScript Class Slice' + nameKey: classNewJavaScriptClassSlice + translateLabel: true + submenuChannel: classNewJavaScriptClassSlice + isMenuSlice: true + ) + (MenuItem + label: 'Groovy Class Slice' + nameKey: classNewGroovyClassSlice + translateLabel: true + submenuChannel: classNewGroovyClassSlice + isMenuSlice: true + ) + (MenuItem + label: 'Lisp Class Slice' + nameKey: classNewLispClassSlice + translateLabel: true + submenuChannel: classNewLispClassSlice + isMenuSlice: true + ) + (MenuItem + label: 'Haskell Class Slice' + nameKey: classNewHaskellClassSlice + translateLabel: true + submenuChannel: classNewHaskellClassSlice + isMenuSlice: true + ) + (MenuItem + label: 'PLSQL Class Slice' + nameKey: classNewPLSQLClassSlice + translateLabel: true + submenuChannel: classNewPLSQLClassSlice + isMenuSlice: true + ) + (MenuItem label: 'Other New Class Slice' nameKey: classOtherClassNewSlice translateLabel: true @@ -8679,108 +8679,108 @@ ^ #(Menu - ( - (MenuItem - enabled: hasAnyUnloadedClassSelectedHolder - label: 'Load' - itemValue: classMenuLoad - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasProjectDefinitionWithAnyUnloadedClassSelectedHolder - label: 'Load Project' - itemValue: classMenuLoadProject - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasClassSelectedHolder - label: 'Unload' - itemValue: classMenuUnload - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasClassSelectedHolder - label: 'Initialize Class(es)' - itemValue: classMenuInitialize - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasClassSelectedHolder - label: 'Compile Lazy Methods' - itemValue: classMenuCompileLazyMethods - translateLabel: true - isVisible: false - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasClassSelectedHolder - label: 'Reload' - itemValue: classMenuReload - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - label: '-' - ) - (MenuItem - enabled: hasClassSelectedWhichCanBeIncludedInProjectHolder - label: 'Include in Project as Compiled Class' - itemValue: classMenuIncludeInProject - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasClassSelectedWhichCanBeMadeAutoloadedInProject - label: 'Include in Project as Autoloaded Class' - itemValue: classMenuMakeAutoloadedInProject - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasClassSelectedWhichCanBeExcludedFromProject - label: 'Exclude from Project' - itemValue: classMenuExcludeFromProject - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - label: '-' - ) - (MenuItem - enabled: hasSingleLoadedClassSelectedHolder - label: 'Primitive Definitions' - itemValue: classMenuPrimitiveDefinitions - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasSingleLoadedClassSelectedHolder - label: 'Primitive Functions' - itemValue: classMenuPrimitiveFunctions - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasSingleLoadedClassSelectedHolder - label: 'Primitive Variables' - itemValue: classMenuPrimitiveVariables - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - label: '-' - ) - (MenuItem - enabled: hasClassSelectedHolder - label: 'Remove from ChangeSet' - itemValue: classMenuCleanUpChangeSet - translateLabel: true - ) - (MenuItem + ( + (MenuItem + enabled: hasAnyUnloadedClassSelectedHolder + label: 'Load' + itemValue: classMenuLoad + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasProjectDefinitionWithAnyUnloadedClassSelectedHolder + label: 'Load Project' + itemValue: classMenuLoadProject + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasClassSelectedHolder + label: 'Unload' + itemValue: classMenuUnload + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasClassSelectedHolder + label: 'Initialize Class(es)' + itemValue: classMenuInitialize + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasClassSelectedHolder + label: 'Compile Lazy Methods' + itemValue: classMenuCompileLazyMethods + translateLabel: true + isVisible: false + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasClassSelectedHolder + label: 'Reload' + itemValue: classMenuReload + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + label: '-' + ) + (MenuItem + enabled: hasClassSelectedWhichCanBeIncludedInProjectHolder + label: 'Include in Project as Compiled Class' + itemValue: classMenuIncludeInProject + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasClassSelectedWhichCanBeMadeAutoloadedInProject + label: 'Include in Project as Autoloaded Class' + itemValue: classMenuMakeAutoloadedInProject + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasClassSelectedWhichCanBeExcludedFromProject + label: 'Exclude from Project' + itemValue: classMenuExcludeFromProject + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + label: '-' + ) + (MenuItem + enabled: hasSingleLoadedClassSelectedHolder + label: 'Primitive Definitions' + itemValue: classMenuPrimitiveDefinitions + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasSingleLoadedClassSelectedHolder + label: 'Primitive Functions' + itemValue: classMenuPrimitiveFunctions + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasSingleLoadedClassSelectedHolder + label: 'Primitive Variables' + itemValue: classMenuPrimitiveVariables + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + label: '-' + ) + (MenuItem + enabled: hasClassSelectedHolder + label: 'Remove from ChangeSet' + itemValue: classMenuCleanUpChangeSet + translateLabel: true + ) + (MenuItem enabled: hasClassSelectedHolder label: 'Entries in ChangeSet' itemValue: classMenuShowEntriesInChangeSet @@ -8796,14 +8796,14 @@ translateLabel: true ) (MenuItem - label: 'Special ClassOPS' - translateLabel: true - submenuChannel: classOperationsMenu - isMenuSlice: true - ) - ) - nil - nil + label: 'Special ClassOPS' + translateLabel: true + submenuChannel: classOperationsMenu + isMenuSlice: true + ) + ) + nil + nil ) "Modified: / 26-07-2012 / 11:48:32 / cg" @@ -13501,157 +13501,157 @@ ^ #(Menu - ( - (MenuItem - label: '** No SourceCodeManager - See Settings in the Launcher **' - translateLabel: true - isVisible: hasNoSourceCodeManagerHolder - ) - (MenuItem - label: '-' - isVisible: hasNoSourceCodeManagerHolder - ) - (MenuItem - enabled: hasClassSelectedHolderAndSourceCodeManagerHolder - label: 'CheckIn...' - itemValue: classMenuCheckIn - translateLabel: true - labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckIn 'CheckIn...') - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasClassWithExtensionsSelectedHolder - label: 'CheckIn Extensions For' - translateLabel: true - submenuChannel: browseClassExtensionsMenu - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: changeSetContainsChangedClassesAndSourceCodeManagerHolder - label: 'CheckIn All Changed Classes' - itemValue: classMenuCheckInAllChangedClasses - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - label: 'Quick CheckIn...' - itemValue: classMenuQuickCheckIn - translateLabel: true - isVisible: hasClassSelectedAndControlKeyDownHolder - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasProjectDefinitionSelectedAndSourceCodeManagerHolder - label: 'CheckIn Build Support Files...' - itemValue: classMenuCheckInBuildSupportFiles - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - label: '-' - ) - (MenuItem - enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder - label: 'CheckOut Newest' - itemValue: classMenuCheckOutNewest - translateLabel: true - labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckOut 'CheckOut Newest') - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder - label: 'CheckOut Previous Version...' - itemValue: classMenuCheckOut - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - label: '-' - ) - (MenuItem - enabled: hasSingleClassSelectedAndSourceCodeManagerHolder - label: 'Edit Version in Repository...' - itemValue: classMenuEditVersionInRepository - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - label: '-' - ) - (MenuItem - enabled: hasClassSelectedAndSourceCodeManagerHolder - label: 'Compare with Newest in Repository...' - itemValue: classMenuCompareAgainstNewestInRepository - translateLabel: true - labelImage: (ResourceRetriever ToolbarIconLibrary repositoryVersions 'Compare with Newest in Repository...') - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasSingleClassSelectedAndSourceCodeManagerHolder - label: 'Compare with Original in Repository...' - itemValue: classMenuCompareAgainstOriginalInRepository - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasSingleClassSelectedAndSourceCodeManagerHolder - label: 'Compare with Repository...' - itemValue: classMenuCompareWithRepository - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasSingleClassSelectedAndSourceCodeManagerHolder - label: 'Compare two Repository Versions...' - itemValue: classMenuCompareTwoRepositoryVersions - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasProjectDefinitionOrClassWithExtensionsSelectedAndSourceCodeManagerHolder - label: 'Compare Extensions with Repository...' - itemValue: classMenuCompareExtensionsWithRepository - translateLabel: true - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasProjectDefinitionSelectedAndSourceCodeManagerHolder - label: 'Compare Build Support File' - translateLabel: true - submenuChannel: compareBuildSupportFileMenu - ) - (MenuItem - label: '-' - ) - (MenuItem - enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder - label: 'Set Tag...' - itemValue: classMenuSetTag - translateLabel: true - labelImage: (ResourceRetriever ToolbarIconLibrary repositoryTag 'Set Tag...') - showBusyCursorWhilePerforming: true - ) - (MenuItem - label: '-' - ) - (MenuItem - enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder - label: 'Revision Log (Recent Changes)' - itemValue: classMenuShortRevisionLog - translateLabel: true - labelImage: (ResourceRetriever ToolbarIconLibrary repositoryLog 'Revision Log (Recent Changes)') - showBusyCursorWhilePerforming: true - ) - (MenuItem - enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder - label: 'Revision Log (Full)' - itemValue: classMenuRevisionLog - translateLabel: true - showBusyCursorWhilePerforming: true - ) - ) - nil - nil + ( + (MenuItem + label: '** No SourceCodeManager - See Settings in the Launcher **' + translateLabel: true + isVisible: hasNoSourceCodeManagerHolder + ) + (MenuItem + label: '-' + isVisible: hasNoSourceCodeManagerHolder + ) + (MenuItem + enabled: hasClassSelectedHolderAndSourceCodeManagerHolder + label: 'CheckIn...' + itemValue: classMenuCheckIn + translateLabel: true + labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckIn 'CheckIn...') + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasClassWithExtensionsSelectedHolder + label: 'CheckIn Extensions For' + translateLabel: true + submenuChannel: browseClassExtensionsMenu + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: changeSetContainsChangedClassesAndSourceCodeManagerHolder + label: 'CheckIn All Changed Classes' + itemValue: classMenuCheckInAllChangedClasses + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + label: 'Quick CheckIn...' + itemValue: classMenuQuickCheckIn + translateLabel: true + isVisible: hasClassSelectedAndControlKeyDownHolder + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasProjectDefinitionSelectedAndSourceCodeManagerHolder + label: 'CheckIn Build Support Files...' + itemValue: classMenuCheckInBuildSupportFiles + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + label: '-' + ) + (MenuItem + enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder + label: 'CheckOut Newest' + itemValue: classMenuCheckOutNewest + translateLabel: true + labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckOut 'CheckOut Newest') + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder + label: 'CheckOut Previous Version...' + itemValue: classMenuCheckOut + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + label: '-' + ) + (MenuItem + enabled: hasSingleClassSelectedAndSourceCodeManagerHolder + label: 'Edit Version in Repository...' + itemValue: classMenuEditVersionInRepository + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + label: '-' + ) + (MenuItem + enabled: hasClassSelectedAndSourceCodeManagerHolder + label: 'Compare with Newest in Repository...' + itemValue: classMenuCompareAgainstNewestInRepository + translateLabel: true + labelImage: (ResourceRetriever ToolbarIconLibrary repositoryVersions 'Compare with Newest in Repository...') + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasSingleClassSelectedAndSourceCodeManagerHolder + label: 'Compare with Original in Repository...' + itemValue: classMenuCompareAgainstOriginalInRepository + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasSingleClassSelectedAndSourceCodeManagerHolder + label: 'Compare with Repository...' + itemValue: classMenuCompareWithRepository + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasSingleClassSelectedAndSourceCodeManagerHolder + label: 'Compare two Repository Versions...' + itemValue: classMenuCompareTwoRepositoryVersions + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasProjectDefinitionOrClassWithExtensionsSelectedAndSourceCodeManagerHolder + label: 'Compare Extensions with Repository...' + itemValue: classMenuCompareExtensionsWithRepository + translateLabel: true + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasProjectDefinitionSelectedAndSourceCodeManagerHolder + label: 'Compare Build Support File' + translateLabel: true + submenuChannel: compareBuildSupportFileMenu + ) + (MenuItem + label: '-' + ) + (MenuItem + enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder + label: 'Set Tag...' + itemValue: classMenuSetTag + translateLabel: true + labelImage: (ResourceRetriever ToolbarIconLibrary repositoryTag 'Set Tag...') + showBusyCursorWhilePerforming: true + ) + (MenuItem + label: '-' + ) + (MenuItem + enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder + label: 'Revision Log (Recent Changes)' + itemValue: classMenuShortRevisionLog + translateLabel: true + labelImage: (ResourceRetriever ToolbarIconLibrary repositoryLog 'Revision Log (Recent Changes)') + showBusyCursorWhilePerforming: true + ) + (MenuItem + enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder + label: 'Revision Log (Full)' + itemValue: classMenuRevisionLog + translateLabel: true + showBusyCursorWhilePerforming: true + ) + ) + nil + nil ) ! @@ -16822,7 +16822,6 @@ "Modified: / 29-09-2006 / 16:11:08 / cg" ! ! - !NewSystemBrowser class methodsFor:'menu specs-popup'! categoryPopUpMenu @@ -18651,7 +18650,6 @@ "Created: / 24.2.2000 / 23:28:06 / cg" ! ! - !NewSystemBrowser methodsFor:'aspects-organization'! categoryMenuVisible @@ -22202,7 +22200,6 @@ ^ UserPreferences current useSearchBarInBrowser or:[self codeView searchBarActionBlock notNil] ! ! - !NewSystemBrowser methodsFor:'change & update'! categorySelectionChanged @@ -27369,8 +27366,8 @@ template := '"/ general class processing; -"/ the following block will be wvaluated for every selected class. -"/ You can perform an operation on the class there... +"/ the following block will be evaluated for every selected class. +"/ You can perform bulk operations classes there... "/ Beginner warning: Smalltalk know-how is useful here. [:class | @@ -27385,7 +27382,7 @@ "/ categorized:''foo methods''. "/ "/ make a backup -"/ self self doCopyClass:class as:(class name,''_saved'') privateIn:nil. +"/ self doCopyClass:class as:(class name,''_saved'') privateIn:nil. "/ "/ change a string in some method "/ mth := class compiledMethodAt:#foo. @@ -31435,6 +31432,173 @@ "Created: / 29-11-2011 / 13:10:05 / cg" ! +askForRepositoryVersionUsingManager:managerOrNil thenWithCurrentVersionDo:aFiveArgBlock + "helper for compare and patch file generation; + ask for version, get it, then call ablock with source1, versionNr1, sourceCurrent, currentVersionNr" + + |currentClass + aStream comparedSource currentSource revInfo rev revString thisRevString mgr + nm msg rev2 newestRev + containerModule containerPackage containerFile rslt + pkg info mod dir versionsAreTheSame| + + currentClass := self theSingleSelectedLoadedNonMetaclassOrNil. + currentClass isNil ifTrue:[ + self warn:'Cannot compare unloaded classes.'. + ^ false. + ]. + + nm := currentClass name. + (mgr := managerOrNil) isNil ifTrue:[ + mgr := currentClass sourceCodeManager. + mgr isNil ifTrue:[ + ^ false + ]. + ]. + + "Use revision of manager" + rev := currentClass binaryRevision. + revInfo := currentClass revisionInfoOfManager: mgr. + revInfo notNil ifTrue:[ + rev2 := revInfo revision. + ]. + rev2 notNil ifTrue:[ + rev := rev2 + ]. + rev isNil ifTrue:[ + "/ + "/ class not in repository - allow compare against any other containers newest contents + "/ + self normalLabel. + + pkg := currentClass package. + (pkg notNil and:[pkg ~= PackageId noProjectID]) ifTrue:[ + containerModule := pkg upTo:$:. + containerPackage := pkg copyFrom:(containerModule size + 2). + ]. + containerModule size == 0 ifTrue:[ + containerModule := (SourceCodeManagerUtilities lastModule) ? Project current repositoryModule. + ]. + containerPackage size == 0 ifTrue:[ + containerPackage := (SourceCodeManagerUtilities lastPackage) ? Project current package. + ]. + rslt := mgr utilities + askForContainer:(resources string:'The class seems to have no repository information.\\Do you want to compare it against an existing containers contents ?') + title:'Container to compare' note:nil + initialModule:containerModule + initialPackage:containerPackage + initialFileName:(currentClass nameWithoutPrefix , '.st') + forNewContainer:false. + rslt isNil ifTrue:[ + "/ cancel + ^ false + ]. + containerModule := rslt at:#module. + containerPackage := rslt at:#package. + containerFile := rslt at:#fileName. + SourceCodeManagerUtilities lastModule:containerModule. + SourceCodeManagerUtilities lastPackage:containerPackage. + ] ifFalse:[ + "/ + "/ class in repository - ask for revision + "/ + newestRev := mgr newestRevisionOf:currentClass. + + msg := resources string:'Compare to revision: (empty for newest)'. + rev notNil ifTrue:[ + msg := msg , '\\' , (resources string:'Current %1 is based upon rev %2.' + with:nm allBold with:rev). + (rev2 notNil and:[rev2 ~= rev]) ifTrue:[ + msg := msg , '\' , (resources string:'And has been checked into the repository as %1.' with:rev2) + ] + ]. + newestRev notNil ifTrue:[ + msg := msg , '\' , (resources string:'Newest in reporitory is %1.' with:newestRev) + ]. + + self normalLabel. + rev := mgr utilities + askForExistingRevision:msg + title:'Compare with repository' + class:currentClass + ]. + + versionsAreTheSame := false. + (rev notNil or:[containerFile notNil]) ifFalse:[ + self normalLabel. + ^ false + ]. + + rev notNil ifTrue:[ + rev withoutSpaces isEmpty ifTrue:[ + msg := 'extracting newest %1 (' , (newestRev ? '???') , ')'. + "/ aStream := mgr getMostRecentSourceStreamForClassNamed:nm. + rev := newestRev. + revString := 'newest'. + ] ifFalse:[ + msg := 'extracting previous %1'. + revString := rev + ]. + aStream := mgr getSourceStreamFor:currentClass revision:rev. + ] ifFalse:[ + msg := 'extracting newest version from ' , containerModule , '/' , containerPackage, '/' , containerFile. + aStream := mgr streamForClass:nil fileName:containerFile revision:#newest directory:containerPackage module:containerModule cache:false. + revString := '???' + ]. + self busyLabel:msg with:nm. + + aStream isNil ifTrue:[ + info := mgr sourceInfoOfClass:currentClass. + info notNil ifTrue:[ + mod := info at:#module ifAbsent:'??'. + dir := info at:#directory ifAbsent:'??'. + ]. + + self warn:(resources + string:'Could not extract source from repository (for module: ''%1'' , directory: ''%2'' , revision: ''%3'')' + with:mod with:dir with:revString). + ^ false + ]. + aStream class readErrorSignal handle:[:ex | + self warn:('read error while reading extracted source\\' , ex description) withCRs. + aStream close. + ^ false + ] do:[ + comparedSource := aStream contents asString. + ]. + aStream close. + + self busyLabel:'generating current source ...' with:nil. + + aStream := '' writeStream. + Method flushSourceStreamCache. + "/ currentClass fileOutOn:aStream withTimeStamp:false. + "/ currentSource := aStream contents asString. + + Class fileOutErrorSignal handle:[:ex | + ex proceed + ] do:[ + currentSource := currentClass source asString. + ]. + + thisRevString := currentClass revision. + thisRevString isNil ifTrue:[ + thisRevString := 'no revision' + ]. + + aFiveArgBlock + value:currentClass + value:comparedSource + value:revString + value:currentSource + value:thisRevString. + + self normalLabel. + ^ true + + "Created: / 26-09-2012 / 12:26:43 / cg" +! + checkInClasses:aCollectionOfClasses withInfo:logInfoOrNil withCheck:doCheck "check a bunch of classes into the source repository. If logInfoOrNil isNil, ask for one." @@ -32304,58 +32468,19 @@ classMenuCompareTwoRepositoryVersions "open a diff-textView comparing two versions found in the repository." - - |currentClass source1 source2 mgr - nm rev1 rev2 versionsAreTheSame| - + |currentClass mgr nm| currentClass := self theSingleSelectedLoadedNonMetaclassOrNil. currentClass isNil ifTrue:[ - self warn:'Cannot compare unloaded classes.'. - ^ self. - ]. - + self warn:'Cannot compare unloaded classes.'. + ^ self. + ]. nm := currentClass name. mgr := SourceCodeManagerUtilities default sourceCodeManagerFor:currentClass. mgr isNil ifTrue:[ - ^ self - ]. - - self normalLabel. - rev1 := SourceCodeManagerUtilities default - askForExistingRevision:(resources string:'Compare which revision:') - title:(resources string:'Compare which repository version') - class:currentClass. - rev1 isNil ifTrue:[^ self]. - - rev2 := SourceCodeManagerUtilities default - askForExistingRevision:(resources string:'Against which revision:') - title:(resources string:'Against which repository version') - class:currentClass. - rev2 isNil ifTrue:[^ self]. - - source1 := self getClassSourceFor:currentClass revision:rev1. - source2 := self getClassSourceFor:currentClass revision:rev2. - - self busyLabel:'comparing ...' with:nil. - versionsAreTheSame := (source1 = source2). - versionsAreTheSame ifFalse:[ - self busyLabel:'comparing ...' with:nil. - (UserPreferences versionDiffViewerClass) - openOnClass:currentClass - labelA:(rev1) - sourceA:source1 - labelB:(rev2) - sourceB:source2 - title:('comparing ' , currentClass name) - ifSame:[versionsAreTheSame := true]. - - versionsAreTheSame ifTrue:[ - self information:'Versions are identical.'. - ]. - ]. - self normalLabel. - - "Modified: / 08-02-2011 / 10:26:45 / cg" + ^ self + ]. + self classMenuCompareTwoRepositoryVersionsUsingManager: mgr + "Modified (format): / 26-09-2012 / 12:17:45 / cg" ! classMenuCompareTwoRepositoryVersionsUsingManager: manager @@ -32549,180 +32674,176 @@ "open a diff-textView comparing the current (in-image) version with the some version found in the repository." - |currentClass - aStream comparedSource currentSource revInfo rev revString thisRevString mgr - nm msg rev2 newestRev - containerModule containerPackage containerFile rslt - pkg info mod dir versionsAreTheSame| - - currentClass := self theSingleSelectedLoadedNonMetaclassOrNil. - currentClass isNil ifTrue:[ - self warn:'Cannot compare unloaded classes.'. - ^ self. - ]. - - nm := currentClass name. - mgr := manager. - mgr isNil ifTrue:[ - ^ self - ]. - "Use revision of manager" - rev := currentClass binaryRevision. - revInfo := mgr revisionInfoOfManager: mgr. - revInfo notNil ifTrue:[ - rev2 := revInfo revision. - ]. - rev2 notNil ifTrue:[ - rev := rev2 - ]. - rev isNil ifTrue:[ - "/ - "/ class not in repository - allow compare against any other containers newest contents - "/ - self normalLabel. - - pkg := currentClass package. - (pkg notNil and:[pkg ~= PackageId noProjectID]) ifTrue:[ - containerModule := pkg upTo:$:. - containerPackage := pkg copyFrom:(containerModule size + 2). - ]. - containerModule size == 0 ifTrue:[ - containerModule := (SourceCodeManagerUtilities lastModule) ? Project current repositoryModule. - ]. - containerPackage size == 0 ifTrue:[ - containerPackage := (SourceCodeManagerUtilities lastPackage) ? Project current package. - ]. - rslt := manager utilities - askForContainer:(resources string:'The class seems to have no repository information.\\Do you want to compare it against an existing containers contents ?') - title:'Container to compare' note:nil - initialModule:containerModule - initialPackage:containerPackage - initialFileName:(currentClass nameWithoutPrefix , '.st') - forNewContainer:false. - rslt isNil ifTrue:[ - "/ canel - ^ self - ]. - containerModule := rslt at:#module. - containerPackage := rslt at:#package. - containerFile := rslt at:#fileName. - SourceCodeManagerUtilities lastModule:containerModule. - SourceCodeManagerUtilities lastPackage:containerPackage. - ] ifFalse:[ - "/ - "/ class in repository - ask for revision - "/ - newestRev := mgr newestRevisionOf:currentClass. - - msg := resources string:'Compare to revision: (empty for newest)'. - rev notNil ifTrue:[ - msg := msg , '\\' , (resources string:'Current %1 is based upon rev %2.' - with:nm allBold with:rev). - (rev2 notNil and:[rev2 ~= rev]) ifTrue:[ - msg := msg , '\' , (resources string:'And has been checked into the repository as %1.' with:rev2) - ] - ]. - newestRev notNil ifTrue:[ - msg := msg , '\' , (resources string:'Newest in reporitory is %1.' with:newestRev) - ]. - - self normalLabel. - rev := manager utilities - askForExistingRevision:msg - title:'Compare with repository' - class:currentClass - ]. - - versionsAreTheSame := false. - (rev notNil or:[containerFile notNil]) ifTrue:[ - rev notNil ifTrue:[ - rev withoutSpaces isEmpty ifTrue:[ - msg := 'extracting newest %1 (' , (newestRev ? '???') , ')'. - "/ aStream := mgr getMostRecentSourceStreamForClassNamed:nm. - rev := newestRev. - revString := 'newest'. - ] ifFalse:[ - msg := 'extracting previous %1'. - revString := rev - ]. - aStream := mgr getSourceStreamFor:currentClass revision:rev. - ] ifFalse:[ - msg := 'extracting newest version from ' , containerModule , '/' , containerPackage, '/' , containerFile. - aStream := mgr streamForClass:nil fileName:containerFile revision:#newest directory:containerPackage module:containerModule cache:false. - revString := '???' - ]. - self busyLabel:msg with:nm. - - aStream isNil ifTrue:[ - info := mgr sourceInfoOfClass:currentClass. - info notNil ifTrue:[ - mod := info at:#module ifAbsent:'??'. - dir := info at:#directory ifAbsent:'??'. - ]. - - self warn:(resources - string:'Could not extract source from repository (for module: ''%1'' , directory: ''%2'' , revision: ''%3'')' - with:mod with:dir with:revString). - ^ self - ]. - aStream class readErrorSignal handle:[:ex | - self warn:('read error while reading extracted source\\' , ex description) withCRs. - aStream close. - ^ self - ] do:[ - comparedSource := aStream contents asString. - ]. - aStream close. - - self busyLabel:'generating current source ...' with:nil. - - aStream := '' writeStream. - Method flushSourceStreamCache. - "/ currentClass fileOutOn:aStream withTimeStamp:false. - "/ currentSource := aStream contents asString. - - Class fileOutErrorSignal handle:[:ex | - ex proceed - ] do:[ - currentSource := currentClass source asString. - ]. - - self busyLabel:'comparing ...' with:nil. - versionsAreTheSame := (comparedSource = currentSource). - versionsAreTheSame ifFalse:[ - thisRevString := currentClass revision. - thisRevString isNil ifTrue:[ - thisRevString := 'no revision' - ]. - - revString = '(newest)' ifTrue:[ - (rev := mgr newestRevisionOf:currentClass) notNil ifTrue:[ - revString := '(newest is ' , rev , ')' - ] - ]. - - self busyLabel:'comparing ...' with:nil. - (UserPreferences versionDiffViewerClass) - openOnClass:currentClass - labelA:('repository: ' , revString) - sourceA:comparedSource - labelB:('current: (based on: ' , thisRevString , ')') - sourceB:currentSource - title:('comparing ' , currentClass name) - ifSame:[versionsAreTheSame := true]. - ]. - versionsAreTheSame ifTrue:[ - ((currentClass revision = newestRev) - and:[currentClass hasUnsavedChanges]) ifTrue:[ - (self confirm:'Versions are identical.\\Remove entries from changeSet ?' withCRs) ifTrue:[ - ChangeSet current condenseChangesForClass:currentClass. - ]. - ] ifFalse:[ - self information:'Versions are identical.'. - ] - ]. - ]. - self normalLabel. + |mgr newestRev| + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "Modified: / 11-10-2011 / 16:25:31 / Jan Vrany " "Created: / 21-12-2011 / 20:28:48 / cg" @@ -32812,6 +32933,34 @@ "Modified: / 28-02-2012 / 16:46:07 / cg" ! +classMenuCreatePatchFileAgainstVersionFromRepository + self classMenuCreatePatchFileAgainstVersionFromRepositoryUsingManager: nil + + "Created: / 26-09-2012 / 13:09:39 / cg" +! + +classMenuCreatePatchFileAgainstVersionFromRepositoryUsingManager: managerOrNil + self + askForRepositoryVersionUsingManager:managerOrNil + thenWithCurrentVersionDo:[:currentClass :comparedSource :revString :currentSource :thisRevString | + |versionsAreTheSame revString rev current old diffs| + + self busyLabel:'comparing ...' with:nil. + versionsAreTheSame := (comparedSource = currentSource). + versionsAreTheSame ifFalse:[ + current := ChangeSet fromStream:(currentSource readStream). + old := ChangeSet fromStream:(comparedSource readStream). + + diffs := old diffSetsAgainst:current. + (versionsAreTheSame := diffs isEmpty) ifFalse:[ + self createPatchFileForDiffSet:diffs checkingForVersionBefore:thisRevString. + ] + ]. + ]. + + "Created: / 26-09-2012 / 13:10:04 / cg" +! + classMenuEditVersionInRepository "open a changelist on a version in the repository. Allow for changes to be made to this list, and the code be checked in as @@ -33094,6 +33243,68 @@ "Created: / 21-12-2011 / 20:13:31 / cg" ! +createPatchFileForDiffSet:diffSet checkingForVersionBefore:thisRevString + "for now, this works only for a diffSet containing only a single class" + + |highest highestString nrString nr fileNamePrefix fileNameMiddle + changedClassesAndMetaclasses changedClasses fileName tempFile| + + "/ find the highest numbered patchfile + 'stxPatches' asFilename directoryContentsDo:[:fn | + (fn includes:$_) ifTrue:[ + nrString := fn upTo:$_. + nr := Integer readFrom:nrString onError:nil. + nr notNil ifTrue:[ + nr > (highest ? -1) ifTrue:[ + highest := nr. + highestString := nrString. + ] + ]. + ]. + ]. + highest isNil ifTrue:[ + fileNamePrefix := '01' + ] ifFalse:[ + fileNamePrefix := (highest+1) printStringLeftPaddedTo:(highestString size) with:$0. + ]. + + Transcript showCR:'x'. + changedClassesAndMetaclasses := diffSet changedClasses. + changedClasses := changedClassesAndMetaclasses collect:[:clsOrMeta | clsOrMeta theNonMetaclass]. + + changedClasses size == 1 ifTrue:[ + fileNameMiddle := changedClasses first nameWithoutPrefix + ] ifFalse:[ + fileNameMiddle := 'patches' + ]. + fileNameMiddle := fileNameMiddle asFilename makeLegalFilename name. + fileName := (fileNamePrefix,'_',fileNameMiddle,'.st') asFilename. + + tempFile := Filename newTemporaryIn:'stxPatches'. + tempFile writingFileDo:[:s | + |changeSet| + + s nextPutLine:('"/ patches to bring %1 to version %2' bindWith:changedClasses first name with:thisRevString). + s nextPutLine:('"/'). + s nextPutLine:('"/ first, a guard, to ignore the patch if the library already contains an up-to-date class:'). + s nextPutLine:('"/'). + changedClasses do:[:eachClass | + s nextPutLine:('(AbstractSourceCodeManager isRevision:(%2 revision) sameOrAfter:''%1'') ifTrue:[ AbortSignal raise ].' + bindWith:eachClass revision + with:eachClass name). + ]. + s nextPutChunkSeparator; cr; cr. + + changeSet := ChangeSet fromDiffSet:diffSet. + changeSet fileOutOn:s. + ]. + + tempFile renameTo:('stxPatches' asFilename construct:fileName). + Dialog information:('Created new patchFile as: "%1"' bindWith:('stxPatches' asFilename construct:fileName) name). + + "Created: / 26-09-2012 / 15:13:07 / cg" +! + doCompareClassesWithRepository:collectionOfClasses self doCompareClassesWithRepository:collectionOfClasses usingManager:nil @@ -33411,29 +33622,7 @@ getClassSourceFor:aClass revision:revision "ask aClass's sourceCodeManager to retrieve a (possibly older or newer) version's source code" - - |msg stream source| - - msg := 'extracting previous %1'. - self busyLabel:msg with:revision. - - stream := aClass sourceCodeManager getSourceStreamFor:aClass revision:revision. - stream isNil ifTrue:[ - self warn:(resources - string:'Could not extract source of rev %1 from repository' - with:revision). - ^ nil - ]. - stream class readErrorSignal handle:[:ex | - self warn:('read error while reading extracted source\\' , ex description) withCRs. - stream close. - ^ nil - ] do:[ - source := stream contents asString. - ]. - stream close. - ^ source - + ^ self getClassSourceFor:aClass revision:revision usingManager:(aClass sourceCodeManager) "Created: / 08-02-2011 / 10:24:50 / cg" ! @@ -33625,74 +33814,40 @@ showRepositoryLogOf:aClass short:shortOrNot beforeLogDo:aBlock "show a classes repository log - append to codeView. CAVEAT: that is almost the same code as found in SystemBrowser; - move to SourceCodeManagerUtilities." - + move to SourceCodeManagerUtilities." + ^ self showRepositoryLogOf:aClass short:shortOrNot usingManager: (aClass sourceCodeManager) beforeLogDo:aBlock + "Modified: / 26-09-2012 / 13:06:30 / cg" +! + +showRepositoryLogOf:aClass short:shortOrNot usingManager: managerOrNil beforeLogDo:aBlock + "show a classes repository log - append to codeView. + CAVEAT: that is almost the same code as found in SystemBrowser; + move to SourceCodeManagerUtilities." |codeView aStream| - aStream := WriteStream on:(String new:200). - Processor activeProcess - withPriority:Processor activePriority-1 to:Processor activePriority + withPriority:Processor activePriority-1 to:Processor activePriority do:[ - self busyLabel:'Extracting log of %1' with:aClass name. - aBlock value:aStream. - SourceCodeManagerUtilities default repositoryLogOf:aClass short:shortOrNot onto:aStream - ]. - + self busyLabel:'Extracting log of %1' with:aClass name. + aBlock value:aStream. + (managerOrNil isNil + ifTrue:[ SourceCodeManagerUtilities default ] + ifFalse:[ managerOrNil utilities ]) + repositoryLogOf:aClass short:shortOrNot onto:aStream + ]. self codeAspect:#repositoryLog. self selectedMethods value:nil. self selectProtocols:nil. - codeView := self codeView. codeView contents:(codeView contents , - Character cr asString , - Character cr asString , - aStream contents). - + Character cr asString , + Character cr asString , + aStream contents). codeView modified:false. navigationState realModifiedState:false. - "/ self clearAcceptAction. "/ self clearExplainAction. - self normalLabel -! - -showRepositoryLogOf:aClass short:shortOrNot usingManager: manager beforeLogDo:aBlock - "show a classes repository log - append to codeView. - CAVEAT: that is almost the same code as found in SystemBrowser; - move to SourceCodeManagerUtilities." - - |codeView aStream| - - aStream := WriteStream on:(String new:200). - - Processor activeProcess - withPriority:Processor activePriority-1 to:Processor activePriority - do:[ - self busyLabel:'Extracting log of %1' with:aClass name. - aBlock value:aStream. - manager utilities repositoryLogOf:aClass short:shortOrNot onto:aStream - ]. - - self codeAspect:#repositoryLog. - self selectedMethods value:nil. - self selectProtocols:nil. - - codeView := self codeView. - codeView contents:(codeView contents , - Character cr asString , - Character cr asString , - aStream contents). - - codeView modified:false. - navigationState realModifiedState:false. - -"/ self clearAcceptAction. -"/ self clearExplainAction. - - self normalLabel - "Created: / 11-10-2011 / 20:33:45 / Jan Vrany " "Created: / 21-12-2011 / 20:24:55 / cg" ! @@ -35198,29 +35353,29 @@ (self askIfModified) ifFalse:[ ^ self ]. newName := Dialog - request:(resources - string:'Enter new name for %2 variable ''%1'':' - with:oldName allBold - with:(self meta value ifTrue:['classInstance'] ifFalse:['instance'])) - title:(resources string:'Rename Variable') - initialAnswer:oldName. + request:(resources + string:'Enter new name for %2 variable ''%1'':' + with:oldName allBold + with:(self meta value ifTrue:['classInstance'] ifFalse:['instance'])) + title:(resources string:'Rename Variable') + initialAnswer:oldName. newName isEmpty ifTrue:[ - ^ self + ^ self ]. (cls := aClass whichClassDefinesInstVar:newName) notNil ifTrue:[ - Dialog warn:(resources string:'Sorry: a variable named ''%1'' is already defined in ''%2''.\\Proceed ?' - with:newName allBold - with:cls name allBold). - ^ self + Dialog warn:(resources string:'Sorry: a variable named ''%1'' is already defined in ''%2''.\\Proceed ?' + with:newName allBold + with:cls name allBold). + ^ self ]. (Dialog - confirm:(resources string:'About to rewrite methods...') - title:(resources string:'About to rewrite methods...') - yesLabel:(resources string:'Proceed') - noLabel:(resources string:'Cancel')) + confirm:(resources string:'About to rewrite methods...') + title:(resources string:'About to rewrite methods...') + yesLabel:(resources string:'Proceed') + noLabel:(resources string:'Cancel')) ifFalse:[ - ^ self + ^ self ]. cls := aClass whichClassDefinesInstVar:oldName. @@ -36523,7 +36678,6 @@ "Modified: / 28-02-2012 / 16:27:44 / cg" ! ! - !NewSystemBrowser methodsFor:'menu actions-namespace'! nameSpaceMenuCheckOut @@ -45235,7 +45389,6 @@ "Modified: / 28-02-2012 / 16:48:38 / cg" ! ! - !NewSystemBrowser methodsFor:'menu actions-variables'! browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll @@ -52576,7 +52729,6 @@ ^ navigationState projectListApplication ! ! - !NewSystemBrowser methodsFor:'private-history'! lastSearchPatterns @@ -57834,15 +57986,15 @@ !NewSystemBrowser class methodsFor:'documentation'! version - ^ '$Id: Tools__NewSystemBrowser.st 8056 2012-09-13 17:50:09Z vranyj1 $' + ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1784 2012/09/26 18:30:14 cg Exp $' ! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1779 2012/09/11 00:47:52 cg Exp §' + ^ '§Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1784 2012/09/26 18:30:14 cg Exp §' ! version_SVN - ^ '$Id: Tools__NewSystemBrowser.st 8056 2012-09-13 17:50:09Z vranyj1 $' + ^ '$Id: Tools__NewSystemBrowser.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! NewSystemBrowser initialize! diff -r 893fad8d458a -r 6921627a8c27 Tools__OrganizerCanvas.st --- a/Tools__OrganizerCanvas.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__OrganizerCanvas.st Thu Sep 27 21:08:20 2012 +0100 @@ -5037,6 +5037,6 @@ ! version_SVN - ^ '$Id: Tools__OrganizerCanvas.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__OrganizerCanvas.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__ProjectList.st --- a/Tools__ProjectList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__ProjectList.st Thu Sep 27 21:08:20 2012 +0100 @@ -966,5 +966,5 @@ ! version_SVN - ^ '$Id: Tools__ProjectList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__ProjectList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__SearchDialog.st --- a/Tools__SearchDialog.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__SearchDialog.st Thu Sep 27 21:08:20 2012 +0100 @@ -231,8 +231,8 @@ askThenDo:aBlock |where code sel matchHolderValue caseHolderValue| + self beScreenDialog. "raise it above all windows" self open. - self beScreenDialog. "raise it above all windows" self accepted ifFalse:[ ^ self. ]. @@ -250,7 +250,7 @@ (selectionList notNil and:[selectionList hasSelection]) ifTrue:[ sel := selectionList selectionValue. ] ifFalse:[ - sel := selectorHolder value. + sel := selectorHolder value withoutSeparators. ]. sel isEmptyOrNil ifTrue:[ browser warn:((searchWhat == #selector) @@ -338,7 +338,7 @@ aBlock value. ] - "Modified: / 14-02-2012 / 14:12:49 / cg" + "Modified: / 26-09-2012 / 11:50:45 / cg" ! setupToAskForMethodSearchTitle:title forBrowser:brwsrArg searchWhat:searchWhatArg @@ -1387,11 +1387,11 @@ !SearchDialog class methodsFor:'documentation'! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.71 2012/08/20 11:35:48 cg Exp §' + ^ '§Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.72 2012/09/26 10:41:23 cg Exp §' ! version_SVN - ^ '$Id: Tools__SearchDialog.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__SearchDialog.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! SearchDialog initialize! diff -r 893fad8d458a -r 6921627a8c27 Tools__SpecialCodeView.st --- a/Tools__SpecialCodeView.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__SpecialCodeView.st Thu Sep 27 21:08:20 2012 +0100 @@ -73,7 +73,7 @@ !SpecialCodeView class methodsFor:'documentation'! version - ^ '$Id: Tools__SpecialCodeView.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__SpecialCodeView.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! version_CVS @@ -81,5 +81,5 @@ ! version_SVN - ^ '$Id: Tools__SpecialCodeView.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__SpecialCodeView.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 Tools__VariableList.st --- a/Tools__VariableList.st Tue Sep 18 11:39:12 2012 +0100 +++ b/Tools__VariableList.st Thu Sep 27 21:08:20 2012 +0100 @@ -826,5 +826,5 @@ ! version_SVN - ^ '$Id: Tools__VariableList.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: Tools__VariableList.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 ViewWithAcceptAndCancelBar.st --- a/ViewWithAcceptAndCancelBar.st Tue Sep 18 11:39:12 2012 +0100 +++ b/ViewWithAcceptAndCancelBar.st Thu Sep 27 21:08:20 2012 +0100 @@ -230,15 +230,17 @@ "return the helpText for aPoint (i.e. when mouse-pointer is moved over an item)." (acceptButton bounds containsPoint:srcPoint) ifTrue:[ - ^ 'Accept' + ^ resources string:'Accept' ]. (cancelButton bounds containsPoint:srcPoint) ifTrue:[ - ^ 'Cancel' + ^ resources string:'Cancel' ]. (compareButton bounds containsPoint:srcPoint) ifTrue:[ - ^ 'Compare against Original' + ^ resources string:'Compare against Original' ]. ^ nil + + "Modified: / 26-09-2012 / 14:26:14 / cg" ! ! !ViewWithAcceptAndCancelBar::AcceptAndCancelBar methodsFor:'initialization'! @@ -249,25 +251,27 @@ acceptButton := ButtonWithHelpText new. acceptButton origin:0.0 @ 0.0 corner:1.0@0.7. acceptButton backgroundColor:Color green. - acceptButton flyByHelpText:'Accept'. + acceptButton flyByHelpText:(resources string:'Accept'). self add:acceptButton. cancelButton := ButtonWithHelpText new. cancelButton origin:0.0 @ 0.7 corner:1.0@0.9. cancelButton backgroundColor:Color red. - cancelButton flyByHelpText:'Cancel'. + cancelButton flyByHelpText:(resources string:'Cancel'). self add:cancelButton. compareButton := ButtonWithHelpText new. compareButton origin:0.0 @ 0.9 corner:1.0@1.0. compareButton backgroundColor:Color yellow. - compareButton flyByHelpText:'Compare against Original'. + compareButton flyByHelpText:(resources string:'Compare against Original'). compareButton label:'?'. self add:compareButton. " AcceptAndCancelBar new open " + + "Modified: / 26-09-2012 / 14:44:18 / cg" ! ! !ViewWithAcceptAndCancelBar::AcceptAndCancelBar::ButtonWithHelpText methodsFor:'accessing'! @@ -283,13 +287,13 @@ !ViewWithAcceptAndCancelBar class methodsFor:'documentation'! version - ^ '$Id: ViewWithAcceptAndCancelBar.st 7854 2012-01-30 17:49:41Z vranyj1 $' + ^ '$Header: /cvs/stx/stx/libtool/ViewWithAcceptAndCancelBar.st,v 1.11 2012/09/26 12:44:28 cg Exp $' ! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/ViewWithAcceptAndCancelBar.st,v 1.10 2011/11/29 13:05:12 cg Exp §' + ^ '§Header: /cvs/stx/stx/libtool/ViewWithAcceptAndCancelBar.st,v 1.11 2012/09/26 12:44:28 cg Exp §' ! version_SVN - ^ '$Id: ViewWithAcceptAndCancelBar.st 7854 2012-01-30 17:49:41Z vranyj1 $' + ^ '$Id: ViewWithAcceptAndCancelBar.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! ! diff -r 893fad8d458a -r 6921627a8c27 WorkspaceApplication.st --- a/WorkspaceApplication.st Tue Sep 18 11:39:12 2012 +0100 +++ b/WorkspaceApplication.st Thu Sep 27 21:08:20 2012 +0100 @@ -2972,13 +2972,15 @@ ! setCompilerForSyntax - |selectedWorkspace| + |selectedWorkspace ws| (selectedWorkspace := self selectedWorkspace) notNil ifTrue:[ - self setCompilerForSyntaxIn:selectedWorkspace. + (ws := self workspaceViewOfView:selectedWorkspace) notNil ifTrue:[ + self setCompilerForSyntaxIn:ws. + ] ]. - "Modified: / 23-07-2012 / 23:07:50 / cg" + "Modified: / 26-09-2012 / 11:55:59 / cg" ! setCompilerForSyntaxIn:aWorkspace @@ -4061,13 +4063,13 @@ !WorkspaceApplication class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.230 2012/09/12 10:19:17 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.231 2012/09/26 09:58:28 cg Exp $' ! version_CVS - ^ '§Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.230 2012/09/12 10:19:17 cg Exp §' + ^ '§Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.231 2012/09/26 09:58:28 cg Exp §' ! version_SVN - ^ '$Id: WorkspaceApplication.st 8054 2012-09-13 09:15:20Z vranyj1 $' + ^ '$Id: WorkspaceApplication.st 8059 2012-09-27 20:08:20Z vranyj1 $' ! !