--- a/BrowserView.st Mon Sep 19 08:48:45 2016 +0100
+++ b/BrowserView.st Wed Sep 28 07:09:57 2016 +0200
@@ -12218,7 +12218,7 @@
classes := IdentitySet new.
"/ first, collect the list of classes to consider
- "/ thats all classes which are in the selected NameSpaces,
+ "/ that's all classes which are in the selected NameSpaces,
"/ or private ones, owned by a class which is
"/ also all of its superclasses are added.
@@ -13594,7 +13594,7 @@
].
"/ stop when keyboard input arrives ...
-"/ cg: commented - thats done when text is modified ...
+"/ cg: commented - that's done when text is modified ...
"/ (sensor hasUserEvents) ifTrue:[
"/ (sensor hasKeyPressEventFor:nil) ifTrue:[
"/ (anyChange and:[cursorWasOn]) ifTrue:[codeView showCursor].
--- a/DebugView.st Mon Sep 19 08:48:45 2016 +0100
+++ b/DebugView.st Wed Sep 28 07:09:57 2016 +0200
@@ -2011,8 +2011,7 @@
].
thisContext isRecursive ifTrue:[
"/ care for the special case, were the Debugger was autoloaded.
- "/ in this case, thisContext IS recursive, but thats no error
- "/ condition.
+ "/ in this case, thisContext IS recursive, but that's no error condition.
foundNoByteCodeContext := false.
foundExitContext := false.
--- a/DirectoryContentsBrowser.st Mon Sep 19 08:48:45 2016 +0100
+++ b/DirectoryContentsBrowser.st Wed Sep 28 07:09:57 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2002 by eXept Software AG
All Rights Reserved
@@ -1535,6 +1537,17 @@
^ self.
].
changedObject == self selectionInFileList ifTrue:[
+ (changedObject value ? #()) do:[:eachSelectedItem |
+ (eachSelectedItem modificationTime notNil
+ and:[ eachSelectedItem fileName notNil
+ and:[ eachSelectedItem fileName modificationTime > eachSelectedItem modificationTime ]]
+ ) ifTrue:[
+ "/ the file was modified in the meantime.
+ "/ flush its info.
+ eachSelectedItem resetItem
+ ].
+ ].
+
self updateToExternFileHolderLock doIfUnLocked:[
self updateContentsSelection doLocked:[
self selectionChanged.
@@ -3213,7 +3226,7 @@
!
resetItem
- " dont know what someone else is doing with the file - read all item properties new "
+ " don't know what someone else is doing with the file - read all item properties new "
fileInfo := nil.
icon := nil.
--- a/FileApplicationNoteBook.st Mon Sep 19 08:48:45 2016 +0100
+++ b/FileApplicationNoteBook.st Wed Sep 28 07:09:57 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2002 by eXept Software AG
All Rights Reserved
@@ -1110,7 +1108,7 @@
| listOfEdits indexOfLastSel list |
sel := changedObject value.
- "/ dont want the tabs with one application - thats why i have to change my tablist
+ "/ dont want the tabs with one application - that's why i have to change my tablist
"/ sel goes to if - i want select the last selection
sel = 0 ifTrue:[
^ self.
@@ -6679,7 +6677,7 @@
aWidget modifiedChannel:self viewModifiedChannel.
editView externalEncoding:self fileEncoding.
- "/ editView characterEncoding:'unicode'. - thats the default anyway
+ "/ editView characterEncoding:'unicode'. - that's the default anyway
"Modified: / 06-10-2011 / 11:43:40 / cg"
"Modified (comment): / 03-12-2011 / 10:27:47 / cg"
--- a/FilenameEditFieldV2.st Mon Sep 19 08:48:45 2016 +0100
+++ b/FilenameEditFieldV2.st Wed Sep 28 07:09:57 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2002 by eXept Software AG
All Rights Reserved
@@ -11,6 +13,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
ComboBoxView subclass:#FilenameEditFieldV2
instanceVariableNames:'directoriesOnly filesOnly directory acceptOnExpand activeMenu
completitionList'
@@ -122,8 +126,8 @@
!
initialText:aString selected:aBoolean
- "move the cursor to the end - thats the most interesting part of
- a filename
+ "redefined to move the cursor to the end
+ - that's the most interesting part of a filename
"
super initialText:aString selected:aBoolean.
@@ -204,7 +208,8 @@
!
realize
- "move the cursor to the end - thats the most interesting part of a filename
+ "redefined to move the cursor to the end
+ - that's the most interesting part of a filename
"
super realize.
self editor cursorToEndOfLine.
@@ -277,6 +282,6 @@
!FilenameEditFieldV2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FilenameEditFieldV2.st,v 1.15 2014-02-18 14:39:34 stefan Exp $'
+ ^ '$Header$'
! !
--- a/SystemBrowser.st Mon Sep 19 08:48:45 2016 +0100
+++ b/SystemBrowser.st Wed Sep 28 07:09:57 2016 +0200
@@ -7150,7 +7150,7 @@
sel := t
].
(sel = s or:[sel isNil or:[t == #'>>']]) ifTrue:[
- "oops - thats probably not what we want here ..."
+ "oops - that's probably not what we want here ..."
self extractClassAndSelectorFrom:s into:[:c :s :m |
sel := s
]
--- a/Tools__ChangeSetBrowser2.st Mon Sep 19 08:48:45 2016 +0100
+++ b/Tools__ChangeSetBrowser2.st Wed Sep 28 07:09:57 2016 +0200
@@ -3158,8 +3158,7 @@
].
changesetFile := newFile.
"/ ] on: Error do:
-"/ [:ex|Dialog warn: 'Erorr saving changes: ' , ex description]
-
+"/ [:ex|Dialog warn: 'Error saving changes: ' , ex description]
!
doScrollToBottom
@@ -4300,11 +4299,11 @@
!ChangeSetBrowser2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.70 2015-05-23 12:47:15 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.70 2015-05-23 12:47:15 cg Exp $'
+ ^ '$Header$'
!
version_HG
@@ -4313,6 +4312,6 @@
!
version_SVN
- ^ '$Id: Tools__ChangeSetBrowser2.st,v 1.70 2015-05-23 12:47:15 cg Exp $'
+ ^ '$Id$'
! !
--- a/Tools__ClassList.st Mon Sep 19 08:48:45 2016 +0100
+++ b/Tools__ClassList.st Wed Sep 28 07:09:57 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2004 by eXept Software AG
All Rights Reserved
@@ -812,20 +814,20 @@
selected := self getSelectedClassesFromIndices.
(selected = lastSelectedClasses and:[selected size == 1])
ifTrue:[
- "/ thats a kludge - we want to turn off the protocol selection,
- "/ when a class is reselected.
+ "/ that's a kludge - we want to turn off the protocol selection,
+ "/ when a class is reselected.
- masterApplication notNil ifTrue:[
- master := masterApplication.
- masterApplication masterApplication notNil ifTrue:[
- master := masterApplication masterApplication.
- ].
- (master respondsTo:#classReselected) ifTrue:[
- master classReselected.
- ].
- ]
+ masterApplication notNil ifTrue:[
+ master := masterApplication.
+ masterApplication masterApplication notNil ifTrue:[
+ master := masterApplication masterApplication.
+ ].
+ (master respondsTo:#classReselected) ifTrue:[
+ master classReselected.
+ ].
+ ]
] ifFalse:[
- lastSelectedClasses := selected copy.
+ lastSelectedClasses := selected copy.
]
!
--- a/Tools__CodeView2.st Mon Sep 19 08:48:45 2016 +0100
+++ b/Tools__CodeView2.st Wed Sep 28 07:09:57 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
All Rights Reserved
@@ -4125,7 +4127,7 @@
updateReallyModified
"check for modified code by comparing the source against
the codeViews contents.
- Thats the true modified value (in case user undid its changes,
+ That's the true modified value (in case user undid its changes,
and the displayed text is actually original"
|modified|
--- a/Tools__NewSystemBrowser.st Mon Sep 19 08:48:45 2016 +0100
+++ b/Tools__NewSystemBrowser.st Wed Sep 28 07:09:57 2016 +0200
@@ -10435,7 +10435,7 @@
label: '-'
)
(MenuItem
- enabled: hasProjectSelectedAndCanFileOutVSEHolder
+ enabled: hasSingleProjectSelectedAndCanFileOutVSEHolder
label: 'VSE Package as...'
itemValue: projectMenuFileOutVSEPackageFormatAs
showBusyCursorWhilePerforming: true
@@ -20145,7 +20145,7 @@
organizerModeForMenu
"need this, since the menu fetches the aspect only once during
- creation - but thats the mode-holder of the first buffer,
+ creation - but that's the mode-holder of the first buffer,
and not the dynamic mode-holder of the current buffer"
|holder|
@@ -23197,6 +23197,10 @@
^ self selectedProjects value size == 1
!
+hasSingleProjectSelectedAndCanFileOutVSEHolder
+ ^ [ self hasSingleProjectSelected and:[self canFileOutVSE] ]
+!
+
hasSingleProjectSelectedHolder
^ [ self hasSingleProjectSelected ]
@@ -36974,7 +36978,7 @@
userFilterPop := box addComboBoxOn:userFilter tabable:true.
userFilterPop width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- "Fetch the list of konwn user names (which are possibly used when cheking in):
+ "Fetch the list of konwn user names (which are possibly used when checking in):
- Try the repository names (smething like ':method:user@host:....')
- If nothing found, use the login name"
@@ -37122,7 +37126,7 @@
userFilterPop := box addComboBoxOn:userFilter tabable:true.
userFilterPop width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- "Fetch the list of konwn user names (which are possibly used when cheking in):
+ "Fetch the list of konwn user names (which are possibly used when checking in):
- Try the repository names (smething like ':method:user@host:....')
- If nothing found, use the login name"
@@ -46938,6 +46942,7 @@
module:module.
] ifFalse:[
revisionLog := mgr revisionLogOf:mclass.
+ revisionLog isNil ifTrue:[self error:'cannot get revision log'].
].
revisions := revisionLog at:#revisions.
@@ -59048,6 +59053,7 @@
^ selectorCompletion
! !
+
!NewSystemBrowser methodsFor:'private-semantic checks'!
checkAcceptedMethod:aMethod inClass:aClass
@@ -59565,7 +59571,7 @@
list isNil ifTrue:[
codeView list:newLines.
] ifFalse:[
- "/ the cursor line first - thats where your eyes are ...
+ "/ the cursor line first - that's where your eyes are ...
(l := codeView cursorLine) notNil ifTrue:[
l <= newLines size ifTrue:[
replaceAction value:l value:(newLines at:l)
--- a/Tools__TagsBrowser.st Mon Sep 19 08:48:45 2016 +0100
+++ b/Tools__TagsBrowser.st Wed Sep 28 07:09:57 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2002 by eXept Software AG
All Rights Reserved
@@ -2821,8 +2823,8 @@
!TagsBrowser::TagView methodsFor:'drawing'!
drawLabelAt:anIndex x:x y:y h:h
- "draw the label at position x/y without clearing the background
- "
+ "draw the label at position x/y without clearing the background"
+
|item label typeIdentifier font
y0 widthOfTypeIdentifier inset inSelection lineNrString|
@@ -2856,12 +2858,12 @@
widthOfTypeIdentifier := 0
] ifFalse:[
typeIdentifier := Text string:typeIdentifier emphasis:#bold.
- typeIdentifier displayOn:self x:x y:y0.
- widthOfTypeIdentifier := (font widthOf:typeIdentifier)+(font widthOf:' ').
+ typeIdentifier displayOn:gc x:x y:y0.
+ widthOfTypeIdentifier := (typeIdentifier widthOn:gc) + font width "... of a space".
].
inset := TypeInset max:widthOfTypeIdentifier.
- label displayOn:self x:(x + inset) y:y0
+ label displayOn:gc x:(x + inset) y:y0
"Modified: / 17-03-2012 / 11:15:27 / cg"
"Modified: / 23-06-2014 / 21:23:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
--- a/resources/de.rs Mon Sep 19 08:48:45 2016 +0100
+++ b/resources/de.rs Wed Sep 28 07:09:57 2016 +0200
@@ -739,7 +739,7 @@
'Copy Key' 'Schlüssel kopieren'
'Copy List of Classes to Clipboard' 'Liste der Klassen ins Clipboard kopieren'
'Copy List to Clipboard' 'Liste ins Clipboard kopieren'
-'Copy Message Representation to Clipboard' 'Nachrichtendartsellung ins Clipboard kopieren'
+'Copy Message Representation to Clipboard' 'Nachrichtendarstellung ins Clipboard kopieren'
'Copy Methods' 'Methoden kopieren'
'Copy Name or Key' 'Name oder Schlüssel kopieren'
'Copy Selected Class Names to Clipboard' 'Ausgewählte Klassennamen ins Clipboard kopieren'