--- a/Filename.st Tue Aug 11 06:46:21 2015 +0200
+++ b/Filename.st Sat Aug 15 06:39:21 2015 +0200
@@ -2154,13 +2154,13 @@
The enumerations order is undefined - i.e. usually NOT sorted by
filenames (but by creation time - on some systems).
This excludes entries for '.' or '..'.
- OpenError is raised if I represent a non-existant or non-readable directories.
+ OpenError is raised if I represent a non-existent or non-readable directories.
So users of this method better test for existing directory before."
self directoryContentsAsFilenamesDo:[:eachFileOrDirectory |
- eachFileOrDirectory isDirectory ifTrue:[
- aBlock value:eachFileOrDirectory
- ]
+ eachFileOrDirectory isDirectory ifTrue:[
+ aBlock value:eachFileOrDirectory
+ ]
].
"
@@ -5003,7 +5003,7 @@
"Answer true, if myself is a parent directory of aFilenameOrString.
Unexpected results may be returned, if one of myself or aFilenameOrString does
not exist and relative and absolute path names are mixed
- ('/' asFilename isParentDirectoryOf:'../noExistant' -> false)
+ ('/' asFilename isParentDirectoryOf:'../noExistent' -> false)
Warning: maybe symbolic links must be resolved which could lead to automounting"
@@ -5015,19 +5015,19 @@
otherNames := self class canonicalizedNameComponents:filenameArg name.
myNames := self class canonicalizedNameComponents:self name.
((otherNames startsWith:myNames) and:[myNames first ~= self class parentDirectoryName]) ifTrue:[
- ^ otherNames ~= myNames
+ ^ otherNames ~= myNames
].
"fall back - try it again with ~ substitution and symbolic links resolved"
otherNames := self class canonicalizedNameComponents:filenameArg pathName.
myNames := self class canonicalizedNameComponents:self pathName.
(otherNames startsWith:myNames) ifTrue:[
- ^ otherNames ~= myNames
+ ^ otherNames ~= myNames
].
myName := self class nameFromComponents:myNames.
filenameArg allParentDirectoriesDo:[:parent |
- parent pathName = myName ifTrue:[^ true].
+ parent pathName = myName ifTrue:[^ true].
].
^ false.
@@ -5042,9 +5042,9 @@
'~' asFilename isParentDirectoryOf:'.'
'~' asFilename isParentDirectoryOf:'..'
'~' asFilename isParentDirectoryOf:'../smalltalk'
- '../..' asFilename isParentDirectoryOf:'../nonExistant'
- '..' asFilename isParentDirectoryOf:'../../nonExistant'
- '/' asFilename isParentDirectoryOf:'../nonExistant'
+ '../..' asFilename isParentDirectoryOf:'../nonExistent'
+ '..' asFilename isParentDirectoryOf:'../../nonExistent'
+ '/' asFilename isParentDirectoryOf:'../nonExistent'
'/' asFilename isParentDirectoryOf:'/phys/qnx'
"
!
--- a/Object.st Tue Aug 11 06:46:21 2015 +0200
+++ b/Object.st Sat Aug 15 06:39:21 2015 +0200
@@ -4316,7 +4316,7 @@
^ KeyNotFoundError raiseRequestWith:aKey errorString:(' ', aKey printString)
"
- Dictionary new at:#nonExistantElement
+ Dictionary new at:#nonExistentElement
"
!
--- a/ProjectDefinition.st Tue Aug 11 06:46:21 2015 +0200
+++ b/ProjectDefinition.st Sat Aug 15 06:39:21 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2006 by eXept Software AG
All Rights Reserved
@@ -2735,7 +2737,6 @@
"Created: / 18-08-2006 / 12:51:38 / cg"
! !
-
!ProjectDefinition class methodsFor:'description - project information'!
applicationAdditionalIconFileNames
@@ -4736,7 +4737,6 @@
^ self subProjectMakeCallsUsing:'call vcmake %1 %2'.
! !
-
!ProjectDefinition class methodsFor:'file templates'!
autopackage_default_dot_apspec
@@ -5453,9 +5453,9 @@
"check if all classes defined by this project are present and
offer a dialog to abort the current operation if not"
- |check nonExistantClasses|
-
- nonExistantClasses := Set new.
+ |check nonExistentClasses|
+
+ nonExistentClasses := Set new.
check :=
[:eachClassName |
@@ -5464,7 +5464,7 @@
cls := Smalltalk classNamed:eachClassName.
cls isNil ifTrue:[
Transcript showCR:eachClassName.
- nonExistantClasses add:eachClassName.
+ nonExistentClasses add:eachClassName.
].
].
@@ -5475,12 +5475,12 @@
].
].
- nonExistantClasses notEmpty ifTrue:[
- Transcript showCR:('"%1" and possibly more classes are missing.\Cannot generate a correct "abbrev.stc" file.' bindWith:nonExistantClasses).
+ nonExistentClasses notEmpty ifTrue:[
+ Transcript showCR:('"%1" and possibly more classes are missing.\Cannot generate a correct "abbrev.stc" file.' bindWith:nonExistentClasses).
UserPreferences current suppressProjectDefinitionWarnings ifFalse:[
(Dialog confirm:(Dialog classResources
stringWithCRs:'"%1" and possibly more classes are missing.\Cannot generate a correct "abbrev.stc" file.\\Continue anyway?'
- with:nonExistantClasses anElement allBold)) ifFalse:[
+ with:nonExistentClasses anElement allBold)) ifFalse:[
AbortOperationRequest raise.
].
].
--- a/UserMessage.st Tue Aug 11 06:46:21 2015 +0200
+++ b/UserMessage.st Sat Aug 15 06:39:21 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"{ Package: 'stx:libbasic' }"
"{ NameSpace: Smalltalk }"
@@ -318,7 +320,7 @@
].
(resolvedMessageCatalog isNil) ifTrue:[
defaultString isNil ifTrue:[
- ^ 'Non-existant message: (%1<<%2)' bindWith:key with:catalogID printString.
+ ^ 'Non-existent message: (%1<<%2)' bindWith:key with:catalogID printString.
].
^ defaultString.
].
@@ -340,10 +342,10 @@
!UserMessage class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/UserMessage.st,v 1.9 2015-02-20 23:59:50 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/UserMessage.st,v 1.9 2015-02-20 23:59:50 cg Exp $'
+ ^ '$Header$'
! !