--- a/Tools__ChangeSetBrowser2.st	Sat Mar 30 01:09:35 2013 +0100
+++ b/Tools__ChangeSetBrowser2.st	Sat Mar 30 02:58:47 2013 +0100
@@ -1216,6 +1216,10 @@
                   indication: showSameAspect
                 )
                (MenuItem
+                  label: 'Show Conflicts Only'
+                  indication: showConflictsOnlyAspect
+                )
+               (MenuItem
                   label: '-'
                 )
                (MenuItem
@@ -1806,16 +1810,33 @@
         codeAspectHolder setValue:
             (change isMethodCodeChange
                 ifTrue:[SyntaxHighlighter codeAspectMethod]
-                ifFalse:[SyntaxHighlighter codeAspectExpression]).
+                ifFalse:[
+                    (change isClassDefinitionChange
+                        ifTrue:[SyntaxHighlighter codeAspectClassDefinition]   
+                        ifFalse:[SyntaxHighlighter codeAspectExpression])]).
         self classHolder value: change changeClass.
         changeSourceHolder setValue: change changeSource"; changed: #value".
         change imageSource = change changeSource ifTrue:[
             imageSourceHolder setValue: nil"; changed: #value".
         ] ifFalse:[
             imageSourceHolder setValue: change imageSource"; changed: #value".
+
+            "/ check agan, based on parser (ignoring indentation)
+            change isClassDefinitionChange ifTrue:[
+                |parseError treeA treeB|
+
+                parseError := false.
+                treeA := RBParser parseExpression:change imageSource onError: [:str :pos | parseError := true].
+                treeB := RBParser parseExpression:change changeSource onError: [:str :pos | parseError := true].
+                parseError ifFalse:[
+                    (treeA equalTo:treeB withMapping:(Dictionary  new)) ifTrue:[
+                        imageSourceHolder setValue: nil
+                    ]
+                ]
+            ].
         ].
         changeSourceHolder changed.
-        "/ imageSourceHolder changed.
+        imageSourceHolder changed.
         codeAspectHolder changed.
 
         self showSource: true
@@ -2803,11 +2824,11 @@
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.44 2013-03-26 00:01:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.45 2013-03-30 01:58:47 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.44 2013-03-26 00:01:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.45 2013-03-30 01:58:47 cg Exp $'
 !
 
 version_SVN