--- a/ImageEditor.st Thu Jan 22 21:50:37 1998 +0100
+++ b/ImageEditor.st Fri Jan 23 13:47:10 1998 +0100
@@ -1569,7 +1569,7 @@
ifTrue:
[
self loadFromInClassesOf: box contents asSymbol
- ].
+ ]
!
@@ -1583,29 +1583,28 @@
loadFromFile: aFileName
- aFileName notNil
+ (self imageEditView loadFromFile: aFileName) notNil
ifTrue:
[
- self imageEditView loadFromFile: aFileName
- ].
- self image notNil
- ifTrue:
- [
- self image colorMap notNil
+ self image notNil
ifTrue:
- [
- self listOfColors contents: self image usedColors asSet.
+ [
+ self image colorMap notNil
+ ifTrue:
+ [
+ self listOfColors contents: self image usedColors asSet.
+ ]
+ ifFalse:
+ [
+ self listOfColors removeAll.
+ ].
+ self findColorMapMode.
+ self updateInputFieldsAndLabelsAndHistory.
]
ifFalse:
[
- self listOfColors removeAll.
- ].
- self findColorMapMode.
- self updateInputFieldsAndLabelsAndHistory.
- ]
- ifFalse:
- [
- self updateForNoneImage
+ self updateForNoneImage
+ ]
]
!
@@ -1635,35 +1634,40 @@
loadFromInClassesOf: aSuperclassOrSymbol
- self imageEditView loadFromInClassesOf: aSuperclassOrSymbol.
- self image notNil
+ (self imageEditView loadFromInClassesOf: aSuperclassOrSymbol) notNil
ifTrue:
[
- self listOfColors contents: self image usedColors asSet asOrderedCollection.
- self findColorMapMode.
- self updateInputFieldsAndLabelsAndHistory.
- ]
- ifFalse:
- [
- self updateForNoneImage
+ self image notNil
+ ifTrue:
+ [
+ self listOfColors contents: self image usedColors asSet asOrderedCollection.
+ self findColorMapMode.
+ self updateInputFieldsAndLabelsAndHistory.
+ ]
+ ifFalse:
+ [
+ self updateForNoneImage
+ ]
]
!
loadFromMessage: aMessage
- self imageEditView loadFromMessage: aMessage.
- self image notNil
+ (self imageEditView loadFromMessage: aMessage) notNil
ifTrue:
[
- self listOfColors contents: self image usedColors asSet asOrderedCollection.
- self findColorMapMode.
- self updateInputFieldsAndLabelsAndHistory.
+ self image notNil
+ ifTrue:
+ [
+ self listOfColors contents: self image usedColors asSet asOrderedCollection.
+ self findColorMapMode.
+ self updateInputFieldsAndLabelsAndHistory.
+ ]
+ ifFalse:
+ [
+ self updateForNoneImage
+ ]
]
- ifFalse:
- [
- self updateForNoneImage
- ]
-
!
loadFromOrPrepareForMessage: aMessage