--- a/ImageEditor.st	Mon Jan 30 09:32:23 2006 +0100
+++ b/ImageEditor.st	Thu Feb 09 19:18:39 2006 +0100
@@ -74,7 +74,7 @@
     imageEditor postOpenAction: [imageEditView := imageEditor imageEditView. imageEditor loadFromOrPrepareForMessage: className, ' ', aSelector].
     imageEditor openModal.
 
-    resourceClassName := imageEditView resourceClass.
+    resourceClassName := imageEditView resourceClass name.
     resourceSelector  := imageEditView resourceSelector.
 
     ((className asString ~= resourceClassName) 
@@ -2823,11 +2823,10 @@
 
 hasClassAndSelectorDefined
     ^ [
-        |clsName|
-
-        (clsName := imageEditView resourceClass) size > 0
-        and:[(Smalltalk at:clsName ifAbsent:nil) notNil
-        and:[imageEditView resourceSelector notNil]]
+        |cls|
+
+        (cls := imageEditView resourceClass) notNil
+        and:[imageEditView resourceSelector notNil]
       ]
 
     "Created: / 31.7.1998 / 02:02:54 / cg"
@@ -2835,10 +2834,7 @@
 
 hasClassDefined
     ^ [
-        |clsName|
-
-        (clsName := imageEditView resourceClass) size > 0
-        and:[(Smalltalk at:clsName ifAbsent:nil) notNil]
+        imageEditView resourceClass notNil
       ]
 
     "Created: / 31.7.1998 / 02:02:22 / cg"
@@ -3320,9 +3316,8 @@
     |resourceClass|
 
     resourceClass := imageEditView resourceClass.
-    (resourceClass isSymbol and: [(Smalltalk at:resourceClass) isClass])
-    ifTrue:[
-        ^ resourceClass, ' >> ', imageEditView resourceSelector
+    resourceClass notNil ifTrue:[
+        ^ resourceClass name, ' >> ', imageEditView resourceSelector
     ].
     ^ 'No class and selector defined.'
 !
@@ -4555,8 +4550,9 @@
 
     |cls|
 
-    cls := Smalltalk at:(imageEditView resourceClass) ifAbsent:nil.
+    cls := imageEditView resourceClass.
     cls isNil ifTrue:[^ self warn:'No Class specified'].
+
     UserPreferences systemBrowserClass
         openInClass:cls class 
         selector:(imageEditView resourceSelector)