--- a/AbstractFileBrowser.st Sat Aug 22 00:04:30 2015 +0100
+++ b/AbstractFileBrowser.st Mon Aug 24 10:07:46 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2002 by eXept Software AG
All Rights Reserved
@@ -9385,12 +9387,12 @@
!AbstractFileBrowser::DirectoryHistory methodsFor:'actions'!
addToHistory:aPath
- | item pathToAdd |
+ | item pathToAdd sep|
pathToAdd := aPath.
- (pathToAdd endsWith:(Filename separator)) ifTrue:[
+ (pathToAdd endsWith:(sep := Filename separator)) ifTrue:[
pathToAdd asFilename isRootDirectory ifFalse:[
- pathToAdd := pathToAdd copyButLast:(Filename separator asString size).
+ pathToAdd := pathToAdd copyButLast:(sep asString size).
]
].
@@ -9654,10 +9656,10 @@
!AbstractFileBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.592 2015-06-04 17:54:16 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.592 2015-06-04 17:54:16 cg Exp $'
+ ^ '$Header$'
! !
--- a/BrowserView.st Sat Aug 22 00:04:30 2015 +0100
+++ b/BrowserView.st Mon Aug 24 10:07:46 2015 +0100
@@ -5117,7 +5117,7 @@
clsName := words first.
(clsName endsWith:' class') ifTrue:[
isMeta := true.
- clsName := clsName copyButLast:6 "copyTo:(clsName size - 5)"
+ clsName := clsName copyButLast:6
] ifFalse:[
isMeta := false
].
@@ -7219,8 +7219,8 @@
].
].
- ((classString ~= 'Metaclass') and:[classString endsWith:' class']) ifTrue:[
- classString := classString copyButLast:6 "copyTo:(classString size - 5)".
+ (classString endsWith:' class') ifTrue:[
+ classString := classString copyButLast:6.
meta := true.
] ifFalse:[
meta := false.
@@ -12493,7 +12493,7 @@
(clsName endsWith:' class') ifTrue:[
isMeta := true.
- clsName := clsName copyButLast:6 "copyTo:(clsName size - 5)"
+ clsName := clsName copyButLast:6
] ifFalse:[
isMeta := false
].
@@ -14522,7 +14522,7 @@
!BrowserView class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.866 2015-03-25 14:20:09 cg Exp $'
+ ^ '$Header$'
! !
--- a/InspectorView.st Sat Aug 22 00:04:30 2015 +0100
+++ b/InspectorView.st Mon Aug 24 10:07:46 2015 +0100
@@ -2959,12 +2959,14 @@
names do:[:eachIdx |
|val|
- padLeft ifTrue:[
- s nextPutAll:(eachIdx printStringLeftPaddedTo:maxLen).
- ] ifFalse:[
- s nextPutAll:((eachIdx printString , ' ') paddedTo:maxLen+1 with:$.).
+ self isIndexShown ifTrue:[
+ padLeft ifTrue:[
+ s nextPutAll:(eachIdx printStringLeftPaddedTo:maxLen).
+ ] ifFalse:[
+ s nextPutAll:((eachIdx printString , ' ') paddedTo:maxLen+1 with:$.).
+ ].
+ s nextPutAll:' : '.
].
- s nextPutAll:' : '.
val := self indexedValueAtKey:eachIdx.
@@ -3841,6 +3843,10 @@
^ dereferenceValueHolders ? false
!
+isIndexShown
+ ^ true
+!
+
labelFor:anObject
"return the windowLabel to use in my topView, when inspecting anObject."
--- a/SetInspectorView.st Sat Aug 22 00:04:30 2015 +0100
+++ b/SetInspectorView.st Mon Aug 24 10:07:46 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 1996 by Claus Gittinger / eXept Software AG
All Rights Reserved
@@ -11,6 +13,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
InspectorView subclass:#SetInspectorView
instanceVariableNames:'keys'
classVariableNames:''
@@ -79,10 +83,10 @@
!SetInspectorView methodsFor:'private'!
baseInspectedObjectClass
- (inspectedObject class inheritsFrom:Set) ifFalse:[
- ^ Object
+ (inspectedObject class inheritsFrom:Set) ifTrue:[
+ ^ Set
].
- ^ Set
+ ^ Object
!
defaultLabel
@@ -132,12 +136,7 @@
Set hasMore to true, if a '...' entry should be added."
keys := self indexList.
- ^ keys collect:[:k | k isSymbol ifTrue:[
- k printString
- ] ifFalse:[
- k displayString
- ]
- ].
+ ^ keys collect:[:k | k displayString].
!
numIndexedFields
@@ -154,6 +153,12 @@
!
showAllIndexedVarsInFieldList
+ ^ true
+! !
+
+!SetInspectorView methodsFor:'queries'!
+
+isIndexShown
^ false
! !
@@ -186,7 +191,7 @@
!
indexedValueAtKey:idx
- ^ keys at:idx
+ ^ idx
!
valueAtLine:lineNr put:newValue
@@ -211,7 +216,7 @@
!SetInspectorView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/SetInspectorView.st,v 1.27 2013-06-04 13:02:54 cg Exp $'
+ ^ '$Header$'
!
version_HG
--- a/Tools__CodeHighlightingService.st Sat Aug 22 00:04:30 2015 +0100
+++ b/Tools__CodeHighlightingService.st Mon Aug 24 10:07:46 2015 +0100
@@ -218,7 +218,7 @@
"textView" modified ifFalse:[
oldCodeList isNil ifFalse:[
- oldCode := oldCodeList asStringWithoutEmphasis.
+ oldCode := oldCodeList asStringCollection asStringWithoutEmphasis.
"textView" modified ifFalse:[
Screen currentScreenQuerySignal answer:codeView device
do:[
--- a/Tools__InlineMessageDialog.st Sat Aug 22 00:04:30 2015 +0100
+++ b/Tools__InlineMessageDialog.st Mon Aug 24 10:07:46 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
Copyright (c) 2007-2010 Jan Vrany, SWING Research Group, Czech Technical University in Prague
Copyright (c) 2009-2010 eXept Software AG
@@ -543,7 +545,7 @@
"Removes all components except subcanvas"
panelViewComponents := nil.
panelView notNil ifTrue:[
- panelView subViews copyWithoutFirst do:[:component|
+ panelView subViews allButFirst do:[:component|
component destroy
]
--- a/extensions.st Sat Aug 22 00:04:30 2015 +0100
+++ b/extensions.st Mon Aug 24 10:07:46 2015 +0100
@@ -1971,6 +1971,14 @@
"Created: / 05-08-2014 / 16:01:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!SocketAddress methodsFor:'printing & storing'!
+
+inspectorValueStringInListFor:anInspector
+ "returns a string to be shown in the inspector's list"
+
+ ^ self printString
+! !
+
!StandaloneStartup class methodsFor:'misc ui support'!
iconInBrowserSymbol
--- a/stx_libtool.st Sat Aug 22 00:04:30 2015 +0100
+++ b/stx_libtool.st Mon Aug 24 10:07:46 2015 +0100
@@ -597,6 +597,7 @@
Object inspectorClass
'Date class' iconInBrowserSymbol
SmallInteger inspectorExtraAttributes
+ SocketAddress inspectorValueStringInListFor:
)
! !