--- a/DiffTextView.st	Fri Jun 21 16:41:14 2002 +0200
+++ b/DiffTextView.st	Fri Jun 21 16:41:56 2002 +0200
@@ -195,8 +195,8 @@
     "set the two texts which are to be diffed;
      execute DiffCommand and update the two textViews."
 
-    |tmpFile1 tmpFile2 name1 tmpName2 stream line 
-     text1 text2 diffList pidString diffTemplate diffCmd|
+    |tmpFile1 tmpFile2  stream line 
+     text1 text2 diffList  diffTemplate diffCmd|
 
     text1 := t1 asStringCollection.
     text2 := t2 asStringCollection.
@@ -212,6 +212,7 @@
         stream := tmpFile1 writeStream.
         text1 do:[:line |
             line notNil ifTrue:[
+(line includes:Character return) ifTrue: [self halt].
                 stream nextPutAll:line.
             ].
             stream cr
@@ -222,6 +223,7 @@
         stream := tmpFile2 writeStream.
         text2 do:[:line |
             line notNil ifTrue:[
+(line includes:Character return) ifTrue: [self halt].
                 stream nextPutAll:line.
             ].
             stream cr
@@ -618,5 +620,5 @@
 !DiffTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.33 2001-07-19 14:12:01 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.34 2002-06-21 14:41:41 cg Exp $'
 ! !

--- a/VersionDiffBrowser.st	Fri Jun 21 16:41:14 2002 +0200
+++ b/VersionDiffBrowser.st	Fri Jun 21 16:41:56 2002 +0200
@@ -616,6 +616,17 @@
     "
      self openOnClass:Array versionA:'1.116' versionB:'1.113'
     "
+!
+
+openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle
+    |theBrowser|
+
+    theBrowser := self new.
+    theBrowser allButOpen.
+    theBrowser setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB.
+    theBrowser window label:ignoredTitle.
+    theBrowser openWindow.
+    ^ theBrowser.
 ! !
 
 !VersionDiffBrowser methodsFor:'accessing'!
@@ -1331,7 +1342,13 @@
     <return: Block>
     "
     ^[:aChange |
-        |result mPkg cPkg cls m changeClassName useChangesString|
+        |result mPkg cPkg cls m changeClassName useChangesString 
+         singleComparedClass singleComparedClassesName singleComparedMetaclassesName|
+
+        (singleComparedClass := self classBeingCompared) notNil ifTrue:[
+            singleComparedClassesName := singleComparedClass name.
+            singleComparedMetaclassesName := singleComparedClass theMetaclass name.
+        ].
 
         aChange isClassDefinitionChange ifTrue:[
             result := aChange printStringWithoutClassName
@@ -1341,11 +1358,11 @@
             ] ifFalse:[
                 useChangesString := false.
                 changeClassName := aChange className.
-                changeClassName = self classBeingCompared name ifTrue:[
+                changeClassName = singleComparedClassesName ifTrue:[
                     result := aChange printStringWithoutClassName.
                     useChangesString := true.
                 ] ifFalse:[
-                    changeClassName = self classBeingCompared theMetaclass name ifTrue:[
+                    changeClassName = singleComparedMetaclassesName ifTrue:[
                         result := aChange printString.
                         useChangesString := true.
                     ].
@@ -1366,9 +1383,11 @@
                         ]
                     ]
                 ] ifFalse:[
+                
                     "/ include name in private class changes
-                    (changeClassName startsWith:(self classBeingCompared name , '::')) ifTrue:[
-                        result := (changeClassName copyFrom:(self classBeingCompared name size + 3)) , ' ' ,  aChange printStringWithoutClassName
+                    (singleComparedClassesName notNil
+                    and:[changeClassName startsWith:(singleComparedClassesName , '::')]) ifTrue:[
+                        result := (changeClassName copyFrom:(singleComparedClassesName size + 3)) , ' ' ,  aChange printStringWithoutClassName
                     ] ifFalse:[
                         result := aChange printString
                     ]
@@ -1571,6 +1590,13 @@
     ].
     self classChangeSet:changeSet.
     self class:aClass versionA:aVersionA versionB:aVersionB.
+!
+
+setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB
+    |changeSet|
+
+    changeSet := (ClassChangeSet new diffSet:diffSet; labelA:aLabelA; labelB:aLabelB).
+    self classChangeSet:changeSet
 ! !
 
 !VersionDiffBrowser::ClassChangeSet class methodsFor:'instance creation'!
@@ -1914,5 +1940,5 @@
 !VersionDiffBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.50 2002-02-26 12:59:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.51 2002-06-21 14:41:56 cg Exp $'
 ! !