--- a/MIMETypeIconLibrary.st	Mon Dec 01 15:04:07 2003 +0100
+++ b/MIMETypeIconLibrary.st	Mon Dec 01 15:47:57 2003 +0100
@@ -2,7 +2,7 @@
 
 Object subclass:#MimeTypeIconLibrary
 	instanceVariableNames:''
-	classVariableNames:'Icons MatchedIcons DefaultIcons'
+	classVariableNames:'Icons MatchedIcons'
 	poolDictionaries:''
 	category:'Interface-Smalltalk'
 !
@@ -10,14 +10,8 @@
 
 !MimeTypeIconLibrary class methodsFor:'initialization'!
 
-icons
-    DefaultIcons isNil ifTrue:[
-        self initializeIcons
-    ].
-    ^ Icons
-!
-
 initialize
+    self initializeIcons
 !
 
 initializeFileTypeIcons
@@ -187,23 +181,20 @@
 
 !MimeTypeIconLibrary class methodsFor:'accessing'!
 
-matchedIcons
-    MatchedIcons isNil ifTrue:[
-        MatchedIcons := OrderedCollection new.
-    ].
-    ^ MatchedIcons
-! !
+iconForKey:mimeTypeOrKey
 
-!MimeTypeIconLibrary class methodsFor:'default'!
+    ^ Icons at:mimeTypeOrKey ifAbsent:nil.
+!
 
-defaultIcons
-    ^ DefaultIcons
+iconForKeyMatching:mimeTypeOrKey
+
+    ^ MatchedIcons detect:[:assoc | assoc key match:mimeTypeOrKey] ifNone:nil.
 ! !
 
 !MimeTypeIconLibrary class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/MIMETypeIconLibrary.st,v 1.1 2003-12-01 14:04:07 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/MIMETypeIconLibrary.st,v 1.2 2003-12-01 14:47:57 penk Exp $'
 ! !
 
 MimeTypeIconLibrary initialize!