Skip to content

Commit

Permalink
#986 - should not be able to select directory in server file dialog
Browse files Browse the repository at this point in the history 
[3.2.13] Navigating in the server file selector and opening directories #986

Put up a message if an attempt is made to press select on a directory.
  • Loading branch information
Eric Winger authored and Eric Winger committed Dec 16, 2022
1 parent 6253663 commit ecec5fb
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 7 deletions.
5 changes: 5 additions & 0 deletions sources/JadeiteServerFileSelectorDialog.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ pathText
^fileSelectorPresenter pathText!

select
| service |
service := RowanFileService new
path: fileSelectorPresenter newPathText;
session: model session.
service isDirectory ifTrue: [^MessageBox notify: 'Cannot open a directory'].
fileSelectorPresenter selectionMade.
self ok.
^fileSelectorPresenter pathText value!
Expand Down
21 changes: 14 additions & 7 deletions sources/JadeiteServerFileSelectorPresenter.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ logoutRequested: aValueHolder

aValueHolder value: true.!

newPathText
| item newPathText finalSlash |
item := directoryContentsList selectionOrNil ifNil: [String new] ifNotNil: [:sel | sel key].
finalSlash := pathText value isEmpty
ifFalse: [pathText value last = $/ ifTrue: [String new] ifFalse: ['/']].
newPathText := pathText value , finalSlash , item.
^newPathText!

parentDirectoryPath
^self model parentDirectoryPath!

Expand All @@ -72,12 +80,10 @@ select
parentPresenter select!

selectionMade
| item finalSlash |
| newPathText |
model value path = pathText value ifFalse: [^self goto].
item := directoryContentsList selectionOrNil ifNil: [String new] ifNotNil: [:sel | sel key].
finalSlash := pathText value isEmpty
ifFalse: [pathText value last = $/ ifTrue: [String new] ifFalse: ['/']].
pathText value: pathText value , finalSlash , item!
newPathText := self newPathText.
pathText value: newPathText!

setPath: path
pathText value: path.
Expand All @@ -96,6 +102,7 @@ dive!actions!public! !
fileName!accessing!public! !
goto!actions!public! !
logoutRequested:!event handlers!private! !
newPathText!actions!public! !
parentDirectoryPath!accessing!public! !
pathText!accessing!private! !
pathText:!accessing!private! !
Expand All @@ -116,8 +123,8 @@ resource_Default_view
ViewComposer openOn: (ResourceIdentifier class: self selector: #resource_Default_view)
"

^#(#'!!STL' 4 788558 10 ##(Smalltalk.STBViewProxy) ##(Smalltalk.ContainerView) 34 15 nil nil 34 2 8 1409286144 131073 416 nil nil nil 5 nil nil nil 416 852230 ##(Smalltalk.FramingLayout) 170 176 34 2 410 ##(Smalltalk.ContainerView) 34 15 nil 416 34 2 8 1140850688 131073 544 nil nil nil 5 nil nil nil 544 482 170 176 34 12 410 ##(Smalltalk.EditableListView) 34 55 nil 544 34 2 8 1140936781 1025 656 590662 2 ##(Smalltalk.ListModel) 138 144 8 #() nil 1310726 ##(Smalltalk.IdentitySearchPolicy) 327686 ##(Smalltalk.Color) #default nil 5 nil nil nil 656 nil 8 1594380512 ##(Smalltalk.BasicListAbstract) 787814 3 ##(Smalltalk.BlockClosure) 0 nil 1180966 ##(Smalltalk.CompiledExpression) 5 1 864 8 'doIt' 8 '[:assoc | assoc value ifTrue:[Icon fromId: ''Folder.ico''] ifFalse:[0]]' 8 #[32 105 17 142 121 45 30 178 106 62 106] 983558 ##(Smalltalk.VariableBinding) #Icon ##(Smalltalk.Icon) 8 'Folder.ico' #fromId: 880 #ifTrue:ifFalse: 7 257 nil 1049926 1 ##(Smalltalk.IconImageManager) nil nil nil 328198 ##(Smalltalk.Point) 65 65 nil nil 138 144 34 1 1447750 15 ##(Smalltalk.EditableListViewColumn) 8 'Column 1' 673 #left ##(Smalltalk.BasicListAbstract) ##(Smalltalk.SortedCollection) 866 0 nil 898 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:assoc | assoc key]' 8 #[30 105 226 0 106] #key 1168 7 257 nil nil 656 nil 3 nil nil false nil 1052998 20 ##(Smalltalk.EmbeddedTextEdit) nil nil 8 #(67174528 0) 1264 721990 2 ##(Smalltalk.ValueHolder) nil false 1310726 ##(Smalltalk.EqualitySearchPolicy) nil nil nil 5 nil nil nil 1264 nil nil 852486 ##(Smalltalk.NullConverter) nil 8 '' 1 nil nil nil nil nil nil nil nil nil #report 8 #() nil 131171 nil 1 nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil 3 nil nil nil nil 983302 ##(Smalltalk.MessageSequence) 138 144 34 2 721670 ##(Smalltalk.MessageSend) #createAt:extent: 34 2 1058 11 101 1058 681 321 656 1490 #text: 34 1 8 'Column 1' 656 983302 ##(Smalltalk.WINDOWPLACEMENT) 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 5 0 0 0 50 0 0 0 89 1 0 0 210 0 0 0] 8 #() 1058 193 193 nil 33 1181766 2 ##(Smalltalk.FramingConstraints) 1180678 ##(Smalltalk.FramingCalculation) #fixedParentLeft 11 1730 #fixedParentRight -9 1730 #fixedParentTop 101 1730 #fixedParentBottom -79 410 ##(Smalltalk.StaticText) 34 16 nil 544 34 2 8 1140850944 65 1808 nil nil nil 5 nil nil nil 1808 nil 8 1594293440 1362 nil nil nil 1426 138 144 34 2 1490 #createAt:extent: 34 2 1058 11 11 1058 101 61 1808 1490 #text: 34 1 8 'Path:
' 1808 1618 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 5 0 0 0 5 0 0 0 55 0 0 0 35 0 0 0] 8 #() 1680 nil 27 1698 1744 11 1744 111 1776 11 1730 #fixedViewTop 61 410 ##(Smalltalk.PushButton) 34 20 nil 544 34 2 8 1140924416 1 2144 nil nil nil 5 nil nil nil 2144 nil 8 1594445232 1180998 4 ##(Smalltalk.CommandDescription) #cancel 8 'Cancel' 1 1 nil nil false nil nil nil 1426 138 144 34 2 1490 #createAt:extent: 34 2 1058 491 431 1058 201 61 2144 1490 #text: 34 1 8 'Cancel' 2144 1618 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 245 0 0 0 215 0 0 0 89 1 0 0 245 0 0 0] 8 #() 1680 nil 29 1698 1760 -209 1760 -9 1792 -69 1792 -9 410 ##(Smalltalk.PushButton) 34 20 nil 544 34 2 8 1140924416 1 2496 nil nil nil 5 nil nil nil 2496 nil 8 1594445232 2226 #select 8 'Select' 1 1 nil nil false nil nil nil 1426 138 144 34 3 1490 #createAt:extent: 34 2 1058 281 431 1058 211 61 2496 1490 #isEnabled: 8 #(false) 2496 1490 #text: 34 1 8 'Select' 2496 1618 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 140 0 0 0 215 0 0 0 245 0 0 0 245 0 0 0] 8 #() 1680 nil 29 1698 1760 -419 1760 -209 1792 -69 1792 -9 410 ##(Smalltalk.ToolButton) 34 14 nil 544 34 2 8 1140850688 131073 2864 nil nil nil 5 nil nil nil 2864 nil 410 ##(Smalltalk.Toolbar) 34 25 nil 2864 34 2 8 1140853580 131137 2928 nil nil nil 1 nil nil nil 2928 nil 8 1594404224 nil 170 192 34 2 27617 1115206 1 ##(Smalltalk.ToolbarIconButton) 2928 1 2226 #pop 8 'Pop' 1 1 263494 3 ##(Smalltalk.Icon) nil true 1572870 ##(Smalltalk.ImageRelativeFileLocator) 8 'icons\FolderUp.ico' nil 27617 34 1 3056 nil nil 3 nil 1058 49 49 1058 71 51 nil nil 1426 138 144 34 1 1490 #createAt:extent: 34 2 1058 1 1 1058 81 61 2928 1618 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 40 0 0 0 30 0 0 0] 8 #() 1680 nil 27 1426 138 144 34 1 1490 #createAt:extent: 34 2 1058 591 11 1058 81 61 2864 1618 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 39 1 0 0 5 0 0 0 79 1 0 0 35 0 0 0] 34 1 2928 1680 nil 27 1698 1760 -109 1760 -29 1776 11 2128 61 410 ##(Smalltalk.TextEdit) 34 16 nil 544 34 2 8 1149239424 1 3568 1298 nil false 1344 nil nil nil 5 nil nil nil 3568 nil 8 1594437040 1362 nil nil 1 1426 138 144 34 3 1490 #createAt:extent: 34 2 1058 121 11 1058 441 61 3568 1490 #text: 34 1 8 'c:\Program Files\Dolphin Smalltalk' 3568 1490 #setMarginWidths: 34 1 8 #(3 3) 3568 1618 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 60 0 0 0 5 0 0 0 24 1 0 0 35 0 0 0] 8 #() 1680 nil 27 1698 1744 121 1760 -139 1776 11 2128 61 170 192 34 4 656 8 'directoryContentsList' 3568 8 'pathText' nil 1426 138 144 34 1 1490 #createAt:extent: 34 2 1058 1 1 1058 701 501 544 1618 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 94 1 0 0 250 0 0 0] 34 6 3568 1808 2496 2864 2144 656 1680 nil 27 1698 1744 1 1760 1 1776 1 1792 1 170 192 768 nil 1426 138 144 34 1 1490 #createAt:extent: 34 2 1058 6947 21 1058 701 501 416 1618 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 145 13 0 0 10 0 0 0 239 14 0 0 4 1 0 0] 34 1 544 1680 nil 27 )! !
^#(#'!!STL' 4 788558 10 ##(Smalltalk.STBViewProxy) ##(Smalltalk.ContainerView) 34 15 nil nil 34 2 8 1409286144 131073 416 nil nil nil 5 nil nil nil 416 852230 ##(Smalltalk.FramingLayout) 170 176 34 2 410 ##(Smalltalk.ContainerView) 34 15 nil 416 34 2 8 1140850688 131073 544 nil nil nil 5 nil nil nil 544 482 170 176 34 12 410 ##(Smalltalk.TextEdit) 34 16 nil 544 34 2 8 1149239424 1 656 721990 2 ##(Smalltalk.ValueHolder) nil false 1310726 ##(Smalltalk.EqualitySearchPolicy) nil nil nil 5 nil nil nil 656 nil 8 1607675312 852486 ##(Smalltalk.NullConverter) nil nil 1 983302 ##(Smalltalk.MessageSequence) 138 144 34 3 721670 ##(Smalltalk.MessageSend) #createAt:extent: 34 2 328198 ##(Smalltalk.Point) 121 11 946 441 61 656 898 #text: 34 1 8 'c:\Program Files\Dolphin Smalltalk' 656 898 #setMarginWidths: 34 1 8 #(3 3) 656 983302 ##(Smalltalk.WINDOWPLACEMENT) 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 60 0 0 0 5 0 0 0 24 1 0 0 35 0 0 0] 8 #() 946 193 193 nil 27 1181766 2 ##(Smalltalk.FramingConstraints) 1180678 ##(Smalltalk.FramingCalculation) #fixedParentLeft 121 1202 #fixedParentRight -139 1202 #fixedParentTop 11 1202 #fixedViewTop 61 410 ##(Smalltalk.PushButton) 34 20 nil 544 34 2 8 1140924416 1 1280 nil nil nil 5 nil nil nil 1280 nil 8 1607683504 1180998 4 ##(Smalltalk.CommandDescription) #cancel 8 'Cancel' 1 1 nil nil false nil nil nil 834 138 144 34 2 898 #createAt:extent: 34 2 946 491 431 946 201 61 1280 898 #text: 34 1 8 'Cancel' 1280 1090 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 245 0 0 0 215 0 0 0 89 1 0 0 245 0 0 0] 8 #() 1152 nil 29 1170 1232 -209 1232 -9 1202 #fixedParentBottom -69 1632 -9 410 ##(Smalltalk.ToolButton) 34 14 nil 544 34 2 8 1140850688 131073 1648 nil nil nil 5 nil nil nil 1648 nil 410 ##(Smalltalk.Toolbar) 34 25 nil 1648 34 2 8 1140853580 131137 1712 nil nil nil 1 nil nil nil 1712 nil 8 1607642496 nil 170 192 34 2 23573 1115206 1 ##(Smalltalk.ToolbarIconButton) 1712 1 1362 #pop 8 'Pop' 1 1 263494 3 ##(Smalltalk.Icon) nil true 1572870 ##(Smalltalk.ImageRelativeFileLocator) 8 'icons\FolderUp.ico' nil 23573 34 1 1840 nil nil 3 nil 946 49 49 946 71 51 nil nil 834 138 144 34 1 898 #createAt:extent: 34 2 946 1 1 946 81 61 1712 1090 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 40 0 0 0 30 0 0 0] 8 #() 1152 nil 27 834 138 144 34 1 898 #createAt:extent: 34 2 946 591 11 946 81 61 1648 1090 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 39 1 0 0 5 0 0 0 79 1 0 0 35 0 0 0] 34 1 1712 1152 nil 27 1170 1232 -109 1232 -29 1248 11 1264 61 410 ##(Smalltalk.StaticText) 34 16 nil 544 34 2 8 1140850944 65 2352 nil nil nil 5 nil nil nil 2352 nil 8 1607531712 802 nil nil nil 834 138 144 34 2 898 #createAt:extent: 34 2 946 11 11 946 101 61 2352 898 #text: 34 1 8 'Path:
' 2352 1090 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 5 0 0 0 5 0 0 0 55 0 0 0 35 0 0 0] 8 #() 1152 nil 27 1170 1216 11 1216 111 1248 11 1264 61 410 ##(Smalltalk.EditableListView) 34 55 nil 544 34 2 8 1140936781 1025 2672 590662 2 ##(Smalltalk.ListModel) 138 144 8 #() nil 1310726 ##(Smalltalk.IdentitySearchPolicy) 327686 ##(Smalltalk.Color) #default nil 5 nil nil nil 2672 nil 8 1607618784 ##(Smalltalk.BasicListAbstract) 787814 3 ##(Smalltalk.BlockClosure) 0 nil 1180966 ##(Smalltalk.CompiledExpression) 5 1 2880 8 'doIt' 8 '[:assoc | assoc value ifTrue:[Icon fromId: ''Folder.ico''] ifFalse:[0]]' 8 #[32 105 17 142 121 45 30 178 106 62 106] 983558 ##(Smalltalk.VariableBinding) #Icon 1888 8 'Folder.ico' #fromId: 2896 #ifTrue:ifFalse: 7 257 nil 1049926 1 ##(Smalltalk.IconImageManager) nil nil nil 946 65 65 nil nil 138 144 34 1 1447750 15 ##(Smalltalk.EditableListViewColumn) 8 'Column 1' 673 #left ##(Smalltalk.BasicListAbstract) ##(Smalltalk.SortedCollection) 2882 0 nil 2914 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:assoc | assoc key]' 8 #[30 105 226 0 106] #key 3168 7 257 nil nil 2672 nil 3 nil nil false nil 1052998 20 ##(Smalltalk.EmbeddedTextEdit) nil nil 8 #(67174528 0) 3264 722 nil false 768 nil nil nil 5 nil nil nil 3264 nil nil 802 nil 8 '' 1 nil nil nil nil nil nil nil nil nil #report 8 #() nil 131171 nil 1 nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil 3 nil nil nil nil 834 138 144 34 2 898 #createAt:extent: 34 2 946 11 101 946 681 321 2672 898 #text: 34 1 8 'Column 1' 2672 1090 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 5 0 0 0 50 0 0 0 89 1 0 0 210 0 0 0] 8 #() 1152 nil 33 1170 1216 11 1232 -9 1248 101 1632 -79 410 ##(Smalltalk.PushButton) 34 20 nil 544 34 2 8 1140924416 1 3584 nil nil nil 5 nil nil nil 3584 nil 8 1607683504 1362 #select 8 'Select' 1 1 nil nil false nil nil nil 834 138 144 34 3 898 #createAt:extent: 34 2 946 281 431 946 211 61 3584 898 #isEnabled: 8 #(false) 3584 898 #text: 34 1 8 'Select' 3584 1090 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 140 0 0 0 215 0 0 0 245 0 0 0 245 0 0 0] 8 #() 1152 nil 29 1170 1232 -419 1232 -209 1632 -69 1632 -9 170 192 34 4 2672 8 'directoryContentsList' 656 8 'pathText' nil 834 138 144 34 1 898 #createAt:extent: 34 2 946 1 1 946 701 501 544 1090 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 94 1 0 0 250 0 0 0] 34 6 656 2352 3584 1648 1280 2672 1152 nil 27 1170 1216 1 1232 1 1248 1 1632 1 170 192 2784 nil 834 138 144 34 1 898 #createAt:extent: 34 2 946 6987 21 946 701 501 416 1090 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 165 13 0 0 10 0 0 0 3 15 0 0 4 1 0 0] 34 1 544 1152 nil 27 )! !
!JadeiteServerFileSelectorPresenter class categoriesForMethods!
resource_Default_view!public!resources-views! !
!
Expand Down
7 changes: 7 additions & 0 deletions sources/RowanFileService.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ fileOutMethods: array
indexOfSessionInstVar
^10!

isDirectory
command := #isDirectory.
commandArgs := Array new.
self issueCommand.
^answer!

isDirectory: directory
command := #isDirectory:.
commandArgs := Array with: path , '/' , directory.
Expand Down Expand Up @@ -120,6 +126,7 @@ fileName!commands!public! !
fileOutDictionaries:!commands!public! !
fileOutMethods:!commands!public! !
indexOfSessionInstVar!public!ston! !
isDirectory!commands!public! !
isDirectory:!commands!public! !
issueCommand!commands!public! !
parentDirectoryPath!commands!public! !
Expand Down

0 comments on commit ecec5fb

Please sign in to comment.