equal
deleted
inserted
replaced
160 label: '-' |
160 label: '-' |
161 isVisible: notEditingClassSourceAndNotReadOnly |
161 isVisible: notEditingClassSourceAndNotReadOnly |
162 ) |
162 ) |
163 (MenuItem |
163 (MenuItem |
164 enabled: hasSelection |
164 enabled: hasSelection |
165 label: 'Save in...' |
165 label: 'Save In...' |
166 itemValue: doSave |
166 itemValue: doSave |
167 translateLabel: true |
167 translateLabel: true |
168 ) |
168 ) |
169 (MenuItem |
169 (MenuItem |
170 enabled: hasSelection |
170 enabled: hasSelection |
171 label: 'Save to End in...' |
171 label: 'Save to End In...' |
172 itemValue: doSaveRest |
172 itemValue: doSaveRest |
173 translateLabel: true |
173 translateLabel: true |
174 ) |
174 ) |
175 (MenuItem |
175 (MenuItem |
176 enabled: hasSelection |
176 enabled: hasSelection |
177 label: 'Save for Class to End in...' |
177 label: 'Save for Class to End In...' |
178 itemValue: doSaveClassRest |
178 itemValue: doSaveClassRest |
179 translateLabel: true |
179 translateLabel: true |
180 ) |
180 ) |
181 (MenuItem |
181 (MenuItem |
182 enabled: hasSelection |
182 enabled: hasSelection |
183 label: 'Save All for Class in...' |
183 label: 'Save All for Class In...' |
184 itemValue: doSaveClassAll |
184 itemValue: doSaveClassAll |
185 translateLabel: true |
185 translateLabel: true |
186 ) |
186 ) |
187 (MenuItem |
187 (MenuItem |
188 label: '-' |
188 label: '-' |
484 ) |
484 ) |
485 (MenuItem |
485 (MenuItem |
486 label: '-' |
486 label: '-' |
487 ) |
487 ) |
488 (MenuItem |
488 (MenuItem |
489 label: 'Add Applies to ChangeSet...' |
489 label: 'Add Applies to ChangeSet' |
490 translateLabel: true |
490 translateLabel: true |
491 indication: updateChangeSet |
491 indication: updateChangeSet |
492 ) |
492 ) |
493 (MenuItem |
493 (MenuItem |
494 label: 'Apply in Original NameSpace' |
494 label: 'Apply in Original NameSpace' |
541 ) |
541 ) |
542 ) |
542 ) |
543 nil |
543 nil |
544 nil |
544 nil |
545 ) |
545 ) |
|
546 ! ! |
|
547 |
|
548 !ChangeSetBrowser methodsFor:'aspects'! |
|
549 |
|
550 canDeleteChanges |
|
551 "makes the delete buttons in the toolbar visible" |
|
552 |
|
553 ^ false. |
546 ! ! |
554 ! ! |
547 |
555 |
548 !ChangeSetBrowser methodsFor:'initialization & release'! |
556 !ChangeSetBrowser methodsFor:'initialization & release'! |
549 |
557 |
550 askIfChangesAreToBeWrittenBack |
558 askIfChangesAreToBeWrittenBack |
989 "Modified: / 7.2.1998 / 19:52:44 / cg" |
997 "Modified: / 7.2.1998 / 19:52:44 / cg" |
990 ! ! |
998 ! ! |
991 |
999 |
992 !ChangeSetBrowser methodsFor:'user actions'! |
1000 !ChangeSetBrowser methodsFor:'user actions'! |
993 |
1001 |
|
1002 compareChange:changeNr showResult:doShowResult |
|
1003 |change isSame outcome beep oldSource newSource showDiff d| |
|
1004 |
|
1005 change := changeSet at:changeNr. |
|
1006 change isMethodCodeChange ifTrue:[ |
|
1007 newSource := change source. |
|
1008 |
|
1009 isSame := self |
|
1010 compareMethodSource:newSource |
|
1011 withVersionInClass:change changeClass |
|
1012 into:[:outcomeResult :beepResult :oldSourceResult | |
|
1013 outcome := outcomeResult. |
|
1014 beep := beepResult. |
|
1015 oldSource := oldSourceResult. |
|
1016 ]. |
|
1017 |
|
1018 isSame isNil ifTrue:[ |
|
1019 showDiff := false. |
|
1020 ] ifFalse:[ |
|
1021 showDiff := isSame not. |
|
1022 ]. |
|
1023 |
|
1024 doShowResult ifTrue:[ |
|
1025 (showDiff and:[oldSource notNil and:[newSource notNil]]) ifTrue:[ |
|
1026 d := DiffCodeView |
|
1027 openOn:oldSource label:(resources string:'Current version (in image)') |
|
1028 and:newSource label:(resources string:'Change version'). |
|
1029 d label:'method differences'. |
|
1030 ] |
|
1031 ]. |
|
1032 ] ifFalse:[ |
|
1033 super compareChange:changeNr showResult:doShowResult |
|
1034 ]. |
|
1035 ! |
|
1036 |
994 doInspectChange |
1037 doInspectChange |
995 self withSelectedChangesDo:[:changeNr | |
1038 self withSelectedChangesDo:[:changeNr | |
996 (changeSet at:changeNr) inspect |
1039 (changeSet at:changeNr) inspect |
997 ]. |
1040 ]. |
998 ! |
1041 ! |
1044 ! ! |
1087 ! ! |
1045 |
1088 |
1046 !ChangeSetBrowser class methodsFor:'documentation'! |
1089 !ChangeSetBrowser class methodsFor:'documentation'! |
1047 |
1090 |
1048 version |
1091 version |
1049 ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.64 2014-12-11 20:48:46 cg Exp $' |
1092 ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.65 2014-12-11 21:56:44 cg Exp $' |
1050 ! |
1093 ! |
1051 |
1094 |
1052 version_CVS |
1095 version_CVS |
1053 ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.64 2014-12-11 20:48:46 cg Exp $' |
1096 ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.65 2014-12-11 21:56:44 cg Exp $' |
1054 ! ! |
1097 ! ! |
1055 |
1098 |