--- a/AbstractFileBrowser.st Tue Jul 24 18:17:26 2012 +0100
+++ b/AbstractFileBrowser.st Wed Jul 25 10:51:30 2012 +0100
@@ -6361,15 +6361,9 @@
!
doOpenExplorer
- OperatingSystem isMSWINDOWSlike ifFalse:[
- self warn:'sorry - this operation is only available under windows'.
- ].
-
- OperatingSystem
- openApplicationForDocument:(self currentDirectory)
- operation:#explore.
-
- "Modified: / 23-07-2007 / 23:01:22 / cg"
+ self currentDirectory asFilename openExplorer
+
+ "Modified: / 21-07-2012 / 12:28:36 / cg"
!
doOpenSettings
@@ -6383,10 +6377,12 @@
fileName := self firstSelectedFile.
fileName notNil ifTrue:[
- Win32OperatingSystem
+ OperatingSystem
openApplicationForDocument:fileName pathName
operation:#open
]
+
+ "Modified: / 21-07-2012 / 12:26:10 / cg"
!
editMode:aSymbol
@@ -9198,13 +9194,13 @@
!AbstractFileBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.495 2012/07/11 17:53:40 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.496 2012/07/21 17:01:39 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.495 2012/07/11 17:53:40 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.496 2012/07/21 17:01:39 cg Exp §'
!
version_SVN
- ^ '$Id: AbstractFileBrowser.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: AbstractFileBrowser.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/CVSSourceCodeManagementSettingsAppl.st Tue Jul 24 18:17:26 2012 +0100
+++ b/CVSSourceCodeManagementSettingsAppl.st Wed Jul 25 10:51:30 2012 +0100
@@ -927,73 +927,7 @@
].
!
-sourceDirChanged
- |nm fn previousDir|
-
- manager isNil ifTrue:[^ self].
-
- previousDir := AbstractSourceCodeManager cacheDirectoryName.
-
- nm := self sourceCacheDir value.
- nm isEmptyOrNil ifTrue:[^ self].
-
- (fn := nm asFilename) exists ifFalse:[
- (self confirm:(resources
- stringWithCRs:'SourceCache directory "%1" does not exist.\Create ?'
- with:nm)
- ) ifFalse:[
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
- fn
- recursiveMakeDirectory;
- makeReadableForAll;
- makeWritableForAll;
- makeExecutableForAll.
- ^ self.
- ].
-
- (fn isDirectory) ifFalse:[
- self warn:(resources
- stringWithCRs:'Not a directory: "%1"'
- with:nm).
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
-
- (fn isReadable and:[fn isWritable]) ifFalse:[
- (self confirm:(resources
- stringWithCRs:'SourceCache directory "%1" is not both readable and writable.\Change ?'
- with:nm)
- ) ifFalse:[
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
- fn
- makeReadableForAll;
- makeWritableForAll;
- makeExecutableForAll.
- ].
-"/ (fn isReadableForAll and:[fn isWritableForAll]) ifFalse:[
-"/ (self confirm:(resources
-"/ stringWithCRs:'SourceCache directory "%1" is not both readable and writable for other users.\Change ?'
-"/ with:nm)
-"/ ) ifTrue:[
-"/ fn
-"/ makeReadableForAll;
-"/ makeWritableForAll;
-"/ makeExecutableForAll.
-"/ ]
-"/ ].
-!
-
update:something with:aParameter from:changedObject
- "/ common
- changedObject == sourceCacheDir ifTrue:[
- self sourceDirChanged.
- self updateModifiedChannel.
- ^ self
- ].
"/ cvs
changedObject == cvsRootHolder ifTrue:[
@@ -1108,13 +1042,13 @@
!CVSSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/CVSSourceCodeManagementSettingsAppl.st,v 1.23 2012/03/12 11:03:03 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/CVSSourceCodeManagementSettingsAppl.st,v 1.24 2012/07/19 15:28:11 stefan Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/CVSSourceCodeManagementSettingsAppl.st,v 1.23 2012/03/12 11:03:03 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/CVSSourceCodeManagementSettingsAppl.st,v 1.24 2012/07/19 15:28:11 stefan Exp §'
!
version_SVN
- ^ '$Id: CVSSourceCodeManagementSettingsAppl.st 7952 2012-03-21 17:50:14Z vranyj1 $'
+ ^ '$Id: CVSSourceCodeManagementSettingsAppl.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/ContextInspectorView.st Tue Jul 24 18:17:26 2012 +0100
+++ b/ContextInspectorView.st Wed Jul 25 10:51:30 2012 +0100
@@ -436,6 +436,7 @@
].
items := items , (self numberBaseItems).
+ items := items , (self sortOrderItems).
m := PopUpMenu
itemList:items
@@ -453,7 +454,7 @@
].
^ m
- "Modified: / 03-08-2011 / 15:02:49 / cg"
+ "Modified: / 20-07-2012 / 10:51:12 / cg"
! !
!ContextInspectorView methodsFor:'private'!
@@ -671,13 +672,13 @@
!ContextInspectorView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.78 2012/06/03 13:32:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.79 2012/07/20 09:22:08 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.78 2012/06/03 13:32:46 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.79 2012/07/20 09:22:08 cg Exp §'
!
version_SVN
- ^ '$Id: ContextInspectorView.st 8007 2012-06-05 14:49:00Z vranyj1 $'
+ ^ '$Id: ContextInspectorView.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/DebugView.st Tue Jul 24 18:17:26 2012 +0100
+++ b/DebugView.st Wed Jul 25 10:51:30 2012 +0100
@@ -34,7 +34,7 @@
DebuggingDebugger DebuggingDebugger2
DefaultDebuggerBackgroundColor InitialNChainShown IgnoredHalts
ShowThreadID LastIgnoreHaltNTimes LastIgnoreHaltDuration
- LastExtent LastOrigin RememberedCallChain'
+ LastExtent LastOrigin RememberedCallChain DebuggingDebugger3'
poolDictionaries:''
category:'Interface-Debugger'
!
@@ -792,10 +792,19 @@
(MenuItem
enabled: canShowMore
label: 'Show More WalkBack'
- itemValue: showMore
+ itemValue: showMoreWalkback
translateLabel: true
)
(MenuItem
+ enabled: canShowMore
+ label: 'Show Full WalkBack'
+ itemValue: showFullWalkback
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
label: 'Show Verbose WalkBack'
itemValue: toggleVerboseWalkback
translateLabel: true
@@ -988,15 +997,18 @@
label: 'Browse Receivers Class Hierarchy'
itemValue: browseClassHierarchy
translateLabel: true
+ isVisible: false
)
(MenuItem
enabled: canBrowseFullClassProtocol
label: 'Browse Receivers Full Protocol'
itemValue: browseFullClassProtocol
translateLabel: true
+ isVisible: false
)
(MenuItem
label: '-'
+ isVisible: false
)
(MenuItem
enabled: canBrowseProcessesApplication
@@ -1221,7 +1233,7 @@
nil
)
- "Modified: / 18-07-2012 / 17:18:32 / cg"
+ "Modified: / 23-07-2012 / 12:41:03 / cg"
! !
!DebugView class methodsFor:'misc'!
@@ -3082,18 +3094,20 @@
stepInterrupt
DebuggingDebugger == true ifTrue:[
- 'stepIRQ' printCR.
- thisContext sender fullPrint.
+ 'stepIRQ' print.
+ "/ ' in ' print. thisContext sender fullPrint.
+ '' printCR.
].
Processor yield.
self stepOrNext
- "Modified: / 13.1.1998 / 21:14:11 / cg"
+ "Modified: / 20-07-2012 / 14:06:54 / cg"
!
stepOrNext
- |where here con s isWrap method wrappedMethod originalMethodOfWrappedMethod originalMethodsContext
- inBlock subBlockLeft ignore contextBelow lastWrappedContext
+ |where here con s isWrap method wrappedMethod
+ originalMethodOfWrappedMethod originalMethodsContext
+ inBlock subBlockLeft ignore contextBelow wrapContext
leftWrap enteredWrap anyStepBlocks
oneMore initiallyShown inBlockBelow receiver processName|
@@ -3101,6 +3115,7 @@
"/ DebuggingDebugger := false
"/ DebuggingDebugger2 := true
"/ DebuggingDebugger2 := false
+ "/ DebuggingDebugger3 := false
"/ '' printCR
processName := (Processor activeProcess nameOrId),' [',Processor activeProcess id printString,']'.
@@ -3141,11 +3156,16 @@
here := here sender. "the interrupted context"
DebuggingDebugger2 == true ifTrue:[
- '*******' printCR.
+ '***************************' printCR.
'here in ' print.
inWrap ifTrue:['(wrap) ' print.].
((ObjectMemory addressOf:here) printStringRadix:16) print. ' ' print.
here selector printCR.
+ 'stepping in ' print.
+ steppedContext notNil ifTrue:[
+ ((ObjectMemory addressOf:steppedContext) printStringRadix:16) print. ' ' print.
+ ].
+ steppedContext printCR.
].
"/ kludge an bug-workaround;
@@ -3205,7 +3225,7 @@
].
"
- kludge to hide breakpoint wrappers in the context list:
+ kludge to hide breakpoint wrappers in the context list and when single stepping:
check if we are in a wrapper method's hidden setup-sequence
if so, ignore the interrupt and continue single sending.
Assume we are in a wrappers setup code, if there is another context above,
@@ -3219,59 +3239,79 @@
inWrap ifTrue:[
"/ situation1:
"/ valueWithReceiver or other
- "/ foo (wrapped)
+ "/ foo (wrapped) <- wrapContext
"/
"/ situation2:
- "/ foo (original)
+ "/ foo (original) <- originalMethodsContext
"/ valueWithReceiver
- "/ foo (wrapped)
+ "/ foo (wrapped) <- wrapContext
"/
"/ situation3:
"/ other
- "/ foo (original)
+ "/ foo (original) <- originalMethodsContext
"/ valueWithReceiver
- "/ foo (wrapped)
+ "/ foo (wrapped) <- wrapContext
+ "/
+ "/ situation4:
+ "/ ... many-contexts ... (more than 8)
+ "/ possibly foo (original)
+ "/ valueWithReceiver or other
+ "/ foo (wrapped)
"/
"/ search for the wrapped method's context and extract the original method
where := here.
8 timesRepeat:[
- originalMethodOfWrappedMethod isNil ifTrue:[
+ wrapContext isNil ifTrue:[
where notNil ifTrue:[
+ DebuggingDebugger2 ifTrue:[
+ ((ObjectMemory addressOf:where) printStringRadix:16) print. ' ' print.
+ where printCR
+ ].
where isBlockContext ifFalse:[
method := where method.
(method notNil and:[method isWrapped]) ifTrue:[
originalMethodOfWrappedMethod := method originalMethod.
- lastWrappedContext := where.
+ wrappedMethod := method.
+ wrapContext := where.
].
].
where := where sender
]
]
].
+ DebuggingDebugger2 ifTrue:[
+ 'wrap-context is: ' print.
+ wrapContext notNil ifTrue:[
+ ((ObjectMemory addressOf:wrapContext) printStringRadix:16) print. ' ' print.
+ ].
+ wrapContext printCR
+ ].
originalMethodOfWrappedMethod isNil ifTrue:[
'oops no wrap?' errorPrintCR.
- inWrap := false.
- ].
- ].
- inWrap ifTrue:[
+ ].
+ ].
+
+ (inWrap and:[ originalMethodOfWrappedMethod notNil ]) ifTrue:[
isWrap := false.
- wrappedMethod := nil.
- DebuggingDebugger2 ifTrue:[ '----------->' print. originalMethodOfWrappedMethod printCR ].
+ "/ DebuggingDebugger2 ifTrue:[ '----------->' print. originalMethodOfWrappedMethod printCR ].
where := here.
8 timesRepeat:[
- wrappedMethod isNil ifTrue:[
+ originalMethodsContext isNil ifTrue:[
where notNil ifTrue:[
+ DebuggingDebugger2 ifTrue:[
+ ((ObjectMemory addressOf:where) printStringRadix:16) print. ' ' print.
+ where printCR
+ ].
where isBlockContext ifFalse:[
method := where method.
method == originalMethodOfWrappedMethod ifTrue:[
- wrappedMethod := method.
+ originalMethodsContext := here.
where == here ifTrue:[
"/ situation2
DebuggingDebugger2 ifTrue:[ 's2' printCR ].
isWrap := true.
- originalMethodsContext := here.
- "/ here setSender:(lastWrappedContext sender). --- leads to a crash
+ "/ here setSender:(wrapContext sender). --- leads to a crash
] ifFalse: [
"/ situation3
DebuggingDebugger2 ifTrue:[ 's3' printCR ].
@@ -3279,17 +3319,41 @@
isWrap := false.
].
steppedContext := where
+"/ ] ifFalse:[
+"/ where selector == wrapContext selector ifTrue:[
+"/ where receiver == wrapContext receiver ifTrue:[
+"/ '!!!!!!!!!!!!!!!!!!!!!!!!' printCR.
+"/ method printCR.
+"/ method originalMethod printCR.
+"/ originalMethodOfWrappedMethod printCR.
+"/ '!!!!!!!!!!!!!!!!!!!!!!!!' printCR.
+"/ ].
+"/ ].
].
where := where sender
].
].
].
].
- wrappedMethod isNil ifTrue:[
- "/ situation1
- DebuggingDebugger2 ifTrue:[ 's1' printCR ].
- isWrap := true.
- steppedContext := here
+ DebuggingDebugger2 ifTrue:[
+ 'original method-context is: ' print.
+ originalMethodsContext notNil ifTrue:[
+ ((ObjectMemory addressOf:originalMethodsContext) printStringRadix:16) print. ' ' print.
+ ].
+ originalMethodsContext printCR
+ ].
+ originalMethodsContext isNil ifTrue:[
+ originalMethodOfWrappedMethod isNil ifTrue:[
+ "/ situation4
+ DebuggingDebugger2 ifTrue:[ 's4' printCR ].
+ DebuggingDebugger2 ifTrue:[ steppedContext printCR ].
+ isWrap := false.
+ ] ifFalse:[
+ "/ situation1
+ DebuggingDebugger2 ifTrue:[ 's1' printCR ].
+ isWrap := true.
+ "/ steppedContext := wrapContext
+ ].
].
].
@@ -3672,7 +3736,7 @@
con := nil
"Created: / 14-10-1996 / 12:53:39 / cg"
- "Modified (comment): / 18-07-2012 / 15:37:38 / cg"
+ "Modified: / 20-07-2012 / 15:26:26 / cg"
! !
!DebugView methodsFor:'menu & button actions'!
@@ -3801,19 +3865,20 @@
browseImplementingClass
"browse the implementing class (of the selected context's message)"
- |mthd who sel cls home|
-
- selectedContext isNil ifTrue:[^ self].
-
- mthd := selectedContext method.
+ |con mthd who sel cls home|
+
+ con := selectedContext ? actualContext.
+ con isNil ifTrue:[^ self].
+
+ mthd := con method.
mthd notNil ifTrue:[
- who := selectedContext method who.
+ who := mthd who.
who notNil ifTrue:[
cls := who methodClass.
sel := who methodSelector.
] ifFalse:[
"might have been re-accepted"
- (home := selectedContext methodHome) notNil ifTrue:[
+ (home := con methodHome) notNil ifTrue:[
(sel := home selector) notNil ifTrue:[
cls := home receiver class
whichClassImplements:selectedContext selector.
@@ -3826,13 +3891,13 @@
].
cls isNil ifTrue:[
"/ class not found - try receiver
- cls := selectedContext receiver class
+ cls := con receiver class
].
cls browserClass openInClass:cls selector:sel.
"Created: / 22-11-1995 / 21:27:01 / cg"
- "Modified: / 01-03-2012 / 14:21:11 / cg"
+ "Modified: / 19-07-2012 / 11:27:32 / cg"
!
browseImplementors
@@ -3842,8 +3907,12 @@
^ self showError:'** select a context first **'
].
"/ selectedContext receiver class browserClass
- UserPreferences systemBrowserClass
- browseImplementorsOf:selectedContext selector.
+ self withWaitCursorDo:[
+ UserPreferences systemBrowserClass
+ browseImplementorsOf:selectedContext selector.
+ ]
+
+ "Modified: / 19-07-2012 / 11:44:03 / cg"
!
browseImplementorsOf
@@ -3862,12 +3931,15 @@
selector := Dialog
requestSelector:'Selector to browse implementors of:'
initialAnswer:initial.
- selector size == 0 ifFalse:[
- UserPreferences systemBrowserClass
- browseImplementorsMatching:selector.
+
+ selector notEmptyOrNil ifTrue:[
+ self withWaitCursorDo:[
+ UserPreferences systemBrowserClass
+ browseImplementorsMatching:selector.
+ ]
]
- "Modified: / 6.2.2000 / 01:05:14 / cg"
+ "Modified: / 19-07-2012 / 11:43:52 / cg"
!
browseProcessesApplication
@@ -3894,14 +3966,19 @@
selectedContext isNil ifTrue:[^ self].
- cls := selectedContext receiver class.
- sel := selectedContext selector.
+ selectedContext isCheapBlockContext ifTrue:[
+ cls := selectedContext method mclass.
+ sel := selectedContext method selector.
+ ] ifFalse:[
+ cls := selectedContext receiver class.
+ sel := selectedContext selector.
+ ].
(cls includesSelector:sel) ifFalse:[
sel := nil
].
cls browserClass openInClass:cls selector:sel.
- "Modified: / 3.2.1998 / 20:23:36 / cg"
+ "Modified: / 19-07-2012 / 11:29:48 / cg"
!
browseSenders
@@ -3910,8 +3987,12 @@
selectedContext isNil ifTrue:[
^ self showError:'** select a context first **'
].
- UserPreferences systemBrowserClass
- browseAllCallsOn:selectedContext selector.
+ self withWaitCursorDo:[
+ UserPreferences systemBrowserClass
+ browseAllCallsOn:selectedContext selector.
+ ]
+
+ "Modified: / 19-07-2012 / 11:43:02 / cg"
!
browseSendersOf
@@ -3930,12 +4011,15 @@
selector := Dialog
requestSelector:'Selector to browse senders of:'
initialAnswer:initial.
- selector size == 0 ifFalse:[
- UserPreferences systemBrowserClass
- browseAllCallsOn:selector asSymbol.
+
+ selector notEmptyOrNil ifTrue:[
+ self withWaitCursorDo:[
+ UserPreferences systemBrowserClass
+ browseAllCallsOn:selector asSymbol.
+ ]
]
- "Modified: / 6.2.2000 / 01:05:29 / cg"
+ "Modified: / 19-07-2012 / 11:43:29 / cg"
!
clearRememberedCallchain
@@ -4760,8 +4844,8 @@
('-' )
('Browse Implementing Class' browseImplementingClass )
('Browse Receivers Class' browseReceiversClass )
- ('Browse Receivers Class Hierarchy' browseClassHierarchy )
- ('Browse Receivers Full Protocol' browseFullClassProtocol )
+"/ ('Browse Receivers Class Hierarchy' browseClassHierarchy )
+"/ ('Browse Receivers Full Protocol' browseFullClassProtocol )
('Implementors' browseImplementors )
('Implementors Of...' browseImplementorsOf )
('Senders' browseSenders )
@@ -4805,7 +4889,7 @@
^ m.
- "Modified: / 19-05-2010 / 11:49:56 / cg"
+ "Modified: / 19-07-2012 / 11:31:57 / cg"
!
notShowingSupportCode
@@ -4904,6 +4988,17 @@
"Modified: / 17.11.2001 / 22:39:48 / cg"
!
+showFullWalkback
+ "double the number of contexts shown"
+
+ contextArray notNil ifTrue:[
+ nChainShown := 9999.
+ self redisplayBacktrace.
+ ]
+
+ "Created: / 23-07-2012 / 12:24:02 / cg"
+!
+
showMore
"double the number of contexts shown"
@@ -4999,7 +5094,7 @@
toggleShowSupportCode
hideSupportCode ifTrue:[
self showSupportCode
- ] ifTrue:[
+ ] ifFalse:[
self hideSupportCode
].
@@ -5015,6 +5110,66 @@
].
"Modified: / 17.11.2001 / 20:07:45 / cg"
+!
+
+updateMenuItems
+ |m mthd cls mCls rCls|
+
+ "
+ enable/disable some menu items
+ "
+ m := contextView middleButtonMenu.
+ m notNil ifTrue:[
+ m disable:#removeBreakpoint.
+ m disable:#addBreakpoint.
+ canShowMore ifFalse:[
+ m disable:#showMore
+ ].
+
+ selectedContext notNil ifTrue:[
+ m enableAll:#(browseImplementors browseSenders inspectContext skip skipForReturn).
+
+ mthd := selectedContext method.
+ mthd notNil ifTrue:[
+ cls := mCls := mthd containingClass.
+ mthd isBreakpointed ifTrue:[
+ m enable:#removeBreakpoint.
+ ] ifFalse:[
+ m enable:#addBreakpoint.
+ ]
+ ].
+ (selectedContext isBlockContext and:[selectedContext home isNil]) ifTrue:[
+ "/ a cheap block's context
+ ] ifFalse:[
+ rCls := selectedContext receiver class.
+ cls isNil ifTrue:[
+ cls := rCls
+ ].
+ ].
+ cls notNil ifTrue:[
+ m enableAll:#(browseImplementingClass browseReceiversClass browseClassHierarchy browseFullClassProtocol).
+ rCls == mCls ifTrue:[
+ m disable:#browseReceiversClass
+ ].
+ mCls isNil ifTrue:[
+ m disable:#browseImplementingClass
+ ]
+
+ ] ifFalse:[
+ m disableAll:#(browseImplementingClass browseReceiversClass browseClassHierarchy browseFullClassProtocol).
+ ].
+ mthd notNil ifTrue:[
+ m enableAll:#(browseImplementingClass).
+ ].
+ selectedContext isCheapBlockContext ifTrue:[
+ m disableAll:#(browseReceiversClass).
+ ].
+ ] ifFalse:[
+ m disableAll:#(browseImplementingClass browseReceiversClass browseClassHierarchy browseFullClassProtocol).
+ ]
+ ]
+
+ "Modified: / 19-07-2012 / 11:53:30 / cg"
! !
!DebugView methodsFor:'menu & button actions-breakpoints'!
@@ -5526,54 +5681,6 @@
"Modified: 20.10.1996 / 18:11:24 / cg"
!
-updateMenuItems
- |m mthd cls mCls rCls|
-
- "
- enable/disable some menu items
- "
- m := contextView middleButtonMenu.
- m notNil ifTrue:[
- m disable:#removeBreakpoint.
- m disable:#addBreakpoint.
- canShowMore ifFalse:[
- m disable:#showMore
- ].
-
- selectedContext notNil ifTrue:[
- m enableAll:#(browseImplementors browseSenders inspectContext skip skipForReturn).
-
- mthd := selectedContext method.
- mthd notNil ifTrue:[
- cls := mCls := mthd containingClass.
- mthd isBreakpointed ifTrue:[
- m enable:#removeBreakpoint.
- ] ifFalse:[
- m enable:#addBreakpoint.
- ]
- ].
- rCls := selectedContext receiver class.
- cls isNil ifTrue:[
- cls := rCls
- ].
- cls notNil ifTrue:[
- m enableAll:#(browseImplementingClass browseReceiversClass browseClassHierarchy browseFullClassProtocol).
- rCls == mCls ifTrue:[
- m disable:#browseReceiversClass
- ].
- mCls isNil ifTrue:[
- m disable:#browseImplementingClass
- ]
-
- ] ifFalse:[
- m disableAll:#(browseImplementingClass browseReceiversClass browseClassHierarchy browseFullClassProtocol).
- ].
- ] ifFalse:[
- m disableAll:#(browseImplementingClass browseReceiversClass browseClassHierarchy browseFullClassProtocol).
- ]
- ]
-!
-
withNodeValueAtInterval:interval do:aBlock
|node definingNode nm nmBold varIdx parentNode receiver con receiversNonMetaClass|
@@ -5858,12 +5965,12 @@
|con mthd|
(con := self selectedContext) notNil ifTrue:[
- mthd := con methodHome method.
+ mthd := con method.
^ mthd notNil and:[mthd isWrapped]
].
^ false.
- "Modified (format): / 17-07-2012 / 12:53:57 / cg"
+ "Modified: / 19-07-2012 / 11:36:28 / cg"
!
setOfHiddenCallingSelectors
@@ -6210,7 +6317,7 @@
].
[
- DebuggingDebugger == true ifTrue:[
+ DebuggingDebugger3 == true ifTrue:[
'showingContext1: (' print. con print.
') --> ' print. (self showingContext1:con calling:calledContext) printCR.
].
@@ -6220,7 +6327,7 @@
con := con sender.
].
- DebuggingDebugger == true ifTrue:[
+ DebuggingDebugger3 == true ifTrue:[
'showingContext2: (' print. con print.
') --> ' print. (self showingContext2:con nesting:count) printCR.
].
@@ -6386,7 +6493,7 @@
^ true
"Created: / 14-12-1995 / 19:10:31 / cg"
- "Modified: / 18-07-2012 / 16:52:38 / cg"
+ "Modified: / 20-07-2012 / 13:16:36 / cg"
!
setContextSkippingInterruptContexts:aContext
@@ -6431,7 +6538,7 @@
senderRec := aContext sender receiver
].
- DebuggingDebugger == true ifTrue:[
+ DebuggingDebugger3 == true ifTrue:[
'showingContext1: (' print. aContext print.
') calling: (' print. calledContext print.
')' printCR.
@@ -6514,7 +6621,7 @@
^ true
"Created: / 17-11-2001 / 22:24:06 / cg"
- "Modified: / 08-12-2010 / 18:21:02 / cg"
+ "Modified: / 20-07-2012 / 13:16:47 / cg"
!
showingContext2:aContext nesting:nesting
@@ -7190,44 +7297,39 @@
currentMethod := aMethodOrNil.
!
-showSelection:lineNr
+showSelection:lineNr
"user clicked on a header line - show selected code in textView.
Also sent to autoselect an interesting context on entry."
-
- Notification
- handle:
- [:ex |
- "/ ex suspendedContext fullPrintAll.
- Transcript showCR:ex description.
- "/ Transcript showCR:ex parameter.
- ex proceed
- ]
- do:
- [
- Error
- handle:
- [:ex |
- |s con|
-
- ex signal isControlInterrupt
- ifTrue:[
- 'DebugView [info]: halt/break ignored - while showing selection in debugger' infoPrintCR.
- ex proceed
- ].
-
- ('DebugView [info]: error at %1 when showing selection in debugger ignored' bindWith:ex suspendedContext) infoPrintCR.
-
- s := '' writeStream.
- s nextPutLine:'**** error in debugger, while extracting source'.
- s nextPutLine:'****'.
- s nextPutAll: '**** '; nextPutLine:(ex description "withCRs").
- s nextPutLine:'****'.
- con := ex suspendedContext.
- s nextPutAll: '**** '; nextPutLine:(con printString).
- con := con sender.
- HaltInterrupt ignoreIn:[
- con fullPrintAllOn:s.
- ].
+
+ Notification
+ handle:[:ex |
+ "/ ex suspendedContext fullPrintAll.
+ Transcript showCR:ex description.
+ "/ Transcript showCR:ex parameter.
+ ex proceed
+ ]
+ do:[
+ Error
+ handle:[:ex |
+ |s con|
+
+ ex signal isControlInterrupt ifTrue:[
+ 'DebugView [info]: halt/break ignored - while showing selection in debugger'
+ infoPrintCR.
+ ex proceed
+ ].
+ ('DebugView [info]: error at %1 when showing selection in debugger ignored'
+ bindWith:ex suspendedContext) infoPrintCR.
+ s := '' writeStream.
+ s nextPutLine:'**** error in debugger, while extracting source'.
+ s nextPutLine:'****'.
+ s nextPutLine:'**** ',(ex description).
+ s nextPutLine:'****'.
+ con := ex suspendedContext.
+ s nextPutLine:'**** ',(con printString).
+ con := con sender.
+ HaltInterrupt ignoreIn:[ con fullPrintAllOn:s. ].
+
"/ [con notNil] whileTrue:[
"/ Error catch:[:ex |
"/ s nextPutAll: '**** '; nextPutLine:(con printString).
@@ -7239,16 +7341,14 @@
"/ con := con sender.
"/ ]
"/ ].
- codeView contents:(s contents).
- ex return.
- ]
- do:
- [
- self doShowSelection:lineNr
- ]
- ]
-
- "Modified: / 04-07-2006 / 14:50:06 / cg"
+
+ codeView contents:(s contents).
+ ex return.
+ ]
+ do:[ self doShowSelection:lineNr ]
+ ]
+
+ "Modified: / 19-07-2012 / 10:56:58 / cg"
!
showStackInspectorFor:con
@@ -7355,27 +7455,28 @@
A future new block calling scheme will fix this
(passing the block instead of the home as block argument).
"
-
- "temporary kludge - peek into the sender context.
- If its a do-like method and there is a single block variable
- in the args or temporaries, that must be the one.
- This helps in some cases.
- "
- (sender := con sender) notNil ifTrue:[
- tryVars := false.
- (selSender := sender selector) notNil ifTrue:[
- ((selSender endsWith:'do:') or:[selSender endsWith:'Do:']) ifTrue:[
- tryVars := true.
+ (method := con method) isNil ifTrue:[
+ "temporary kludge - peek into the sender context.
+ If its a do-like method and there is a single block variable
+ in the args or temporaries, that must be the one.
+ This helps in some cases.
+ "
+ (sender := con sender) notNil ifTrue:[
+ tryVars := false.
+ (selSender := sender selector) notNil ifTrue:[
+ ((selSender endsWith:'do:') or:[selSender endsWith:'Do:']) ifTrue:[
+ tryVars := true.
+ ]
+ ].
+ tryVars ifTrue:[
+ possibleBlocks := sender argsAndVars select:[:v | v isBlock].
+ possibleBlocks := possibleBlocks select:[:b | b home isNil].
+ possibleBlocks size == 1 ifTrue:[
+ method := possibleBlocks first method.
+ ].
]
].
- tryVars ifTrue:[
- possibleBlocks := sender argsAndVars select:[:v | v isBlock].
- possibleBlocks := possibleBlocks select:[:b | b home isNil].
- possibleBlocks size == 1 ifTrue:[
- method := possibleBlocks first method.
- ].
- ]
- ].
+ ]
] ifFalse:[
"fetch rec here - so we won't need context in doItAction"
rec := homeContext receiver.
@@ -7631,7 +7732,7 @@
].
self setCurrentMethod:method.
- selectedContext := homeContext.
+ selectedContext := homeContext ? con.
actualContext := con
].
] ifFalse:[
@@ -7673,7 +7774,7 @@
"Created: / 14-08-1997 / 20:15:00 / cg"
"Modified: / 05-10-2011 / 11:55:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-07-2012 / 15:42:11 / cg"
+ "Modified: / 23-07-2012 / 12:23:49 / cg"
! !
!DebugView::IgnoredHaltOrBreakpoint methodsFor:'accessing'!
@@ -7922,15 +8023,15 @@
!DebugView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.544 2012/07/18 15:21:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.548 2012/07/23 10:43:16 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/DebugView.st,v 1.544 2012/07/18 15:21:08 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/DebugView.st,v 1.548 2012/07/23 10:43:16 cg Exp §'
!
version_SVN
- ^ '$Id: DebugView.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: DebugView.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
DebugView initialize!
\ No newline at end of file
--- a/GitSourceCodeManagementSettingsAppl.st Tue Jul 24 18:17:26 2012 +0100
+++ b/GitSourceCodeManagementSettingsAppl.st Wed Jul 25 10:51:30 2012 +0100
@@ -53,7 +53,7 @@
defaultRepositoryName
- ^ ''
+ ^ './gitRepository'
"Created: / 19-04-2011 / 11:00:11 / cg"
! !
@@ -839,7 +839,7 @@
]
].
- GitSourceCodeManager hgCommandTimeout:(self hgCommandTimeoutHolder value).
+ GitSourceCodeManager gitCommandTimeout:(self gitCommandTimeoutHolder value).
modules := repositoriesPerModule select:[:entry | entry first == GitSourceCodeManager].
infoPerModule := Dictionary new.
@@ -859,7 +859,7 @@
self acceptChannel value.
- "Modified: / 03-03-2012 / 11:25:12 / cg"
+ "Modified: / 23-07-2012 / 13:18:38 / cg"
!
removePerModuleRoot
@@ -876,7 +876,7 @@
"Modified: / 26-01-2012 / 13:50:08 / cg"
! !
-!GitSourceCodeManagementSettingsAppl methodsFor:'actions - mercurial'!
+!GitSourceCodeManagementSettingsAppl methodsFor:'actions - git'!
addPerModuleRoot
|module gitRepository|
@@ -893,34 +893,6 @@
"Modified (format): / 02-03-2012 / 15:22:41 / cg"
!
-basicSaveGitSettings
- |hgRepository|
-
- repositoryHolder notNil ifTrue:[
- repositoryHolder value size > 0 ifTrue:[
- manager notNil ifTrue:[
- manager initializeForRepository:repositoryHolder value.
- ]
- ].
- ].
- GitSourceCodeManager gitExecutable:((self gitExecutableHolder value ? '') withoutSeparators).
- GitSourceCodeManager initializeForRepository:(hgRepository := self repositoryHolder value).
- GitSourceCodeManager verboseSourceCodeAccess: verboseSourceCodeAccess value.
- GitSourceCodeManager shownInBrowserMenus:self shownInBrowserMenusHolder value.
-
- RecentlyUsedRepositoryURLS isNil ifTrue:[
- RecentlyUsedRepositoryURLS := OrderedCollection new.
- ].
- (RecentlyUsedRepositoryURLS includes:hgRepository) ifFalse:[
- RecentlyUsedRepositoryURLS addFirst:hgRepository.
- RecentlyUsedRepositoryURLS size > 20 ifTrue:[
- RecentlyUsedRepositoryURLS removeLast.
- ].
- ].
-
- "Created: / 02-03-2012 / 15:19:22 / cg"
-!
-
checkAccess
self halt:'unimplemented feature'
@@ -940,6 +912,40 @@
"Created: / 17-01-2012 / 17:42:27 / cg"
! !
+!GitSourceCodeManagementSettingsAppl methodsFor:'actions - mercurial'!
+
+basicSaveGitSettings
+ |gitRepository|
+
+ repositoryHolder notNil ifTrue:[
+ repositoryHolder value size > 0 ifTrue:[
+ manager notNil ifTrue:[
+ manager initializeForRepository:repositoryHolder value.
+ ]
+ ].
+ ].
+ GitSourceCodeManager gitExecutable:((self gitExecutableHolder value ? '') withoutSeparators).
+ self repositoryHolder value isEmptyOrNil ifTrue:[
+ Dialog information:'You must specify a valid gitRepository directory'.
+ ^ self.
+ ].
+ GitSourceCodeManager initializeForRepository:(gitRepository := self repositoryHolder value).
+ GitSourceCodeManager verboseSourceCodeAccess: verboseSourceCodeAccess value.
+ GitSourceCodeManager shownInBrowserMenus:self shownInBrowserMenusHolder value.
+
+ RecentlyUsedRepositoryURLS isNil ifTrue:[
+ RecentlyUsedRepositoryURLS := OrderedCollection new.
+ ].
+ (RecentlyUsedRepositoryURLS includes:gitRepository) ifFalse:[
+ RecentlyUsedRepositoryURLS addFirst:gitRepository.
+ RecentlyUsedRepositoryURLS size > 20 ifTrue:[
+ RecentlyUsedRepositoryURLS removeLast.
+ ].
+ ].
+
+ "Created: / 02-03-2012 / 15:19:22 / cg"
+! !
+
!GitSourceCodeManagementSettingsAppl methodsFor:'aspects'!
gitCommandTimeoutHolder
@@ -1030,7 +1036,7 @@
repositoryHolder
repositoryHolder isNil ifTrue:[
- repositoryHolder := '' asValue.
+ repositoryHolder := self class defaultRepositoryName asValue.
repositoryHolder addDependent:self.
].
^ repositoryHolder.
@@ -1119,73 +1125,9 @@
"Created: / 14-01-2012 / 20:24:57 / cg"
!
-sourceDirChanged
- |nm fn previousDir|
- manager isNil ifTrue:[^ self].
-
- previousDir := AbstractSourceCodeManager cacheDirectoryName.
-
- nm := self sourceCacheDir value.
- nm isEmptyOrNil ifTrue:[^ self].
-
- (fn := nm asFilename) exists ifFalse:[
- (self confirm:(resources
- stringWithCRs:'SourceCache directory "%1" does not exist.\Create ?'
- with:nm)
- ) ifFalse:[
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
- fn
- recursiveMakeDirectory;
- makeReadableForAll;
- makeWritableForAll;
- makeExecutableForAll.
- ^ self.
- ].
-
- (fn isDirectory) ifFalse:[
- self warn:(resources
- stringWithCRs:'Not a directory: "%1"'
- with:nm).
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
-
- (fn isReadable and:[fn isWritable]) ifFalse:[
- (self confirm:(resources
- stringWithCRs:'SourceCache directory "%1" is not both readable and writable.\Change ?'
- with:nm)
- ) ifFalse:[
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
- fn
- makeReadableForAll;
- makeWritableForAll;
- makeExecutableForAll.
- ].
-"/ (fn isReadableForAll and:[fn isWritableForAll]) ifFalse:[
-"/ (self confirm:(resources
-"/ stringWithCRs:'SourceCache directory "%1" is not both readable and writable for other users.\Change ?'
-"/ with:nm)
-"/ ) ifTrue:[
-"/ fn
-"/ makeReadableForAll;
-"/ makeWritableForAll;
-"/ makeExecutableForAll.
-"/ ]
-"/ ].
-!
update:something with:aParameter from:changedObject
- "/ common
- changedObject == sourceCacheDir ifTrue:[
- self sourceDirChanged.
- self updateModifiedChannel.
- ^ self
- ].
"/ cvs
changedObject == repositoryHolder ifTrue:[
@@ -1279,13 +1221,13 @@
!GitSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
version
- ^ '$Id: GitSourceCodeManagementSettingsAppl.st 7954 2012-03-26 15:34:31Z vranyj1 $'
+ ^ '$Header: /cvs/stx/stx/libtool/GitSourceCodeManagementSettingsAppl.st,v 1.8 2012/07/23 11:26:05 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/GitSourceCodeManagementSettingsAppl.st,v 1.6 2012/03/12 11:11:48 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/GitSourceCodeManagementSettingsAppl.st,v 1.8 2012/07/23 11:26:05 cg Exp §'
!
version_SVN
- ^ '$Id: GitSourceCodeManagementSettingsAppl.st 7954 2012-03-26 15:34:31Z vranyj1 $'
+ ^ '$Id: GitSourceCodeManagementSettingsAppl.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/InspectorView.st Tue Jul 24 18:17:26 2012 +0100
+++ b/InspectorView.st Wed Jul 25 10:51:30 2012 +0100
@@ -17,7 +17,7 @@
inspectHistory allowFollow isStandaloneInspector selectionIndex
object inspectedObjectHolder displayStringMessage
suppressPseudoSlots dereferenceValueHolders suppressHeadline
- headLineLabel'
+ headLineLabel sortOrder'
classVariableNames:'DefaultIcon IdDictionary NextSequentialID LastExtent
DefaultIntegerDisplayRadix ExpandArraysInAllLists'
poolDictionaries:''
@@ -1017,6 +1017,7 @@
displayStringMessage := #displayString.
hideReceiver := false.
integerDisplayRadix := (DefaultIntegerDisplayRadix ? 10).
+ sortOrder := #instvarOrder.
allowFollow := false.
isStandaloneInspector := false.
@@ -1080,7 +1081,7 @@
hasMore := false.
"Modified: / 16-08-2005 / 21:54:04 / janfrog"
- "Modified: / 30-10-2011 / 09:18:36 / cg"
+ "Modified: / 20-07-2012 / 10:48:34 / cg"
!
initializeDragAndDrop
@@ -1308,6 +1309,7 @@
args:localSelectors
receiver:self.
+ items := items , (self sortOrderItems).
items := items , (self numberBaseItems).
m := PopUpMenu
@@ -1341,7 +1343,7 @@
^ m
- "Modified: / 13-06-2012 / 10:13:39 / cg"
+ "Modified: / 20-07-2012 / 10:50:45 / cg"
!
numberBaseItems
@@ -1469,6 +1471,19 @@
).
].
^ #()
+!
+
+sortOrderItems
+ object class instSize == 0 ifTrue:[ ^ #() ].
+ ^ {
+ #('-') .
+ (sortOrder == #instvarOrder)
+ ifFalse:[ #('Instvar Order' #setSortOrderToInstvarOrder ) ] .
+ (sortOrder == #alphabetical)
+ ifFalse:[ #('Alphabetical' #setSortOrderToAlphabetical ) ] .
+ } select:[:el | el notNil].
+
+ "Created: / 20-07-2012 / 10:47:53 / cg"
! !
!InspectorView methodsFor:'menu actions'!
@@ -1798,6 +1813,56 @@
"Modified: / 25-01-2011 / 17:23:38 / cg"
!
+setDisplayRadixTo10
+ self setDisplayRadixTo:10
+
+ "Created: / 24-08-2010 / 17:26:12 / cg"
+!
+
+setDisplayRadixTo16
+ self setDisplayRadixTo:16
+
+ "Created: / 24-08-2010 / 17:26:22 / cg"
+!
+
+setDisplayRadixTo2
+ self setDisplayRadixTo:2
+
+ "Created: / 24-08-2010 / 17:26:18 / cg"
+!
+
+setDisplayRadixTo:radix
+ |sel|
+
+ integerDisplayRadix := DefaultIntegerDisplayRadix := radix.
+ self reinspect.
+ sel := listView selection.
+ sel notNil ifTrue:[
+ self showSelection:sel
+ ]
+
+ "Created: / 24-08-2010 / 17:26:54 / cg"
+!
+
+setSortOrderTo:aSymbol
+ sortOrder := aSymbol.
+ self reinspect.
+
+ "Created: / 20-07-2012 / 10:59:30 / cg"
+!
+
+setSortOrderToAlphabetical
+ self setSortOrderTo:#alphabetical
+
+ "Created: / 20-07-2012 / 10:59:52 / cg"
+!
+
+setSortOrderToInstvarOrder
+ self setSortOrderTo:#instvarOrder
+
+ "Created: / 20-07-2012 / 10:59:59 / cg"
+!
+
showAll
|o|
@@ -1826,9 +1891,7 @@
ifTrue:[ fn ]
ifFalse:[ fn directory ].
- OperatingSystem
- openApplicationForDocument:dir
- operation:#explore.
+ dir asFilename openExplorer
"Created: / 05-02-2011 / 15:49:33 / cg"
!
@@ -1932,6 +1995,9 @@
"/ not everything can be shown in HEX/Binary
someValue isInteger ifTrue:[
+ (someValue < integerDisplayRadix) ifTrue:[
+ ^ someValue printString.
+ ].
s := someValue radixPrintStringRadix:integerDisplayRadix.
s := s , ' "',(someValue printString),'"'.
^ s
@@ -1975,7 +2041,7 @@
^ s contents
].
- "Modified: / 17-07-2012 / 13:22:27 / cg"
+ "Modified: / 20-07-2012 / 10:54:05 / cg"
!
displayStringForValue:someValue
@@ -2102,10 +2168,16 @@
].
(value isNumber or:[value isBoolean]) ifTrue:[
- ^ value printString
+ ^ self basicDisplayStringForValue:value "value printString"
+ ].
+ (value isSymbol) ifTrue:[
+ ^ value storeString
].
- (value isSymbol or:[value isCharacter]) 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 contractTo:30.
@@ -2528,22 +2600,24 @@
"helper - return the index for a named instVar;
nil, if self or a keyed instvar is selected."
- |idx nNamedInstvarsShown cls baseCls firstRealIndex line|
+ |idx nNamedInstvarsShown cls baseCls firstRealIndex line nm|
lineNr isNil ifTrue:[^ nil].
firstRealIndex := 1.
- idx := lineNr.
- self hasSelfEntry ifTrue:[
- (lineNr == 1 or:[lineNr isNil]) ifTrue:[
- ^ nil "/ self selected
- ].
- idx := idx - 1.
- firstRealIndex := 2.
- ].
-
- [line :=self listEntryAt:firstRealIndex.
- (line startsWith:'-') and:[line size < 2 or:[line second isDigit not]]] whileTrue:[
+ line := (self listEntryAt:lineNr) string.
+ ((line startsWith:'-') and:[line size < 2 or:[line second isDigit not]])
+ ifTrue:[^ nil].
+
+ nm := line asCollectionOfWords first.
+ idx := object class allInstVarNames indexOf:nm.
+ idx == 0 ifTrue:[^ nil].
+ ^ idx.
+
+ [
+ line := self listEntryAt:firstRealIndex.
+ (line startsWith:'-') and:[line size < 2 or:[line second isDigit not]]
+ ] whileTrue:[
firstRealIndex := firstRealIndex + 1.
idx := idx - 1.
].
@@ -2563,7 +2637,7 @@
].
^ nil "/ indexed instvar or other selected
- "Modified: / 16-05-2012 / 17:54:41 / cg"
+ "Modified: / 20-07-2012 / 11:11:10 / cg"
!
keyIndexForLine:lineNr
@@ -2644,14 +2718,16 @@
"/ hide some stuff
aList := aList copyFrom:(self baseInspectedObjectClass instSize + 1).
].
- ^ aList
- keysAndValuesCollect:[:idx :nm |
- self listEntryForName:nm value:(object instVarAt:idx)
- ].
-
+ aList := aList
+ keysAndValuesCollect:[:idx :nm |
+ self listEntryForName:nm value:(object instVarAt:idx)
+ ].
+ sortOrder == #alphabetical ifTrue:[
+ aList sort:[:a :b | a string < b string].
+ ].
^ aList
- "Modified: / 16-05-2012 / 18:43:23 / cg"
+ "Modified: / 20-07-2012 / 10:58:13 / cg"
!
numIndexedFields
@@ -3177,37 +3253,6 @@
"Modified: / 03-08-2006 / 14:27:02 / cg"
!
-setDisplayRadixTo10
- self setDisplayRadixTo:10
-
- "Created: / 24-08-2010 / 17:26:12 / cg"
-!
-
-setDisplayRadixTo16
- self setDisplayRadixTo:16
-
- "Created: / 24-08-2010 / 17:26:22 / cg"
-!
-
-setDisplayRadixTo2
- self setDisplayRadixTo:2
-
- "Created: / 24-08-2010 / 17:26:18 / cg"
-!
-
-setDisplayRadixTo:radix
- |sel|
-
- integerDisplayRadix := DefaultIntegerDisplayRadix := radix.
- self reinspect.
- sel := listView selection.
- sel notNil ifTrue:[
- self showSelection:sel
- ]
-
- "Created: / 24-08-2010 / 17:26:54 / cg"
-!
-
showLast
"user clicked on an instvar - show value in workspace"
@@ -3253,13 +3298,13 @@
!InspectorView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.266 2012/07/18 15:17:31 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.270 2012/07/22 08:02:43 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.266 2012/07/18 15:17:31 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.270 2012/07/22 08:02:43 cg Exp §'
!
version_SVN
- ^ '$Id: InspectorView.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: InspectorView.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/MercurialSourceCodeManagementSettingsAppl.st Tue Jul 24 18:17:26 2012 +0100
+++ b/MercurialSourceCodeManagementSettingsAppl.st Wed Jul 25 10:51:30 2012 +0100
@@ -53,7 +53,7 @@
defaultRepositoryName
- ^ ''
+ ^ './hgRepository'
"Created: / 19-04-2011 / 11:00:11 / cg"
! !
@@ -1068,7 +1068,7 @@
repositoryHolder
repositoryHolder isNil ifTrue:[
- repositoryHolder := '' asValue.
+ repositoryHolder := self class defaultRepositoryName asValue.
repositoryHolder addDependent:self.
].
^ repositoryHolder.
@@ -1157,73 +1157,7 @@
"Created: / 14-01-2012 / 20:24:57 / cg"
!
-sourceDirChanged
- |nm fn previousDir|
-
- manager isNil ifTrue:[^ self].
-
- previousDir := AbstractSourceCodeManager cacheDirectoryName.
-
- nm := self sourceCacheDir value.
- nm isEmptyOrNil ifTrue:[^ self].
-
- (fn := nm asFilename) exists ifFalse:[
- (self confirm:(resources
- stringWithCRs:'SourceCache directory "%1" does not exist.\Create ?'
- with:nm)
- ) ifFalse:[
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
- fn
- recursiveMakeDirectory;
- makeReadableForAll;
- makeWritableForAll;
- makeExecutableForAll.
- ^ self.
- ].
-
- (fn isDirectory) ifFalse:[
- self warn:(resources
- stringWithCRs:'Not a directory: "%1"'
- with:nm).
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
-
- (fn isReadable and:[fn isWritable]) ifFalse:[
- (self confirm:(resources
- stringWithCRs:'SourceCache directory "%1" is not both readable and writable.\Change ?'
- with:nm)
- ) ifFalse:[
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
- fn
- makeReadableForAll;
- makeWritableForAll;
- makeExecutableForAll.
- ].
-"/ (fn isReadableForAll and:[fn isWritableForAll]) ifFalse:[
-"/ (self confirm:(resources
-"/ stringWithCRs:'SourceCache directory "%1" is not both readable and writable for other users.\Change ?'
-"/ with:nm)
-"/ ) ifTrue:[
-"/ fn
-"/ makeReadableForAll;
-"/ makeWritableForAll;
-"/ makeExecutableForAll.
-"/ ]
-"/ ].
-!
-
update:something with:aParameter from:changedObject
- "/ common
- changedObject == sourceCacheDir ifTrue:[
- self sourceDirChanged.
- self updateModifiedChannel.
- ^ self
- ].
"/ cvs
changedObject == repositoryHolder ifTrue:[
@@ -1317,13 +1251,13 @@
!MercurialSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.16 2012/03/12 11:05:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.18 2012/07/23 11:25:37 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.16 2012/03/12 11:05:56 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.18 2012/07/23 11:25:37 cg Exp §'
!
version_SVN
- ^ '$Id: MercurialSourceCodeManagementSettingsAppl.st 7952 2012-03-21 17:50:14Z vranyj1 $'
+ ^ '$Id: MercurialSourceCodeManagementSettingsAppl.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/MultiViewToolApplication.st Tue Jul 24 18:17:26 2012 +0100
+++ b/MultiViewToolApplication.st Wed Jul 25 10:51:30 2012 +0100
@@ -1147,10 +1147,12 @@
] ifFalse:[
oldName := tabList at:wsIndex.
].
- newName := Dialog request:(resources string:'New Name for %1:' with:oldName) initialAnswer:oldName.
+ newName := Dialog request:(resources string:'New Name for "%1":' with:oldName) initialAnswer:oldName.
newName size == 0 ifTrue:[ ^ self].
self renameWorkspace:wsIndex to:newName.
+
+ "Modified: / 20-07-2012 / 10:21:29 / cg"
!
renameWorkspace:wsIndex to:newName
@@ -1375,9 +1377,9 @@
!MultiViewToolApplication class methodsFor:'documentation'!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/MultiViewToolApplication.st,v 1.43 2012/04/21 18:38:24 stefan Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/MultiViewToolApplication.st,v 1.44 2012/07/20 08:22:53 cg Exp §'
!
version_SVN
- ^ '$Id: MultiViewToolApplication.st 8014 2012-07-10 15:42:40Z vranyj1 $'
+ ^ '$Id: MultiViewToolApplication.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/NewLauncher.st Tue Jul 24 18:17:26 2012 +0100
+++ b/NewLauncher.st Wed Jul 25 10:51:30 2012 +0100
@@ -4241,6 +4241,7 @@
menu addItem:(MenuItem new
label: label;
submenu: submenu;
+ value: [view raiseDeiconified; setForegroundWindow];
translateLabel: false).
].
@@ -4973,13 +4974,13 @@
!NewLauncher class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.436 2012/06/01 11:23:14 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.437 2012/07/20 11:14:46 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.436 2012/06/01 11:23:14 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.437 2012/07/20 11:14:46 cg Exp §'
!
version_SVN
- ^ '$Id: NewLauncher.st 8007 2012-06-05 14:49:00Z vranyj1 $'
+ ^ '$Id: NewLauncher.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/PerforceSourceCodeManagementSettingsAppl.st Tue Jul 24 18:17:26 2012 +0100
+++ b/PerforceSourceCodeManagementSettingsAppl.st Wed Jul 25 10:51:30 2012 +0100
@@ -815,40 +815,7 @@
self removeEnabled value:self selectedPerModuleRoot value notNil.
!
-sourceDirChanged
- | nm fn|
-
- nm := self sourceCacheDir value.
- nm isEmptyOrNil ifTrue:[^ self].
-
- (fn := nm asFilename) exists ifFalse:[
- (self confirm:('SourceCache directory ''' , nm , ''' does not exist.\Create ?' withCRs)) ifTrue:[
- fn makeDirectory;
- makeReadableForAll;
- makeWritableForAll;
- makeExecutableForAll.
- ] ifFalse:[
- self sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
- ^ self.
- ].
- ].
- (fn isDirectory
- and:[fn isReadable
- and:[fn isWritable]]) ifTrue:[
- AbstractSourceCodeManager cacheDirectoryName:nm.
- ] ifFalse:[
- self warn:'Invalid sourceCache directory.'.
- self sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
- ].
-!
-
update:something with:aParameter from:changedObject
- "/ common
- changedObject == sourceCacheDir ifTrue:[
- self sourceDirChanged.
- self updateModifiedChannel.
- ^ self
- ].
changedObject == selectedPerModuleRoot ifTrue:[
self selectedPerModuleRootChanged.
@@ -1366,13 +1333,13 @@
!PerforceSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagementSettingsAppl.st,v 1.24 2012/06/01 22:21:24 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagementSettingsAppl.st,v 1.25 2012/07/19 15:27:52 stefan Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagementSettingsAppl.st,v 1.24 2012/06/01 22:21:24 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagementSettingsAppl.st,v 1.25 2012/07/19 15:27:52 stefan Exp §'
!
version_SVN
- ^ '$Id: PerforceSourceCodeManagementSettingsAppl.st 8007 2012-06-05 14:49:00Z vranyj1 $'
+ ^ '$Id: PerforceSourceCodeManagementSettingsAppl.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/SmalltalkCodeGeneratorTool.st Tue Jul 24 18:17:26 2012 +0100
+++ b/SmalltalkCodeGeneratorTool.st Wed Jul 25 10:51:30 2012 +0100
@@ -2254,7 +2254,7 @@
] ifFalse:[
self realMain:argv.
].
- Smalltalk exit:0.
+ "/ do not exit here; caller will go into event loop when returning
'.
"Created: / 19-08-2011 / 02:18:49 / cg"
@@ -2275,7 +2275,7 @@
^
'realMain:argsToEcho
- "just a dummy as example - does nothing but echo its arguments"
+ "just a dummy example - does nothing but echo its arguments"
Stdout nextPutLine:''Hello World''.
Stdout nextPutLine:(argsToEcho asStringWith:Character space)
@@ -2493,13 +2493,13 @@
!SmalltalkCodeGeneratorTool class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/SmalltalkCodeGeneratorTool.st,v 1.13 2012/05/22 16:33:26 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/SmalltalkCodeGeneratorTool.st,v 1.15 2012/07/20 18:13:34 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/SmalltalkCodeGeneratorTool.st,v 1.13 2012/05/22 16:33:26 stefan Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/SmalltalkCodeGeneratorTool.st,v 1.15 2012/07/20 18:13:34 cg Exp §'
!
version_SVN
- ^ '$Id: SmalltalkCodeGeneratorTool.st 8007 2012-06-05 14:49:00Z vranyj1 $'
+ ^ '$Id: SmalltalkCodeGeneratorTool.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/StoreSourceCodeManagementSettingsAppl.st Tue Jul 24 18:17:26 2012 +0100
+++ b/StoreSourceCodeManagementSettingsAppl.st Wed Jul 25 10:51:30 2012 +0100
@@ -504,13 +504,6 @@
"Created: / 19-04-2011 / 12:48:57 / cg"
! !
-!StoreSourceCodeManagementSettingsAppl methodsFor:'accessing'!
-
-manager
-
- ^ Smalltalk at:#SourceCodeManager
-! !
-
!StoreSourceCodeManagementSettingsAppl methodsFor:'actions'!
addModule:module withData:data
@@ -1007,66 +1000,6 @@
].
!
-sourceDirChanged
- |nm fn previousDir|
-
- manager isNil ifTrue:[^ self].
-
- previousDir := AbstractSourceCodeManager cacheDirectoryName.
-
- nm := self sourceCacheDir value.
- nm isEmptyOrNil ifTrue:[^ self].
-
- (fn := nm asFilename) exists ifFalse:[
- (self confirm:(resources
- stringWithCRs:'SourceCache directory "%1" does not exist.\Create ?'
- with:nm)
- ) ifFalse:[
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
- fn
- recursiveMakeDirectory;
- makeReadableForAll;
- makeWritableForAll;
- makeExecutableForAll.
- ^ self.
- ].
-
- (fn isDirectory) ifFalse:[
- self warn:(resources
- stringWithCRs:'Not a directory: "%1"'
- with:nm).
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
-
- (fn isReadable and:[fn isWritable]) ifFalse:[
- (self confirm:(resources
- stringWithCRs:'SourceCache directory "%1" is not both readable and writable.\Change ?'
- with:nm)
- ) ifFalse:[
- self sourceCacheDir value:previousDir.
- ^ self.
- ].
- fn
- makeReadableForAll;
- makeWritableForAll;
- makeExecutableForAll.
- ].
-"/ (fn isReadableForAll and:[fn isWritableForAll]) ifFalse:[
-"/ (self confirm:(resources
-"/ stringWithCRs:'SourceCache directory "%1" is not both readable and writable for other users.\Change ?'
-"/ with:nm)
-"/ ) ifTrue:[
-"/ fn
-"/ makeReadableForAll;
-"/ makeWritableForAll;
-"/ makeExecutableForAll.
-"/ ]
-"/ ].
-!
-
update:something with:aParameter from:changedObject
"/ common
changedObject == sourceCacheDir ifTrue:[
@@ -1218,13 +1151,13 @@
!StoreSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/StoreSourceCodeManagementSettingsAppl.st,v 1.17 2012/03/16 11:37:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/StoreSourceCodeManagementSettingsAppl.st,v 1.18 2012/07/19 15:28:21 stefan Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/StoreSourceCodeManagementSettingsAppl.st,v 1.17 2012/03/16 11:37:02 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/StoreSourceCodeManagementSettingsAppl.st,v 1.18 2012/07/19 15:28:21 stefan Exp §'
!
version_SVN
- ^ '$Id: StoreSourceCodeManagementSettingsAppl.st 7952 2012-03-21 17:50:14Z vranyj1 $'
+ ^ '$Id: StoreSourceCodeManagementSettingsAppl.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/SystemBrowser.st Tue Jul 24 18:17:26 2012 +0100
+++ b/SystemBrowser.st Wed Jul 25 10:51:30 2012 +0100
@@ -4528,7 +4528,7 @@
- extracting accessed globals from the pattern, and limiting the search to
methods which also refer to those globals"
- |errAction searchTree searcher globalVariablesUsed usedSymbols
+ |errAction searchTree searcher globalVariablesUsed usedSymbols usedStrings
sentMessages searchBlock foundMatch numMethodArgs methodSelector nameSpacesForGlobals|
"/self halt.
@@ -4595,6 +4595,7 @@
].
usedSymbols := searchTree usedSymbols.
+ usedStrings := searchTree usedLiterals select:[:lit | lit isString].
"/ sorry:
"/ cannot use literals to speedup the search, because stc does not store
@@ -4616,7 +4617,8 @@
searchBlock := [:c :m :sel |
|allSelectorsInLiteralArray allMessagesSent
- allGlobalsReferenced allUsedSymbolsInLiteralArray allSent src rslt parseTree
+ allGlobalsReferenced allUsedSymbolsInLiteralArray allStringsInLiteralArray
+ allSent src rslt parseTree
literalsInMethod|
foundMatch := false.
@@ -4637,31 +4639,36 @@
allSelectorsInLiteralArray ifTrue:[
allUsedSymbolsInLiteralArray := usedSymbols isEmptyOrNil or:[ literalsInMethod includesAll:usedSymbols ].
allUsedSymbolsInLiteralArray ifTrue:[
- allGlobalsReferenced := globalVariablesUsed conform:[:varNames | varNames contains:[:varName | m referencesGlobal:varName]].
- allGlobalsReferenced ifTrue:[
- allMessagesSent := sentMessages isEmptyOrNil or:[ m messages includesAll:sentMessages ].
- allMessagesSent ifTrue:[
- allSent := sentMessages conform:[:sel | (m sends:sel)].
- allSent ifTrue:[
- src := m source.
- src isNil ifTrue:[
- ('Browser [info]: no source for ' , m printString) infoPrintCR.
- false
- ] ifFalse:[
- "/ the rest is done by the slower RB-match process...
- parseTree := RBParser
- parseSearchMethod:src
- onError: [:str :pos |
- "/ self halt.
- Transcript show:'Error during search in '; showCR:m.
- Transcript showCR:str.
- Transcript showCR:pos.
- nil].
-
- parseTree notNil ifTrue:[
- searcher executeTree:parseTree.
- "/ notice: searcher sets foundMatch !!
- ].
+ "/ not true, but I am lazy: if ANY string is in match, ANY string must be in method
+ allStringsInLiteralArray := usedStrings isEmptyOrNil
+ or:[ literalsInMethod contains:[:lit | lit isString] ].
+ allStringsInLiteralArray ifTrue:[
+ allGlobalsReferenced := globalVariablesUsed conform:[:varNames | varNames contains:[:varName | m referencesGlobal:varName]].
+ allGlobalsReferenced ifTrue:[
+ allMessagesSent := sentMessages isEmptyOrNil or:[ m messages includesAll:sentMessages ].
+ allMessagesSent ifTrue:[
+ allSent := sentMessages conform:[:sel | (m sends:sel)].
+ allSent ifTrue:[
+ src := m source.
+ src isNil ifTrue:[
+ ('Browser [info]: no source for ' , m printString) infoPrintCR.
+ false
+ ] ifFalse:[
+ "/ the rest is done by the slower RB-match process...
+ parseTree := RBParser
+ parseSearchMethod:src
+ onError: [:str :pos |
+ "/ self halt.
+ Transcript show:'Error during search in '; showCR:m.
+ Transcript showCR:str.
+ Transcript showCR:pos.
+ nil].
+
+ parseTree notNil ifTrue:[
+ searcher executeTree:parseTree.
+ "/ notice: searcher sets foundMatch !!
+ ].
+ ]
]
]
]
@@ -4674,7 +4681,7 @@
^ searchBlock.
"Created: / 02-05-2011 / 13:25:01 / sr"
- "Modified: / 08-08-2011 / 17:25:34 / cg"
+ "Modified: / 20-07-2012 / 19:07:36 / cg"
!
searchBlockForCode:aCodeString isMethod:isMethod
@@ -5845,11 +5852,11 @@
!SystemBrowser class methodsFor:'documentation'!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.301 2012/05/15 09:29:00 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.302 2012/07/20 17:32:10 cg Exp §'
!
version_SVN
- ^ '$Id: SystemBrowser.st 8007 2012-06-05 14:49:00Z vranyj1 $'
+ ^ '$Id: SystemBrowser.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
SystemBrowser initialize!
--- a/Tools__BackgroundSourceProcessingService.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__BackgroundSourceProcessingService.st Wed Jul 25 10:51:30 2012 +0100
@@ -157,12 +157,20 @@
initialize
job := (Smalltalk at:#BackgroundJob)
named:self defaultJobName
- on:[self process:true].
+ on:[
+ Error handle:[:ex |
+ (Dialog confirm:('Error while processing source:\\',ex description,'\\Debug ?') withCRs)
+ ifTrue:[
+ ex reject.
+ ]
+ ] do:[
+ self process:true
+ ]
+ ].
"Created: / 29-07-2011 / 10:31:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 03-08-2011 / 16:47:53 / cg"
- "Modified (format): / 26-09-2011 / 15:39:56 / cg"
"Modified: / 24-01-2012 / 12:26:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 19-07-2012 / 16:17:21 / cg"
! !
!BackgroundSourceProcessingService methodsFor:'processing'!
@@ -220,13 +228,13 @@
!BackgroundSourceProcessingService class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__BackgroundSourceProcessingService.st,v 1.2 2012/06/05 21:59:55 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__BackgroundSourceProcessingService.st,v 1.3 2012/07/19 15:19:59 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/Tools__BackgroundSourceProcessingService.st,v 1.2 2012/06/05 21:59:55 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__BackgroundSourceProcessingService.st,v 1.3 2012/07/19 15:19:59 cg Exp §'
!
version_SVN
- ^ '$Id: Tools__BackgroundSourceProcessingService.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__BackgroundSourceProcessingService.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__BreakpointService.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__BreakpointService.st Wed Jul 25 10:51:30 2012 +0100
@@ -27,7 +27,7 @@
"{ NameSpace: Tools }"
-CodeViewService subclass:#BreakpointService
+Tools::CodeViewService subclass:#BreakpointService
instanceVariableNames:'breakpoints currentMethod'
classVariableNames:''
poolDictionaries:''
@@ -317,11 +317,10 @@
!BreakpointService class methodsFor:'documentation'!
version_CVS
- ^ 'Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.14 2012/07/18 09:56:53 vrany Exp '
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.15 2012/07/18 17:06:31 cg Exp §'
!
version_SVN
- ^ '$Id: Tools__BreakpointService.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__BreakpointService.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
-
--- a/Tools__BrowserList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__BrowserList.st Wed Jul 25 10:51:30 2012 +0100
@@ -1816,5 +1816,5 @@
!
version_SVN
- ^ '$Id: Tools__BrowserList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__BrowserList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__ChangeSetBrowser2.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__ChangeSetBrowser2.st Wed Jul 25 10:51:30 2012 +0100
@@ -2231,7 +2231,9 @@
"Created: / 07-09-2011 / 15:54:03 / cg"
"Created: / 11-02-2012 / 22:40:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
+!
+
+ !
!ChangeSetBrowser2 methodsFor:'aspects-queries'!
@@ -2600,13 +2602,9 @@
changeMenuBrowse: changeList
|changes methods classes|
- changeList == list1 ifTrue:[
- changes := selection1Holder value.
- ] ifFalse:[
- changes := selection2Holder value.
- ].
- changes := changes collect:[:c | c change].
+ changes := self selectedChangesIn: changeList.
"/ changes := changeList listHolder value collect:[:c | c change].
+
(changes conform:[:c | c isClassDefinitionChange]) ifTrue:[
classes := (changes collect:[:c | c changeClass]).
UserPreferences current systemBrowserClass
@@ -2632,18 +2630,13 @@
].
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 05-09-2011 / 16:17:48 / cg"
+ "Modified: / 23-07-2012 / 13:13:37 / cg"
!
changeMenuBrowseClass: changeList
|changes classes addThemChanges cls|
- changeList == list1 ifTrue:[
- changes := selection1Holder value.
- ] ifFalse:[
- changes := selection2Holder value.
- ].
- changes := changes collect:[:eachListEntry | eachListEntry change].
+ changes := self selectedChangesIn: changeList.
classes := Set new.
addThemChanges :=
@@ -2677,12 +2670,7 @@
addClassName addThemChanges existingClasses
allChanges changeSet1 changeSet2 diffSet|
- changeList == list1 ifTrue:[
- changes := selection1Holder value.
- ] ifFalse:[
- changes := selection2Holder value.
- ].
- changes := changes collect:[:eachListEntry | eachListEntry change].
+ changes := self selectedChangesIn: changeList.
classNameToClassMapping := Dictionary new.
classNames := Set new.
@@ -2691,7 +2679,7 @@
addClassName :=
[:nmArg |
- |nm ns existingClass goodAnswer|
+ |nm ns existingClass goodAnswer cls|
nm := nmArg.
existingClass := Smalltalk classNamed:nm.
@@ -2707,16 +2695,16 @@
] ifFalse:[
goodAnswer := nm.
(lastNameSpace notNil
- and:[ lastNameSpace isNamespace
- and:[(lastNameSpace classNamed:nm) notNil ]]
+ and:[ lastNameSpace isNameSpace
+ and:[(cls := lastNameSpace classNamed:nm) notNil ]]
) ifTrue:[
- goodAnswer := (lastNameSpace classNamed:nm) name.
+ goodAnswer := cls name.
] ifFalse:[
(lastNameSpace notNil
and:[ lastNameSpace isBehavior
- and:[(lastNameSpace privateClassesAt:nm asSymbol) notNil ]]
+ and:[(cls := lastNameSpace privateClassesAt:nm asSymbol) notNil ]]
) ifTrue:[
- goodAnswer := (lastNameSpace privateClassesAt:nm asSymbol) name.
+ goodAnswer := cls name.
]
].
].
@@ -2951,6 +2939,17 @@
"Modified: / 29-10-2010 / 13:53:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 04-08-2011 / 17:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+selectedChangesIn: changeList
+ |changes|
+
+ changes := (changeList == list1
+ ifTrue:[ selection1Holder ]
+ ifFalse:[ selection2Holder ]) value.
+ ^ changes collect:[:eachListEntry | eachListEntry change].
+
+ "Created: / 23-07-2012 / 13:13:11 / cg"
! !
!ChangeSetBrowser2 methodsFor:'menu actions - changes - helpers'!
@@ -3473,13 +3472,13 @@
!ChangeSetBrowser2 class methodsFor:'documentation'!
version
- ^ '$Id: Tools__ChangeSetBrowser2.st 8016 2012-07-18 09:57:46Z vranyj1 $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.35 2012/07/23 11:15:10 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.32 2012/03/20 18:18:17 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.35 2012/07/23 11:15:10 cg Exp §'
!
version_SVN
- ^ '$Id: Tools__ChangeSetBrowser2.st 8016 2012-07-18 09:57:46Z vranyj1 $'
+ ^ '$Id: Tools__ChangeSetBrowser2.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__ClassCategoryList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__ClassCategoryList.st Wed Jul 25 10:51:30 2012 +0100
@@ -915,7 +915,7 @@
!ClassCategoryList class methodsFor:'documentation'!
version
- ^ '$Id: Tools__ClassCategoryList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ClassCategoryList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
!
version_CVS
@@ -923,6 +923,6 @@
!
version_SVN
- ^ '$Id: Tools__ClassCategoryList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ClassCategoryList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__ClassChecker.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__ClassChecker.st Wed Jul 25 10:51:30 2012 +0100
@@ -916,7 +916,7 @@
!ClassChecker class methodsFor:'documentation'!
version
- ^ '$Id: Tools__ClassChecker.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ClassChecker.st 8022 2012-07-25 09:51:30Z vranyj1 $'
!
version_CVS
@@ -924,5 +924,5 @@
!
version_SVN
- ^ '$Id: Tools__ClassChecker.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ClassChecker.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__ClassGeneratorList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__ClassGeneratorList.st Wed Jul 25 10:51:30 2012 +0100
@@ -513,7 +513,7 @@
!ClassGeneratorList class methodsFor:'documentation'!
version
- ^ '$Id: Tools__ClassGeneratorList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ClassGeneratorList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
!
version_CVS
@@ -521,5 +521,5 @@
!
version_SVN
- ^ '$Id: Tools__ClassGeneratorList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ClassGeneratorList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__ClassList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__ClassList.st Wed Jul 25 10:51:30 2012 +0100
@@ -2050,5 +2050,5 @@
!
version_SVN
- ^ '$Id: Tools__ClassList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ClassList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__CodeHighlightingService.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__CodeHighlightingService.st Wed Jul 25 10:51:30 2012 +0100
@@ -86,10 +86,10 @@
| mthd class |
mthd := codeView methodHolder value.
- class := codeView classHolder value.
(mthd notNil and:[app respondsTo: #syntaxHighlighterForMethod:]) ifTrue:[
highlighter := app syntaxHighlighterForMethod:mthd.
] ifFalse:[
+ class := codeView classHolder value.
(class notNil and:[app respondsTo: #syntaxHighlighterForClass:]) ifTrue:[
highlighter := app syntaxHighlighterForClass: class.
] ifFalse:[
@@ -113,7 +113,7 @@
"Created: / 05-08-2011 / 10:48:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 28-09-2011 / 00:23:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 01-06-2012 / 21:17:50 / cg"
+ "Modified: / 19-07-2012 / 13:03:21 / cg"
!
syntaxHighlighters
@@ -135,10 +135,10 @@
].
]
].
-
^highlighters
"Created: / 05-08-2011 / 10:49:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 19-07-2012 / 12:58:48 / cg"
! !
!CodeHighlightingService methodsFor:'acessing-defaults'!
@@ -272,7 +272,7 @@
^ self
].
- done ifFalse:[
+ done ifFalse:[
"/ another coloring process has already been started.
"/ ignore this (leftover) code.
^ self
@@ -357,13 +357,13 @@
!CodeHighlightingService class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.32 2012/06/01 22:05:31 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.34 2012/07/19 15:19:41 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.32 2012/06/01 22:05:31 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.34 2012/07/19 15:19:41 cg Exp §'
!
version_SVN
- ^ '$Id: Tools__CodeHighlightingService.st 8007 2012-06-05 14:49:00Z vranyj1 $'
+ ^ '$Id: Tools__CodeHighlightingService.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__CodeView2.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__CodeView2.st Wed Jul 25 10:51:30 2012 +0100
@@ -879,7 +879,7 @@
languageHolder
languageHolder isNil ifTrue:[
- "/ cg: I dont like this default here; everyone who is not showing ST-code (expecco, filebrowser etc.)
+ "/ cg: I dont like the smalltalk default here, because everyone who is not showing ST-code (expecco, filebrowser etc.)
"/ has to explicitely clear the valueholder. I guess, it is better for the few
"/ others to explicitely set it, if they do not provide syntaxHighlighter per method
"/ or class.
@@ -888,7 +888,7 @@
].
^ languageHolder
- "Modified (format): / 26-09-2011 / 17:04:04 / cg"
+ "Modified: / 19-07-2012 / 16:51:04 / cg"
!
languageHolder:aValueModel
@@ -913,6 +913,7 @@
self changed: #languageHolder with: old -> languageHolder
"Modified: / 17-06-2011 / 12:56:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 19-07-2012 / 16:51:08 / cg"
!
methodHolder
@@ -2000,12 +2001,15 @@
"Created: / 06-03-2010 / 19:19:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-underService: aCodeViewService
+
+
+unregisterService: aCodeViewService
services remove: aCodeViewService ifAbsent:[^self].
aCodeViewService unregister.
"Created: / 06-03-2010 / 19:21:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Created: / 19-07-2012 / 16:34:18 / cg"
! !
!CodeView2 methodsFor:'testing'!
@@ -2403,9 +2407,10 @@
self font:newFont
].
- y0 := (yOfLine := textView yOfLine:line)
- + (textView "font ascentOn:device"fontAscent)
- "- (newFont descentOn:device)".
+ y0 := (textView yOfLine:line)
+ + (textView font ascentOn:device)
+ "/ - (newFont descentOn:device)
+ + 1.
cleared ifFalse:[
self clearRectangleX:0 y:y0 - font height width: self width - 2 height: font height + font descent.
@@ -2433,8 +2438,7 @@
"Modified: / 14-12-2009 / 15:30:44 / Jindra <a>"
"Created: / 17-06-2011 / 14:11:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 16-03-2012 / 11:16:27 / cg"
- "Modified: / 19-05-2012 / 14:15:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 18-07-2012 / 19:05:24 / cg"
!
redrawLinesFrom:start
@@ -3447,15 +3451,15 @@
!CodeView2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.61 2012/07/17 17:03:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.63 2012/07/19 15:12:12 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.61 2012/07/17 17:03:15 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.63 2012/07/19 15:12:12 cg Exp §'
!
version_SVN
- ^ '$Id: Tools__CodeView2.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__CodeView2.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
CodeView2 initialize!
--- a/Tools__FullMethodCategoryList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__FullMethodCategoryList.st Wed Jul 25 10:51:30 2012 +0100
@@ -123,9 +123,9 @@
!FullMethodCategoryList class methodsFor:'documentation'!
version
- ^ '$Id: Tools__FullMethodCategoryList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__FullMethodCategoryList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
!
version_SVN
- ^ '$Id: Tools__FullMethodCategoryList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__FullMethodCategoryList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__HierarchicalClassCategoryList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__HierarchicalClassCategoryList.st Wed Jul 25 10:51:30 2012 +0100
@@ -402,7 +402,7 @@
!HierarchicalClassCategoryList class methodsFor:'documentation'!
version
- ^ '$Id: Tools__HierarchicalClassCategoryList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__HierarchicalClassCategoryList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
!
version_CVS
@@ -410,5 +410,5 @@
!
version_SVN
- ^ '$Id: Tools__HierarchicalClassCategoryList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__HierarchicalClassCategoryList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__HierarchicalClassList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__HierarchicalClassList.st Wed Jul 25 10:51:30 2012 +0100
@@ -308,11 +308,11 @@
!HierarchicalClassList class methodsFor:'documentation'!
version
- ^ '$Id: Tools__HierarchicalClassList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__HierarchicalClassList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
!
version_SVN
- ^ '$Id: Tools__HierarchicalClassList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__HierarchicalClassList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
HierarchicalClassList initialize!
--- a/Tools__HierarchicalProjectList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__HierarchicalProjectList.st Wed Jul 25 10:51:30 2012 +0100
@@ -518,7 +518,7 @@
!HierarchicalProjectList class methodsFor:'documentation'!
version
- ^ '$Id: Tools__HierarchicalProjectList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__HierarchicalProjectList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
!
version_CVS
@@ -526,5 +526,5 @@
!
version_SVN
- ^ '$Id: Tools__HierarchicalProjectList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__HierarchicalProjectList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__ImplementingClassList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__ImplementingClassList.st Wed Jul 25 10:51:30 2012 +0100
@@ -117,9 +117,9 @@
!ImplementingClassList class methodsFor:'documentation'!
version
- ^ '$Id: Tools__ImplementingClassList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ImplementingClassList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
!
version_SVN
- ^ '$Id: Tools__ImplementingClassList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ImplementingClassList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__ImplementingMethodList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__ImplementingMethodList.st Wed Jul 25 10:51:30 2012 +0100
@@ -287,9 +287,9 @@
!ImplementingMethodList class methodsFor:'documentation'!
version
- ^ '$Id: Tools__ImplementingMethodList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ImplementingMethodList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
!
version_SVN
- ^ '$Id: Tools__ImplementingMethodList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ImplementingMethodList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__InheritanceClassList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__InheritanceClassList.st Wed Jul 25 10:51:30 2012 +0100
@@ -187,9 +187,9 @@
!InheritanceClassList class methodsFor:'documentation'!
version
- ^ '$Id: Tools__InheritanceClassList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__InheritanceClassList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
!
version_SVN
- ^ '$Id: Tools__InheritanceClassList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__InheritanceClassList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__MethodCategoryList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__MethodCategoryList.st Wed Jul 25 10:51:30 2012 +0100
@@ -1999,7 +1999,7 @@
!
version_SVN
- ^ '$Id: Tools__MethodCategoryList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__MethodCategoryList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
MethodCategoryList::CachedMethodInfo initialize!
--- a/Tools__MethodList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__MethodList.st Wed Jul 25 10:51:30 2012 +0100
@@ -13,7 +13,7 @@
"{ NameSpace: Tools }"
-BrowserList subclass:#MethodList
+Tools::BrowserList subclass:#MethodList
instanceVariableNames:'classes selectedMethodNameIndices methodList lastSelectedMethods
browserNameList variableFilter filterClassVars updateProcess
lastShowClass lastShowCategory lastShowClassFirst
@@ -965,10 +965,11 @@
mthd == aMethod ifTrue:[
(mthd isSynthetic not or:[self showSyntheticMethods value]) ifTrue:[
sel notNil ifTrue:[
- (packageFilter value isNil
- or:[ packageFilter value includes:mthd package ]) ifTrue:[
+"/ cg: no longer filter those...
+"/ (packageFilter value isNil
+"/ or:[ packageFilter value includes:mthd package ]) ifTrue:[
^ true
- ]
+"/ ]
]
].
^ false
@@ -1001,7 +1002,8 @@
entries := OrderedCollection new.
enforceClassAndProtocolInList := false.
anyMethodToWatch := false.
- packageFilterValue := packageFilter value.
+"/ no longer filter those
+"/ packageFilterValue := packageFilter value.
"/ generator generates nil-selector entries
"/ to pass multiple-class and multiple-protocol info
@@ -1240,8 +1242,7 @@
"Created: / 05-02-2000 / 22:43:40 / cg"
"Modified: / 24-08-2010 / 20:34:09 / Jan Vrany <enter your email here>"
- "Modified: / 07-09-2011 / 09:33:30 / cg"
- "Modified: / 13-04-2012 / 17:55:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 20-07-2012 / 20:00:58 / cg"
!
makeDependent
@@ -1794,13 +1795,13 @@
!MethodList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.65 2012/06/05 21:48:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.66 2012/07/20 18:11:57 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.65 2012/06/05 21:48:53 cg Exp '
+ ^ '§Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.66 2012/07/20 18:11:57 cg Exp §'
!
version_SVN
- ^ '$Id: Tools__MethodList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__MethodList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__NamespaceList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__NamespaceList.st Wed Jul 25 10:51:30 2012 +0100
@@ -559,5 +559,5 @@
!
version_SVN
- ^ '$Id: Tools__NamespaceList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__NamespaceList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__NavigationState.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__NavigationState.st Wed Jul 25 10:51:30 2012 +0100
@@ -1370,7 +1370,7 @@
theSingleMethod notNil ifTrue:[
methodName := theSingleMethod selector.
- methodName ifNotNil:[methodName := methodName selector].
+ methodName isSymbol ifTrue:[methodName := methodName selector].
theSingleMethod isJavaMethod ifTrue:[
methodName := theSingleMethod printStringForBrowserWithSelector:methodName.
].
@@ -1669,9 +1669,9 @@
!NavigationState class methodsFor:'documentation'!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/Tools_NavigationState.st,v 1.41 2012/02/12 23:19:21 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools_NavigationState.st,v 1.42 2012/07/19 18:28:54 stefan Exp §'
!
version_SVN
- ^ '$Id: Tools__NavigationState.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__NavigationState.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__NavigatorCanvas.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__NavigatorCanvas.st Wed Jul 25 10:51:30 2012 +0100
@@ -6933,5 +6933,5 @@
!
version_SVN
- ^ '$Id: Tools__NavigatorCanvas.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__NavigatorCanvas.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__NavigatorModel.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__NavigatorModel.st Wed Jul 25 10:51:30 2012 +0100
@@ -351,7 +351,7 @@
!
version_SVN
- ^ '$Id: Tools__NavigatorModel.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__NavigatorModel.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
NavigatorModel initialize!
--- a/Tools__NewSystemBrowser.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__NewSystemBrowser.st Wed Jul 25 10:51:30 2012 +0100
@@ -6130,6 +6130,12 @@
showBusyCursorWhilePerforming: true
)
(MenuItem
+ label: 'With Annotation'
+ itemValue: browseMenuMethodsWithAnnotation
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
label: '-'
)
(MenuItem
@@ -10180,6 +10186,14 @@
label: '-'
)
(MenuItem
+ label: 'Build with Interactive Application Packager...'
+ itemValue: projectMenuBuildWithApplicationPackager
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
enabled: hasProjectSelectedHolder
label: 'Patch-Set...'
itemValue: projectMenuGeneratePatchSet
@@ -13129,6 +13143,7 @@
)
"Created: / 15-10-2011 / 12:22:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 23-07-2012 / 15:13:51 / cg"
!
categoryMenuSCMSlice
@@ -13289,7 +13304,7 @@
nameKey: CommonSlice
translateLabel: true
submenuChannel: categoryMenuSCMFor:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
isMenuSlice: true
)
(MenuItem
@@ -13320,6 +13335,7 @@
)
"Created: / 15-10-2011 / 12:21:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 23-07-2012 / 15:14:32 / cg"
!
categoryMenuSCMSlice_inline
@@ -13899,6 +13915,194 @@
)
!
+classGitMenu
+ "This resource specification was automatically generated
+ by the MenuEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the MenuEditor may not be able to read the specification."
+
+
+ "
+ MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#classMercurialMenu
+ (Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser classMercurialMenu)) startUp
+ "
+
+ <resource: #menu>
+
+ ^
+ #(Menu
+ (
+ (MenuItem
+ label: '** No SourceCodeManager - See Settings in the Launcher **'
+ translateLabel: true
+ isVisible: hasNoSourceCodeManagerHolder
+ )
+ (MenuItem
+ label: '-'
+ isVisible: hasNoSourceCodeManagerHolder
+ )
+ (MenuItem
+ enabled: hasClassSelectedHolderAndSourceCodeManagerHolder
+ label: 'CheckIn...'
+ itemValue: classMenuCheckInUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ 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: classMenuCheckInAllChangedClassesUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: 'Quick CheckIn...'
+ itemValue: classMenuQuickCheckInUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ isVisible: hasClassSelectedAndControlKeyDownHolder
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasProjectDefinitionSelectedAndSourceCodeManagerHolder
+ label: 'CheckIn Build Support Files...'
+ itemValue: classMenuCheckInBuildSupportFilesUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder
+ label: 'CheckOut Newest'
+ itemValue: classMenuCheckOutNewestUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckOut 'CheckOut Newest')
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder
+ label: 'CheckOut Previous Version...'
+ argument: SourceCodeManagerPlaceholder
+ itemValue: classMenuCheckOutUsingManager:
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasSingleClassSelectedAndSourceCodeManagerHolder
+ label: 'Edit Version in Repository...'
+ itemValue: classMenuEditVersionInRepositoryUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasClassSelectedAndSourceCodeManagerHolder
+ label: 'Compare with Newest in Repository...'
+ itemValue: classMenuCompareAgainstNewestInRepositoryUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary repositoryVersions 'Compare with Newest in Repository...')
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleClassSelectedAndSourceCodeManagerHolder
+ label: 'Compare with Original in Repository...'
+ itemValue: classMenuCompareAgainstOriginalInRepositoryUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleClassSelectedAndSourceCodeManagerHolder
+ label: 'Compare with Repository...'
+ itemValue: classMenuCompareWithRepositoryUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasSingleClassSelectedAndSourceCodeManagerHolder
+ label: 'Compare two Repository Versions...'
+ itemValue: classMenuCompareTwoRepositoryVersionsUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasProjectDefinitionOrClassWithExtensionsSelectedAndSourceCodeManagerHolder
+ label: 'Compare Extensions with Repository...'
+ itemValue: classMenuCompareExtensionsWithRepositoryUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ 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: classMenuSetTagUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary repositoryTag 'Set Tag...')
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder
+ label: 'Revision Log (Recent Changes)'
+ itemValue: classMenuShortRevisionLogUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary repositoryLog 'Revision Log (Recent Changes)')
+ showBusyCursorWhilePerforming: true
+ )
+ (MenuItem
+ enabled: hasNonPrivateClassSelectedAndSourceCodeManagerHolder
+ label: 'Revision Log (Full)'
+ itemValue: classMenuRevisionLogUsingManager:
+ argument: SourceCodeManagerPlaceholder
+ translateLabel: true
+ showBusyCursorWhilePerforming: true
+ )
+ )
+ nil
+ nil
+ )
+
+ "Created: / 23-07-2012 / 13:35:49 / cg"
+!
+
classMenuSCMCommon
"This resource specification was automatically generated
by the MenuEditor of ST/X."
@@ -13923,7 +14127,7 @@
itemValue: classMenuCheckInUsingManagerNamed:
translateLabel: true
labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckIn 'CheckIn...')
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -13931,14 +14135,14 @@
itemValue: classMenuQuickCheckInUsingManagerNamed:
translateLabel: true
isVisible: hasClassSelectedAndControlKeyDownHolder
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
enabled: hasClassWithExtensionsSelectedHolder
label: 'CheckIn Extensions For'
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
submenuChannel: browseClassExtensionsMenuUsingManagerNamed:
showBusyCursorWhilePerforming: true
)
@@ -13947,7 +14151,7 @@
label: 'CheckIn All Changed Classes'
itemValue: classMenuCheckInAllChangedClassesUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -13955,7 +14159,7 @@
label: 'CheckIn Build Support Files...'
itemValue: classMenuCheckInBuildSupportFilesUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -13967,7 +14171,7 @@
itemValue: classMenuCheckOutNewestUsingManagerNamed:
translateLabel: true
labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckOut 'CheckOut Newest')
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -13975,7 +14179,7 @@
label: 'CheckOut Previous Version...'
itemValue: classMenuCheckOutUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -13987,7 +14191,7 @@
itemValue: classMenuShortRevisionLogUsingManagerNamed:
translateLabel: true
labelImage: (ResourceRetriever ToolbarIconLibrary repositoryLog 'Revision Log (Recent Changes)')
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -13995,7 +14199,7 @@
label: 'Revision Log (Full)'
itemValue: classMenuRevisionLogUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -14007,7 +14211,7 @@
itemValue: classMenuCompareAgainstNewestInRepositoryUsingManagerNamed:
translateLabel: true
labelImage: (ResourceRetriever ToolbarIconLibrary repositoryVersions 'Compare with Newest in Repository...')
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -14015,7 +14219,7 @@
label: 'Compare with Original in Repository...'
itemValue: classMenuCompareAgainstOriginalInRepositoryUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -14023,7 +14227,7 @@
label: 'Compare with Repository...'
itemValue: classMenuCompareWithRepositoryUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -14031,7 +14235,7 @@
label: 'Compare two Repository Versions...'
itemValue: classMenuCompareTwoRepositoryVersionsUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -14039,14 +14243,14 @@
label: 'Compare Extensions with Repository...'
itemValue: classMenuCompareExtensionsWithRepositoryUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
enabled: hasProjectDefinitionSelectedAndSourceCodeManagerHolder
label: 'Compare Build Support File'
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
submenuChannel: projectMenuSCMCompareBuildSupportFileForManagerNamed:
argument: Default
)
@@ -14054,7 +14258,7 @@
label: 'Extras'
translateLabel: true
submenuChannel: classMenuSCMExtraForManagerNamed:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
isMenuSlice: true
)
)
@@ -14063,7 +14267,7 @@
)
"Modified: / 12-10-2011 / 20:24:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 21-12-2011 / 20:02:25 / cg"
+ "Modified: / 23-07-2012 / 15:15:29 / cg"
!
classMenuSCMExtra_CVS
@@ -14105,6 +14309,82 @@
)
!
+classMenuSCMExtra_Git
+ "This resource specification was automatically generated
+ by the MenuEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the MenuEditor may not be able to read the specification."
+
+
+ "
+ MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#classMenuSCMExtra_SVN
+ (Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser classMenuSCMExtra_SVN)) startUp
+ "
+
+ <resource: #menu>
+
+ ^
+ #(Menu
+ (
+ (MenuItem
+ enabled: hasClassesSelectedAndSubversionRepositoryExistsAndBranchSelectedHolder
+ label: 'Changeset'
+ translateLabel: true
+ submenuChannel: classSubversionChangesetMenu
+ )
+ (MenuItem
+ label: 'Branch'
+ translateLabel: true
+ submenuChannel: commonSubversionBranchMenu
+ )
+ (MenuItem
+ label: 'Browse working copy'
+ itemValue: commonMenuSubversionBrowseWorkingCopy
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'More'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Common Slice'
+ translateLabel: true
+ submenuChannel: commonSubversionMenuSlice
+ isMenuSlice: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasClassesSelectedAndSubversionRepositoryExistsAndBranchSelectedHolder
+ label: 'Compare'
+ translateLabel: true
+ submenuChannel: classSubversionCompareMenu
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare')
+ )
+ (MenuItem
+ enabled: hasClassesSelectedAndSubversionRepositoryExistsAndBranchSelectedHolder
+ label: 'Browse Revision log'
+ itemValue: classMenuSubversionShowRevisionLog
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' log 'Browse Revision log')
+ )
+ )
+ nil
+ nil
+ )
+ )
+ )
+ nil
+ nil
+ )
+
+ "Created: / 23-07-2012 / 13:27:23 / cg"
+!
+
classMenuSCMExtra_Mercurial
"This resource specification was automatically generated
by the MenuEditor of ST/X."
@@ -14416,7 +14696,7 @@
nameKey: CommonSlice
translateLabel: true
submenuChannel: classMenuSCMFor:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
isMenuSlice: true
)
(MenuItem
@@ -14447,6 +14727,7 @@
)
"Modified: / 15-10-2011 / 12:04:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 23-07-2012 / 15:15:37 / cg"
!
classMenuSCMSlice_inline
@@ -14519,6 +14800,14 @@
labelImage: (ResourceRetriever ToolbarIconLibrary repositorySVNIcon 'SubVersion')
)
(MenuItem
+ enabled: hasClassesSelectedAndGitRepositoryExistsHolder
+ isVisible: gitRepositoryMenusAreShown
+ label: 'Git'
+ translateLabel: true
+ submenuChannel: classGitMenu
+ labelImage: (ResourceRetriever ToolbarIconLibrary repositoryGitIcon 'Git')
+ )
+ (MenuItem
enabled: hasClassesSelectedAndMercurialRepositoryExistsHolder
isVisible: mercurialRepositoryMenusAreShown
label: 'Mercurial'
@@ -14555,7 +14844,7 @@
nil
)
- "Modified: / 15-01-2012 / 14:49:41 / cg"
+ "Modified: / 23-07-2012 / 13:36:12 / cg"
!
classMercurialMenu
@@ -15259,7 +15548,7 @@
itemValue: projectMenuCheckInAllUsingManagerNamed:
translateLabel: true
labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckIn 'CheckIn...')
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -15267,7 +15556,7 @@
label: 'CheckIn Classes Only...'
itemValue: projectMenuCheckInClassesUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -15275,7 +15564,7 @@
label: 'CheckIn Extensions Only...'
itemValue: projectMenuCheckInExtensionsUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -15283,7 +15572,7 @@
label: 'CheckIn Build Support Files Only...'
itemValue: projectMenuCheckInBuildSupportFilesUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -15295,7 +15584,7 @@
itemValue: projectMenuCheckOutNewestUsingManagerNamed:
translateLabel: true
labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckOut 'CheckOut Newest')
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -15303,7 +15592,7 @@
label: 'CheckOut Previous Version...'
itemValue: projectMenuCheckOutUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -15311,7 +15600,7 @@
label: 'CheckOut Extensions Only...'
itemValue: projectMenuCheckOutExtensionsUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -15321,14 +15610,14 @@
label: 'Import Structure...'
itemValue: projectMenuImportUsing:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
label: 'Import...'
itemValue: projectMenuImportAndLoadClassesUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
showBusyCursorWhilePerforming: true
)
(MenuItem
@@ -15339,27 +15628,27 @@
label: 'Compare with Newest in Repository...'
itemValue: projectMenuCompareAgainstNewestInRepositoryUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
)
(MenuItem
enabled: hasProjectSelectedAndSourceCodeManagerHolder
label: 'Compare with Repository at Date...'
itemValue: projectMenuCompareAgainstRepositoryUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
)
(MenuItem
label: 'Compare Build Support File'
translateLabel: true
submenuChannel: projectMenuSCMCompareBuildSupportFileForManagerNamed:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
)
(MenuItem
enabled: hasProjectSelectedAndSourceCodeManagerHolder
label: 'Consistency Check...'
itemValue: projectMenuCheckRepositoryConsistencyUsingManagerNamed:
translateLabel: true
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
)
(MenuItem
enabled: hasProjectSelectedAndSourceCodeManagerHolder
@@ -15377,7 +15666,7 @@
itemValue: projectMenuResourcesUsingManagerNamed:
translateLabel: true
isVisible: false
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
)
(MenuItem
enabled: hasProjectSelectedHolder
@@ -15385,13 +15674,13 @@
itemValue: projectMenuBitmapFilesUsingManagerNamed:
translateLabel: true
isVisible: false
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
)
(MenuItem
label: 'Extras'
translateLabel: true
submenuChannel: projectMenuSCMExtraFor:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
isMenuSlice: true
)
)
@@ -15400,6 +15689,7 @@
)
"Modified: / 23-02-2012 / 14:30:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 23-07-2012 / 15:16:15 / cg"
!
projectMenuSCMCompareBuildSupportFile
@@ -15539,12 +15829,14 @@
itemValue: projectMenuSetTagUsing:
translateLabel: true
labelImage: (ResourceRetriever ToolbarIconLibrary repositoryTag 'Set Tag (Release As)...')
- argument: SourceCodeManagerPlaceholder
- )
- )
- nil
- nil
- )
+ argument: SourceCodeManagerNamePlaceholder
+ )
+ )
+ nil
+ nil
+ )
+
+ "Modified: / 23-07-2012 / 15:16:21 / cg"
!
projectMenuSCMExtra_SVN
@@ -15587,7 +15879,7 @@
itemValue: projectMenuSetTagUsing:
translateLabel: true
labelImage: (ResourceRetriever ToolbarIconLibrary repositoryTag 'Set Tag (Release As)...')
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
)
(MenuItem
label: 'More'
@@ -15635,6 +15927,8 @@
nil
nil
)
+
+ "Modified: / 23-07-2012 / 15:16:29 / cg"
!
projectMenuSCMSlice
@@ -15741,7 +16035,7 @@
nameKey: CommonSlice
translateLabel: true
submenuChannel: projectMenuSCMFor:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
isMenuSlice: true
)
(MenuItem
@@ -15772,6 +16066,7 @@
)
"Created: / 12-10-2011 / 20:36:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 23-07-2012 / 15:16:38 / cg"
!
projectMenuSCMSlice_inline
@@ -15919,7 +16214,7 @@
!
selectorMenuSCMCommon
- "This resource specification was automatically generated
+ "This resource specification was automatically generated
by the MenuEditor of ST/X."
"Do not manually edit this!! If it is corrupted,
@@ -15940,7 +16235,7 @@
enabled: hasMethodSelected
label: 'CheckIn Class(es)...'
itemValue: methodListMenuCheckInClassUsingManagerNamed:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
translateLabel: true
labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckIn 'CheckIn Class(es)...')
showBusyCursorWhilePerforming: true
@@ -15949,7 +16244,7 @@
enabled: hasRealExtensionMethodSelectedHolder
label: 'CheckIn Extensions for Project...'
itemValue: selectorMenuCheckInProjectExtensionsUsingManagerNamed:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
translateLabel: true
isVisible: hasExtensionMethodSelectedHolder
)
@@ -15960,7 +16255,7 @@
enabled: hasMethodSelectedAndSourceCodeManagerHolder
label: 'Compare with Newest in Repository...'
itemValue: selectorMenuCompareAgainstNewestInRepositoryUsingManagerNamed:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
translateLabel: true
labelImage: (ResourceRetriever ToolbarIconLibrary repositoryVersions 'Compare with Newest in Repository...')
)
@@ -15968,7 +16263,7 @@
enabled: hasMethodSelectedAndSourceCodeManagerHolder
label: 'Compare Class with Newest in Repository...'
itemValue: selectorMenuCompareClassAgainstNewestInRepositoryUsingManagerNamed:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
translateLabel: true
)
(MenuItem
@@ -15978,7 +16273,7 @@
enabled: hasSingleMethodSelected
label: 'Browse Repository Versions...'
itemValue: selectorMenuBrowseRepositoryVersionsUsingManagerNamed:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
translateLabel: true
)
)
@@ -15987,6 +16282,7 @@
)
"Modified: / 11-01-2012 / 14:05:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 23-07-2012 / 15:16:47 / cg"
!
selectorMenuSCMSlice
@@ -16106,7 +16402,7 @@
nameKey: CommonSlice
translateLabel: true
submenuChannel: selectorMenuSCMFor:
- argument: SourceCodeManagerPlaceholder
+ argument: SourceCodeManagerNamePlaceholder
isMenuSlice: true
)
(MenuItem
@@ -16137,6 +16433,7 @@
)
"Created: / 12-10-2011 / 20:45:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 23-07-2012 / 15:16:53 / cg"
!
selectorMenuSCMSlice_inline
@@ -16395,7 +16692,6 @@
"Modified: / 29-09-2006 / 16:11:08 / cg"
! !
-
!NewSystemBrowser class methodsFor:'menu specs-popup'!
categoryPopUpMenu
@@ -17862,6 +18158,12 @@
"Modified: / 19-01-2012 / 10:44:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+gitRepositoryMenusAreShown
+ ^ ConfigurableFeatures includesFeature: #GitSupportEnabled
+
+ "Created: / 23-07-2012 / 13:35:17 / cg"
+!
+
mercurialRepositoryMenusAreShown
^ ConfigurableFeatures includesFeature: #MercurialSupportEnabled
@@ -19934,6 +20236,23 @@
"Modified: / 28-02-2012 / 16:54:49 / cg"
!
+hasClassesSelectedAndGitRepositoryExistsHolder
+ ^ [
+ | classes |
+
+ classes := self selectedClassesValue.
+ classes isEmptyOrNil ifTrue:[
+ false
+ ] ifFalse:[
+ classes
+ allSatisfy:
+ [:cls | self hasGitRepositoryFor: cls theNonMetaclass package]
+ ]
+ ]
+
+ "Created: / 23-07-2012 / 13:33:07 / cg"
+!
+
hasClassesSelectedAndMercurialRepositoryExistsHolder
^ [
| classes |
@@ -20161,6 +20480,24 @@
"Created: / 18-02-2012 / 16:59:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+hasGitRepositoryFor: package
+ "is there a git source repository for package?"
+
+ ^ self hasGitSupport
+ "/ use Smalltalk-at to trick the dependency/prerequisite generator
+"/ and:[(Smalltalk at:#'GitSourceCodeManager') hasRepositoryForPackage: package]
+
+ "Created: / 23-07-2012 / 13:33:39 / cg"
+!
+
+hasGitSupport
+ "is there support for the git source code manager?"
+
+ ^ self hasSCMSupportFor:#'GitSourceCodeManager'
+
+ "Created: / 23-07-2012 / 13:34:15 / cg"
+!
+
hasInstanceMethodsSelected
^ self hasOnlyMethodsSelectedForWhich:[:m | m mclass isMeta not]
@@ -20292,18 +20629,18 @@
!
hasMercurialRepositoryFor: package
- "is there a perforce source repository for package?"
+ "is there a mercurial (hg) source repository for package?"
^ self hasMercurialSupport
"/ use Smalltalk-at to trick the dependency/prerequisite generator
-"/ and:[(Smalltalk at:#'PerforceSourceCodeManager') hasRepositoryForPackage: package]
+"/ and:[(Smalltalk at:#'MercurialSourceCodeManager') hasRepositoryForPackage: package]
"Modified: / 22-08-2009 / 10:49:33 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Created: / 15-01-2012 / 14:42:02 / cg"
!
hasMercurialSupport
- "is there support for the perforce source code manager?"
+ "is there support for the mercurial (hg) source code manager?"
^ self hasSCMSupportFor:#'MercurialSourceCodeManager'
@@ -23637,6 +23974,32 @@
^ self browseMenuMethodsInChangeSets:(Array with:ChangeSet current) openAs:openHow
!
+browseMenuMethodsWithAnnotation
+ "launch an enterBox for area to search in"
+
+ ^ self
+ askForMethodAndSpawnSearchTitle:'Search for Annotated Methods:)'
+ browserLabel:'Annotated Methods'
+ searchWith:[:resourceOrEmpty :classes :ignoreCase :doMatch |
+ self class findResource:resourceOrEmpty match:doMatch ignoreCase:ignoreCase in:classes.
+ self class
+ findMethodsIn:classes
+ where:[:c :m :sel |
+ m hasAnnotation
+ and:[ m annotations contains:[:a | a isArray not and:[ a isResource not ] ]]
+ ]
+ ]
+ searchWhat:#annotation
+ searchArea:(self defaultSearchArea)
+ withCaseIgnore:false
+ withTextEntry:false
+ withMatch:false
+ withMethodList:false
+ setSearchPattern:nil
+
+ "Created: / 18-07-2012 / 19:26:56 / cg"
+!
+
browseMenuMethodsWithCode
"launch an enterBox for code to search for"
@@ -35928,7 +36291,6 @@
"Modified: / 28-02-2012 / 16:27:44 / cg"
! !
-
!NewSystemBrowser methodsFor:'menu actions-namespace'!
nameSpaceMenuCheckOut
@@ -36618,14 +36980,14 @@
currentProject notNil ifTrue:[
initial := currentProject.
(initial includes:$:) ifTrue:[
- (ProjectDefinition definitionClassForPackage:initial) notNil ifTrue:[
- initial := initial , '/newProject'.
- ].
- ] ifFalse:[
- initial := initial , ':newProject'.
- ].
- ] ifFalse:[
- initial := OperatingSystem getLoginName , ':newProject'.
+ (ProjectDefinition definitionClassForPackage:initial) isNil ifTrue:[
+ initial := initial , '/','newProject' allBold.
+ ].
+ ] ifFalse:[
+ initial := initial , ':module/','newProject' allBold.
+ ].
+ ] ifFalse:[
+ initial := OperatingSystem getLoginName , ':module/'.'newProject' allBold.
].
defaultProjectType := ProjectDefinition defaultProjectType.
@@ -36684,6 +37046,7 @@
] ifFalse:[
newProjectID := packageIDHolder value.
newProjectID notEmptyOrNil ifTrue:[
+ newProjectID := newProjectID string.
"/ self immediateUpdate value:true.
self projectListApp addAdditionalProject:newProjectID.
"/ self immediateUpdate value:false.
@@ -36698,7 +37061,7 @@
].
^ projectDefinitionClass
- "Modified: / 21-01-2012 / 10:33:15 / cg"
+ "Modified: / 20-07-2012 / 19:42:48 / cg"
!
projectMenuBitmapFiles
@@ -36718,7 +37081,7 @@
!
projectMenuBuildExeOnly:exeOnly
- |projectToBuild projectDefinitionClasses projectDefinition projectBuilder|
+ |projectToBuild projectDefinitionClasses projectDefinition projectBuilder buildDir|
projectToBuild := self theSingleSelectedProject.
projectDefinitionClasses := self projectDefinitionClassesForSelectedProjects.
@@ -36742,11 +37105,36 @@
"/ build
buildWithColorizedOutputTo:Transcript.
- FileBrowserV2 openOnDirectory:(projectBuilder buildDirectory)
+ buildDir := projectToBuild asPackageId pathRelativeToTopDirectory:projectBuilder buildDirectory.
+
+ OperatingSystem isMSWINDOWSlike ifTrue:[
+ self activityNotification:'Showing result in explorer.'.
+ buildDir asFilename openExplorer
+ ] ifFalse:[
+ self activityNotification:'Showing result in filebrowser.'.
+ FileBrowserV2 openOnDirectory:buildDir
+ ].
"Created: / 21-01-2012 / 13:53:34 / cg"
!
+projectMenuBuildWithApplicationPackager
+ |package dfnClass|
+
+ (package := self theSingleSelectedProject) isNil ifTrue:[
+ Dialog warn:'Please select exactly one package.'.
+ ^ self.
+ ].
+ dfnClass := ProjectDefinition definitionClassForPackage:package.
+ dfnClass notNil ifTrue:[
+ Tools::ProjectBuilderAssistantApplication openOn:dfnClass.
+ ] ifFalse:[
+ Tools::ProjectBuilderAssistantApplication openOnPackage:package.
+ ].
+
+ "Created: / 20-07-2012 / 12:32:34 / cg"
+!
+
projectMenuCheckInAll
<resource: #obsolete> "use ...Using:manager variant"
@@ -38483,7 +38871,7 @@
!
projectMenuNew
- |projectDefinitionClass appClassName theCode appClass package
+ |projectDefinitionClass appClassName theCode appClass package category
defaultStartupClassName startupClassName startupClass change|
projectDefinitionClass := self projectDefinitionDialogFor:nil.
@@ -38496,86 +38884,88 @@
do:[
projectDefinitionClass compileDescriptionMethods.
self selectClass:projectDefinitionClass.
+ category := projectDefinitionClass name copyReplaceAll:$_ with:$-.
projectDefinitionClass isApplicationDefinition ifTrue:[
appClassName := Dialog
- request:(resources
- stringWithCRs:'Create initial application class?\(Enter name or cancel)').
- appClassName notNil ifTrue:[
- theCode := '
+ request:(resources stringWithCRs:'Create initial application class?\(Enter name or cancel)').
+ appClassName notEmptyOrNil ifTrue:[
+ (appClass := Smalltalk classNamed:appClassName) notNil ifTrue:[
+ Dialog warn:(resources stringWithCRs:'Application class already exists\(in "%1")' with:appClass package).
+ ] ifFalse:[
+ theCode := '
ApplicationModel subclass: #''%1''
instanceVariableNames:'' ''
classVariableNames:'' ''
poolDictionaries:'' ''
- category:''%1''
-' bindWith:appClassName.
-
-
- self canUseRefactoringSupport ifTrue:[
- change := AddClassChange definition: theCode.
- change name:('Create application class %1' bindWith:appClassName).
- RefactoryChangeManager performChange:change
- ] ifFalse:[
- self
- doAcceptClassDefinition:theCode
- usingCompiler:Compiler.
- ].
-
- appClass := Smalltalk classNamed:appClassName.
- appClass package:package.
-
- self classMenuGenerateApplicationCodeForClasses:{ appClass }.
- appClass instAndClassMethodsDo:[:m | m package:package].
-
- defaultStartupClassName := appClassName,'Start'.
- (Smalltalk classNamed:defaultStartupClassName) notNil ifTrue:[
- defaultStartupClassName := nil
- ].
- startupClassName := Dialog
- request:(resources
- stringWithCRs:'Create startup class (e.g. main)?\(Enter name or cancel)')
- initialAnswer:defaultStartupClassName.
- startupClassName notNil ifTrue:[
+ category:''%2''
+' bindWith:appClassName with:category.
+
+ self canUseRefactoringSupport ifTrue:[
+ change := AddClassChange definition: theCode.
+ change name:('Create application class %1' bindWith:appClassName).
+ RefactoryChangeManager performChange:change
+ ] ifFalse:[
+ self
+ doAcceptClassDefinition:theCode
+ usingCompiler:Compiler.
+ ].
+ appClass := Smalltalk classNamed:appClassName.
+ appClass package:package.
+ self classMenuGenerateApplicationCodeForClasses:{ appClass }.
+ appClass instAndClassMethodsDo:[:m | m package:package].
+ ].
+ ] ifFalse:[
+ appClassName := nil "/ for xxx below
+ ].
+ defaultStartupClassName := (appClassName ? 'xxx'),'Start'.
+ (Smalltalk classNamed:defaultStartupClassName) notNil ifTrue:[
+ defaultStartupClassName := nil
+ ].
+ startupClassName := Dialog
+ request:(resources
+ stringWithCRs:'Create startup class (e.g. main)?\(Enter name or cancel)')
+ initialAnswer:defaultStartupClassName.
+ startupClassName notEmptyOrNil ifTrue:[
+ (startupClass := Smalltalk classNamed:startupClassName) notNil ifTrue:[
+ Dialog warn:(resources stringWithCRs:'Startup class already exists\(in "%1")' with:startupClass package).
+ ] ifFalse:[
theCode := '
StandaloneStartup subclass: #''%1''
instanceVariableNames:'' ''
classVariableNames:'' ''
poolDictionaries:'' ''
- category:''%1''
-' bindWith:startupClassName.
+ category:''%2''
+' bindWith:startupClassName with:category.
self canUseRefactoringSupport ifTrue:[
change := AddClassChange definition: theCode.
change name:('Create startup class %1' bindWith:startupClassName).
RefactoryChangeManager performChange:change
] ifFalse:[
- self
- doAcceptClassDefinition:theCode
- usingCompiler:Compiler.
- ].
-
+ self doAcceptClassDefinition:theCode usingCompiler:Compiler.
+ ].
startupClass := Smalltalk classNamed:startupClassName.
startupClass package:package.
-
- "/ update the classList, again
- projectDefinitionClass compileDescriptionMethods.
- "/ generate startupClass code
- self halt.
- SmalltalkCodeGeneratorTool
+ ].
+
+ "/ update the classList, again
+ projectDefinitionClass compileDescriptionMethods.
+ "/ generate startupClass code
+
+ SmalltalkCodeGeneratorTool
compile:(projectDefinitionClass startupClassName_codeFor:(startupClass name))
forClass:projectDefinitionClass theMetaclass
inCategory:'description - startup'.
- self classMenuGenerateApplicationCodeForClasses:{ startupClass }.
- startupClass instAndClassMethodsDo:[:m | m package:package].
- ].
-
- self selectClass:appClass.
- ]
- ]
- ].
-
- "Modified: / 21-01-2012 / 13:38:43 / cg"
+ self classMenuGenerateApplicationCodeForClasses:{ startupClass }.
+ startupClass instAndClassMethodsDo:[:m | m package:package].
+ ].
+ self selectClass:(appClass ? startupClass).
+ ]
+ ].
+
+ "Modified: / 23-07-2012 / 13:44:04 / cg"
!
projectMenuProperties
@@ -40103,7 +40493,11 @@
ns = 'Smalltalk'
ifTrue:[ ns := '' ]
ifFalse:[ns := ' (in ',ns,')'].
- cls nameWithoutNameSpacePrefix,ns
+ cls isNameSpace ifTrue:[
+ cls nameWithoutNameSpacePrefix,ns,' (Namespace)'
+ ] ifFalse:[
+ cls nameWithoutNameSpacePrefix,ns
+ ]
]) sortWith:allClasses; yourself.
allFullNames := (allClasses collect:[:cls | cls name]) sortWith:allClasses; yourself.
@@ -40148,8 +40542,9 @@
]
]
].
- box listView list:list.
- box listView scrollToLine:((list findFirst:[:line | (line ? '') startsWith:lcName]) max:1)
+ box listView
+ list:list;
+ scrollToLine:((list findFirst:[:line | (line ? '') startsWith:lcName]) max:1)
].
classNameHolder := '' asValue.
@@ -40162,11 +40557,8 @@
box action:[:aString | className := aString].
box panelView
- addSubView:(showingWhatLabel := (Label label:(resources string:'Recently visited:')) adjust:#left)
- before:nil.
- box panelView
- addSubView:(check := CheckBox label:'Show Full Name (do not strip off Namespace)' model:showFullNameHolder)
- before:nil.
+ addSubView:(showingWhatLabel := (Label label:(resources string:'Recently visited:')) adjust:#left) before:nil;
+ addSubView:(check := CheckBox label:'Show Full Name (do not strip off Namespace)' model:showFullNameHolder) before:nil.
showFullNameHolder onChangeEvaluate:updateList.
box enterField origin:(0 @ check corner y).
box listView origin:(0 @ check corner y).
@@ -40192,7 +40584,7 @@
].
^ className
- "Modified: / 23-03-2012 / 11:55:33 / cg"
+ "Modified: / 23-07-2012 / 11:00:22 / cg"
!
askForClassToSearch:doWhatByDefault single:singleClass msgTail:msgTail thenDo:aBlock
@@ -43974,6 +44366,10 @@
value:nil
value:nil
value:nil.
+
+ theMethodNameList size > 7 ifTrue:[
+ brwsr showInfo:('%1 methods in list.' bindWith:theMethodNameList size).
+ ]
].
sortHow notNil ifTrue:[brwsr sortBy value:sortHow].
@@ -44027,7 +44423,7 @@
]
]
- "Modified: / 18-05-2010 / 15:15:27 / cg"
+ "Modified: / 19-07-2012 / 11:51:02 / cg"
!
spawnMethodBrowserFor:methods in:where label:labelOrNil perMethodInfo:infoDictionaryOrNil sortBy:sortHow
@@ -47174,6 +47570,16 @@
"Created: / 15-10-2011 / 12:31:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+classGitMenu
+ |menu|
+
+ menu := self class classGitMenu decodeAsLiteralArray.
+ self replaceSourceCodeManagerPlaceholderWith: GitSourceCodeManager in: menu.
+ ^ menu
+
+ "Created: / 23-07-2012 / 15:10:12 / cg"
+!
+
classMenuSCMExtraFor: sourceCodeManagerClassName
<resource: #programMenu>
@@ -52447,7 +52853,6 @@
!
replaceSourceCodeManagerPlaceholderWith: manager in: menu
-
| nm |
manager isNil ifTrue:[
@@ -52456,13 +52861,16 @@
nm := manager name.
].
- menu replaceArgument: #SourceCodeManagerPlaceholder with: nm.
+ menu replaceArgument: #SourceCodeManagerNamePlaceholder with: nm.
+ menu replaceArgument: #SourceCodeManagerPlaceholder with: manager.
menu receiver:self.
menu findGuiResourcesIn:self.
"Must once again after resolve because of slices!!!!!!"
- menu replaceArgument: #SourceCodeManagerPlaceholder with: nm.
+ menu replaceArgument: #SourceCodeManagerNamePlaceholder with: nm.
+ menu replaceArgument: #SourceCodeManagerPlaceholder with: manager.
"Created: / 12-10-2011 / 20:22:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 23-07-2012 / 15:13:27 / cg"
!
showActivity:someMessage
@@ -57388,15 +57796,15 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1752 2012/06/13 12:08:32 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1758 2012/07/24 07:55:23 cg Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1752 2012/06/13 12:08:32 cg Exp '
+ ^ 'Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1758 2012/07/24 07:55:23 cg Exp '
!
version_SVN
- ^ '$Id: Tools__NewSystemBrowser.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__NewSystemBrowser.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
NewSystemBrowser initialize!
--- a/Tools__OrganizerCanvas.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__OrganizerCanvas.st Wed Jul 25 10:51:30 2012 +0100
@@ -5037,6 +5037,6 @@
!
version_SVN
- ^ '$Id: Tools__OrganizerCanvas.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__OrganizerCanvas.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__ProjectList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__ProjectList.st Wed Jul 25 10:51:30 2012 +0100
@@ -966,5 +966,5 @@
!
version_SVN
- ^ '$Id: Tools__ProjectList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__ProjectList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__SearchDialog.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__SearchDialog.st Wed Jul 25 10:51:30 2012 +0100
@@ -482,9 +482,7 @@
self addCheckBoxForEverywhere.
].
self addCheckBoxForMethodList.
- browser selectedMethods value size > 1 ifTrue:[
- self addCheckBoxForSelectedMethods.
- ].
+ self addCheckBoxForSelectedMethods.
self addCheckBoxForSelectedMethodClasses.
self addCheckBoxForSelectedMethodPackages.
] ifFalse:[
@@ -556,7 +554,7 @@
self label:(resources string:'Search').
- "Modified: / 29-02-2012 / 19:48:17 / cg"
+ "Modified: / 20-07-2012 / 11:37:57 / cg"
! !
!SearchDialog methodsFor:'setup'!
@@ -805,36 +803,47 @@
!
addCheckBoxForSelectedMethodClasses
- |b classes|
+ |b classes numClasses|
classes := ((browser selectedMethods value ? #())
select:[:m | m mclass notNil]
thenCollect:[:m | m mclass theNonMetaclass]) asSet.
- classes size == 1 ifTrue:[
+ numClasses := classes size.
+ numClasses == 0 ifTrue:[^ self]. "/ comment this to show, but disabled
+
+ numClasses == 1 ifTrue:[
b := CheckBox label:(resources string:'Selected method''s class ("%1")'
with:classes first name).
] ifFalse:[
b := CheckBox label:(resources string:'Selected methods'' classes (%1)'
- with:classes size).
+ with:numClasses).
+ numClasses == 0 ifTrue:[
+ b disable
+ ].
].
self addCheckBox:b forSearchArea:#listOfSelectedMethodClasses.
^ b.
- "Modified: / 29-02-2012 / 19:42:33 / cg"
+ "Modified (comment): / 20-07-2012 / 11:40:44 / cg"
!
addCheckBoxForSelectedMethodPackages
- |b packages|
+ |b packages numPackages|
packages := ((browser selectedMethods value ? #())
collect:[:m | m package]) asSet.
+ numPackages := packages size.
+ numPackages size == 0 ifTrue:[^ self]. "/ comment this to show, but disabled
- packages size == 1 ifTrue:[
+ numPackages == 1 ifTrue:[
b := CheckBox label:(resources string:'Selected method''s package ("%1")'
with:packages first).
] ifFalse:[
b := CheckBox label:(resources string:'Selected methods'' packages (%1)'
- with:packages size).
+ with:numPackages).
+ numPackages == 0 ifTrue:[
+ b disable
+ ].
].
self addCheckBox:b forSearchArea:#listOfSelectedMethodPackages.
^ b.
@@ -843,12 +852,17 @@
!
addCheckBoxForSelectedMethods
- |b|
+ |b numSelected|
+
+ numSelected := browser selectedMethods value size.
+ numSelected == 0 ifTrue:[^ self]. "/ comment this to show, but disabled
- b := CheckBox label:(resources string:'Selected methods (%1)'
- with:browser selectedMethods value size).
+ b := CheckBox label:(resources string:'Selected methods (%1)' with:numSelected).
self addCheckBox:b forSearchArea:#listOfSelectedMethods.
+ numSelected == 0 ifTrue:[b disable].
^ b.
+
+ "Modified (comment): / 20-07-2012 / 11:40:33 / cg"
!
addCheckBoxForSelectedPackage
@@ -1325,11 +1339,11 @@
!SearchDialog class methodsFor:'documentation'!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.69 2012/02/29 18:50:58 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.70 2012/07/20 09:42:22 cg Exp §'
!
version_SVN
- ^ '$Id: Tools__SearchDialog.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__SearchDialog.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
SearchDialog initialize!
--- a/Tools__SpecialCodeView.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__SpecialCodeView.st Wed Jul 25 10:51:30 2012 +0100
@@ -73,7 +73,7 @@
!SpecialCodeView class methodsFor:'documentation'!
version
- ^ '$Id: Tools__SpecialCodeView.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__SpecialCodeView.st 8022 2012-07-25 09:51:30Z vranyj1 $'
!
version_CVS
@@ -81,5 +81,5 @@
!
version_SVN
- ^ '$Id: Tools__SpecialCodeView.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__SpecialCodeView.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/Tools__VariableList.st Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__VariableList.st Wed Jul 25 10:51:30 2012 +0100
@@ -826,5 +826,5 @@
!
version_SVN
- ^ '$Id: Tools__VariableList.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+ ^ '$Id: Tools__VariableList.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/WorkspaceApplication.st Tue Jul 24 18:17:26 2012 +0100
+++ b/WorkspaceApplication.st Wed Jul 25 10:51:30 2012 +0100
@@ -1484,7 +1484,7 @@
itemValue: menuSave
translateLabel: true
isButton: true
- labelImage: (ResourceRetriever ToolbarIconLibrary saveToFileAsIcon)
+ labelImage: (ResourceRetriever ToolbarIconLibrary saveToFileIcon)
)
(MenuItem
label: '-'
@@ -1550,7 +1550,7 @@
nil
)
- "Modified: / 05-07-2011 / 15:49:14 / cg"
+ "Modified: / 19-07-2012 / 12:04:47 / cg"
!
workspaceMenu
@@ -2096,10 +2096,16 @@
languageInfoLabelHolder
^ BlockValue
- with:[:syntax | "'Syntax: ',"syntax name ]
+ with:[:syntax |
+ syntax notNil ifTrue:[
+ "'Syntax: ',"syntax name
+ ] ifFalse:[
+ 'Text'
+ ]
+ ]
argument:self syntaxHolder
- "Modified: / 26-04-2012 / 12:53:20 / cg"
+ "Modified: / 19-07-2012 / 16:53:30 / cg"
!
modeLabelHolder
@@ -2121,8 +2127,14 @@
!
setWindowLabel: label language: language
-
- self window label:label, ' - ' , language name
+ |languageName|
+
+ language notNil ifTrue:[
+ languageName := ' - ', language name.
+ ] ifFalse:[
+ languageName := ''.
+ ].
+ self window label:label, ' - ' , languageName
!
smalltalkMenuEnabledHolder
@@ -2952,9 +2964,13 @@
!
setCompilerForSyntax
- self setCompilerForSyntaxIn:self selectedWorkspace.
-
- "Modified: / 08-02-2011 / 21:39:51 / cg"
+ |selectedWorkspace|
+
+ (selectedWorkspace := self selectedWorkspace) notNil ifTrue:[
+ self setCompilerForSyntaxIn:selectedWorkspace.
+ ].
+
+ "Modified: / 23-07-2012 / 23:07:50 / cg"
!
setCompilerForSyntaxIn:aWorkspace
@@ -3894,17 +3910,19 @@
!
createWorkspaceView
- |ws|
+ |ws language|
ws := self class createWorkspaceView.
(ws respondsTo:#languageHolder:) ifTrue:[
ws languageHolder:self syntaxHolder
].
- ws compilerClass:(self syntaxHolder value evaluatorClass).
+ (language := self syntaxHolder value) notNil ifTrue:[
+ ws compilerClass:(language evaluatorClass).
+ ].
^ ws
"Modified: / 14-07-2010 / 18:47:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 26-04-2012 / 12:58:28 / cg"
+ "Modified: / 19-07-2012 / 16:39:15 / cg"
!
isModifiedWorkspace:aView
@@ -4032,13 +4050,13 @@
!WorkspaceApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.220 2012/05/04 14:04:21 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.225 2012/07/23 21:08:47 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.220 2012/05/04 14:04:21 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.225 2012/07/23 21:08:47 cg Exp §'
!
version_SVN
- ^ '$Id: WorkspaceApplication.st 8007 2012-06-05 14:49:00Z vranyj1 $'
+ ^ '$Id: WorkspaceApplication.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !
--- a/resources/de.rs Tue Jul 24 18:17:26 2012 +0100
+++ b/resources/de.rs Wed Jul 25 10:51:30 2012 +0100
@@ -1,6 +1,6 @@
#encoding utf8
-; $Header: /cvs/stx/stx/libtool/resources/de.rs,v 1.166 2012/07/18 15:26:32 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/de.rs,v 1.170 2012/07/23 10:42:13 cg Exp $
;
; German Workspace (and other tools) resources
;
@@ -42,6 +42,7 @@
'Remove all Workspace Variables' 'Alle Workspace Variablen entfernen'
'New Name for %1:' 'Neuer Name für %1:'
+'New Name for "%1":' 'Neuer Name für "%1":'
'Save all As' 'Alle sichern als'
'Ask for a file and save the page''s contents there' 'Den Seiteninhalt in einer Datei sichern'
@@ -51,6 +52,7 @@
'Filter Text' 'Text filtern'
'Process Text' 'Text bearbeiten'
+'Compare Text Against' 'Text vergleichen mit'
'Redo Last' 'Letzte Anweisung wiederholen'
'Paste Last' 'Letzte Anweisung einfügen'
@@ -83,6 +85,7 @@
'Autodefine as DoIt Variable' 'Automatisch definieren als DoIt-Variable'
'Autodefine off' 'Nicht automatisch definieren'
'Autofetch Selection' 'Clipboard automatisch holen'
+'Insert as Line (Append CR)' 'Als Zeile einfügen (CR anhängen)'
'Add SharedPool' 'SharedPool hinzufügen'
'Remove SharedPool' 'SharedPool ignorieren'
@@ -469,6 +472,7 @@
'Load class(es) from the repository' 'Klasse(n) aus der Quellcodeverwaltung laden'
'Modules' 'Module'
'Packages' 'Pakete'
+'Package' 'Paket'
'Containers' 'Behälter'
'Load' 'Laden'
'Dismiss' 'Schließen'
@@ -528,7 +532,6 @@
'unload' 'Entladen'
'Unload' 'Entladen'
'Remove all from Changeset' 'Im Changeset entfernen'
-'Package' 'Projekt'
'Remove Classes & Unload' 'Klassen entfernen und Entladen'
'Remove Classes && Unload' 'Klassen entfernen und Entladen'
@@ -742,10 +745,10 @@
'current nameSpace (''%1'')' 'Namensraum (''%1'')'
'current nameSpace ("%1")' 'Namensraum ("%1")'
'classes'' nameSpace ("%1")' 'Namensraum der Klasse ("%1")'
-'classes'' package ("%1")' 'Projekt der Klasse ("%1")'
-'current package' 'in diesem Projekt'
-'current package (''%1'')' 'Projekt (''%1'')'
-'current package ("%1")' 'Projekt ("%1")'
+'classes'' package ("%1")' 'Paket der Klasse ("%1")'
+'current package' 'in diesem Paket'
+'current package (''%1'')' 'Paket (''%1'')'
+'current package ("%1")' 'Paket ("%1")'
'class category' 'Klassenkategorie'
'class category (''%1'')' 'Klassenkategorie (''%1'')'
'class category ("%1")' 'Klassenkategorie ("%1")'
@@ -760,6 +763,12 @@
'owners & all their private classes' 'Besitzer & alle private Klassen'
'owners & their subclasses & all their private classes' 'Besitzer & alle Subklassen & alle private Klassen'
'methodlist' 'Methodenliste'
+'selected methods' 'Ausgewählte Methoden'
+'selected methods (%1)' 'Ausgewählte Methoden (%1)'
+'selected method''s class ("%1")' 'Klasse der ausgewählten Methode ("%1")'
+'selected methods'' classes (%1)' 'Klassen der ausgewählten Methoden (%1)'
+'selected method''s package ("%1")' 'Paket der ausgewählten Methode ("%1")'
+'selected methods'' packages (%1)' 'Pakete der ausgewählten Methoden (%1)'
'class to copy instance method category from:' 'Klasse von der Instanzmethoden einer Kategorie kopiert werden:'
'class to copy class method category from:' 'Klasse von der Klassenmethoden einer Kategorie kopiert werden:'
@@ -994,6 +1003,7 @@
'Bookmarks' 'Lesezeichen'
'add bookmark' 'Lesezeichen hinzufügen'
'Add Bookmark' 'Lesezeichen hinzufügen'
+'Add Bookmark Here' 'Lesezeichen hier hinzufügen'
'Edit Bookmarks' 'Lesezeichen verwalten'
'Remove Bookmark' 'Lesezeichen entfernen'
; 'Remove Bookmark' 'Lesezeichen löschen'
@@ -1529,9 +1539,9 @@
'no classes or methods in this project (yet)' '(Noch) keine Klassen oder Methoden in diesem Projekt'
'no changes made in this project (yet)' 'In diesem Projekt wurden (noch) keine Änderungen gemacht.'
-'classes in package %1' 'Klassen im Projekt: %1'
-'individual methods in package %1' 'einzelne Methoden im Projekt: %1'
-'Changes in %1' 'Änderungen im Projekt: %1'
+'classes in package %1' 'Klassen im Paket: %1'
+'individual methods in package %1' 'einzelne Methoden im Paket: %1'
+'Changes in %1' 'Änderungen im Paket: %1'
;--------------------------------------------------------------------------------------------
;
@@ -1755,8 +1765,6 @@
'compare and compress' 'Vergleichen und Komprimieren'
'Compare and Compress' 'Vergleichen und Komprimieren'
-'Senders' 'Sender'
-'Implementors' 'Implementierungen'
'make change a patch' 'Änderung automatisieren (in patches übernehmen)'
'Make Change a Patch' 'Änderung automatisieren (in patches übernehmen)'
@@ -2528,8 +2536,9 @@
Breakpoint 'Haltepunkt'
'Show More WalkBack' 'Mehr von der Aufrufkette zeigen'
-'Show Verbose WalkBack' 'Aufrufkette komplett zeigen'
-'Show Dense WalkBack' 'Aufrufkette verkürzt zeigen'
+'Show Full WalkBack' 'Gesamte Aufrufkette zeigen'
+'Show Verbose WalkBack' 'Aufrufkette ausführlich zeigen'
+'Show Dense WalkBack' 'Aufrufkette komprimiert zeigen'
'Show Support Code (Implementation of Enumerations, Exceptions etc.)' 'Helfercode anzeigen (Implementierung von Enumerations, Exceptions etc.)'
'Hide Support Code (Implementation of Enumerations, Exceptions etc.)' 'Helfercode nicht zeigen (Implementierung von Enumerations, Exceptions etc.)'
'Close Debugger and Abort' 'Debugger schließen und abbrechen'
@@ -2755,19 +2764,15 @@
'Class Hierarchy Browser' 'Hierarchiebrowser'
'Class Hierarchy Browser On' 'Hierarchiebrowser auf'
'Class Tree' 'Klassenhierarchie'
-; 'Implementors' 'Implementierungen einer Nachricht'
-'Implementors' 'Implementierungen'
-'Implementors of' 'Implementierungen einer Nachricht'
-'Implementors Of' 'Implementierungen einer Nachricht'
+'Implementors of' 'Implementierungen von'
+'Implementors Of' 'Implementierungen von'
'Browse implementors of:' 'Implementierungen suchen von:'
'Browse Implementors Of:' 'Implementierungen suchen von:'
'Browse senders of:' 'Sender suchen von:'
'Browse Senders Of:' 'Sender suchen von:'
'Browse Senders of (Tab for Completion)' 'Sender suchen von (Tab zur Komplettierung):'
-'Senders of' 'Sender einer Nachricht'
-'Senders Of' 'Sender einer Nachricht'
-; 'Senders' 'Sender einer Nachricht'
-'Senders' 'Sender'
+'Senders of' 'Sender von'
+'Senders Of' 'Sender von'
'Special' 'Spezial'
'Method Finder' 'Methodensuche'
--- a/stx_libtool.st Tue Jul 24 18:17:26 2012 +0100
+++ b/stx_libtool.st Wed Jul 25 10:51:30 2012 +0100
@@ -11,7 +11,7 @@
"
"{ Package: 'stx:libtool' }"
-LibraryDefinition subclass:#stx_libtool
+LibraryDefinition subclass:#'stx_libtool'
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
@@ -42,8 +42,10 @@
!
extensionsVersion_CVS
- ^ '$Header: /cvs/stx/stx/libtool/stx_libtool.st,v 1.82 2012/06/01 10:44:51 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/stx_libtool.st,v 1.83 2012/07/18 17:12:58 cg Exp $'
+!
+
+ !
!stx_libtool class methodsFor:'description'!
@@ -511,9 +513,9 @@
legalCopyright
"Return a copyright string which will appear in <lib>.rc"
- ^ 'Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011'
+ ^ 'Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012'
- "Modified: / 01-02-2011 / 11:56:18 / cg"
+ "Modified: / 18-07-2012 / 19:11:53 / cg"
!
productName
@@ -543,13 +545,13 @@
!stx_libtool class methodsFor:'documentation'!
version
- ^ '$Id: stx_libtool.st 8008 2012-06-17 08:45:40Z vranyj1 $'
+ ^ '$Header: /cvs/stx/stx/libtool/stx_libtool.st,v 1.83 2012/07/18 17:12:58 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/stx_libtool.st,v 1.82 2012/06/01 10:44:51 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/stx_libtool.st,v 1.83 2012/07/18 17:12:58 cg Exp §'
!
version_SVN
- ^ '$Id: stx_libtool.st 8008 2012-06-17 08:45:40Z vranyj1 $'
+ ^ '$Id: stx_libtool.st 8022 2012-07-25 09:51:30Z vranyj1 $'
! !