`ChangeSetBrowser2`: fix for composite refactory changes jv
authorJan Vrany <jan.vrany@labware.com>
Tue, 04 Apr 2023 17:00:56 +0200
branchjv
changeset 19645 346f10c81090
parent 19644 4a417ccbd1ae
child 19646 235fea37201a
`ChangeSetBrowser2`: fix for composite refactory changes
Tools__ChangeSetBrowser2.st
--- a/Tools__ChangeSetBrowser2.st	Thu Mar 23 18:50:44 2023 +0000
+++ b/Tools__ChangeSetBrowser2.st	Tue Apr 04 17:00:56 2023 +0200
@@ -2,6 +2,7 @@
  COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
  COPYRIGHT (c) 2015-2018 Jan Vrany
  COPYRIGHT (c) 2020 LabWare
+ COPYRIGHT (c) 2023 LabWare
               All Rights Reserved
 
 Permission is hereby granted, free of charge, to any person
@@ -61,6 +62,7 @@
  COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
  COPYRIGHT (c) 2015-2018 Jan Vrany
  COPYRIGHT (c) 2020 LabWare
+ COPYRIGHT (c) 2023 LabWare
               All Rights Reserved
 
 Permission is hereby granted, free of charge, to any person
@@ -3906,8 +3908,13 @@
 
     | changeset |
     changeset := changesetHolder value. "/deepCopy.
-    (changeset isKindOf: ChangeSet) ifFalse:
-        [changeset := ChangeSet withAll: changeset].
+    changeset isSequenceable ifFalse: [
+        changeset isCompositeChange ifTrue: [ 
+            changeset := ChangeSet withAll: changeset changes
+        ] ifFalse: [ 
+            changeset := ChangeSet with: changeset
+        ].
+    ].
 
     ^ (self navigatorSpecHolder value ~~ #oneColumnNavigatorSpec) ifTrue:[
         changeset groupByClass
@@ -3917,6 +3924,7 @@
 
     "Created: / 24-10-2009 / 19:31:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 27-07-2012 / 17:02:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 04-04-2023 / 22:29:19 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 iconSelectorForChange:aChange