--- a/.hgtags Thu Aug 15 12:42:38 2013 +0100
+++ b/.hgtags Tue Aug 20 00:07:44 2013 +0100
@@ -23,7 +23,6 @@
5aa270837e0ab5e0fa19d2c02d46c864cc41c859 expeccoNET_1_5_1rc1
62451ecb3d3bbf1f6067c931eda2cdb57aa67ead expeccoNET_1_7_0_0
6ae442626f2090b5275b777f1a9d09ef0e092628 rel3_4_1_2
-6dc16a41e74b5861cd01117dbb105c512ad69e5b expecco_2_5_1
6ea7ea821b44f30ae3737d4703af910788f4c854 rel3-1-2
8046120212f6e56f5142e2881d4d7a425527eae1 expecco_1_7_0b1
8046120212f6e56f5142e2881d4d7a425527eae1 expecco_1_7_0b2
@@ -49,6 +48,7 @@
b407d6ab29da8f079cbe8f9cd2430630786f720f expecco_1_7_1rc3
b407d6ab29da8f079cbe8f9cd2430630786f720f expecco_1_7_1rc4
b68ba5310493e1bf7956bb5e75309b4b5d33dd68 expecco_1_6_0
+c248680c1ebfc64d800897239758a5f96a509faf expecco_2_5_1
c6afed1e4bfa09e6c3b209679925ad74eb761af9 expecco_1_7_0rc8
c955fe2bbcb582ea2c89428707d2a181ecde2f92 stx_6_2_2
d42566f1a9ba30ece3b2ddea3ac312dfc6802e45 rel5_2_8
--- a/ChangesBrowser.st Thu Aug 15 12:42:38 2013 +0100
+++ b/ChangesBrowser.st Tue Aug 20 00:07:44 2013 +0100
@@ -4091,7 +4091,7 @@
aStream := EncodedStream stream:aStream encoder:decoder.
].
- aStream position1Based:(changePositions at:changeNr).
+ aStream position:(changePositions at:changeNr)-1.
^ aStream
! !
@@ -4288,7 +4288,7 @@
nChanges := self numberOfChanges.
1 to:nChanges do:[:index |
- inStream position1Based:(changePositions at:index).
+ inStream position:(changePositions at:index)-1.
sawExcla := inStream peekFor:excla.
chunk := inStream nextChunk.
@@ -5079,7 +5079,7 @@
aStream notNil ifTrue:[
excla := aStream class chunkSeparator.
numChanges to:1 by:-1 do:[:changeNr |
- aStream position1Based:(changePositions at:changeNr).
+ aStream position:(changePositions at:changeNr)-1.
sawExcla := aStream peekFor:excla.
chunk := aStream nextChunk.
sawExcla ifTrue:[
@@ -5141,7 +5141,7 @@
] ifFalse:[
CompressSnapshotInfo == true ifTrue:[
(chunk startsWith:snapshotPrefix) ifTrue:[
- str := chunk readStream position1Based:snapshotNameIndex.
+ str := chunk readStream position:snapshotNameIndex-1.
fileName := str upTo:(Character space).
"
kludge to allow use of match-check below
@@ -6138,7 +6138,7 @@
first := true.
[done] whileFalse:[
changeDelta := ' '.
- methodPos := inStream position1Based.
+ methodPos := inStream position + 1.
text := inStream nextChunk.
done := text isEmptyOrNil.
@@ -6522,7 +6522,7 @@
get a chunk (separated by excla)
"
inStream skipSeparators.
- chunkPosition := inStream position1Based.
+ chunkPosition := inStream position + 1.
sawExcla := inStream peekFor:excla.
chunkText := fullChunkText := inStream nextChunk.
@@ -6538,11 +6538,11 @@
!ChangesBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.446 2013-07-06 07:12:58 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.447 2013-08-10 11:12:05 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.446 2013-07-06 07:12:58 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.447 2013-08-10 11:12:05 stefan Exp $'
!
version_HG
--- a/DebugView.st Thu Aug 15 12:42:38 2013 +0100
+++ b/DebugView.st Tue Aug 20 00:07:44 2013 +0100
@@ -1346,12 +1346,10 @@
and Exception contexts, to present the context in which the error actually occured.
Just for your convenience :-)"
- |con found offset sel prev rcvr nMax idx|
+ |con found offset sel prev rcvr nMax idx methodHome method|
"/ Transcript showCR:aContextArray.
- '1' printCR.
-
nMax := aContextArray size.
nMax <= 1 ifTrue:[^ 1].
con := aContextArray at:1.
@@ -1508,14 +1506,15 @@
[
con notNil
- and:[ con methodHome notNil
- and:[ con methodHome method notNil
- and:[ con methodHome method shouldBeSkippedInDebuggersWalkBack ]]]
+ and:[ (methodHome := con methodHome) notNil
+ and:[ (method := methodHome method) notNil
+ and:[ method shouldBeSkippedInDebuggersWalkBack ]]]
] whileTrue:[
"/ Transcript showCR:con methodHome method.
offset := offset + 1.
con := aContextArray at:offset ifAbsent:nil.
].
+ methodHome := nil. "/ help GC
"
got it; move up, skipping all intermediate Signal and
@@ -8609,11 +8608,11 @@
!DebugView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.607 2013-08-01 22:03:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.608 2013-08-09 22:21:45 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.607 2013-08-01 22:03:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.608 2013-08-09 22:21:45 cg Exp $'
!
version_HG
@@ -8622,7 +8621,7 @@
!
version_SVN
- ^ '$Id: DebugView.st,v 1.607 2013-08-01 22:03:15 cg Exp $'
+ ^ '$Id: DebugView.st,v 1.608 2013-08-09 22:21:45 cg Exp $'
! !
--- a/MercurialSourceCodeManagementSettingsAppl.st Thu Aug 15 12:42:38 2013 +0100
+++ b/MercurialSourceCodeManagementSettingsAppl.st Tue Aug 20 00:07:44 2013 +0100
@@ -1076,7 +1076,8 @@
"/ prototypeList add:cvsRoot
"/ ].
- prototypeList add:('.' asFilename / 'hgRepository') name.
+ prototypeList add:(Filename currentDirectory / 'hgRepository') name.
+ prototypeList add:(Filename currentDirectory / '.hgRepository') name.
prototypeList add:(OperatingSystem getHomeDirectory asFilename / 'hgRepository') pathName.
prototypeList add:(OperatingSystem getHomeDirectory asFilename / '.smalltalk' / 'hgRepository') pathName.
prototypeList add:('https://inst.kilnhg.com/Repo/Foo/Bar/Baz').
@@ -1240,11 +1241,11 @@
!MercurialSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.24 2013-08-01 07:41:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.25 2013-08-11 09:58:59 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.24 2013-08-01 07:41:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.25 2013-08-11 09:58:59 cg Exp $'
!
version_HG
--- a/SyntaxHighlighter2.st Thu Aug 15 12:42:38 2013 +0100
+++ b/SyntaxHighlighter2.st Tue Aug 20 00:07:44 2013 +0100
@@ -65,6 +65,61 @@
!SyntaxHighlighter2 class methodsFor:'highlighting'!
+format:aString parsingWith:aBlock in:aClass elementsInto:elements
+ "common code for formatStatementList, formatExpression, ...
+ format (recolor) whatever is parsed in aBlock (within the context of a given class).
+ Return the text containing font changes and color information.
+ As a side effect, put syntax elements into the passed in elements container
+ (for element-highlighting in codeView2)"
+
+ |parser tree text endPos|
+
+ aString isNil ifTrue:[^ nil].
+
+ parser := self for:(ReadStream on:aString string) in:aClass.
+ parser elements: elements.
+ parser ignoreErrors:true.
+ parser ignoreWarnings:true.
+ parser sourceText:(text := aString string asText).
+ "/ use an array here - this can be changed much faster using #at:put:
+ text emphasisCollection:(Array new:aString size).
+
+ parser nextToken.
+ tree := aBlock value:parser.
+ "/ now, convert the emphasis-array to a runArray
+ text emphasisCollection:(text emphasis asRunArray).
+
+ tree == #Error ifTrue:[
+ "/ mhmh - which is better ...
+ "/ alternative1: color rest after error in red
+"/ text
+"/ emphasizeFrom:(parser sourceStream position)
+"/ to:text size
+"/ with:(#color->Color red).
+
+
+ "/ alternative2: take original emphasis for rest
+
+ endPos := parser sourceStream position + 1.
+ endPos >= text size ifTrue:[
+ ^ text
+ ].
+ ^ ((text copyTo:endPos) , (aString copyFrom:(endPos+1))).
+
+ "/ alternative3: no emphasis for rest.
+
+"/ ^ text "/ aString
+ ].
+ ^ text
+
+ "
+ self
+ formatStatementList:'(1 + 2) max:5. 1 + 2'
+ in:UndefinedObject
+ elementsInto:(OrderedCollection new).
+ "
+!
+
formatClassDefinition:aString in:aClass elementsInto: elements
"format (recolor) a class definition expression in a given class.
Return the text containing font changes and color information."
@@ -152,65 +207,67 @@
aString isNil ifTrue:[^ nil].
Error handle:[:ex |
- ex creator isHandled ifTrue:[
- ex reject.
- ].
- (self parseErrorSignal handles:ex) ifFalse:[
- "Parse error may happen when re-formatting incomplete code while editing"
- ('SyntaxHighlighter [info]: error during highlight: ' , ex description) infoPrintCR.
- "/ ex suspendedContext fullPrintAll.
- ].
- ^ aString
+ ex creator isHandled ifTrue:[
+ ex reject.
+ ].
+ (self parseErrorSignal handles:ex) ifFalse:[
+ "Parse error may happen when re-formatting incomplete code while editing"
+ ('SyntaxHighlighter [info]: error during highlight: ' , ex description) infoPrintCR.
+ "/ ex suspendedContext fullPrintAll.
+ ].
+ ^ aString
] do:[
- highlighter := self for:(ReadStream on:aString string) in:aClass.
- highlighter elements: elements.
- preferencesOrNil notNil ifTrue:[highlighter preferences:preferencesOrNil].
- "/ highlighter ignoreErrors:true.
- highlighter ignoreWarnings:true.
- highlighter sourceText:(text := aString string asText).
- "/ use an array here - this can be changed much faster using #at:put:
- text emphasisCollection:(Array new:aString size).
+ highlighter := self for:(ReadStream on:aString string) in:aClass.
+ highlighter elements: elements.
+ preferencesOrNil notNil ifTrue:[highlighter preferences:preferencesOrNil].
+ "/ highlighter ignoreErrors:true.
+ highlighter ignoreWarnings:true.
+ highlighter sourceText:(text := aString string asText).
+ "/ use an array here - this can be changed much faster using #at:put:
+ text emphasisCollection:(Array new:aString size).
- tree := highlighter parseMethod.
- "/ now, convert the emphasis-array to a runArray
- text emphasisCollection:(text emphasis asRunArray).
+ tree := highlighter parseMethod.
+ "/ now, convert the emphasis-array to a runArray
+ text emphasisCollection:(text emphasis asRunArray).
- tree == #Error ifTrue:[
- eColor := UserPreferences current errorColor.
- eColor notNil ifTrue:[
- "/ mhmh - which is better ...
- "/ alternative1: color rest after error in red
- text
- emphasizeFrom:(highlighter sourceStream position1Based)
- to:text size
- with:(#color->eColor).
- ] ifFalse:[
- "/ alternative2: take original emphasis for rest
+ tree == #Error ifTrue:[
+ eColor := UserPreferences current errorColor.
+ eColor notNil ifTrue:[
+ "/ mhmh - which is better ...
+ "/ alternative1: color rest after error in red
+ text
+ emphasizeFrom:(highlighter sourceStream position + 1)
+ to:text size
+ with:(#color->eColor).
+ ] ifFalse:[
+ "/ alternative2: take original emphasis for rest
- endPos := highlighter sourceStream position1Based.
- endPos >= text size ifTrue:[
- ^ Array with: text with: highlighter elements
- ].
- ^ ((text copyTo:endPos) , (aString copyFrom:(endPos+1)))
- ].
- "/ alternative3: no emphasis for rest.
- ].
- ^text
+ endPos := highlighter sourceStream position + 1.
+ endPos >= text size ifTrue:[
+ ^ Array with: text with: highlighter elements
+ ].
+ ^ ((text copyTo:endPos) , (aString copyFrom:(endPos+1)))
+ ].
+ "/ alternative3: no emphasis for rest.
+ ].
+ ^text
]
"
self
- formatMethod:'foo
+ formatMethod:'foo
^ self bar:''hello''.
' , (Character doubleQuote asString) , 'some comment' , (Character doubleQuote asString) , '
'
- in:UndefinedObject
+ in:UndefinedObject
"
"Modified: / 22-08-2006 / 13:32:04 / cg"
"Created: / 05-07-2011 / 10:39:21 / cg"
"Modified: / 28-05-2013 / 22:45:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
+!
+
+ !
!SyntaxHighlighter2 methodsFor:'accessing'!
@@ -555,6 +612,8 @@
"Created: / 16-02-2012 / 21:56:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+
+
expression
| node savedLastSelectorElement |
@@ -562,10 +621,10 @@
lastSelectorElement := nil.
node := super expression.
((node ~~ #Error) and:[node isMessage]) ifTrue:[
- [ lastSelectorElement notNil ] whileTrue:[
- lastSelectorElement node parent: node.
- lastSelectorElement := lastSelectorElement prev.
- ].
+ [ lastSelectorElement notNil ] whileTrue:[
+ lastSelectorElement node parent: node.
+ lastSelectorElement := lastSelectorElement prev.
+ ].
].
lastSelectorElement := savedLastSelectorElement.
^node
@@ -574,6 +633,8 @@
"Modified: / 16-02-2012 / 23:39:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+
+
unaryExpressionFor:receiverArg
"parse a unary-expression; return a node-tree, nil or #Error"
@@ -683,6 +744,8 @@
"Modified: / 16-02-2012 / 22:34:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+
+
markBadIdentifierFrom:pos1 to:pos2
super markBadIdentifierFrom:pos1 to:pos2
@@ -690,6 +753,8 @@
"Created: / 17-03-2012 / 19:02:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+
+
markLocalIdentifierFrom:pos1 to:pos2
| node el prevEl |
@@ -706,6 +771,8 @@
"Created: / 16-02-2012 / 22:36:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+
+
markSelector:selectorString from:pos1 to:pos2 receiverNode:aReceiverNode
| element selectorSymbol |
@@ -741,6 +808,8 @@
"Modified: / 19-04-2012 / 09:53:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+
+
markUnknownIdentifierFrom:pos1 to:pos2
ignoreBadIdentifier == true ifTrue:[ ^ self ].
@@ -749,12 +818,22 @@
"Created: / 31.3.1998 / 19:09:26 / cg"
"Modified: / 31.3.1998 / 19:10:30 / cg"
-! !
+!
+
+
+
+
+
+ !
!SyntaxHighlighter2 class methodsFor:'documentation'!
+version
+ ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.18 2013-08-10 11:10:24 stefan Exp $'
+!
+
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.15 2013-06-23 10:44:44 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.18 2013-08-10 11:10:24 stefan Exp $'
!
version_HG
@@ -763,5 +842,6 @@
!
version_SVN
- ^ '$Id: SyntaxHighlighter2.st,v 1.15 2013-06-23 10:44:44 cg Exp $'
+ ^ '$Id: SyntaxHighlighter2.st,v 1.18 2013-08-10 11:10:24 stefan Exp $'
! !
+
--- a/Tools__CodeView2.st Thu Aug 15 12:42:38 2013 +0100
+++ b/Tools__CodeView2.st Tue Aug 20 00:07:44 2013 +0100
@@ -1413,7 +1413,11 @@
"Created: / 06-07-2011 / 17:12:58 / jv"
"Modified: / 06-10-2011 / 14:13:44 / cg"
-! !
+!
+
+
+
+ !
!CodeView2 methodsFor:'diff mode'!
@@ -1507,7 +1511,7 @@
initializeGutterView
gutterView setCodeView:self.
- gutterView origin:(0.0 @ 0.0) corner:(gutterView preferredWidth @ 1.0).
+ gutterView origin:(0.0 @ 0.0) corner:(gutterView preferredWidth+1 @ 1.0).
showGutterChannel value ifTrue:[self addSubView: gutterView].
"Created: / 02-09-2009 / 21:35:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1520,10 +1524,10 @@
"/ only do it, if the services have not yet been defined by the user of this view
"/ (FileBrowser does not want Smalltalk-specific services)
servicesFromClient ifFalse:[
- serviceClasses := self defaultServices sort:[:a :b|a priority = b priority ifTrue:[a name < b name] ifFalse:[a priority > b priority]].
- serviceClasses do:[:cls|
- self registerService: cls new
- ].
+ serviceClasses := self defaultServices sort:[:a :b|a priority = b priority ifTrue:[a name < b name] ifFalse:[a priority > b priority]].
+ serviceClasses do:[:cls|
+ self registerService: cls new
+ ].
].
"Modified: / 22-07-2013 / 14:02:59 / cg"
@@ -2281,8 +2285,9 @@
((requiredW > width) or:[requiredW < (width * 3 // 4)]) ifTrue:[
"/ some hysteresis to avoid quick readjust again
- newWidth := (requiredW * 1.1) rounded.
+ newWidth := (requiredW "* 1.1") rounded.
self corner:(newWidth+1 @ 1.0).
+
[
textView removeDependent:self.
textViewScroller origin:(newWidth+1 @ 0.0) corner:(1.0 @ 1.0).
@@ -2581,7 +2586,7 @@
cleared ifFalse:[
self clearRectangleX:0 y:yBaseline - font ascent
- width: self width - 2
+ width: width - 2
height: font ascent + font descent.
].
@@ -2599,7 +2604,7 @@
self
displayString:lineString
- x:(self width - textW - 2 - self paddingRight - widthDiffInfo)
+ x:(width - textW - 2 - self paddingRight - widthDiffInfo)
y:yBaseline.
newFont
@@ -3013,6 +3018,8 @@
"Modified: / 17-03-2012 / 10:04:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+
+
redrawLines
|i pom|
@@ -3684,6 +3691,8 @@
!CodeView2::TextView methodsFor:'scrolling'!
+
+
basicScrollTo:anOrigin redraw:doRedraw
super scrollTo:anOrigin redraw:doRedraw
@@ -3692,6 +3701,8 @@
"Created: / 19-03-2012 / 17:01:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+
+
originChanged:delta
super originChanged:delta.
@@ -3701,6 +3712,8 @@
"Created: / 07-12-2009 / 21:50:49 / Jindra <a>"
!
+
+
scrollTo:anOrigin redraw:doRedraw
codeView scrollTo:anOrigin redraw:doRedraw in: self.
@@ -3709,7 +3722,9 @@
"Modified: / 06-04-2010 / 14:04:28 / Jakub <zelenja7@fel.cvut.cz>"
"Modified: / 17-03-2012 / 10:06:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 19-03-2012 / 17:05:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
+!
+
+ !
!CodeView2::TextView methodsFor:'undo & again'!
@@ -3732,11 +3747,11 @@
!CodeView2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.110 2013-07-23 12:14:21 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.111 2013-08-16 15:03:20 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.110 2013-07-23 12:14:21 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.111 2013-08-16 15:03:20 cg Exp $'
!
version_HG
@@ -3745,7 +3760,7 @@
!
version_SVN
- ^ '$Id: Tools__CodeView2.st,v 1.110 2013-07-23 12:14:21 cg Exp $'
+ ^ '$Id: Tools__CodeView2.st,v 1.111 2013-08-16 15:03:20 cg Exp $'
! !
--- a/Tools__NewSystemBrowser.st Thu Aug 15 12:42:38 2013 +0100
+++ b/Tools__NewSystemBrowser.st Tue Aug 20 00:07:44 2013 +0100
@@ -19007,8 +19007,6 @@
"Created: / 24.2.2000 / 23:28:06 / cg"
! !
-
-
!NewSystemBrowser methodsFor:'aspects-organization'!
categoryMenuVisible
@@ -22694,7 +22692,6 @@
^ UserPreferences current useSearchBarInBrowser or:[self codeView searchBarActionBlock notNil]
! !
-
!NewSystemBrowser methodsFor:'change & update'!
categorySelectionChanged
@@ -28762,14 +28759,21 @@
files := Set new.
self selectedClassesValue do:[:eachClass |
- resources := eachClass theNonMetaclass projectDefinitionClass classResources.
+ |defClass directory|
+
+ (defClass := eachClass theNonMetaclass projectDefinitionClass) notNil ifTrue:[
+ resources := defClass classResources.
+ ].
resources notNil ifTrue:[
resources := resources projectPack.
resources notNil ifTrue:[
filename := resources packsFileName.
files add:filename
]
- ].
+ ] ifFalse:[
+ directory := Smalltalk packageDirectoryForPackageId:(eachClass package).
+ files add:(directory asFilename / 'resources' / (Smalltalk language, '.rs')).
+ ]
].
files do:[:eachFile |
UserPreferences current fileBrowserClass
@@ -38088,7 +38092,6 @@
HTMLDocumentView openFullOnDocumentationFile:'TOP.html'
! !
-
!NewSystemBrowser methodsFor:'menu actions-inheritance'!
inheritanceMenuNavigateToClass
@@ -47520,7 +47523,6 @@
"Modified: / 28-02-2012 / 16:48:38 / cg"
! !
-
!NewSystemBrowser methodsFor:'menu actions-variables'!
browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll
@@ -50650,7 +50652,6 @@
"Modified: / 19-10-2011 / 16:48:31 / cg"
! !
-
!NewSystemBrowser methodsFor:'menus-dynamic-popup'!
categoryPopUpMenu
@@ -55147,7 +55148,6 @@
^ navigationState projectListApplication
! !
-
!NewSystemBrowser methodsFor:'private-history'!
lastSearchPatterns
@@ -58865,14 +58865,14 @@
compiler := JavaLanguage instance compilerClass.
compiler notNil ifTrue:[
- newClass := compiler compile: theCode register: true notifying: self.
- newClass isNil ifTrue:[ ^ false ].
- newClass isBehavior ifTrue:[
- navigationState realModifiedState:false.
- navigationState modified:false.
- self switchToClass:newClass.
- ].
- ^true.
+ newClass := compiler compile: theCode register: true notifying: self.
+ newClass isNil ifTrue:[ ^ false ].
+ newClass isBehavior ifTrue:[
+ navigationState realModifiedState:false.
+ navigationState modified:false.
+ self switchToClass:newClass.
+ ].
+ ^true.
].
self warn:'Accept of Java classes is not yet implemented'.
@@ -60530,11 +60530,11 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1956 2013-08-07 12:19:13 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1957 2013-08-18 11:04:25 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1956 2013-08-07 12:19:13 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1957 2013-08-18 11:04:25 cg Exp $'
!
version_HG
@@ -60543,7 +60543,7 @@
!
version_SVN
- ^ '$Id: Tools__NewSystemBrowser.st,v 1.1956 2013-08-07 12:19:13 stefan Exp $'
+ ^ '$Id: Tools__NewSystemBrowser.st,v 1.1957 2013-08-18 11:04:25 cg Exp $'
! !
--- a/Tools__TagList.st Thu Aug 15 12:42:38 2013 +0100
+++ b/Tools__TagList.st Tue Aug 20 00:07:44 2013 +0100
@@ -673,9 +673,9 @@
"Created: / 08-05-2011 / 10:11:39 / cg"
!
-filter:something
- (filter ? '') ~= (something ? '') ifTrue:[
- filter := something.
+filter:aStringOrNil
+ (filter ? '') ~= (aStringOrNil ? '') ifTrue:[
+ filter := aStringOrNil.
rawList notNil ifTrue:[
self updateContentsFromRawList
].
@@ -2223,7 +2223,7 @@
file className lineNumber tagClass fmtString fmt
showOnly|
-"/ Transcript showCR:aLine.
+ "/ Transcript showCR:aLine.
aLine size < 6 ifTrue:[
^ nil
].
@@ -3667,11 +3667,11 @@
!TagList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.29 2013-07-23 23:20:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.31 2013-08-16 15:04:37 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.29 2013-07-23 23:20:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.31 2013-08-16 15:04:37 cg Exp $'
!
version_HG
@@ -3680,6 +3680,6 @@
!
version_SVN
- ^ '$Id: Tools__TagList.st,v 1.29 2013-07-23 23:20:56 cg Exp $'
+ ^ '$Id: Tools__TagList.st,v 1.31 2013-08-16 15:04:37 cg Exp $'
! !
--- a/Tools__TagsBrowser.st Thu Aug 15 12:42:38 2013 +0100
+++ b/Tools__TagsBrowser.st Tue Aug 20 00:07:44 2013 +0100
@@ -22,7 +22,7 @@
!
SelectionInListModelView subclass:#TagView
- instanceVariableNames:'application process fileName tagLineNr filter'
+ instanceVariableNames:'application process fileName tagLineNr'
classVariableNames:'TypeInset'
poolDictionaries:''
privateIn:TagsBrowser
@@ -2402,7 +2402,6 @@
!
filter:aString
- filter := aString.
list filter:aString.
!
@@ -2549,7 +2548,7 @@
self enabled:false.
list add:nil.
list add:(Tag label:('Generating Tags ...' allBold) pattern:nil).
- list filter:filter.
+ "/ list filter:filter.
list sortedByName:(application sortIsByName value).
list
@@ -2630,11 +2629,11 @@
!TagsBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TagsBrowser.st,v 1.37 2013-08-07 07:25:07 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__TagsBrowser.st,v 1.38 2013-08-09 22:27:47 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__TagsBrowser.st,v 1.37 2013-08-07 07:25:07 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__TagsBrowser.st,v 1.38 2013-08-09 22:27:47 cg Exp $'
!
version_HG
@@ -2643,6 +2642,6 @@
!
version_SVN
- ^ '$Id: Tools__TagsBrowser.st,v 1.37 2013-08-07 07:25:07 cg Exp $'
+ ^ '$Id: Tools__TagsBrowser.st,v 1.38 2013-08-09 22:27:47 cg Exp $'
! !