--- a/AbstractFileBrowser.st Mon May 09 21:47:57 2016 +0200
+++ b/AbstractFileBrowser.st Thu May 12 08:33:55 2016 +0200
@@ -8371,7 +8371,7 @@
] ifFalse:[sig == HaltInterrupt ifTrue:[ |sender|
label := msg := 'Breakpoint/Halt in fileIn'.
sender := ex suspendedContext.
- msg := msg , '\\in ' , sender receiver class name , '>>' , sender sender selector
+ msg := msg , ('\\in %1 » %2' bindWith:(sender receiver class name) with:(sender sender selector))
] ifFalse:[
label := 'Error in fileIn'.
msg := 'error in fileIn: %1'
--- a/AbstractLauncherApplication.st Mon May 09 21:47:57 2016 +0200
+++ b/AbstractLauncherApplication.st Thu May 12 08:33:55 2016 +0200
@@ -7261,7 +7261,7 @@
(MCRepositoryGroup isNil or:[MCRepositoryGroup isLoaded not]) ifTrue:[
monticelloRoot icon:greyFolderIcon.
- monticelloRoot label:monticelloLabel, (' (Monticello Support not Loaded)' asText colorizeAllWith:Color grey).
+ monticelloRoot label:monticelloLabel, (' (Monticello Support not Loaded)' withColor:Color grey).
] ifFalse:[
monticelloRoot icon:folderIcon.
monticelloRoot label:monticelloLabel.
@@ -7869,7 +7869,7 @@
isAlreadyLoaded := false.
Error handle:[:ex |
- item label:(item label , (' ERROR - please rebuild!!' colorizeAllWith:Color red)).
+ item label:(item label , (' ERROR - please rebuild!!' withColor:Color red)).
] do:[
isAlreadyLoaded :=
(defClass := ProjectDefinition definitionClassForPackage:packageID) notNil
--- a/AbstractSettingsApplication.st Mon May 09 21:47:57 2016 +0200
+++ b/AbstractSettingsApplication.st Thu May 12 08:33:55 2016 +0200
@@ -6769,7 +6769,7 @@
^ super flyByHelpSpec addPairsFrom:#(
#useSystemLanguage
-'If set, the operating system language (LANG variable) is used agaig in the next session\(and the setting here only affects the current session).\If clear, this language is also used in the next session.'
+'If set, the operating system language (LANG variable) is used in the next session\(and the setting here only affects the current session).\If clear, the language setting is also used in the next session.'
)
! !
--- a/BookmarkBar.st Mon May 09 21:47:57 2016 +0200
+++ b/BookmarkBar.st Thu May 12 08:33:55 2016 +0200
@@ -369,7 +369,7 @@
menu := self bookmarksHolder value asMenu.
menu hasItems ifFalse:[
item := MenuItem
- label: ('No bookmarks yet, click here or on star to add one' asText colorizeAllWith: Color gray)
+ label: ('No bookmarks yet, click here or on star to add one' withColor: Color gray)
itemValue: #bookmarkMenu
enabled: self hasBookmarkHolder.
item isButton: true.
--- a/BrowserView.st Mon May 09 21:47:57 2016 +0200
+++ b/BrowserView.st Thu May 12 08:33:55 2016 +0200
@@ -152,10 +152,6 @@
"
"Modified: / 26.7.1998 / 14:12:23 / cg"
-!
-
-preSnapshot
- Icons := DefaultIcon := nil.
! !
!BrowserView class methodsFor:'defaults'!
@@ -1672,6 +1668,15 @@
^ SystemBrowser classResources
! !
+!BrowserView class methodsFor:'startup & release'!
+
+preSnapshot
+ "flush cached resources before saving a snapshot
+ (do not save them in the image)"
+
+ Icons := DefaultIcon := nil.
+! !
+
!BrowserView methodsFor:'change & update'!
delayedUpdate:something with:someArgument from:changedObject
@@ -12465,42 +12470,12 @@
!
extractClassAndSelectorFromSelectionInto:aBlock
- "given a string which can be either 'class>>sel' or
- 'class sel', extract className and selector, and call aBlock with
- the result."
-
- |sel clsName isMeta sep s|
-
- sel := codeView selection.
- sel notNil ifTrue:[
- sel := sel asString withoutSeparators.
- ('*>>*' match:sel) ifTrue:[
- sep := $>
- ] ifFalse:[
- ('* *' match:sel) ifTrue:[
- sep := Character space
- ]
- ].
- sep notNil ifTrue:[
- "
- extract class/sel from selection
- "
- s := ReadStream on:sel.
- clsName := s upTo:sep.
- [s peek == sep] whileTrue:[s next].
- sel := s upToEnd.
-
- (clsName endsWith:' class') ifTrue:[
- isMeta := true.
- clsName := clsName copyButLast:6
- ] ifFalse:[
- isMeta := false
- ].
- ]
- ].
- aBlock value:clsName value:sel value:isMeta
-
- "Modified: 17.6.1996 / 16:52:14 / stefan"
+ "given a string which can be either
+ 'class>>sel', 'class » sel' or 'class sel',
+ extract className and selector,
+ and call aBlock with the result."
+
+ ^ SystemBrowser extractClassAndSelectorFrom:codeView selection into:aBlock
!
findClassNamed:aClassName
@@ -14520,6 +14495,10 @@
!BrowserView class methodsFor:'documentation'!
+version
+ ^ '$Header$'
+!
+
version_CVS
^ '$Header$'
! !
--- a/CVSSourceCodeManagementSettingsAppl.st Mon May 09 21:47:57 2016 +0200
+++ b/CVSSourceCodeManagementSettingsAppl.st Thu May 12 08:33:55 2016 +0200
@@ -813,7 +813,7 @@
rootLocal := cvsRoot withoutPrefix:':local:'.
rootLocal := rootLocal asFilename asAbsoluteFilename pathName.
"/ self halt.
- term showCR:(('Close this terminal window, when finished') allBold colorizeAllWith:Color red).
+ term showCR:(('Close this terminal window, when finished') withColor:#red).
term showCR:''.
term endEntry.
@@ -851,7 +851,7 @@
"/ term topView destroy
].
- term showCR:(('Please enter the CVS-password then close this terminal window.') allBold colorizeAllWith:Color red).
+ term showCR:(('Please enter the CVS-password then close this terminal window.') withColor:#red).
term showCR:''.
term endEntry.
--- a/ContextInspectorView.st Mon May 09 21:47:57 2016 +0200
+++ b/ContextInspectorView.st Thu May 12 08:33:55 2016 +0200
@@ -504,7 +504,7 @@
names size == 0 ifTrue:[
(inspectedContext isBlockContext and:[inspectedContext home isNil]) ifTrue:[
"/ hack to guide beginners
- ^ { '>> no home in cheap block <<' colorizeAllWith:Color gray }
+ ^ { '>> no home in cheap block <<' withColor:Color gray }
].
list := #()
] ifFalse:[
--- a/DebugView.st Mon May 09 21:47:57 2016 +0200
+++ b/DebugView.st Thu May 12 08:33:55 2016 +0200
@@ -3724,37 +3724,37 @@
lines := aMessage asStringCollection.
lines size > 1 ifTrue:[
- l := lines first
+ l := lines first
] ifFalse:[
- l := aMessage.
+ l := aMessage.
].
l := l , ' ('.
Error handle:[:ex |
- l := l , '???'
+ l := l , '???'
] do:[
- processNameOrNil := aProcess name.
- processNameOrNil notNil ifTrue:[
- l := l , (processNameOrNil contractTo:20) , ''.
- ].
- pidOrNil := aProcess id printString.
- l := l , '[' , pidOrNil , ']'.
+ processNameOrNil := aProcess name.
+ processNameOrNil notNil ifTrue:[
+ l := l , (processNameOrNil contractTo:20) , ''.
+ ].
+ pidOrNil := aProcess id printString.
+ l := l , '[' , pidOrNil , ']'.
].
l := l , ')'.
self label:l.
((ShowThreadID == true) and:[OperatingSystem isMSDOSlike]) ifTrue:[
- osPidString := ' {threadID: ',OperatingSystem getThreadId printString,'}'.
+ osPidString := ' {threadID: ',OperatingSystem getThreadId printString,'}'.
].
exceptionInfoLabel notNil ifTrue:[
- exceptionInfoLabel
- label:(resources
- string:'%1 in process %2 [%3]%4'
- with:(lines first colorizeAllWith:Color red)
- with:(processNameOrNil ? '')
- with:(pidOrNil ? '')
- with:(osPidString ? ''))
+ exceptionInfoLabel
+ label:(resources
+ string:'%1 in process %2 [%3]%4'
+ with:(lines first withColor:#red)
+ with:(processNameOrNil ? '')
+ with:(pidOrNil ? '')
+ with:(osPidString ? ''))
].
"Modified: / 06-07-2006 / 12:43:19 / cg"
@@ -7381,24 +7381,24 @@
contextListEntryFor:aContext
^ Error
- handle:[:ex | '???' ]
- do:[
- |s|
-
- aContext selector == #doIt ifTrue:[
- aContext receiver isNil ifTrue:[
- s := 'doIt' allBold
- ]
- ].
-
- s := Text streamContents:[:s | aContext printOn:s ].
- RememberedCallChain notNil ifTrue:[
- (RememberedCallChain includesIdentical:aContext) ifTrue:[
- s := s colorizeAllWith:(Color red).
- ].
- ].
- s
- ].
+ handle:[:ex | '???' ]
+ do:[
+ |s|
+
+ aContext selector == #doIt ifTrue:[
+ aContext receiver isNil ifTrue:[
+ s := 'doIt' allBold
+ ]
+ ].
+
+ s := Text streamContents:[:s | aContext printOn:s ].
+ RememberedCallChain notNil ifTrue:[
+ (RememberedCallChain includesIdentical:aContext) ifTrue:[
+ s := s withColor:#red.
+ ].
+ ].
+ s
+ ].
"Created: / 21-05-2007 / 13:30:24 / cg"
!
@@ -9276,7 +9276,7 @@
"/ code ~= (codeView contents) ifTrue:[
cannotAcceptDueToOutdatedClass ifTrue:[
- codeView setContents:(('Obsolete code (outdated due to class change). Use Browser.' colorizeAllWith:Color red),Character cr,Character cr,code asString).
+ codeView setContents:(('Obsolete code (outdated due to class change). Use Browser.' withColor:Color red),Character cr,Character cr,code asString).
] ifFalse:[
codeView setContents:code.
].
@@ -9440,43 +9440,43 @@
printConditionOn:aStream
ignoredSendingClassAndSelectors notEmptyOrNil ifTrue:[
- aStream nextPutAll:(' if called from %1 >> %2'
- bindWith:ignoredSendingClassAndSelectors first first
- with:ignoredSendingClassAndSelectors first second).
- ^ self.
+ aStream nextPutAll:(' if called from %1 %2'
+ bindWith:ignoredSendingClassAndSelectors first first
+ with:ignoredSendingClassAndSelectors first second).
+ ^ self.
].
ignoredProcesses notEmptyOrNil ifTrue:[
- aStream nextPutAll:(' in %1 processes (%2)'
- bindWith:ignoredProcesses size
- with:((ignoredProcesses collect:[:each | each name] as:OrderedCollection) asStringWith:', ')).
- ^ self.
+ aStream nextPutAll:(' in %1 processes (%2)'
+ bindWith:ignoredProcesses size
+ with:((ignoredProcesses collect:[:each | each name] as:OrderedCollection) asStringWith:', ')).
+ ^ self.
].
ignoredReceiverClasses notNil ifTrue:[
- aStream nextPutAll:(' for %1 classes (%2)'
- bindWith:ignoredReceiverClasses size
- with:((ignoredReceiverClasses collect:[:each | each name] as:OrderedCollection) asStringWith:', ')).
- ^ self.
+ aStream nextPutAll:(' for %1 classes (%2)'
+ bindWith:ignoredReceiverClasses size
+ with:((ignoredReceiverClasses collect:[:each | each name] as:OrderedCollection) asStringWith:', ')).
+ ^ self.
].
ignoreUntilShiftKeyPressed == true ifTrue:[
- aStream nextPutAll:' until shiftKey pressed'.
- ^ self.
+ aStream nextPutAll:' until shiftKey pressed'.
+ ^ self.
].
ignoreEndTime notNil ifTrue:[
- aStream nextPutAll:' until '.
- ignoreEndTime printOn:aStream.
- ^ self.
+ aStream nextPutAll:' until '.
+ ignoreEndTime printOn:aStream.
+ ^ self.
].
(ignoreCount notNil) ifTrue:[
- (ignoreCount > 0) ifTrue:[
- aStream nextPutAll:' for '.
- ignoreCount printOn:aStream.
- ^ self.
- ].
- (ignoreCount < 0) ifTrue:[
- aStream nextPutAll:' forEver'.
- ^ self.
- ].
- aStream nextPutAll:' no longer'.
+ (ignoreCount > 0) ifTrue:[
+ aStream nextPutAll:' for '.
+ ignoreCount printOn:aStream.
+ ^ self.
+ ].
+ (ignoreCount < 0) ifTrue:[
+ aStream nextPutAll:' forEver'.
+ ^ self.
+ ].
+ aStream nextPutAll:' no longer'.
].
! !
--- a/FileApplicationNoteBook.st Mon May 09 21:47:57 2016 +0200
+++ b/FileApplicationNoteBook.st Thu May 12 08:33:55 2016 +0200
@@ -4633,8 +4633,7 @@
self notify:'shell in ' , self fileName asString, ' finished'.
terminalView cr.
- text := '>> shell terminated.' allBold.
- text colorizeAllWith:Color red.
+ text := '>> shell terminated.' allBold withColor:#red.
terminalView nextPutAll:text.
!
--- a/FindFileApplication.st Mon May 09 21:47:57 2016 +0200
+++ b/FindFileApplication.st Thu May 12 08:33:55 2016 +0200
@@ -1528,7 +1528,7 @@
contentsMatches := true.
(f exists and:[f isReadable]) ifFalse:[
showUnreadableFilesAndDirectoriesHolder value ifTrue:[
- resultList add: (('*** "',f pathName,'" skipped - unreadable or bad symbolic link ***') colorizeAllWith:(Color red darkened)).
+ resultList add: (('*** "',f pathName,'" skipped - unreadable or bad symbolic link ***') withColor:(Color red darkened)).
].
contentsMatches := false.
] ifTrue:[
@@ -1538,7 +1538,7 @@
realFile := f linkInfo linkTargetPath asFilename.
(realFile exists and:[realFile isReadable]) ifFalse:[
showUnreadableFilesAndDirectoriesHolder value ifTrue:[
- resultList add: (('*** "',f pathName,'"->"',realFile pathName,'" skipped - unreadable or bad symbolic link destination ***') colorizeAllWith:(Color red darkened)).
+ resultList add: (('*** "',f pathName,'"->"',realFile pathName,'" skipped - unreadable or bad symbolic link destination ***') withColor:(Color red darkened)).
].
contentsMatches := false.
isBadFile := true.
@@ -1557,7 +1557,7 @@
hugeFile ifTrue:[
showUnreadableFilesAndDirectoriesHolder value ifTrue:[
- resultList add: (('*** ' , f pathName , ' skipped - too large ***') colorizeAllWith:(Color red darkened)).
+ resultList add: (('*** ' , f pathName , ' skipped - too large ***') withColor:(Color red darkened)).
].
contentsMatches := false.
] ifFalse:[
@@ -1566,14 +1566,14 @@
"/ "/ this typically happens, when a binary file is read linewise ...
showUnreadableFilesAndDirectoriesHolder value ifTrue:[
- resultList add: (('*** ' , f pathName , ' skipped - binary/long line ***') colorizeAllWith:(Color red darkened)).
+ resultList add: (('*** ' , f pathName , ' skipped - binary/long line ***') withColor:(Color red darkened)).
].
contentsMatches := false.
] do:[
bigFile ifTrue:[
Stream lineTooLongErrorSignal handle:[:ex |
showUnreadableFilesAndDirectoriesHolder value ifTrue:[
- resultList add: (('*** ' , f pathName , ' skipped - too large ***') colorizeAllWith:(Color red darkened)).
+ resultList add: (('*** ' , f pathName , ' skipped - too large ***') withColor:(Color red darkened)).
].
contentsMatches := false.
] do:[
@@ -1775,7 +1775,7 @@
directoryContents := dir directoryContents.
] on:FileStream openErrorSignal do:[:ex|
self showUnreadableFilesAndDirectoriesHolder value ifTrue:[
- list add:((ex pathName , ' -> ' , ex description) colorizeAllWith:Color red darkened).
+ list add:((ex pathName , ' -> ' , ex description) withColor:Color red darkened).
].
"/ self warn:('Cannot access %1\(%2)'
"/ bindWith:ex parameter printString
--- a/Make.proto Mon May 09 21:47:57 2016 +0200
+++ b/Make.proto Thu May 12 08:33:55 2016 +0200
@@ -255,6 +255,7 @@
$(OUTDIR)AbstractFileFinderApplicationComponent.$(O) AbstractFileFinderApplicationComponent.$(C) AbstractFileFinderApplicationComponent.$(H): AbstractFileFinderApplicationComponent.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractFileApplicationNoteBookComponent.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
$(OUTDIR)AbstractSourceCodeManagementSettingsAppl.$(O) AbstractSourceCodeManagementSettingsAppl.$(C) AbstractSourceCodeManagementSettingsAppl.$(H): AbstractSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
$(OUTDIR)BookmarkMenuBuilder.$(O) BookmarkMenuBuilder.$(C) BookmarkMenuBuilder.$(H): BookmarkMenuBuilder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/BookmarkVisitor.$(H) $(STCHDR)
+$(OUTDIR)ChangeSetBrowser.$(O) ChangeSetBrowser.$(C) ChangeSetBrowser.$(H): ChangeSetBrowser.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/ChangesBrowser.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/StandardSystemView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
$(OUTDIR)ClassInspectorView.$(O) ClassInspectorView.$(C) ClassInspectorView.$(H): ClassInspectorView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(STCHDR)
$(OUTDIR)ContextInspectorView.$(O) ContextInspectorView.$(C) ContextInspectorView.$(H): ContextInspectorView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(STCHDR)
$(OUTDIR)DictionaryInspectorView.$(O) DictionaryInspectorView.$(C) DictionaryInspectorView.$(H): DictionaryInspectorView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(STCHDR)
--- a/Make.spec Mon May 09 21:47:57 2016 +0200
+++ b/Make.spec Thu May 12 08:33:55 2016 +0200
@@ -154,6 +154,7 @@
AbstractFileFinderApplicationComponent \
AbstractSourceCodeManagementSettingsAppl \
BookmarkMenuBuilder \
+ ChangeSetBrowser \
ClassInspectorView \
ContextInspectorView \
DictionaryInspectorView \
@@ -341,6 +342,7 @@
$(OUTDIR_SLASH)AbstractFileFinderApplicationComponent.$(O) \
$(OUTDIR_SLASH)AbstractSourceCodeManagementSettingsAppl.$(O) \
$(OUTDIR_SLASH)BookmarkMenuBuilder.$(O) \
+ $(OUTDIR_SLASH)ChangeSetBrowser.$(O) \
$(OUTDIR_SLASH)ClassInspectorView.$(O) \
$(OUTDIR_SLASH)ContextInspectorView.$(O) \
$(OUTDIR_SLASH)DictionaryInspectorView.$(O) \
--- a/MemoryUsageView.st Mon May 09 21:47:57 2016 +0200
+++ b/MemoryUsageView.st Thu May 12 08:33:55 2016 +0200
@@ -893,12 +893,12 @@
s1 := allocRate printString.
s2 := memRate printString.
allocRate > 0 ifTrue:[
- s1 := s1 colorizeAllWith:(Color red).
- s2 := s2 colorizeAllWith:(Color red).
+ s1 := s1 withColor:#red.
+ s2 := s2 withColor:#red.
] ifFalse:[
allocRate < 0 ifTrue:[
- s1 := s1 colorizeAllWith:(Color green darkened).
- s2 := s2 colorizeAllWith:(Color green darkened).
+ s1 := s1 withColor:(Color green darkened).
+ s2 := s2 withColor:(Color green darkened).
]
].
line := line , (s1 leftPaddedTo:countLen).
--- a/NewLauncher.st Mon May 09 21:47:57 2016 +0200
+++ b/NewLauncher.st Thu May 12 08:33:55 2016 +0200
@@ -3724,7 +3724,8 @@
"update the infoLabel (at the bottom) from the current project"
|project projectDir packageName packageNameOrNil defNameSpace projectInfo
- cvsRepository storeDB image bindings makeInfoString svnWorkDirBaseName|
+ cvsRepository storeDB image bindings makeInfoString
+ svnRepositoryManagerClass svnWorkDirBaseName|
(Project notNil and:[(project := Project current) notNil]) ifTrue:[
projectDir := project directory.
@@ -3753,9 +3754,12 @@
].
makeInfoString := [:title :value |
+ |v|
+ v := value.
+value isString ifFalse:[v := '***' ].
(resources string:title) allBold
,': '
- ,(value colorizeAllWith:(Color blue darkened))
+ ,(v withColor:(Color blue darkened))
,' '
].
@@ -3801,11 +3805,12 @@
bindings at:'NOREPOSITORY' put:''.
].
- (SVN::RepositoryManager notNil
- and:[ SVN::RepositoryManager isLoaded
- and:[ SVN::RepositoryManager enabled ]])
+ svnRepositoryManagerClass := Smalltalk at:#'SVN::RepositoryManager'.
+ (svnRepositoryManagerClass notNil
+ and:[ svnRepositoryManagerClass isLoaded
+ and:[ svnRepositoryManagerClass enabled ]])
ifTrue:[
- svnWorkDirBaseName := SVN::RepositoryManager current workingCopyBase asFilename baseName.
+ svnWorkDirBaseName := svnRepositoryManagerClass current workingCopyBase asFilename baseName.
bindings
at: 'SVN_WORKING_COPY'
--- a/PerforceSourceCodeManagerUtilities.st Mon May 09 21:47:57 2016 +0200
+++ b/PerforceSourceCodeManagerUtilities.st Thu May 12 08:33:55 2016 +0200
@@ -950,9 +950,9 @@
stopAsking := dialog allowEmptyLogMessage
or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
stopAsking ifFalse:[
- warnMessage := (self resources string:'Please enter a description of your changes!!')
- asText
- colorizeAllWith:Color red.
+ warnMessage := (self resources
+ string:'Please enter a description of your changes!!')
+ withColor:Color red.
].
stopAsking
].
@@ -1339,9 +1339,9 @@
stopAsking := dialog allowEmptyLogMessage
or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
stopAsking ifFalse:[
- warnMessage := (self resources string:'Please enter a description of your changes!!')
- asText
- colorizeAllWith:Color red.
+ warnMessage := (self resources
+ string:'Please enter a description of your changes!!')
+ withColor:Color red.
].
stopAsking
].
@@ -1376,9 +1376,9 @@
stopAsking := dialog allowEmptyLogMessage
or:[ dialog logMessage withoutSeparators notEmptyOrNil ].
stopAsking ifFalse:[
- warnMessage := (self resources string:'Please enter a description of your changes!!')
- asText
- colorizeAllWith:Color red.
+ warnMessage := (self resources
+ string:'Please enter a description of your changes!!')
+ withColor:Color red.
].
stopAsking
].
--- a/ProcessMonitorV2.st Mon May 09 21:47:57 2016 +0200
+++ b/ProcessMonitorV2.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2003 by eXept Software AG
All Rights Reserved
@@ -3495,7 +3493,7 @@
aProcess := processItem processInstance.
aProcess isNil ifTrue:[
- ^ self.
+ ^ self.
].
processItem processId:aProcess id.
@@ -3510,13 +3508,13 @@
running := (state == #run and:[aProcess == Processor interruptedProcess]).
stateColor := (state == #run)
- ifTrue:[ Color green darkened ]
- ifFalse:[
- (state == #debug or:[state == #stopped])
- ifTrue:[ Color red ]
- ifFalse:[ Color black ]].
-
- processItem processState:(state asString colorizeAllWith:stateColor).
+ ifTrue:[ Color green darkened ]
+ ifFalse:[
+ (state == #debug or:[state == #stopped])
+ ifTrue:[ Color red ]
+ ifFalse:[ Color black ]].
+
+ processItem processState:(state asString withColor:stateColor).
processItem processActive:(self getActiveStringFor:aProcess running:running).
"/ processItem processBlocked:(aProcess interruptsDisabled).
@@ -3528,23 +3526,23 @@
con := aProcess suspendedContext.
con isNil ifTrue:[
- aProcess == Processor activeProcess ifTrue:[
- con := thisContext
- ]
+ aProcess == Processor activeProcess ifTrue:[
+ con := thisContext
+ ]
].
showWhere value ifTrue:[
- processItem processWhere:(self getWhereStringFor:con running:running).
+ processItem processWhere:(self getWhereStringFor:con running:running).
].
processItem processCurrentSegment:(self getCurrentSegmentStringFor:con).
processItem processSwitch:(aProcess numberOfStackBoundaryHits).
showApplication value ifTrue:[
- processItem processApplication:(self getApplicationStringFor:aProcess)
+ processItem processApplication:(self getApplicationStringFor:aProcess)
].
showWindowTitle value ifTrue:[
- processItem processWindowTitle:(self getWindowTitleFor:aProcess)
+ processItem processWindowTitle:(self getWindowTitleFor:aProcess)
].
showInstrumentation value ifTrue:[
- processItem processInstrumentation:(self getInstrumentationStringFor:aProcess)
+ processItem processInstrumentation:(self getInstrumentationStringFor:aProcess)
].
"Modified: / 17-08-2011 / 11:04:32 / cg"
--- a/SettingsDialog.st Mon May 09 21:47:57 2016 +0200
+++ b/SettingsDialog.st Thu May 12 08:33:55 2016 +0200
@@ -1928,7 +1928,7 @@
applicationList root children do:[:c | c recursiveCollapse].
"/ now expand all matches
matchingTreeItems do:[:eachMatchingItem |
- eachMatchingItem label:(eachMatchingItem label string allBold colorizeAllWith:Color red).
+ eachMatchingItem label:(eachMatchingItem label string allBold withColor:Color red).
applicationList itemChanged:#redraw with:nil from:eachMatchingItem.
eachMatchingItem makeVisible
].
@@ -2324,8 +2324,7 @@
filename := self settingsFile.
"/ filename := filename asText
-"/ colorizeAllWith: Color blue;
-"/ actionForAll:[ self openSettingsFile: filename ].
+"/ asActionLinkTo:[ self openSettingsFile: filename ].
self settingsFilenameHolder value:filename.
!
--- a/SystemBrowser.st Mon May 09 21:47:57 2016 +0200
+++ b/SystemBrowser.st Thu May 12 08:33:55 2016 +0200
@@ -120,7 +120,7 @@
openInClass:aClass selector:aSelector
"launch a standard browser which immediately switches
- to aClass>>aSelector. Returns the browser"
+ to aClass » aSelector. Returns the browser"
|brwsr classesName|
@@ -5396,7 +5396,7 @@
parseRewriteExpression:aCodeString
onError: errAction.
].
-
+
"/ extract messages sent by the pattern
Error handle:[:ex |
self halt:'check this, please'.
@@ -5445,6 +5445,7 @@
matchesTree:searchTree
do:[:aNode :answer | foundMatch := true].
].
+ searcher computeQuickSearchStrings.
searchBlock := [:c :m :sel |
|isSTCCompiled allSelectorsInLiteralArray allMessagesSent
@@ -5464,7 +5465,7 @@
m makeRealMethod.
].
].
- "/ can speedup the search, by filtering for sent messages...
+ "/ can speedup the search, by quickly filtering for sent messages...
literalsInMethod := m literals.
allSelectorsInLiteralArray := sentMessages isEmptyOrNil or:[ literalsInMethod includesAll:sentMessages ].
allSelectorsInLiteralArray ifTrue:[
@@ -5499,8 +5500,11 @@
]
].
allStringsInLiteralArray ifTrue:[
- "/ the rest is done by the slower RB-match process...
- parseTree := RBParser
+ (searcher canQuicklyReject:src) ifTrue:[
+ "/ Transcript show:'qReject: '; showCR:m whoString.
+ ] ifFalse:[
+ "/ the rest is done by the slower RB-match process...
+ parseTree := RBParser
parseSearchMethod:src
onError: [:str :pos |
"/ self halt.
@@ -5509,9 +5513,10 @@
Transcript showCR:pos.
nil].
- parseTree notNil ifTrue:[
- searcher executeTree:parseTree.
- "/ notice: searcher sets foundMatch !!
+ parseTree notNil ifTrue:[
+ searcher executeTree:parseTree.
+ "/ notice: searcher sets foundMatch !!
+ ].
].
].
]
@@ -6961,18 +6966,22 @@
('*>>*' match:sel) ifTrue:[
sep := $>
] ifFalse:[
- ('* *' match:sel) ifTrue:[
- sep := Character space
- ]
+ ('*»*' match:sel) ifTrue:[
+ sep := $»
+ ] ifFalse:[
+ ('* *' match:sel) ifTrue:[
+ sep := Character space
+ ]
+ ].
].
sep notNil ifTrue:[
"
extract class/sel from selection
"
s := ReadStream on:sel.
- clsName := s upTo:sep.
+ clsName := (s upTo:sep) withoutSeparators.
[s peek == sep] whileTrue:[s next].
- sel := s upToEnd.
+ sel := (s upToEnd) withoutSeparators.
(clsName endsWith:' class') ifTrue:[
isMeta := true.
@@ -6993,11 +7002,16 @@
"given an arbitrary string, try to extract a useful selector.
Useful to open browser on a selected code fragment."
- |s sel sel2 t|
-
- aString isNil ifTrue:[^ nil].
-
- s := aString asString string withoutSeparators.
+ |s sel sel2 t idx|
+
+ aString isEmptyOrNil ifTrue:[^ nil].
+
+ (idx := aString indexOf:$») ~~ 0 ifTrue:[
+ s := (aString copyFrom:idx+1) withoutSeparators.
+ s isEmpty ifTrue:[^ nil].
+ ] ifFalse:[
+ s := aString asString string withoutSeparators.
+ ].
sel := s asSymbolIfInterned.
sel isNil ifTrue:[
sel := s.
@@ -7011,7 +7025,7 @@
t notNil ifTrue:[
sel := t
].
- (sel = s or:[sel isNil or:[t == #>>]]) ifTrue:[
+ (sel = s or:[sel isNil or:[t == #'>>']]) ifTrue:[
"oops - thats probably not what we want here ..."
self extractClassAndSelectorFrom:s into:[:c :s :m |
sel := s
@@ -7042,6 +7056,7 @@
self extractSelectorFrom:'self at:something put:someValue'
self extractSelectorFrom:'(self at:something put:someValue)'
self extractSelectorFrom:'[self at:something put:someValue] value'
+ self extractSelectorFrom:'Array » at:put:'
self extractSelectorFrom:'Array>>at:put:'
self extractSelectorFrom:'Array>>#at:put:'
self extractSelectorFrom:'Array>>#''at:put:'''
--- a/Tools__ChangeList.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__ChangeList.st Thu May 12 08:33:55 2016 +0200
@@ -1515,7 +1515,7 @@
label := (label copyTo: firstCR - 1) , '...'
].
].
- self removed ifTrue:[label := label asText colorizeAllWith: Color gray].
+ self removed ifTrue:[label := label withColor: Color gray].
^label
"Created: / 05-11-2008 / 08:20:02 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -1688,11 +1688,11 @@
!ChangeList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.37 2015-02-26 01:06:39 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.37 2015-02-26 01:06:39 cg Exp $'
+ ^ '$Header$'
!
version_HG
@@ -1701,6 +1701,6 @@
!
version_SVN
- ^ '$Id: Tools__ChangeList.st,v 1.37 2015-02-26 01:06:39 cg Exp $'
+ ^ '$Id$'
! !
--- a/Tools__ChangeSetDiffTool.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__ChangeSetDiffTool.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
Copyright (c) 2007-2010 Jan Vrany
Copyright (c) 2009-2010 eXept Software AG
@@ -184,7 +182,7 @@
!
versionNotPresentText
- ^ 'Not present' asText allItalic colorizeAllWith:Color gray lighter
+ ^ 'Not present' allItalic withColor:Color gray lighter
! !
!ChangeSetDiffTool class methodsFor:'image specs'!
@@ -2829,7 +2827,7 @@
Dialog warn: (self class resources at: 'Oops, class is gone')
]
] ifFalse:[
- Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool>>listMenuBrowse)'.
+ Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool » listMenuBrowse)'.
]
"Created: / 30-11-2011 / 11:30:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
--- a/Tools__CheckinInfoDialog.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__CheckinInfoDialog.st Thu May 12 08:33:55 2016 +0200
@@ -521,8 +521,7 @@
or:[ (dialog logMessage) withoutSeparators notEmptyOrNil ].
stopAsking ifFalse:[
warnMessage := (self resources string:'Please enter a description of your changes!!')
- asText
- colorizeAllWith:Color red.
+ withColor:Color red.
].
stopAsking
].
--- a/Tools__ClassCategoryList.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__ClassCategoryList.st Thu May 12 08:33:55 2016 +0200
@@ -931,19 +931,19 @@
numUndocumented > 0 ifTrue:[
rawCategoryList add:self class nameListEntryForUndocumented.
- categories add:((self class nameListEntryForUndocumentedWithCount bindWith:numUndocumented) allItalic colorizeAllWith:pseudoEntryColor).
+ categories add:((self class nameListEntryForUndocumentedWithCount bindWith:numUndocumented) allItalic withColor:pseudoEntryColor).
].
numUnloaded > 0 ifTrue:[
rawCategoryList add:self class nameListEntryForUnloaded.
- categories add:((self class nameListEntryForUnloadedWithCount bindWith:numUnloaded) allItalic colorizeAllWith:pseudoEntryColor).
+ categories add:((self class nameListEntryForUnloadedWithCount bindWith:numUnloaded) allItalic withColor:pseudoEntryColor).
].
(classesWithExtensions size > 0) ifTrue:[
rawCategoryList add:self class nameListEntryForExtendedClasses.
- categories add:((self class nameListEntryForExtendedClassesWithCount bindWith:(classesWithExtensions size)) allItalic colorizeAllWith:pseudoEntryColor).
+ categories add:((self class nameListEntryForExtendedClassesWithCount bindWith:(classesWithExtensions size)) allItalic withColor:pseudoEntryColor).
].
numClassesInChangeSet > 0 ifTrue:[
rawCategoryList addFirst:self class nameListEntryForChanged.
- categories addFirst:((self class nameListEntryForChangedWithCount bindWith:numClassesInChangeSet) allItalic colorizeAllWith:pseudoEntryColor).
+ categories addFirst:((self class nameListEntryForChangedWithCount bindWith:numClassesInChangeSet) allItalic withColor:pseudoEntryColor).
].
categories size > 0 ifTrue:[
@@ -951,7 +951,7 @@
self classCategoryLabelHolder value:(categories first)
].
rawCategoryList addFirst:self class nameListEntryForALL.
- categories addFirst:((self class nameListEntryForALLWithCount bindWith:(classes size)) allItalic colorizeAllWith:pseudoEntryColor).
+ categories addFirst:((self class nameListEntryForALLWithCount bindWith:(classes size)) allItalic withColor:pseudoEntryColor).
].
cookedCategoryList := categories.
@@ -1180,8 +1180,9 @@
]
].
showCounts ifTrue:[
- item := item , ((' (%1)' bindWith:numClasses)
- colorizeAllWith:pseudoEntryColor).
+ item := item ,
+ ((' (%1)' bindWith:numClasses)
+ withColor:pseudoEntryColor).
].
isInLocalChangeSet ifTrue:[
item := item , self class markForBeingInChangeList
--- a/Tools__ClassList.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__ClassList.st Thu May 12 08:33:55 2016 +0200
@@ -1574,7 +1574,7 @@
and:[cl ~~ (JavaVM systemClassLoader instVarNamed:#parent)]]])
ifTrue:[
clstring := ' [', cl displayString , ']'.
- nm := nm , (clstring asText colorizeAllWith: Color gray)
+ nm := nm , (clstring withColor: Color gray)
]
]
].
@@ -1992,7 +1992,7 @@
aClass isLoaded ifFalse:[
unloadedClassesColor notNil ifTrue:[
- nm := nm colorizeAllWith:unloadedClassesColor
+ nm := nm withColor:unloadedClassesColor
]
].
@@ -2007,7 +2007,7 @@
(instMethodCount notNil or:[ classMethodCount notNil ]) ifTrue:[
nm := nm,((' (%1+%2) ' bindWith:(instMethodCount ? '?') with:(classMethodCount ? '?'))
- colorizeAllWith:self class pseudoEntryForegroundColor).
+ withColor:self class pseudoEntryForegroundColor).
]
].
--- a/Tools__HierarchicalClassList.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__HierarchicalClassList.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2004 by eXept Software AG
All Rights Reserved
@@ -285,7 +283,7 @@
] ifTrue:[
aClass isAbstract ifTrue:[ nm := nm allItalic ].
nm := nm,((' (%1+%2) ' bindWith:(aClass methodDictionary size) with:(aClass class methodDictionary size))
- colorizeAllWith:self class pseudoEntryForegroundColor).
+ withColor:self class pseudoEntryForegroundColor).
].
indent := 0.
@@ -325,7 +323,7 @@
!HierarchicalClassList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__HierarchicalClassList.st,v 1.17 2015-03-25 14:14:00 cg Exp $'
+ ^ '$Header$'
! !
--- a/Tools__Inspector2.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__Inspector2.st Thu May 12 08:33:55 2016 +0200
@@ -1079,7 +1079,7 @@
clr := Color perform:eachItem choiceValue.
labelWithColor := lbl asText backgroundColorizeAllWith:clr.
clr brightness < 0.5 ifTrue:[
- labelWithColor := labelWithColor colorizeAllWith:Color white.
+ labelWithColor := labelWithColor withColor:Color white.
].
eachItem label:labelWithColor.
].
--- a/Tools__LintRuleDetail.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__LintRuleDetail.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
Copyright (c) 2009-2010 eXept Software AG
@@ -295,7 +293,7 @@
holder := BlockValue
with:[:h |
"/ h displayString , ' ' , (('[browse]' actionForAll:[ self browseLintRule]) colorizeAllWith:Color blue)
- (h ? '') displayString actionForAll:[ self browseLintRule ]
+ (h ? '') displayString asActionLinkTo:[ self browseLintRule ]
]
argument: self ruleHolder.
builder aspectAt:#ruleNameAspect put:holder.
--- a/Tools__MethodCategoryList.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__MethodCategoryList.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2000 by eXept Software AG
All Rights Reserved
@@ -1113,7 +1111,7 @@
requiredProtocolForClass do:[:sel |
|selectorInRed missingMethodPlaceHolder|
- selectorInRed := sel colorizeAllWith:Color red.
+ selectorInRed := sel withColor:Color red.
missingMethodPlaceHolder := MissingMethod mclass:aClass selector:sel.
whatToDo value:aClass value:'required' value:selectorInRed value:missingMethodPlaceHolder.
].
@@ -1593,7 +1591,7 @@
item := item , ((' (%1)' bindWith:(categoryBag occurrencesOf:cat))
- colorizeAllWith:pseudoEntryColor).
+ withColor:pseudoEntryColor).
needsSpecialColoring ifTrue:[
hasExtensions := itemsWithExtensions includes:cat.
@@ -1644,7 +1642,7 @@
] ifFalse:[
allName := nameListEntryForALL.
].
- categoryList addFirst:(allName allItalic colorizeAllWith:pseudoEntryColor).
+ categoryList addFirst:(allName allItalic withColor:pseudoEntryColor).
rawProtocolList addFirst:nameListEntryForALL.
].
].
@@ -1653,7 +1651,7 @@
addPseudoEntryWithColor := [:s :n :clr |
n > 0 ifTrue:[
categoryList
- add:((s bindWith:n) allItalic colorizeAllWith:clr).
+ add:((s bindWith:n) allItalic withColor:clr).
rawProtocolList add:s.
].
].
@@ -2185,7 +2183,7 @@
source
^ (SmalltalkCodeGeneratorTool basicNew
codeFor_shouldImplementFor:selector inClass:mclass)
- colorizeAllWith:Color red
+ withColor:Color red
"Modified: / 31-01-2011 / 18:29:17 / cg"
! !
@@ -2193,7 +2191,7 @@
!MethodCategoryList::MissingMethod methodsFor:'printing & storing'!
printStringForBrowserWithSelector:selector inClass:aClass
- ^ (selector,' (** missing required **)') colorizeAllWith:Color red
+ ^ (selector,' (** missing required **)') withColor:Color red
! !
!MethodCategoryList::MissingMethod methodsFor:'queries'!
@@ -2234,13 +2232,13 @@
source
^ (mclass compiledMethodAt:selector) source
- colorizeAllWith:Color grey
+ withColor:Color grey
! !
!MethodCategoryList::MethodStubForTestResult methodsFor:'printing & storing'!
printStringForBrowserWithSelector:selector inClass:aClass
- ^ (selector,' (** from ',self mclass name,' **)') colorizeAllWith:Color gray
+ ^ (selector,' (** from ',self mclass name,' **)') withColor:Color gray
! !
!MethodCategoryList class methodsFor:'documentation'!
--- a/Tools__MethodList.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__MethodList.st Thu May 12 08:33:55 2016 +0200
@@ -1651,7 +1651,7 @@
aMethod isNil ifTrue:[
"/ a non-existing (pseudo) method (such as required protocol)
- ^ selector colorizeAllWith:Color red.
+ ^ selector withColor:Color red.
].
showClassFirst ifTrue:[
@@ -1763,7 +1763,7 @@
(showCategory and:[aMethod mclass notNil and:[aMethod mclass supportsMethodCategories]]) ifTrue:[
cat := aMethod category.
cat notNil ifTrue:[
- s := s , ' {' , (cat "asText allItalic" colorizeAllWith:Color gray), '}'
+ s := s , ' {' , (cat "allItalic" withColor:Color gray), '}'
]
].
--- a/Tools__MethodRewriter.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__MethodRewriter.st Thu May 12 08:33:55 2016 +0200
@@ -942,41 +942,41 @@
rules
RBTransformationRule isNil ifTrue:[
- Smalltalk loadPackage:'stx:goodies/refactoryBrowser/lint'.
+ Smalltalk loadPackage:'stx:goodies/refactoryBrowser/lint'.
].
rules isNil ifTrue:[
- |knownRules separator1 separator2 separator3|
+ |knownRules separator1 separator2 separator3|
- "/ construct a pseudo list from existing transformation rules
- separator1 := '----------- search for:' asText colorizeAllWith:Color grey.
- separator2 := '----------- replace by:' asText colorizeAllWith:Color grey.
- separator3 := '\=================================================================================\' withCRs asText colorizeAllWith:Color grey.
+ "/ construct a pseudo list from existing transformation rules
+ separator1 := '----------- search for:' withColor:Color grey.
+ separator2 := '----------- replace by:' withColor:Color grey.
+ separator3 := '\=================================================================================\' withCRs withColor:Color grey.
- knownRules := OrderedCollection new.
- (RBTransformationRule allSubclasses asNewOrderedCollection sort:[:a :b | a basicNew name < b basicNew name])
- do:[:each |
- |rule |
+ knownRules := OrderedCollection new.
+ (RBTransformationRule allSubclasses asNewOrderedCollection sort:[:a :b | a basicNew name < b basicNew name])
+ do:[:each |
+ |rule |
- rule := each new.
- knownRules add:{ rule .
- (rule rewriteRule searches
- collectAll:[:each |
- {
- separator1.
- each searchString
- asText backgroundColorizeAllWith:(Color red lightened lightened lightened) .
- separator2.
- each replaceString asText
- asText backgroundColorizeAllWith:(Color green lightened lightened lightened) .
- separator3
- }
- ]
- ) asStringCollection asString.
- }
- ].
+ rule := each new.
+ knownRules add:{ rule .
+ (rule rewriteRule searches
+ collectAll:[:each |
+ {
+ separator1.
+ each searchString
+ asText backgroundColorizeAllWith:(Color red lightened lightened lightened) .
+ separator2.
+ each replaceString asText
+ asText backgroundColorizeAllWith:(Color green lightened lightened lightened) .
+ separator3
+ }
+ ]
+ ) asStringCollection asString.
+ }
+ ].
- rules := knownRules
+ rules := knownRules
].
^ rules
@@ -1711,3 +1711,4 @@
version_SVN
^ '$Id$'
! !
+
--- a/Tools__NavigatorCanvas.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__NavigatorCanvas.st Thu May 12 08:33:55 2016 +0200
@@ -627,6 +627,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -975,6 +979,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
(SubChannelInfoSpec
subAspect: variableDoubleClickChannel
@@ -1247,6 +1255,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -1610,6 +1622,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -2116,6 +2132,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -2693,6 +2713,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -3166,6 +3190,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -3565,6 +3593,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -4045,6 +4077,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -4918,6 +4954,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -5318,6 +5358,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -5783,6 +5827,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -6248,6 +6296,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -6640,6 +6692,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -7114,6 +7170,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -7499,6 +7559,6 @@
!NavigatorCanvas class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NavigatorCanvas.st,v 1.26 2015-02-27 00:02:09 cg Exp $'
+ ^ '$Header$'
! !
--- a/Tools__NavigatorModel.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__NavigatorModel.st Thu May 12 08:33:55 2016 +0200
@@ -110,7 +110,7 @@
mark := ' [SVN]'.
branch := repo workingCopy branchOrNil.
branch ifNotNil:[mark := ' [SVN: ', branch path,']'].
- ^mark asText colorizeAllWith: Color gray
+ ^mark withColor: Color gray
"Created: / 06-04-2010 / 11:23:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (comment): / 07-09-2011 / 10:43:00 / cg"
@@ -126,7 +126,7 @@
ifNotNil:
[' [SVN: ',branch,']'].
- ^mark asText colorizeAllWith: Color gray.
+ ^mark withColor: Color gray.
"Created: / 14-12-2010 / 15:56:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
--- a/Tools__NewSystemBrowser.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__NewSystemBrowser.st Thu May 12 08:33:55 2016 +0200
@@ -448,12 +448,16 @@
#hideBookmarkBar
'Hide the bookmark-bar. Show again via the "View"-menu'
+#infoLabelHelp
+'Display info on the just selected method, the clicked on code-fragment or the current activity'
+
#redoOperation
'Redo undone operation'
#undoOperation
'Undo operation'
+
).
(RefactoryChangeManager notNil and:[ RefactoryChangeManager isLoaded ]) ifTrue:[
@@ -1473,6 +1477,7 @@
translateLabel: true
labelChannel: infoLabelHolder
adjust: left
+ activeHelpKey: infoLabelHelp
)
(HorizontalPanelViewSpec
name: 'PackageInfoPanel'
@@ -1482,6 +1487,7 @@
horizontalSpace: 0
verticalSpace: 0
elementsChangeSize: true
+ activeHelpKey: packageInfoLabel
component:
(SpecCollection
collection: (
@@ -12669,6 +12675,11 @@
indication: sortVariablesByName
)
(MenuItem
+ label: 'Group by Inheritance'
+ hideMenuOnActivated: false
+ indication: groupVariablesByInheritance
+ )
+ (MenuItem
label: '-'
)
(MenuItem
@@ -18435,7 +18446,7 @@
cls := Smalltalk classNamed:nm.
cls isNil ifTrue:[
"/ class no longer exists (removed?)
- nm colorizeAllWith:(Color gray)
+ nm withColor:(Color gray)
] ifFalse:[
cls isJavaClass ifTrue:[
cls javaName
@@ -19703,7 +19714,8 @@
!
selectedMethodsClasses
- ^ (self selectedMethodsValue collect:[:m | m mclass] as:Set)
+ ^ (self selectedMethodsValue
+ collect:[:m | m mclass] as:Set)
select:[:each| each notNil]
"Created: / 07-08-2006 / 12:13:37 / cg"
@@ -19751,24 +19763,31 @@
!
selectorListGenerator1
+ "used for the sender-/implementor-chain's first methodlist"
+
^ self navigationState selectorListGeneratorArrayAt:1
!
selectorListGenerator2
+ "used for the sender-/implementor-chain's second methodlist"
+
^ self navigationState selectorListGeneratorArrayAt:2
!
selectorListGenerator3
+ "used for the sender-/implementor-chain's third methodlist"
+
^ self navigationState selectorListGeneratorArrayAt:3
!
selectorListGenerator4
+ "used for the sender-/implementor-chain's fourth methodlist"
+
^ self navigationState selectorListGeneratorArrayAt:4
!
selectorListGenerator5
-
- "Used for all methods generator of ClassList. "
+ "Used for all method's generator of ClassList. "
^ self navigationState selectorListGeneratorArrayAt:5
@@ -20391,6 +20410,10 @@
"Modified: / 31.10.2001 / 11:14:50 / cg"
!
+groupVariablesByInheritance
+ ^ builder valueAspectFor:#groupVariablesByInheritance initialValue:true
+!
+
hidePrivateClasses
^ self navigationState hidePrivateClasses
@@ -24939,7 +24962,9 @@
|changeSet spec|
spec := super flyByHelpSpec.
+
changeSet := ChangeSet current.
+ "/ (changeSet contains:[:chg | chg isMethodChange and:[chg changeClass notNil]]) ifTrue:[
(changeSet findLast:[:chg | chg isMethodChange and:[chg changeClass notNil]]) ~~ 0 ifTrue:[
spec at:#recentChanges put:(spec at:#recentlyChangedMethods).
] ifFalse:[
@@ -24954,10 +24979,23 @@
"Modified: / 08-09-2011 / 05:05:06 / cg"
!
-flyByHelpTextFor:aComponent
-"/ (aComponent == builder componentAt:) ifTrue:[
-"/ ].
- ^ super flyByHelpTextFor:aComponent
+flyByHelpTextFor:aWidget at:aPoint
+ |action info label|
+
+ aWidget = (navigationState canvas builder componentAt:'InfoLabel') ifTrue:[
+ action := aWidget actionAt:aPoint.
+ Transcript showCR:action.
+ info := action perform:#info ifNotUnderstood:nil.
+ info notNil ifTrue:[
+ ^ info value
+ ].
+ (label := aWidget label) notNil ifTrue:[
+ (label widthOn:aWidget) > aWidget width ifTrue:[
+ ^ label
+ ]
+ ]
+ ].
+ ^ nil
! !
!NewSystemBrowser methodsFor:'history'!
@@ -39384,16 +39422,16 @@
].
iconifiedOrNot := ''.
topView isCollapsed ifTrue:[
- iconifiedOrNot := ' iconified' colorizeAllWith:Color blue.
+ iconifiedOrNot := ' iconified' withColor:Color blue.
].
busyOrNot notEmptyOrNil ifTrue:[
- busyOrNot := busyOrNot allBold colorizeAllWith:Color red
+ busyOrNot := busyOrNot allBold withColor:Color red
].
winLabel := ' ("' , topLabel , '"',busyOrNot,iconifiedOrNot, ')'
].
] ifFalse:[
(aProcess isDebugged) ifTrue:[
- winLabel := ' (debug)' allBold colorizeAllWith:Color red
+ winLabel := ' (debug)' allBold withColor:Color red
].
].
aProcess id printString , ' [' , pName , ']' , winLabel
@@ -46653,7 +46691,7 @@
|method mclass mselector className mgr revisions previousMethods browser
lastSource currentSource lastRevision lastDate lastChange lastAuthor thisIsAnExtensionMethod
- packageId directory module|
+ packageId directory module currentVersion newestVersion|
method := self theSingleSelectedMethod.
method isNil ifTrue:[^ self].
@@ -46668,7 +46706,8 @@
set := set select:[:c | c isMethodChange].
lastChange := set first.
] value.
-
+ currentVersion := mclass revisionOfManager:manager.
+
thisIsAnExtensionMethod := (method isExtension).
thisIsAnExtensionMethod ifTrue:[
packageId := method package asPackageId.
@@ -46683,7 +46722,7 @@
module := packageId module.
self withWaitCursorDo:[
- |revisionLog start stop answer t tS list msg first|
+ |revisionLog numRevisions stop answer t tS list msg first|
thisIsAnExtensionMethod ifTrue:[
revisionLog := mgr
@@ -46699,8 +46738,7 @@
].
revisions := revisionLog at:#revisions.
- start := 1.
- stop := revisions size.
+ stop := numRevisions := revisions size.
stop > 20 ifTrue:[
thisIsAnExtensionMethod ifTrue:[
t := 500. "/ fake time
@@ -46714,6 +46752,7 @@
revSourceStream close.
].
].
+ newestVersion := revisions first at:#revision.
list := revisions collect:[:entry |
|rev author dateString date msg|
@@ -46728,21 +46767,19 @@
rev,' ',author,' ',dateString,' ',msg
].
msg := 'There are %1 revisions to extract from the repository'.
- t := (t * revisions size / 1000) rounded.
+ t := (t * numRevisions / 1000) rounded.
t < 10 ifTrue:[
msg := msg,'\(this will take a few seconds).'.
tS := t.
] ifFalse:[
- t := t * revisions size // 1000 // 10 * 10.
+ t := t * numRevisions // 1000 // 10 * 10.
tS := (TimeDuration fromSeconds:t) printStringForApproximation.
msg := msg,'\(this will take roughly %2).'
].
msg := msg,'\\Do you want to see all or only some of the revisions ?'.
answer := Dialog
- choose:(resources stringWithCRs:msg
- with:revisions size
- with:tS)
+ choose:(resources stringWithCRs:msg with:numRevisions with:tS)
fromList:list values:revisions initialSelection:nil
buttons:nil
values:nil
@@ -46751,16 +46788,17 @@
cancel:[^ self]
multiple:false
title:(resources string:'Confirmation')
- postBuildBlock:[:dialog |
- |b|
-
- b := Button label:(resources string:'Browse Newer than Selected').
- b action:[ stop := (dialog componentAt:#ListView) selection. dialog okPressed].
- b := dialog addButton:b before:dialog okButton.
-
- dialog okButton label:(resources string:'Browse All').
- dialog okButton action:[ stop := revisions size. dialog okPressed].
- ].
+ postBuildBlock:
+ [:dialog |
+ |b|
+
+ b := Button label:(resources string:'Browse Newer than Selected').
+ b action:[ stop := (dialog componentAt:#ListView) selection. dialog okPressed].
+ b := dialog addButton:b before:dialog okButton.
+
+ dialog okButton label:(resources string:'Browse All').
+ dialog okButton action:[ stop := revisions size. dialog okPressed].
+ ].
stop isNil ifTrue:[^ self ].
].
@@ -46768,11 +46806,15 @@
t := Time millisecondsToRun:[
previousMethods := ChangeSet new.
- lastSource := currentSource := method source.
+ currentSource := method source.
+ currentVersion = newestVersion ifTrue:[
+ lastSource := currentSource.
+ ].
lastRevision := lastDate := lastAuthor := nil.
first := true.
-
- revisions from:start to:stop do:[:eachLogEntry |
+self halt.
+ "/ revisions at:1 is now the newest (may be newer than current!!)
+ revisions from:1 to:stop do:[:eachLogEntry |
|revision date author revSourceStream|
revision := eachLogEntry at:#revision.
@@ -46782,7 +46824,7 @@
[
|chg nChg classChangeSet changeSource changeName|
- self activityNotification:('Fetching revision ',revision,'...').
+ self activityNotification:(resources string:'Fetching revision %1...' with:revision).
thisIsAnExtensionMethod ifTrue:[
revSourceStream := mgr
streamForClass:nil
@@ -46795,7 +46837,7 @@
revSourceStream := mgr getSourceStreamFor:mclass revision:revision.
].
revSourceStream isNil ifTrue:[
- self warn:'could not load source for ' , mclass name , ' revision ', revision, ' from repository'.
+ self warn:(resources string:'Could not load source for %1 revision %2 from repository' with:mclass name with:revision).
chg := nil.
] ifFalse:[
classChangeSet := ChangeSet fromStream:revSourceStream.
@@ -46803,8 +46845,14 @@
chg := classChangeSet
detect:[:chg | chg isMethodChange
and:[chg selector = mselector
- and:[chg className = className]]]
+ and:[chg fullClassName = className]]]
ifNone:nil.
+ chg isNil ifTrue:[
+ "/ maybe the class was renamed!!
+ (classChangeSet contains:[:chg | chg isMethodChange and:[chg selector = mselector]]) ifTrue:[
+ self halt:'check for renamed class'.
+ ]
+ ].
].
chg isNil ifTrue:[
@@ -46821,16 +46869,19 @@
nChg := lastChange asNamedMethodChange
].
lastRevision isNil ifTrue:[
+
(stop = revisions size) ifTrue:[
changeName := 'current (not in the repository)'.
] ifFalse:[
- "/ not showing all - dont really know
+ "/ not showing all - don't really know
changeName := 'current'.
].
] ifFalse:[
changeName := lastRevision,' [',lastDate,' by ',lastAuthor,']'.
first ifTrue:[
- changeName := changeName,' (= current)'.
+ (newestVersion compareAsVersionNumberWith:lastRevision) >= 0 ifTrue:[
+ changeName := changeName,' (= current)'.
+ ].
]
].
nChg notNil ifTrue:[
@@ -46854,7 +46905,7 @@
self activityNotification:nil.
browser := (UserPreferences current changeSetBrowserClass) openOn:previousMethods.
- browser window label:('Revisions of ' , mclass name , ' ' , mselector).
+ browser window label:(resources string:'Revisions of %1 %2' with:mclass name with:mselector).
browser readOnly:true.
].
@@ -52848,7 +52899,7 @@
(item notNil) ifTrue:[
manager notNil ifTrue:[
manager := managers anyOne.
- item label:(resources string:'Repository') , ' ' , (manager managerTypeName asText colorizeAllWith:Color gray).
+ item label:(resources string:'Repository') , ' ' , (manager managerTypeName withColor:Color gray).
] ifFalse:[
item label:(resources string:'Repository').
item enabled: false.
@@ -52859,7 +52910,7 @@
menu itemsDo:[:item|
manager notNil ifTrue:[
item argument == manager name ifTrue:[
- item label: (item label , ' ' , ((resources string: '(default)') asText colorizeAllWith: Color gray)).
+ item label: (item label , ' ' , ((resources string: '(default)') withColor: Color gray)).
]
] ifFalse:[
item enabled: false
@@ -53961,10 +54012,10 @@
with:aMatchString allBold
with:implementors size
with:classesMatchingCaseless size)
- fromList:({'Implementors:' colorizeAllWith:Color gray}
+ fromList:({'Implementors:' withColor:Color gray}
,(implementors collect:[:m | m mclass name])
,'-'
- ,{'Classes:' colorizeAllWith:Color gray}
+ ,{'Classes:' withColor:Color gray}
,classesMatchingCaseless)
values:(#(nil),implementors,#(nil nil),classesMatchingCaseless)
buttons:#('No, Search for a Class' 'Show all Implementors')
@@ -56045,7 +56096,7 @@
stringWithCRs:label,extraStringMsg
with:((string ? '')
allBold
- colorizeAllWith:Color red darkened).
+ withColor:Color red darkened).
question := question , (resources string:' - none found.').
((selector == #findImplementors:in:ignoreCase:match:)
@@ -56125,6 +56176,7 @@
newBrowser methodListApp autoUpdateOnChange: false.
].
].
+ Transcript show:'search time: '; showCR:t.
^ newBrowser.
].
].
@@ -58434,9 +58486,9 @@
method isInstrumented ifTrue:[
msg isEmpty ifTrue:[
- msg := 'Instrumented.' colorizeAllWith:(Color green darkened).
- ] ifFalse:[
- msg := ('Instrumented.' colorizeAllWith:(Color green darkened)),' ',msg.
+ msg := 'Instrumented.' withColor:(Color green darkened).
+ ] ifFalse:[
+ msg := ('Instrumented.' withColor:(Color green darkened)),' ',msg.
].
self showCoverageInformation value ifFalse:[
msg := msg , ' (coverage display is turned off - see "view"-menu)'
@@ -59056,7 +59108,7 @@
"/ Transcript topView raiseDeiconified.
"/ Transcript showCR:'ParseError: ', ex description.
"/ self halt.
- self showInfo:(errMsg colorizeAllWith:Color red).
+ self showInfo:(errMsg withColor:Color red).
self navigationState showingParseError:true.
newCode := nil.
] do:[
--- a/Tools__OrganizerCanvas.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__OrganizerCanvas.st Thu May 12 08:33:55 2016 +0200
@@ -34,7 +34,8 @@
sortVariablesByName showAllClassesInNameSpaceView
showMethodInheritance showMethodComplexity showMethodTypeIcon
methodVisibilityHolder showCoverageInformation
- sortByNameAndInheritance nameSpaceListWidgetVisibleHolder'
+ sortByNameAndInheritance nameSpaceListWidgetVisibleHolder
+ groupVariablesByInheritance'
classVariableNames:''
poolDictionaries:''
category:'Interface-Browsers-New'
@@ -630,6 +631,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
(SubChannelInfoSpec
subAspect: slaveMode
aspect: classListSlaveMode
@@ -1364,6 +1369,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
(SubChannelInfoSpec
subAspect: slaveMode
aspect: classListSlaveMode
@@ -2415,6 +2424,10 @@
subAspect: sortVariablesByName
aspect: sortVariablesByName
)
+ (SubChannelInfoSpec
+ subAspect: groupVariablesByInheritance
+ aspect: groupVariablesByInheritance
+ )
(SubChannelInfoSpec
subAspect: slaveMode
aspect: classListSlaveMode
@@ -3179,6 +3192,13 @@
"Created: / 24-02-2000 / 23:29:52 / cg"
!
+groupVariablesByInheritance
+ groupVariablesByInheritance isNil ifTrue:[
+ groupVariablesByInheritance := ValueHolder with:true.
+ ].
+ ^ groupVariablesByInheritance.
+!
+
hidePrivateClasses
hidePrivateClasses isNil ifTrue:[
hidePrivateClasses := ValueHolder with:false.
@@ -3662,54 +3682,36 @@
!OrganizerCanvas methodsFor:'aspects-exported'!
-classCategoryDoubleClickChannel:something
- "automatically generated by UIPainter ..."
-
- "This method is used when I am embedded as subApplication,"
- "and the mainApp wants to connect its aspects to mine."
-
- "/ classCategoryDoubleClickChannel removeDependent:self.
-
- classCategoryDoubleClickChannel := something.
-
- "/ something notNil ifTrue:[
- "/ something addDependent:self.
- "/ ].
- ^ self.
-
- "Created: / 18.8.2000 / 20:04:48 / cg"
-!
-
-classCategoryListMenuHolder:something
+classCategoryDoubleClickChannel:aValueHolder
"automatically generated by UIPainter ..."
"This method is used when I am embedded as subApplication,"
"and the mainApp wants to connect its aspects to mine."
- "/ classCategoryListMenuHolder removeDependent:self.
-
- classCategoryListMenuHolder := something.
- "/ something notNil ifTrue:[
- "/ something addDependent:self.
- "/ ].
- ^ self.
-
- "Created: / 18.2.2000 / 11:53:31 / cg"
+ classCategoryDoubleClickChannel := aValueHolder.
+
+ "Created: / 18.8.2000 / 20:04:48 / cg"
!
-classCategoryListUpdateTrigger:something
+classCategoryListMenuHolder:aValueHolder
"automatically generated by UIPainter ..."
"This method is used when I am embedded as subApplication,"
"and the mainApp wants to connect its aspects to mine."
- "/ classCategoryListUpdateTrigger removeDependent:self.
-
- classCategoryListUpdateTrigger := something.
-
- "/ something notNil ifTrue:[
- "/ something addDependent:self.
- "/ ].
+ classCategoryListMenuHolder := aValueHolder.
+
+ "Created: / 18.2.2000 / 11:53:31 / cg"
+!
+
+classCategoryListUpdateTrigger:aValueHolder
+ "automatically generated by UIPainter ..."
+
+ "This method is used when I am embedded as subApplication,"
+ "and the mainApp wants to connect its aspects to mine."
+
+ classCategoryListUpdateTrigger := aValueHolder.
+
^ self.
"Created: / 18.2.2000 / 02:08:01 / cg"
@@ -3874,6 +3876,15 @@
"Created: / 24.2.2000 / 23:46:16 / cg"
!
+groupVariablesByInheritance:aValueHolder
+ "automatically generated by UIPainter ..."
+
+ "This method is used when I am embedded as subApplication,"
+ "and the mainApp wants to connect its aspects to mine."
+
+ groupVariablesByInheritance := aValueHolder.
+!
+
hidePrivateClasses:something
"automatically generated by UIPainter ..."
@@ -4276,31 +4287,22 @@
"Created: / 04-07-2011 / 18:42:01 / cg"
!
-sortVariablesByName:something
+sortVariablesByName:aValueHolder
"automatically generated by UIPainter ..."
"This method is used when I am embedded as subApplication,"
"and the mainApp wants to connect its aspects to mine."
- sortVariablesByName := something.
+ sortVariablesByName := aValueHolder.
!
-variableDoubleClickChannel:something
+variableDoubleClickChannel:aValueHolder
"automatically generated by UIPainter ..."
"This method is used when I am embedded as subApplication,"
"and the mainApp wants to connect its aspects to mine."
- "/ |holder|
-
- "/ (holder := builder bindingAt:#variableDoubleClickChannel) notNil ifTrue:[
- "/ holder removeDependent:self.
- "/ ].
- builder aspectAt:#variableDoubleClickChannel put:something.
- "/ something notNil ifTrue:[
- "/ something addDependent:self.
- "/ ].
- ^ self.
+ builder aspectAt:#variableDoubleClickChannel put:aValueHolder.
!
variableFilter:something
--- a/Tools__ProjectLoader.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__ProjectLoader.st Thu May 12 08:33:55 2016 +0200
@@ -413,7 +413,7 @@
origin := prj second first.
'%1 %2'
bindWith:prj first
- with:(('(%1)' bindWith:origin) colorizeAllWith:Color gray)
+ with:(('(%1)' bindWith:origin) withColor:Color gray)
])
"Created: / 22-11-2008 / 09:52:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -445,15 +445,15 @@
!ProjectLoader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ProjectLoader.st,v 1.10 2014-07-08 21:38:38 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ProjectLoader.st,v 1.10 2014-07-08 21:38:38 cg Exp $'
+ ^ '$Header$'
!
version_SVN
- ^ '$Id: Tools__ProjectLoader.st,v 1.10 2014-07-08 21:38:38 cg Exp $'
+ ^ '$Id$'
! !
--- a/Tools__TagList.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__TagList.st Thu May 12 08:33:55 2016 +0200
@@ -3413,7 +3413,7 @@
rest isEmpty ifTrue:[^ nil].
(rest conform:[:ch | ch == $;]) ifTrue:[^ nil].
^ Tag::TDocumentation
- label:(rest colorizeAllWith:(Color blue "grey"))
+ label:(rest withColor:(Color blue "grey"))
pattern:nil
type:nil
lineNumber:lineNr.
--- a/Tools__TagsBrowser.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__TagsBrowser.st Thu May 12 08:33:55 2016 +0200
@@ -2845,7 +2845,7 @@
lineNrString := ' [ %1 ]' bindWith:item lineNumber.
inSelection ifFalse:[
- lineNrString := lineNrString colorizeAllWith:Color darkGray.
+ lineNrString := lineNrString withColor:Color darkGray.
].
label := label asText , lineNrString.
--- a/Tools__TestRunner2.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__TestRunner2.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
Copyright (c) 2009-2010 eXept Software AG
@@ -1943,7 +1941,7 @@
^nm
].
aClass isAbstract ifTrue:[
- nm := (nm,' ') allItalic colorizeAllWith:Color gray
+ nm := (nm,' ') allItalic withColor:Color gray
].
^nm
@@ -2247,9 +2245,9 @@
"/ please change as required (and remove this comment)
- PassedText := ' [passed]' asText colorizeAllWith: Tools::TestRunner2 passedColor darker.
- FailedText := ' [','failed' allBold,']' asText colorizeAllWith: Tools::TestRunner2 failedColor "darker".
- ErrorText := ' [','error' allBold,']' asText colorizeAllWith: Tools::TestRunner2 errorColor "darker".
+ PassedText := ' [passed]' withColor: Tools::TestRunner2 passedColor darker.
+ FailedText := ' [','failed' allBold,']' withColor: Tools::TestRunner2 failedColor "darker".
+ ErrorText := ' [','error' allBold,']' withColor: Tools::TestRunner2 errorColor "darker".
"Modified: / 07-02-2010 / 15:06:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
--- a/Tools__TextMergeInfo.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__TextMergeInfo.st Thu May 12 08:33:55 2016 +0200
@@ -47,14 +47,14 @@
conflictLineText
- ^ '<conflict>' asText allBold colorizeAllWith: Color red.
+ ^ '<conflict>' allBold withColor: Color red.
"Created: / 03-04-2012 / 23:26:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
noSourceLineText
- ^'<no source line>' asText colorizeAllWith: Color red.
+ ^'<no source line>' withColor: Color red.
"Created: / 03-04-2012 / 23:26:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
@@ -458,10 +458,10 @@
!TextMergeInfo class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TextMergeInfo.st,v 1.1 2014-02-05 18:57:16 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TextMergeInfo.st,v 1.1 2014-02-05 18:57:16 cg Exp $'
+ ^ '$Header$'
! !
--- a/Tools__VariableList.st Mon May 09 21:47:57 2016 +0200
+++ b/Tools__VariableList.st Thu May 12 08:33:55 2016 +0200
@@ -14,8 +14,9 @@
"{ NameSpace: Tools }"
BrowserList subclass:#VariableList
- instanceVariableNames:'variableList classHolder showClassVars sortVariablesByName
- selectedVariableEntries showWarningAboutMissingEntryInXmlSpec'
+ instanceVariableNames:'classHolder groupVariablesByInheritance selectedVariableEntries
+ showClassVars showWarningAboutMissingEntryInXmlSpec
+ sortVariablesByName variableList'
classVariableNames:''
poolDictionaries:''
category:'Interface-Browsers-New'
@@ -23,7 +24,7 @@
Object subclass:#VariableEntry
instanceVariableNames:'label application class name type icon sortingByNameHolder
- classShown'
+ classShown groupByInheritanceHolder'
classVariableNames:''
poolDictionaries:''
privateIn:VariableList
@@ -131,6 +132,7 @@
#showClassVarsInVariableList
#slaveMode
#sortVariablesByName
+ #groupVariablesByInheritance
).
"Modified: / 24-02-2014 / 10:37:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -163,6 +165,32 @@
^ false.
!
+groupVariablesByInheritance
+ "/ groupVariablesByInheritance and sortVariablesByName form a 3-state value
+ "/ groupVariablesByInheritance sortVariablesByName
+ "/ T T - sort within each defining class
+ "/ T F - by inst-order grouped by defining class
+ "/ F T - show all of them in one big sorted list
+ "/ F F - useless - show all of them by inst-order
+ groupVariablesByInheritance isNil ifTrue:[
+ groupVariablesByInheritance := true asValue.
+ groupVariablesByInheritance addDependent:self
+ ].
+ ^ groupVariablesByInheritance
+!
+
+groupVariablesByInheritance:aValueHolder
+ "/ self assert:(aValueHolder value isBoolean).
+
+ groupVariablesByInheritance notNil ifTrue:[
+ groupVariablesByInheritance removeDependent:self
+ ].
+ groupVariablesByInheritance := aValueHolder.
+ groupVariablesByInheritance notNil ifTrue:[
+ groupVariablesByInheritance addDependent:self
+ ].
+!
+
selectedVariableEntries
<resource: #uiAspect>
@@ -211,9 +239,15 @@
!
sortVariablesByName
+ "/ groupVariablesByInheritance and sortVariablesByName form a 3-state value
+ "/ groupVariablesByInheritance sortVariablesByName
+ "/ T T - sort within each defining class
+ "/ T F - by inst-order grouped by defining class
+ "/ F T - show all of them in one big sorted list
+ "/ F F - useless - show all of them by inst-order
sortVariablesByName isNil ifTrue:[
- sortVariablesByName := false asValue.
- sortVariablesByName addDependent:self
+ sortVariablesByName := false asValue.
+ sortVariablesByName addDependent:self
].
^ sortVariablesByName
!
@@ -266,6 +300,10 @@
self invalidateList.
^ self.
].
+ changedObject == groupVariablesByInheritance ifTrue:[
+ self invalidateList.
+ ^ self.
+ ].
changedObject == environment ifTrue:[
(something == #projectOrganization) ifTrue:[^ self].
(something == #currentChangeSet) ifTrue:[^ self].
@@ -491,37 +529,17 @@
!
listEntryForClass: cls name:name
-
- " (showWarningAboutMissingEntryInXmlSpec not
- and:[Expecco::ExpeccoXMLDecoder notNil
- and:[cls canUnderstand: #xmlSpecFor:]]) ifTrue:
- [| hasSpecEntry |
- hasSpecEntry := false.
- (Expecco::ExpeccoXMLDecoder xmlSpecForObject:cls basicNew)
- do:[:spec|spec getter = name ifTrue:
- [
- hasSpecEntry := true]].
- showWarningAboutMissingEntryInXmlSpec := hasSpecEntry not]. "
-
- |entry|
-
- entry := VariableEntry application: self class: cls name: name.
- entry sortingByNameHolder:sortVariablesByName.
- ^ entry
-
- "Created: / 12-04-2011 / 15:41:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 12-04-2011 / 21:36:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ ^ self listEntryForClass: cls name:name info:nil
!
-listEntryForClass: cls name:name info: classInfo
-
- | nm entry |
+listEntryForClass: cls name:name info: classInfoOrNil
+ | entry |
- nm := name.
- entry := Tools::VariableList::VariableEntry application: self class: cls name: nm.
+ entry := Tools::VariableList::VariableEntry application: self class: cls name: name.
entry sortingByNameHolder:sortVariablesByName.
- classInfo notNil ifTrue:[
- entry type: (classInfo infoForInstvarOrNil: name).
+ entry groupByInheritanceHolder:groupVariablesByInheritance.
+ classInfoOrNil notNil ifTrue:[
+ entry type: (classInfoOrNil infoForInstvarOrNil: name).
].
^entry
@@ -532,7 +550,7 @@
listOfVariables
|nameList numClasses classes class commonSubclass showingClassVars
- sortByName classesAlreadyProcessed hasSmallSense smallSenseManager info |
+ sortByName groupByInheritance classesAlreadyProcessed hasSmallSense smallSenseManager info |
classHolder isNil ifTrue:[
"/ testing
@@ -547,7 +565,9 @@
showingClassVars := self showClassVarsInVariableList value == true.
sortByName := self sortVariablesByName value.
- "/ self assert:(sortByName isBoolean).
+ groupByInheritance := self groupVariablesByInheritance value.
+ self assert:(sortByName isBoolean).
+ self assert:(groupByInheritance isBoolean).
classes := classHolder value.
(numClasses := classes size) == 0 ifTrue:[^ #() ].
@@ -657,21 +677,23 @@
].
varNames := showingClassVars ifTrue:[ cls classVarNames ] ifFalse:[ cls instVarNames ].
classShown := (cls ~~ class). "/ only append the class in the shown name, if the var is inherited
-
+ sortByName ifTrue:[
+ varNames sort.
+ ].
varNames reversed do:[:varName|
|entry|
nameList addFirst: (entry := self listEntryForClass: cls name: varName info: info).
classShown ifFalse:[ entry classShown:classShown ].
].
- sortByName ifFalse:[
- nameList addFirst:(("'----- ' , "cls nameInBrowser" , ' -----'") asText colorizeAllWith: Color gray).
+ groupByInheritance ifTrue:[
+ nameList addFirst:(("'----- ' , "cls nameInBrowser" , ' -----'") withColor: Color gray).
]
].
].
].
].
- (numClasses > 1 or:[sortByName]) ifTrue:[
+ (numClasses > 1 or:[sortByName and:[groupByInheritance not]]) ifTrue:[
nameList := nameList asSortedCollection:[:a :b|a name < b name].
].
^ nameList
@@ -791,6 +813,11 @@
classShown := aBoolean.
!
+groupByInheritanceHolder:aValueHolder
+ "/ is there a need for a valueHolder?
+ groupByInheritanceHolder := aValueHolder.
+!
+
icon
icon isNil ifTrue:[
icon := application iconInBrowserForVariable: name in: class.
@@ -814,7 +841,7 @@
label isNil ifTrue:[
label := name.
type notNil ifTrue:[
- label := (label , ' ' , (type displayString colorizeAllWith: Color brown))
+ label := (label , ' ' , (type displayString withColor: Color brown))
] ifFalse:[
"/ Hack for Java classes to display field type
class theNonMetaclass isJavaClass ifTrue:[
@@ -824,7 +851,7 @@
label := label asText ,
' ' ,
(('< ' , (JavaMethod fieldTypeFromStream: (field descriptor readStream) in: class theNonMetaclass javaPackage) , ' >')
- asText colorizeAllWith: Color brown).
+ withColor: Color brown).
].
].
].
@@ -840,7 +867,7 @@
l := self label.
class notNil ifTrue:[
- ^ label,' (' ,(class nameWithoutPrefix colorizeAllWith: Color gray),')'
+ ^ label,' (' ,(class nameWithoutPrefix withColor: Color gray),')'
].
^label
!
@@ -853,8 +880,9 @@
name := aString.
!
-sortingByNameHolder:something
- sortingByNameHolder := something.
+sortingByNameHolder:aValueHolder
+ "/ is there a need for a valueHolder?
+ sortingByNameHolder := aValueHolder.
!
string
@@ -890,7 +918,7 @@
icn displayOn:aGC x:x + 1 y:y - icn height.
].
- shownLabel := ((classShown ? true) and:[sortingByNameHolder value])
+ shownLabel := ((classShown ? true) and:[sortingByNameHolder value and:[groupByInheritanceHolder value not]])
ifTrue:[ self labelWithClass ]
ifFalse: [ self label ].
--- a/VersionDiffBrowser.st Mon May 09 21:47:57 2016 +0200
+++ b/VersionDiffBrowser.st Thu May 12 08:33:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2000 by eXept Software AG
All Rights Reserved
@@ -2210,7 +2208,7 @@
].
].
changeClassName notEmptyOrNil ifTrue:[
- selectorString := ' >> ',selectorString
+ selectorString := ' » ',selectorString
]
].
@@ -2978,10 +2976,10 @@
!VersionDiffBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.126 2015-05-11 16:35:49 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.126 2015-05-11 16:35:49 cg Exp $'
+ ^ '$Header$'
! !
--- a/abbrev.stc Mon May 09 21:47:57 2016 +0200
+++ b/abbrev.stc Thu May 12 08:33:55 2016 +0200
@@ -105,6 +105,7 @@
AbstractFileFinderApplicationComponent AbstractFileFinderApplicationComponent stx:libtool 'Interface-Tools-File' 1
AbstractSourceCodeManagementSettingsAppl AbstractSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
BookmarkMenuBuilder BookmarkMenuBuilder stx:libtool 'Interface-Bookmarks' 0
+ChangeSetBrowser ChangeSetBrowser stx:libtool 'Interface-Browsers' 2
ClassInspectorView ClassInspectorView stx:libtool 'Interface-Inspector' 2
ContextInspectorView ContextInspectorView stx:libtool 'Interface-Inspector' 2
DictionaryInspectorView DictionaryInspectorView stx:libtool 'Interface-Inspector' 2
@@ -187,7 +188,6 @@
AbstractRevisionItem AbstractRevisionItem stx:libtool 'Interface-Browsers-Support' 0
AbstractVersionDiffBrowserItem AbstractVersionDiffBrowserItem stx:libtool 'Interface-Browsers-Support' 0
ApplicationBuilder ApplicationBuilder stx:libtool 'Interface-Tools' 8
-ChangeSetBrowser ChangeSetBrowser stx:libtool 'Interface-Browsers' 2
ClassItem ClassItem stx:libtool 'Interface-Browsers-Support' 0
ClassItemRoot ClassItemRoot stx:libtool 'Interface-Browsers-Support' 0
ClassItemRootForRevision ClassItemRootForRevision stx:libtool 'Interface-Browsers-Support' 0
--- a/bc.mak Mon May 09 21:47:57 2016 +0200
+++ b/bc.mak Thu May 12 08:33:55 2016 +0200
@@ -183,6 +183,7 @@
$(OUTDIR)AbstractFileFinderApplicationComponent.$(O) AbstractFileFinderApplicationComponent.$(C) AbstractFileFinderApplicationComponent.$(H): AbstractFileFinderApplicationComponent.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractFileApplicationNoteBookComponent.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
$(OUTDIR)AbstractSourceCodeManagementSettingsAppl.$(O) AbstractSourceCodeManagementSettingsAppl.$(C) AbstractSourceCodeManagementSettingsAppl.$(H): AbstractSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
$(OUTDIR)BookmarkMenuBuilder.$(O) BookmarkMenuBuilder.$(C) BookmarkMenuBuilder.$(H): BookmarkMenuBuilder.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\BookmarkVisitor.$(H) $(STCHDR)
+$(OUTDIR)ChangeSetBrowser.$(O) ChangeSetBrowser.$(C) ChangeSetBrowser.$(H): ChangeSetBrowser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\ChangesBrowser.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\StandardSystemView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(STCHDR)
$(OUTDIR)ClassInspectorView.$(O) ClassInspectorView.$(C) ClassInspectorView.$(H): ClassInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
$(OUTDIR)ContextInspectorView.$(O) ContextInspectorView.$(C) ContextInspectorView.$(H): ContextInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
$(OUTDIR)DictionaryInspectorView.$(O) DictionaryInspectorView.$(C) DictionaryInspectorView.$(H): DictionaryInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
--- a/libInit.cc Mon May 09 21:47:57 2016 +0200
+++ b/libInit.cc Thu May 12 08:33:55 2016 +0200
@@ -119,6 +119,7 @@
extern void _AbstractFileFinderApplicationComponent_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
extern void _AbstractSourceCodeManagementSettingsAppl_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
extern void _BookmarkMenuBuilder_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _ChangeSetBrowser_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
extern void _ClassInspectorView_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
extern void _ContextInspectorView_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
extern void _DictionaryInspectorView_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
@@ -314,6 +315,7 @@
_AbstractFileFinderApplicationComponent_Init(pass,__pRT__,snd);
_AbstractSourceCodeManagementSettingsAppl_Init(pass,__pRT__,snd);
_BookmarkMenuBuilder_Init(pass,__pRT__,snd);
+ _ChangeSetBrowser_Init(pass,__pRT__,snd);
_ClassInspectorView_Init(pass,__pRT__,snd);
_ContextInspectorView_Init(pass,__pRT__,snd);
_DictionaryInspectorView_Init(pass,__pRT__,snd);
--- a/libtool.rc Mon May 09 21:47:57 2016 +0200
+++ b/libtool.rc Thu May 12 08:33:55 2016 +0200
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 2012\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.5.0\0"
- VALUE "ProductDate", "Sun, 08 May 2016 17:31:24 GMT\0"
+ VALUE "ProductDate", "Tue, 10 May 2016 23:38:31 GMT\0"
END
END
--- a/resources/de.rs Mon May 09 21:47:57 2016 +0200
+++ b/resources/de.rs Thu May 12 08:33:55 2016 +0200
@@ -1799,6 +1799,13 @@
'Other packages\found along the package-path' 'Sonstige Pakete\gefunden im "package"-Pfad'
'searching %1...' 'durchsuche %1...'
'done searching other package folders' 'Suche nach weiteren Paketen beendet' 'durchsuche %1...'
+'Packages Automatically Loaded at Startup' 'Beim Start automatisch geladene Pakete'
+'Packages Loaded at Startup' 'Autom. geladene Pakete'
+'Autoloaded Packages' 'Zu ladende Pakete'
+'Package Path' 'Paketpfad'
+'Folders in Package Path' 'Ordner im Paketpfad'
+'Remove Selected' 'Ausgewählte austragen'
+'Available Packages' 'Bekannte Pakete'
'Page Format:' 'Seitenformat:'
'Page Source' 'Quelltext'
'Paint Demo' 'Malprogramm '
@@ -2668,6 +2675,7 @@
'Use Native File Dialogs (Experimental & Unfinished Feature)' 'Native Filedialoge verwenden (experimentell)'
'Use Native Widgets (Experimental & Unfinished Feature)' 'Native Widgets verwenden (experimentell)'
'Use New Layout' 'Neues Layout verwenden'
+'Use OS Language on Startup' 'Systemsprache verwenden'
'Use in-place Search in Browser Lists (experimental)' 'Schnellsuche innnerhalb der Browserliste (experimentell)'
'Use slower 2-pass compressing GC if > 0 and more memory is in use' 'Benutze langsamere 2-Phasen-Komprimierung, falls > 0 und mehr Speicher belegt ist'
'Use the Embedded Test Runner' 'Verwende den eingebetteten TestRunner'
--- a/stx_libtool.st Mon May 09 21:47:57 2016 +0200
+++ b/stx_libtool.st Thu May 12 08:33:55 2016 +0200
@@ -294,6 +294,7 @@
AbstractFileFinderApplicationComponent
AbstractSourceCodeManagementSettingsAppl
BookmarkMenuBuilder
+ ChangeSetBrowser
ClassInspectorView
ContextInspectorView
DictionaryInspectorView
@@ -376,7 +377,6 @@
(AbstractRevisionItem autoload)
(AbstractVersionDiffBrowserItem autoload)
(ApplicationBuilder autoload)
- (ChangeSetBrowser autoload)
(ClassItem autoload)
(ClassItemRoot autoload)
(ClassItemRootForRevision autoload)