equal
deleted
inserted
replaced
1227 mergeDataHolder |
1227 mergeDataHolder |
1228 "return/create the 'mergeDataHolder' value holder (automatically generated)" |
1228 "return/create the 'mergeDataHolder' value holder (automatically generated)" |
1229 |
1229 |
1230 mergeDataHolder isNil ifTrue:[ |
1230 mergeDataHolder isNil ifTrue:[ |
1231 mergeDataHolder := ValueHolder new. |
1231 mergeDataHolder := ValueHolder new. |
|
1232 mergeDataHolder addDependent:self. |
1232 ]. |
1233 ]. |
1233 ^ mergeDataHolder |
1234 ^ mergeDataHolder |
1234 ! |
1235 ! |
1235 |
1236 |
1236 mergeDataHolder:something |
1237 mergeDataHolder:something |
1237 "set the 'mergeDataHolder' value holder (automatically generated)" |
1238 "set the 'mergeDataHolder' value holder (automatically generated)" |
1238 |
1239 |
|
1240 |oldValue newValue| |
|
1241 |
|
1242 mergeDataHolder notNil ifTrue:[ |
|
1243 oldValue := mergeDataHolder value. |
|
1244 mergeDataHolder removeDependent:self. |
|
1245 ]. |
1239 mergeDataHolder := something. |
1246 mergeDataHolder := something. |
|
1247 mergeDataHolder notNil ifTrue:[ |
|
1248 mergeDataHolder addDependent:self. |
|
1249 ]. |
|
1250 newValue := mergeDataHolder value. |
|
1251 oldValue ~~ newValue ifTrue:[ |
|
1252 self update:#value with:newValue from:mergeDataHolder. |
|
1253 ]. |
1240 ! |
1254 ! |
1241 |
1255 |
1242 mergeHolder |
1256 mergeHolder |
1243 "return/create the 'mergeHolder' value holder (automatically generated)" |
1257 "return/create the 'mergeHolder' value holder (automatically generated)" |
1244 |
1258 |
1490 "Created: / 05-12-2009 / 11:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1504 "Created: / 05-12-2009 / 11:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1491 "Modified: / 29-06-2011 / 08:24:18 / Jan Vrany <enter your email here>" |
1505 "Modified: / 29-06-2011 / 08:24:18 / Jan Vrany <enter your email here>" |
1492 "Modified: / 15-01-2013 / 11:30:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1506 "Modified: / 15-01-2013 / 11:30:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1493 ! |
1507 ! |
1494 |
1508 |
|
1509 mergeDataChanged |
|
1510 |
|
1511 "Created: / 16-01-2013 / 09:24:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1512 ! |
|
1513 |
1495 selectionChanged |
1514 selectionChanged |
1496 |
1515 |
1497 | diffItem mergeData | |
1516 | diffItem mergeData | |
1498 |
1517 |
1499 diffItem := self theSingleSelectedObject. |
1518 diffItem := self theSingleSelectedObject. |
1539 sender == diffInfoHolder ifTrue:[ |
1558 sender == diffInfoHolder ifTrue:[ |
1540 self diffInfoChanged. |
1559 self diffInfoChanged. |
1541 ^self. |
1560 ^self. |
1542 ]. |
1561 ]. |
1543 |
1562 |
|
1563 sender == mergeDataHolder ifTrue:[ |
|
1564 self mergeDataChanged. |
|
1565 ^self. |
|
1566 ]. |
|
1567 |
1544 ^super update: aspect with: param from: sender |
1568 ^super update: aspect with: param from: sender |
1545 |
1569 |
1546 "Created: / 05-12-2009 / 11:02:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1570 "Created: / 05-12-2009 / 11:02:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1571 "Modified: / 16-01-2013 / 09:24:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1547 ! |
1572 ! |
1548 |
1573 |
1549 updateListMenu |
1574 updateListMenu |
1550 |menu diffs loadA loadB| |
1575 |menu diffs loadA loadB| |
1551 |
1576 |
2763 version_CVS |
2788 version_CVS |
2764 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §' |
2789 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §' |
2765 ! |
2790 ! |
2766 |
2791 |
2767 version_SVN |
2792 version_SVN |
2768 ^ '$Id: Tools__ChangeSetDiffTool.st 8086 2013-01-15 12:03:21Z vranyj1 $' |
2793 ^ '$Id: Tools__ChangeSetDiffTool.st 8087 2013-01-16 11:53:38Z vranyj1 $' |
2769 ! ! |
2794 ! ! |