--- a/FileBrowser.st Mon Jul 22 15:40:55 2002 +0200
+++ b/FileBrowser.st Mon Jul 22 17:19:02 2002 +0200
@@ -1520,7 +1520,7 @@
].
ok ifFalse:[
ok := currentDirectory notNil
- and:[(currentDirectory asFilename construct:'abbrev.stc') exists].
+ and:[(currentDirectory construct:'abbrev.stc') exists].
].
ok
]
@@ -1610,7 +1610,7 @@
hasBookmarksToRemove
^ DirectoryBookmarks size > 0
- and:[ DirectoryBookmarks includes:(currentDirectory asFilename pathName) ]
+ and:[ DirectoryBookmarks includes:(currentDirectory pathName) ]
"Created: / 14.8.1998 / 19:17:02 / cg"
"Modified: / 14.8.1998 / 19:17:17 / cg"
@@ -1753,7 +1753,7 @@
].
f := fileList at:sel first ifAbsent:nil.
f notNil ifTrue:[
- ^ currentDirectory asFilename construct:f
+ ^ currentDirectory construct:f
].
^ nil
@@ -1768,11 +1768,11 @@
^ nil
].
sel size == 0 ifTrue:[
- ^ currentDirectory asFilename
+ ^ currentDirectory
].
f := fileList at:sel first ifAbsent:nil.
f notNil ifTrue:[
- ^ currentDirectory asFilename construct:f
+ ^ currentDirectory construct:f
].
^ nil
!
@@ -3111,7 +3111,7 @@
"/ access by name, to get most up-to-date version
"/ (if changed in the browser, and the running one is old)
(Smalltalk at:(self class name))
- openOn:currentDirectory pathName withExtent:self topView extent
+ openOn:currentDirectory withExtent:self topView extent
]
"Modified: 18.9.1997 / 16:32:39 / stefan"
@@ -3254,7 +3254,7 @@
newHardLink
"ask for and create a hard link (unix only)"
- |sel box orgName1 name1 name2 f1 f2 err here if1 if2|
+ |sel box orgName1 name1 name2 f1 f2 err if1 if2|
sel := self getSelectedFileName.
@@ -3270,9 +3270,9 @@
box := DialogBox new.
(box addTextLabel:(resources string:'Create hard link from:')) adjust:#left.
- if1 := box addFilenameInputFieldOn:name1 in:here tabable:true.
+ if1 := box addFilenameInputFieldOn:name1 in:currentDirectory tabable:true.
(box addTextLabel:(resources string:'to:')) adjust:#left.
- if2 := box addFilenameInputFieldOn:name2 in:here tabable:true.
+ if2 := box addFilenameInputFieldOn:name2 in:currentDirectory tabable:true.
box addAbortAndOkButtons.
@@ -3324,10 +3324,9 @@
newSoftLink
"ask for and create a soft link (unix only)"
- |sel box orgName1 name1 name2 f1 f2 err here if1 if2|
+ |sel box orgName1 name1 name2 f1 f2 err if1 if2|
sel := self getSelectedFileName.
- here := currentDirectory pathName.
orgName1 := ''.
(sel size > 0) ifTrue:[
@@ -3339,9 +3338,9 @@
box := DialogBox new.
(box addTextLabel:'Create symbolic link to:') adjust:#left.
- if1 := box addFilenameInputFieldOn:name1 in:here tabable:true.
+ if1 := box addFilenameInputFieldOn:name1 in:currentDirectory tabable:true.
(box addTextLabel:'as:') adjust:#left.
- if2 := box addFilenameInputFieldOn:name2 in:here tabable:true.
+ if2 := box addFilenameInputFieldOn:name2 in:currentDirectory tabable:true.
box addAbortAndOkButtons.
@@ -3695,19 +3694,18 @@
readAbbrevFile
"read the abbrev file and install classes found there as autoloaded classes"
- |sel current|
-
- current := currentDirectory asFilename.
+ |sel|
+
sel := fileListView selection.
sel size == 0 ifTrue:[
- Smalltalk installAutoloadedClassesFrom:(current construct:'abbrev.stc').
+ Smalltalk installAutoloadedClassesFrom:(currentDirectory construct:'abbrev.stc').
^ self
].
sel do:[:eachIndex |
|f|
f := fileList at:eachIndex ifAbsent:nil.
- f := current construct:f.
+ f := currentDirectory construct:f.
f isDirectory ifTrue:[
f := f construct:'abbrev.stc'
].
@@ -3818,7 +3816,7 @@
^ self
].
- currentDirectory := aDirectoryPath asFilename.
+ currentDirectory := newDirectory.
self changed:#path.
"
@@ -4236,7 +4234,7 @@
textView doItAction:[:theCode |
PositionableStream currentFileInDirectoryQuerySignal
- answer:(currentDirectory asFilename)
+ answer:currentDirectory
do:[
Compiler
evaluate:theCode
@@ -4892,7 +4890,7 @@
f isNil ifTrue:[
^ self addDirToJavaClassPath
].
- f := currentDirectory asFilename construct:f.
+ f := currentDirectory construct:f.
Java addToClassPath:(f pathName)
"Created: / 9.11.1998 / 05:41:34 / cg"
@@ -4909,7 +4907,7 @@
f isNil ifTrue:[
^ self addDirToJavaSourcePath
].
- f := currentDirectory asFilename construct:f.
+ f := currentDirectory construct:f.
Java addToSourcePath:(f pathName)
"Created: / 9.11.1998 / 05:41:34 / cg"
@@ -4926,7 +4924,7 @@
f isNil ifTrue:[
^ self removeDirFromJavaClassPath
].
- f := currentDirectory asFilename construct:f.
+ f := currentDirectory construct:f.
Java removeFromClassPath:(f pathName)
"Created: / 9.11.1998 / 05:42:05 / cg"
@@ -4943,7 +4941,7 @@
f isNil ifTrue:[
^ self removeDirFromJavaSourcePath
].
- f := currentDirectory asFilename construct:f.
+ f := currentDirectory construct:f.
Java removeFromSourcePath:(f pathName)
"Created: / 9.11.1998 / 05:42:05 / cg"
@@ -5322,13 +5320,13 @@
cmd notNil ifTrue:[
(OperatingSystem
executeCommand:(cmd bindWith:aFilename with:Display displayName)
- inDirectory:currentDirectory pathName)
+ inDirectory:currentDirectory)
ifTrue:[^true].
].
].
(currentDirectory construct:aFilename) isExecutableProgram ifTrue:[
- (OperatingSystem executeCommand:aFilename inDirectory:currentDirectory pathName)
+ (OperatingSystem executeCommand:aFilename inDirectory:currentDirectory)
ifTrue:[^true].
].
^ self imageAction:aFilename
@@ -6650,7 +6648,7 @@
"get stat info on selected file - return a string which can be
shown in a box"
- |fileName f fullPath text info fileOutput type modeBits modeString s ts|
+ |fileName f text info fileOutput type modeBits modeString s ts|
fileName := self getSelectedFileName.
fileName isNil ifTrue:[^ nil].
@@ -6671,8 +6669,7 @@
type := info type.
(longInfo and:[type == #regular]) ifTrue:[
- fullPath := currentDirectory pathName asFilename constructString:fileName.
- fileOutput := fullPath asFilename fileType.
+ fileOutput := (currentDirectory construct:fileName) fileType.
].
s := (resources at:'type: ').
@@ -7843,7 +7840,7 @@
"/ then convert it to a directory name
"/ (which only makes a difference on VMS)
- ^ currentDirectory asFilename pathName "/ asFilename osNameForDirectory
+ ^ currentDirectory pathName "/ asFilename osNameForDirectory
"Modified: / 12.8.1998 / 14:45:48 / cg"
! !
@@ -7851,5 +7848,5 @@
!FileBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.477 2002-07-22 13:40:55 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.478 2002-07-22 15:19:02 stefan Exp $'
! !