--- a/MIMETypeIconLibrary.st Tue Jan 06 13:50:25 2015 +0100
+++ b/MIMETypeIconLibrary.st Mon Jan 26 11:11:25 2015 +0100
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libview2' }"
+"{ NameSpace: Smalltalk }"
+
Object subclass:#MIMETypeIconLibrary
instanceVariableNames:''
classVariableNames:'Icons MatchedIcons'
@@ -221,7 +223,7 @@
addOnIconsFor:aFilename to:anIcon
"given a fileName, return an appropriate icon, especially an overlaid icon if linked or locked"
- |addOnIcon addIcns isDirectory isReadable|
+ |addOnIcon addIcns|
aFilename isNil ifTrue:[^ anIcon ].
anIcon isNil ifTrue:[^ anIcon ].
@@ -231,9 +233,8 @@
addOnIcon := self iconForKeyMatching:#addOnLinked.
addOnIcon notNil ifTrue:[ addIcns add:addOnIcon ].
].
- isDirectory := aFilename isDirectory.
- isReadable := aFilename isReadable.
- ((isReadable not and:[isDirectory not]) or:[(isDirectory) and:[(isReadable not) or:[aFilename isExecutable not]]]) ifTrue:[
+ (aFilename isReadable not
+ and:[aFilename isDirectory not or:[aFilename isExecutable not]]) ifTrue:[
addOnIcon := self iconForKeyMatching:#addOnLocked.
addOnIcon notNil ifTrue:[ addIcns add:addOnIcon ].
].
@@ -622,11 +623,11 @@
!MIMETypeIconLibrary class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/MIMETypeIconLibrary.st,v 1.29 2014-12-19 19:21:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/MIMETypeIconLibrary.st,v 1.30 2015-01-26 10:11:25 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview2/MIMETypeIconLibrary.st,v 1.29 2014-12-19 19:21:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/MIMETypeIconLibrary.st,v 1.30 2015-01-26 10:11:25 stefan Exp $'
! !