--- a/Tools__ChangeSetBrowser2.st Wed Sep 12 12:00:27 2012 +0100
+++ b/Tools__ChangeSetBrowser2.st Thu Sep 13 10:15:20 2012 +0100
@@ -1,6 +1,6 @@
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
- All Rights Reserved
+ All Rights Reserved
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -37,7 +37,7 @@
allowAcceptHolder infoPanel updateChangeFileHolder
showFilterHolder showingRegularChangesetHolder isWorkingHolder
isWorkingNotHolder hasSelectionHolder'
- classVariableNames:'ShowRemoved LastSelectionConditionString'
+ classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages'
poolDictionaries:''
category:'Interface-Browsers-ChangeSet'
!
@@ -55,7 +55,7 @@
copyright
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
- All Rights Reserved
+ All Rights Reserved
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -88,9 +88,9 @@
compatibility with other tools"
^aStringOrChangeSet isString ifTrue:[
- self onFile: aStringOrChangeSet
+ self onFile: aStringOrChangeSet
] ifFalse:[
- self on: aStringOrChangeSet label: aStringOrChangeSet name
+ self on: aStringOrChangeSet label: aStringOrChangeSet name
]
"Modified: / 21-05-2012 / 13:55:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -109,8 +109,8 @@
browser := self new.
browser
- changeset: aChangeSet;
- title: label.
+ changeset: aChangeSet;
+ title: label.
aBlock value: browser.
^browser
@@ -254,7 +254,7 @@
the UIHelpTool may not be able to read the specification."
"
- UIHelpTool openOnClass:Tools::ChangeSetBrowser2
+ UIHelpTool openOnClass:Tools::ChangeSetBrowser2
"
<resource: #help>
@@ -384,8 +384,8 @@
<resource: #image>
^Icon
- constantNamed:#'NewChangesBrowser class applyFromLastSnapshotIcon'
- ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:#'NewChangesBrowser class applyFromLastSnapshotIcon'
+ ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@BH"H"H@@@@@@@@@H"H"H @@@@@@@@@@@@@B@@@@@@
@@;.;.; H@@@@@@@C.;.;.@@@@@@@@@@@@@@8@@N@@@@C?????C @@@N@@@O????<@@@8@@@@@@@@@C0@@@@8@@O????<O@@C @@@@?????0@@@@C @@@@@@
@O@@@N@@@@DQDQDP<@C @@@@@_??DQ@@@@@@@@@A????D@@@@@@@@@DQDQDP@@@@C @@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 0 255 0 0 0 255 0 255 255 255 255 0 255 0 255 127 0 0 0 127 0 0 0 127 0 127 127 127 127 0 127 0 127 127 127 127 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@C?0@B@P@B@P@O?P@O?P@O?0@??@@??@@??LC?<\C?<\C?<8O?08O?10O?10??C ??[@??_@?<^@?<_@?<_@') ; yourself); yourself]
@@ -407,8 +407,8 @@
<resource: #image>
^Icon
- constantNamed:#'NewChangesBrowser class applyFromLastSnapshotIcon1'
- ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:#'NewChangesBrowser class applyFromLastSnapshotIcon1'
+ ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
@@@BH@@@@@@QDQ<@@BH @@@@@AH"H@@@H"@@@@@@D"H H H"@@@@@@@RH"@"H"@@@@@@@AH"H@H"H@@@@@@@<@@@@BH@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@;.;.; @@@@@@@@C.;.;.@@@@@@@@@@@@@@8@@N@@@@C?????C @@@N@@@O????<@@@8@@@@@@@@@C0@@@@8@@O????<O@@C @@@@?????0@@@@C @@@@@@
@O@@@N@@@@DQDQDP<@C @@@@@_??DQ@@@@@@@@@A????D@@@@@@@@@DQDQDP@@@@C @@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 0 255 0 0 0 255 0 255 255 255 255 0 255 0 255 127 0 0 0 127 0 0 0 127 0 127 127 127 127 0 127 0 127 127 127 127 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'A@C<C@C<C@C<&@C<<@C<\@C<H@@@@?<@@?<@@?<LC?<\C?<\C?<8O?08O?10O?10??C ??[@??_@?<^@?<_@?<_@') ; yourself); yourself]
@@ -434,8 +434,8 @@
<resource: #image>
^Icon
- constantNamed:#'NewChangesBrowser class applyIcon'
- ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:#'NewChangesBrowser class applyIcon'
+ ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
UUUUUUUPUUUUUU?PUUUUUU?[UUUUUW=PP@@@@C<QQUUU=_4PQUUU?_4VQ**U_?TPQUUUW?TPQUUUW=TXQ***U=TPQ**UUUTPQ*****TPQ***%UTPQ****)TP
QUUUUUTPQUUUUUTUP@@@@@@PUUUUUUUPUUUUUUUPUUUUUUUPUUUUUUUP') ; colorMapFromArray:#[0 0 0 255 255 255 170 170 170 255 0 0]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
@@@@@@@8@@@8@@A0_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@ -462,8 +462,8 @@
<resource: #image>
^Icon
- constantNamed:#'NewChangesBrowser class applyIcon2'
- ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[4]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:#'NewChangesBrowser class applyIcon2'
+ ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[4]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
DQDQDQDQDQDQP3PQDQDQDQDQDQECMADQDQDQDQDQECMADQDQDQEDPQDTL4DP@@@@@DL4@DL4@Q@QDQDQP3MAP3PADADQDQDTL3P3PPDPD"H"HQECL3MA@Q@Q
DQDQDQP3MADADADQDQDQDTL4DPDPD"H"H"HQEDDQ@Q@RH"H!!DQDQDQDADAH"H"H"H"H"DPDPD"H"H"H!!DQDQ@Q@RH"H"H"H"HQDADADQDQDQDQDQDPDPDQDQ
DQDQDQDQ@Q@@@@@@@@@@@@@ADQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDb') ; colorMapFromArray:#[0 0 0 255 255 255 170 170 170 255 0 0 85 85 85]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
@@ -491,8 +491,8 @@
<resource: #image>
^Icon
- constantNamed:#'NewChangesBrowser class applyToEndIcon'
- ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[4]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:#'NewChangesBrowser class applyToEndIcon'
+ ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[4]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
@@@DP@@@@@@@@@@@@DQ@@@@@@@@@@@@@QD@@@"H"H"@@Q@QD@@@BH"H"H@ADQD@@@@@@@@@ @@QDP@@BH"H"HB@@@DP@@@H"H"H @@@@@@@@@@@@@B@@@@@@
@@L3L3L0H@@@@@@@@3L3L3@@@@@@@@@@@@@@L@@B@@@@@3L3L3@0@@@B@@@CL3L3L@@@H@@@@@@@@@@0@@@@H@@ADQDQDC@@@ @@@@DQDQDP@@@@@ @@@@@@
@A@@@B@@@@DQDQDPD@@ @@@@@SL3DQ@@@@@@@@@AL3L3D@@@@@@@@@DQDQDP@@@@@ @@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255 127 127 127 170 170 170 255 0 0]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'A@@@CC?0CC?0&C?0<O?0\O?0HO?0@??@@??@@??LC?<\C?<\C?<8O?08O?10O?10??C ??[@??_@?<^@?<_@?<_@') ; yourself); yourself]
@@ -604,8 +604,8 @@
<resource: #image>
^Icon
- constantNamed:#'NewChangesBrowser class findPreviousForClassIcon'
- ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:#'NewChangesBrowser class findPreviousForClassIcon'
+ ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
@EUUUW@A@G???<@@@G???<@@@G???<@@@G???<@@@G???<@@@G???<@@@G???<@A@G???<@M@G???<@H@G???<@@@G???<@@@G???<@I@L@@@@@@@@@@@@@A
@P@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??B@@@B@C@B@G B@O0@@_8@@G @@G @@G @') ; yourself); yourself]
!
@@ -626,8 +626,8 @@
<resource: #image>
^Icon
- constantNamed:#'NewChangesBrowser class findPreviousSnapshotIcon'
- ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:#'NewChangesBrowser class findPreviousSnapshotIcon'
+ ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
@EUUUW@A@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@A@F***(@M@F***(@H@F***(@@@F***(@@@F***(@I@L@@@@@@@@@@@@@A
@P@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??B@@@B@C@B@G B@O0@@_8@@G @@G @@G @') ; yourself); yourself]
! !
@@ -653,31 +653,31 @@
browser showRemovedAspect: true asValue.
browser beHierarchical.
browserView := ApplicationSubView new
- client:browser
- spec:#windowSpecForEmbedding.
+ client:browser
+ spec:#windowSpecForEmbedding.
dialog := (Dialog new)
- addComponent:browserView withHeight: 300;
- addAbortAndOkButtons;
- yourself.
+ addComponent:browserView withHeight: 300;
+ addAbortAndOkButtons;
+ yourself.
dialog label: aString.
dialog buttonPanel
- layout:(LayoutFrame fractions:(0.0 @ 1.0 corner:1.0 @ 1.0)
- offsets:(0 @ -30 corner:0 @ 0)).
+ layout:(LayoutFrame fractions:(0.0 @ 1.0 corner:1.0 @ 1.0)
+ offsets:(0 @ -30 corner:0 @ 0)).
browserView layout:(LayoutFrame fractions:(0.0 @ 0.0 corner:1.0 @ 1.0)
- offsets:(0 @ 0 corner:0 @ -30)).
+ offsets:(0 @ 0 corner:0 @ -30)).
dialog
- okAction:
- [^browser list1Holder value condenseChangesForRemoved];
- abortAction:
- [^#()].
+ okAction:
+ [^browser list1Holder value condenseChangesForRemoved];
+ abortAction:
+ [^#()].
dialog openWithExtent: 800@700.
^#()
"
- Tools::ChangeSetBrowser2
- confirmChanges:
- (ChangeSet current copyFrom: ((ChangeSet current size - 10) max: 1) to: ChangeSet current size)
- label: 'Last 10 changes...'
+ Tools::ChangeSetBrowser2
+ confirmChanges:
+ (ChangeSet current copyFrom: ((ChangeSet current size - 10) max: 1) to: ChangeSet current size)
+ label: 'Last 10 changes...'
"
"Created: / 08-11-2010 / 17:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -696,11 +696,11 @@
launcher toolbar button"
(thisContext sender sender receiver isKindOf: AbstractLauncherApplication) ifTrue:[
- browser builder window sensor
- pushUserEvent: #doOpenCurrent for: browser.
+ browser builder window sensor
+ pushUserEvent: #doOpenCurrent for: browser.
] ifFalse:[
- browser builder window sensor
- pushUserEvent: #doOpenNew for: browser.
+ browser builder window sensor
+ pushUserEvent: #doOpenNew for: browser.
]
@@ -709,12 +709,12 @@
!
openOn: aChangeSet
- ^(self on: aChangeSet)
- open;
- yourself.
+ ^(self on: aChangeSet)
+ open;
+ yourself.
"
- self openOn: ChangeSet current
+ self openOn: ChangeSet current
"
"Modified: / 30-01-2012 / 15:59:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -751,71 +751,71 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: hierarchicalNavigatorSpec
- window:
+ name: hierarchicalNavigatorSpec
+ window:
(WindowSpec
- label: 'Hierarchical Navigator'
- name: 'Hierarchical Navigator'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 300 300)
- )
- component:
+ label: 'Hierarchical Navigator'
+ name: 'Hierarchical Navigator'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 300 300)
+ )
+ component:
(SpecCollection
- collection: (
- (SubCanvasSpec
- name: 'ChangeList'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::HierarchicalChangeList'
- subAspectHolders:
- (Array
-
- (SubChannelInfoSpec
- subAspect: allowAcceptHolder
- aspect: allowAcceptHolder
- )
- (SubChannelInfoSpec
- subAspect: allowRemoveHolder
- aspect: allowRemoveHolder
- )
-
- (SubChannelInfoSpec
- subAspect: inGeneratorHolder
- aspect: list1Holder
- )
- (SubChannelInfoSpec
- subAspect: menuHolder
- aspect: list1MenuHolder
- )
-
- (SubChannelInfoSpec
- subAspect: selectionHolder
- aspect: selection1Holder
- )
- (SubChannelInfoSpec
- subAspect: showFilterHolder
- aspect: showFilterHolder
- )
-
- (SubChannelInfoSpec
- subAspect: showRemovedHolder
- aspect: showRemovedAspect
- )
- (SubChannelInfoSpec
- subAspect: showSameHolder
- aspect: showSameAspect
- )
- )
- createNewApplication: true
- createNewBuilder: true
- postBuildCallback: list1View:
- )
- )
-
- )
+ collection: (
+ (SubCanvasSpec
+ name: 'ChangeList'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: #'Tools::HierarchicalChangeList'
+ subAspectHolders:
+ (Array
+
+ (SubChannelInfoSpec
+ subAspect: allowAcceptHolder
+ aspect: allowAcceptHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: allowRemoveHolder
+ aspect: allowRemoveHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: inGeneratorHolder
+ aspect: list1Holder
+ )
+ (SubChannelInfoSpec
+ subAspect: menuHolder
+ aspect: list1MenuHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: selectionHolder
+ aspect: selection1Holder
+ )
+ (SubChannelInfoSpec
+ subAspect: showFilterHolder
+ aspect: showFilterHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: showRemovedHolder
+ aspect: showRemovedAspect
+ )
+ (SubChannelInfoSpec
+ subAspect: showSameHolder
+ aspect: showSameAspect
+ )
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ postBuildCallback: list1View:
+ )
+ )
+
+ )
)
!
@@ -833,76 +833,76 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: oneColumnNavigatorSpec
- window:
+ name: oneColumnNavigatorSpec
+ window:
(WindowSpec
- label: 'One Column Navigator'
- name: 'One Column Navigator'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 300 300)
- )
- component:
+ label: 'One Column Navigator'
+ name: 'One Column Navigator'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 300 300)
+ )
+ component:
(SpecCollection
- collection: (
- (SubCanvasSpec
- name: 'ChangeList'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::ChangeList'
- subAspectHolders:
- (Array
-
- (SubChannelInfoSpec
- subAspect: allowAcceptHolder
- aspect: allowAcceptHolder
- )
- (SubChannelInfoSpec
- subAspect: allowRemoveHolder
- aspect: allowRemoveHolder
- )
-
- (SubChannelInfoSpec
- subAspect: inGeneratorHolder
- aspect: list1Holder
- )
- (SubChannelInfoSpec
- subAspect: menuHolder
- aspect: list1MenuHolder
- )
-
- (SubChannelInfoSpec
- subAspect: selectionHolder
- aspect: selection1Holder
- )
- (SubChannelInfoSpec
- subAspect: showFilterHolder
- aspect: showFilterHolder
- )
-
- (SubChannelInfoSpec
- subAspect: showRemovedHolder
- aspect: showRemovedAspect
- )
- (SubChannelInfoSpec
- subAspect: showSameHolder
- aspect: showSameAspect
- )
-
- (SubChannelInfoSpec
- subAspect: showTimestampHolder
- aspect: showTimestampHolder
- )
- )
- createNewApplication: true
- createNewBuilder: true
- postBuildCallback: list1View:
- )
- )
-
- )
+ collection: (
+ (SubCanvasSpec
+ name: 'ChangeList'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: #'Tools::ChangeList'
+ subAspectHolders:
+ (Array
+
+ (SubChannelInfoSpec
+ subAspect: allowAcceptHolder
+ aspect: allowAcceptHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: allowRemoveHolder
+ aspect: allowRemoveHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: inGeneratorHolder
+ aspect: list1Holder
+ )
+ (SubChannelInfoSpec
+ subAspect: menuHolder
+ aspect: list1MenuHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: selectionHolder
+ aspect: selection1Holder
+ )
+ (SubChannelInfoSpec
+ subAspect: showFilterHolder
+ aspect: showFilterHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: showRemovedHolder
+ aspect: showRemovedAspect
+ )
+ (SubChannelInfoSpec
+ subAspect: showSameHolder
+ aspect: showSameAspect
+ )
+
+ (SubChannelInfoSpec
+ subAspect: showTimestampHolder
+ aspect: showTimestampHolder
+ )
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ postBuildCallback: list1View:
+ )
+ )
+
+ )
)
!
@@ -920,143 +920,143 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: twoColumnNavigatorSpec
- window:
+ name: twoColumnNavigatorSpec
+ window:
(WindowSpec
- label: 'Two Column Navigator'
- name: 'Two Column Navigator'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 300 300)
- )
- component:
+ label: 'Two Column Navigator'
+ name: 'Two Column Navigator'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 300 300)
+ )
+ component:
(SpecCollection
- collection: (
- (VariableHorizontalPanelSpec
- name: 'Columns'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- component:
- (SpecCollection
- collection: (
- (SubCanvasSpec
- name: 'FirstColumn'
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::ChangeList'
- subAspectHolders:
- (Array
-
- (SubChannelInfoSpec
- subAspect: allowAcceptHolder
- aspect: allowAcceptHolder
- )
- (SubChannelInfoSpec
- subAspect: allowRemoveHolder
- aspect: allowRemoveHolder
- )
-
- (SubChannelInfoSpec
- subAspect: inGeneratorHolder
- aspect: list1Holder
- )
- (SubChannelInfoSpec
- subAspect: menuHolder
- aspect: list1MenuHolder
- )
-
- (SubChannelInfoSpec
- subAspect: outGeneratorHolder
- aspect: list2Holder
- )
- (SubChannelInfoSpec
- subAspect: selectionHolder
- aspect: selection1Holder
- )
-
- (SubChannelInfoSpec
- subAspect: showFilterHolder
- aspect: showFilterHolder
- )
- (SubChannelInfoSpec
- subAspect: showRemovedHolder
- aspect: showRemovedAspect
- )
-
- (SubChannelInfoSpec
- subAspect: showSameHolder
- aspect: showSameAspect
- )
- (SubChannelInfoSpec
- subAspect: showTimestampHolder
- aspect: showTimestampHolder
- )
- )
- createNewApplication: true
- createNewBuilder: true
- postBuildCallback: list1View:
- )
- (SubCanvasSpec
- name: 'SecondColumn'
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::ChangeList'
- subAspectHolders:
- (Array
-
- (SubChannelInfoSpec
- subAspect: allowAcceptHolder
- aspect: allowAcceptHolder
- )
- (SubChannelInfoSpec
- subAspect: allowRemoveHolder
- aspect: allowRemoveHolder
- )
-
- (SubChannelInfoSpec
- subAspect: inGeneratorHolder
- aspect: list2Holder
- )
- (SubChannelInfoSpec
- subAspect: menuHolder
- aspect: list2MenuHolder
- )
-
- (SubChannelInfoSpec
- subAspect: selectionHolder
- aspect: selection2Holder
- )
- (SubChannelInfoSpec
- subAspect: showFilterHolder
- aspect: showFilterHolder
- )
-
- (SubChannelInfoSpec
- subAspect: showRemovedHolder
- aspect: showRemovedAspect
- )
- (SubChannelInfoSpec
- subAspect: showSameHolder
- aspect: showSameAspect
- )
-
- (SubChannelInfoSpec
- subAspect: showTimestampHolder
- aspect: showTimestampHolder
- )
- )
- createNewApplication: true
- createNewBuilder: true
- postBuildCallback: list2View:
- )
- )
-
- )
- handles: (Any 0.5 1.0)
- )
- )
-
- )
+ collection: (
+ (VariableHorizontalPanelSpec
+ name: 'Columns'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ component:
+ (SpecCollection
+ collection: (
+ (SubCanvasSpec
+ name: 'FirstColumn'
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: #'Tools::ChangeList'
+ subAspectHolders:
+ (Array
+
+ (SubChannelInfoSpec
+ subAspect: allowAcceptHolder
+ aspect: allowAcceptHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: allowRemoveHolder
+ aspect: allowRemoveHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: inGeneratorHolder
+ aspect: list1Holder
+ )
+ (SubChannelInfoSpec
+ subAspect: menuHolder
+ aspect: list1MenuHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: outGeneratorHolder
+ aspect: list2Holder
+ )
+ (SubChannelInfoSpec
+ subAspect: selectionHolder
+ aspect: selection1Holder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: showFilterHolder
+ aspect: showFilterHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: showRemovedHolder
+ aspect: showRemovedAspect
+ )
+
+ (SubChannelInfoSpec
+ subAspect: showSameHolder
+ aspect: showSameAspect
+ )
+ (SubChannelInfoSpec
+ subAspect: showTimestampHolder
+ aspect: showTimestampHolder
+ )
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ postBuildCallback: list1View:
+ )
+ (SubCanvasSpec
+ name: 'SecondColumn'
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: #'Tools::ChangeList'
+ subAspectHolders:
+ (Array
+
+ (SubChannelInfoSpec
+ subAspect: allowAcceptHolder
+ aspect: allowAcceptHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: allowRemoveHolder
+ aspect: allowRemoveHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: inGeneratorHolder
+ aspect: list2Holder
+ )
+ (SubChannelInfoSpec
+ subAspect: menuHolder
+ aspect: list2MenuHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: selectionHolder
+ aspect: selection2Holder
+ )
+ (SubChannelInfoSpec
+ subAspect: showFilterHolder
+ aspect: showFilterHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: showRemovedHolder
+ aspect: showRemovedAspect
+ )
+ (SubChannelInfoSpec
+ subAspect: showSameHolder
+ aspect: showSameAspect
+ )
+
+ (SubChannelInfoSpec
+ subAspect: showTimestampHolder
+ aspect: showTimestampHolder
+ )
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ postBuildCallback: list2View:
+ )
+ )
+
+ )
+ handles: (Any 0.5 1.0)
+ )
+ )
+
+ )
)
!
@@ -1075,45 +1075,45 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: windowSpec
- window:
+ name: windowSpec
+ window:
(WindowSpec
- label: 'ChangeSet browser'
- name: 'ChangeSet browser'
- labelChannel: titleHolder
- min: (Point 10 10)
- bounds: (Rectangle 0 0 800 600)
- menu: mainMenu
- )
- component:
+ label: 'ChangeSet browser'
+ name: 'ChangeSet browser'
+ labelChannel: titleHolder
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 800 600)
+ menu: mainMenu
+ )
+ component:
(SpecCollection
- collection: (
- (MenuPanelSpec
- name: 'ToolBar'
- layout: (LayoutFrame 0 0 0 0 0 1 30 0)
- menu: toolbarMenu
- textDefault: true
- )
- (SubCanvasSpec
- name: 'InfoPanel'
- layout: (LayoutFrame 0 0 30 0 0 1 70 0)
- level: 0
- initiallyInvisible: true
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- clientKey: infoPanel
- createNewBuilder: false
- )
- (UISubSpecification
- name: 'Contents'
- layout: (LayoutFrame 0 0 30 0 0 1 0 1)
- minorKey: windowSpecWithoutToolbar
- )
- )
-
- )
+ collection: (
+ (MenuPanelSpec
+ name: 'ToolBar'
+ layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+ menu: toolbarMenu
+ textDefault: true
+ )
+ (SubCanvasSpec
+ name: 'InfoPanel'
+ layout: (LayoutFrame 0 0 30 0 0 1 70 0)
+ level: 0
+ initiallyInvisible: true
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ clientKey: infoPanel
+ createNewBuilder: false
+ )
+ (UISubSpecification
+ name: 'Contents'
+ layout: (LayoutFrame 0 0 30 0 0 1 0 1)
+ minorKey: windowSpecWithoutToolbar
+ )
+ )
+
+ )
)
!
@@ -1138,82 +1138,82 @@
^
#(FullSpec
- name: windowSpecWithoutToolbar
- window:
+ name: windowSpecWithoutToolbar
+ window:
(WindowSpec
- label: 'ChangeSet browser'
- name: 'ChangeSet browser'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 653 488)
- menu: mainMenu
- )
- component:
+ label: 'ChangeSet browser'
+ name: 'ChangeSet browser'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 653 488)
+ menu: mainMenu
+ )
+ component:
(SpecCollection
- collection: (
- (VariableVerticalPanelSpec
- name: 'VerticalPanel'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- component:
- (SpecCollection
- collection: (
- (SubCanvasSpec
- name: 'NavigatorPanel'
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- specHolder: navigatorSpecHolder
- createNewBuilder: false
- )
- (SubCanvasSpec
- name: 'TextDiffTool'
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::TextDiff2Tool'
- minorKey: windowSpecForEmbedding
- subAspectHolders:
- (Array
-
- (SubChannelInfoSpec
- subAspect: classHolder
- aspect: classHolder
- )
- (SubChannelInfoSpec
- subAspect: languageHolder
- aspect: languageHolder
- )
- (SubChannelInfoSpec
- subAspect: codeAspectHolder
- aspect: codeAspectHolder
- )
-
- (SubChannelInfoSpec
- subAspect: labelAHolder
- aspect: labelAHolder
- )
- (SubChannelInfoSpec
- subAspect: labelBHolder
- aspect: labelBHolder
- )
-
- (SubChannelInfoSpec
- subAspect: textAHolder
- aspect: changeSourceHolder
- )
- (SubChannelInfoSpec
- subAspect: textBHolder
- aspect: imageSourceHolder
- )
- )
- createNewApplication: true
- createNewBuilder: true
- )
- )
-
- )
- handles: (Any 0.5 1.0)
- )
- )
-
- )
+ collection: (
+ (VariableVerticalPanelSpec
+ name: 'VerticalPanel'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ component:
+ (SpecCollection
+ collection: (
+ (SubCanvasSpec
+ name: 'NavigatorPanel'
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ specHolder: navigatorSpecHolder
+ createNewBuilder: false
+ )
+ (SubCanvasSpec
+ name: 'TextDiffTool'
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: #'Tools::TextDiff2Tool'
+ minorKey: windowSpecForEmbedding
+ subAspectHolders:
+ (Array
+
+ (SubChannelInfoSpec
+ subAspect: classHolder
+ aspect: classHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: languageHolder
+ aspect: languageHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: codeAspectHolder
+ aspect: codeAspectHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: labelAHolder
+ aspect: labelAHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: labelBHolder
+ aspect: labelBHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: textAHolder
+ aspect: changeSourceHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: textBHolder
+ aspect: imageSourceHolder
+ )
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ )
+ )
+
+ )
+ handles: (Any 0.5 1.0)
+ )
+ )
+
+ )
)
"Modified: / 03-12-2011 / 10:36:40 / cg"
@@ -1237,143 +1237,143 @@
<resource: #menu>
- ^
+ ^
#(Menu
- (
- (MenuItem
- enabled: hasChangeSelectedAndNotRemoved:
- label: 'Apply'
- itemValue: changeMenuApplySelection:
- translateLabel: true
- isVisible: allowAcceptHolder
- shortcutKey: Accept
- auxValue: 100
- )
- (MenuItem
- label: 'Apply all'
- itemValue: changeMenuApply:
- translateLabel: true
- isVisible: allowAcceptHolder
- )
- (MenuItem
- label: '-'
- isVisible: allowAcceptHolder
- )
- (MenuItem
- label: 'Delete (selected)'
- itemValue: changeMenuDeleteSelection:
- nameKey: Delete
- translateLabel: true
- isVisible: allowRemoveHolder
- shortcutKey: Delete
- )
- (MenuItem
- label: 'Delete (unselected)'
- itemValue: changeMenuDeleteSelectionInverted:
- nameKey: Delete
- translateLabel: true
- isVisible: allowRemoveHolder
- )
- (MenuItem
- label: 'Undelete'
- itemValue: changeMenuUndeleteSelection:
- nameKey: Undelete
- translateLabel: true
- isVisible: allowRemoveHolder
- )
- (MenuItem
- label: '-'
- isVisible: allowRemoveHolder
- )
- (MenuItem
- label: 'Select...'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Select same'
- itemValue: changeMenuSelectSame:
- translateLabel: true
- )
- (MenuItem
- label: 'Select additions (new classes/methods)'
- itemValue: changeMenuSelectAdditions:
- translateLabel: true
- )
- (MenuItem
- label: 'Select removals'
- itemValue: changeMenuSelectRemovals:
- translateLabel: true
- )
- (MenuItem
- label: 'Select differences'
- itemValue: changeMenuSelectDifferences:
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Select all'
- itemValue: changeMenuSelectAll:
- translateLabel: true
- shortcutKey: SelectAll
- )
- (MenuItem
- label: 'Select none'
- itemValue: changeMenuSelectNone:
- translateLabel: true
- )
- (MenuItem
- label: 'Invert Selection'
- itemValue: changeMenuSelectInversion:
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Select Using Block...'
- itemValue: changeMenuSelectUsingBlock:
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Show Deleted'
- translateLabel: true
- isVisible: allowRemoveHolder
- indication: showRemovedAspect
- )
- (MenuItem
- label: 'Show Same'
- translateLabel: true
- indication: showSameAspect
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Inspect change'
- itemValue: changeMenuInspect:
- translateLabel: true
- )
- (MenuItem
- enabled: hasSingleChangeSelectedAndCanBrowse:
- label: 'Browse Method(s)'
- itemValue: changeMenuBrowse:
- translateLabel: true
- )
- )
- nil
- nil
+ (
+ (MenuItem
+ enabled: hasChangeSelectedAndNotRemoved:
+ label: 'Apply'
+ itemValue: changeMenuApplySelection:
+ translateLabel: true
+ isVisible: allowAcceptHolder
+ shortcutKey: Accept
+ auxValue: 100
+ )
+ (MenuItem
+ label: 'Apply all'
+ itemValue: changeMenuApply:
+ translateLabel: true
+ isVisible: allowAcceptHolder
+ )
+ (MenuItem
+ label: '-'
+ isVisible: allowAcceptHolder
+ )
+ (MenuItem
+ label: 'Delete (selected)'
+ itemValue: changeMenuDeleteSelection:
+ nameKey: Delete
+ translateLabel: true
+ isVisible: allowRemoveHolder
+ shortcutKey: Delete
+ )
+ (MenuItem
+ label: 'Delete (unselected)'
+ itemValue: changeMenuDeleteSelectionInverted:
+ nameKey: Delete
+ translateLabel: true
+ isVisible: allowRemoveHolder
+ )
+ (MenuItem
+ label: 'Undelete'
+ itemValue: changeMenuUndeleteSelection:
+ nameKey: Undelete
+ translateLabel: true
+ isVisible: allowRemoveHolder
+ )
+ (MenuItem
+ label: '-'
+ isVisible: allowRemoveHolder
+ )
+ (MenuItem
+ label: 'Select...'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Select same'
+ itemValue: changeMenuSelectSame:
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Select additions (new classes/methods)'
+ itemValue: changeMenuSelectAdditions:
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Select removals'
+ itemValue: changeMenuSelectRemovals:
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Select differences'
+ itemValue: changeMenuSelectDifferences:
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Select all'
+ itemValue: changeMenuSelectAll:
+ translateLabel: true
+ shortcutKey: SelectAll
+ )
+ (MenuItem
+ label: 'Select none'
+ itemValue: changeMenuSelectNone:
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Invert Selection'
+ itemValue: changeMenuSelectInversion:
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Select Using Block...'
+ itemValue: changeMenuSelectUsingBlock:
+ translateLabel: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Show Deleted'
+ translateLabel: true
+ isVisible: allowRemoveHolder
+ indication: showRemovedAspect
+ )
+ (MenuItem
+ label: 'Show Same'
+ translateLabel: true
+ indication: showSameAspect
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Inspect change'
+ itemValue: changeMenuInspect:
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasSingleChangeSelectedAndCanBrowse:
+ label: 'Browse Method(s)'
+ itemValue: changeMenuBrowse:
+ translateLabel: true
+ )
+ )
+ nil
+ nil
)
!
@@ -1408,194 +1408,194 @@
<resource: #menu>
- ^
+ ^
#(Menu
- (
- (MenuItem
- label: 'File'
- submenu:
- (Menu
- (
- (MenuItem
- label: 'New'
- submenu:
- (Menu
- (
- (MenuItem
- activeHelpKey: fileNew
- label: 'New Changeset'
- itemValue: doOpenNew
- )
- (MenuItem
- label: 'New Window'
- itemValue: doOpenNewWindow
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- activeHelpKey: fileOpenSelection
- enabled: isWorkingNotHolder
- label: 'Spawn Browser on Selection'
- itemValue: doOpenOnSelection
- isVisible: allowOpenHolder
- )
- (MenuItem
- activeHelpKey: fileOpenSelection
- enabled: isWorkingNotHolder
- label: 'Spawn on Selection'
- itemValue: doOpenOnSelection
- isVisible: allowOpenHolder
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- activeHelpKey: fileLoad
- enabled: isWorkingNotHolder
- label: 'Open...'
- itemValue: doOpen
- isVisible: allowOpenHolder
- shortcutKey: Ctrlo
- )
- (MenuItem
- activeHelpKey: fileOpenCurrent
- enabled: isWorkingNotHolder
- label: 'Open Current'
- itemValue: doOpenCurrent
- isVisible: allowOpenHolder
- )
- (MenuItem
- activeHelpKey: fileOpenCurrent
- enabled: isWorkingNotHolder
- label: 'Open Cypress Package'
- itemValue: doOpenCypress
- isVisible: allowOpenHolderAndCypressPresent
- )
- (MenuItem
- activeHelpKey: fileSaveAs
- enabled: isWorkingNotHolder
- label: 'Save'
- itemValue: doSave
- )
- (MenuItem
- enabled: isWorkingNotHolder
- label: 'Save As...'
- itemValue: doSaveAs
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Exit'
- itemValue: closeRequest
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- enabled: isWorkingNotHolder
- label: 'Changes'
- isVisible: isTwoColumnHolderNot
- submenuChannel: list1MenuHolder
- )
- (MenuItem
- enabled: isWorkingNotHolder
- label: 'Left'
- isVisible: isTwoColumnHolder
- submenuChannel: list1MenuHolder
- )
- (MenuItem
- enabled: isWorkingNotHolder
- label: 'Right'
- isVisible: isTwoColumnHolder
- submenuChannel: list2MenuHolder
- )
- (MenuItem
- label: 'View'
- submenu:
- (Menu
- (
- (MenuItem
- label: 'List'
- choice: navigatorSpecHolder
- choiceValue: oneColumnNavigatorSpec
- )
- (MenuItem
- label: 'Hierarchical List'
- choice: navigatorSpecHolder
- choiceValue: hierarchicalNavigatorSpec
- )
- (MenuItem
- label: 'Browser Like'
- choice: navigatorSpecHolder
- choiceValue: twoColumnNavigatorSpec
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Show Deleted'
- indication: showRemovedAspect
- )
- (MenuItem
- label: 'Show Same'
- indication: showSameAspect
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Show Filter'
- indication: showFilterHolder
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Show Timestamp'
- indication: showTimestampHolder
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: 'Loading'
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Set Target Package...'
- itemValue: setTargetPackage
- )
- (MenuItem
- label: 'Set Target Namespace...'
- itemValue: setTargetNamespace
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Update Changefile'
- indication: updateChangeFileHolder
- )
- )
- nil
- nil
- )
- )
- )
- nil
- nil
+ (
+ (MenuItem
+ label: 'File'
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'New'
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ activeHelpKey: fileNew
+ label: 'New Changeset'
+ itemValue: doOpenNew
+ )
+ (MenuItem
+ label: 'New Window'
+ itemValue: doOpenNewWindow
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ activeHelpKey: fileOpenSelection
+ enabled: isWorkingNotHolder
+ label: 'Spawn Browser on Selection'
+ itemValue: doOpenOnSelection
+ isVisible: allowOpenHolder
+ )
+ (MenuItem
+ activeHelpKey: fileOpenSelection
+ enabled: isWorkingNotHolder
+ label: 'Spawn on Selection'
+ itemValue: doOpenOnSelection
+ isVisible: allowOpenHolder
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ activeHelpKey: fileLoad
+ enabled: isWorkingNotHolder
+ label: 'Open...'
+ itemValue: doOpen
+ isVisible: allowOpenHolder
+ shortcutKey: Ctrlo
+ )
+ (MenuItem
+ activeHelpKey: fileOpenCurrent
+ enabled: isWorkingNotHolder
+ label: 'Open Current'
+ itemValue: doOpenCurrent
+ isVisible: allowOpenHolder
+ )
+ (MenuItem
+ activeHelpKey: fileOpenCurrent
+ enabled: isWorkingNotHolder
+ label: 'Open Cypress Package'
+ itemValue: doOpenCypress
+ isVisible: allowOpenHolderAndCypressPresent
+ )
+ (MenuItem
+ activeHelpKey: fileSaveAs
+ enabled: isWorkingNotHolder
+ label: 'Save'
+ itemValue: doSave
+ )
+ (MenuItem
+ enabled: isWorkingNotHolder
+ label: 'Save As...'
+ itemValue: doSaveAs
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Exit'
+ itemValue: closeRequest
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ enabled: isWorkingNotHolder
+ label: 'Changes'
+ isVisible: isTwoColumnHolderNot
+ submenuChannel: list1MenuHolder
+ )
+ (MenuItem
+ enabled: isWorkingNotHolder
+ label: 'Left'
+ isVisible: isTwoColumnHolder
+ submenuChannel: list1MenuHolder
+ )
+ (MenuItem
+ enabled: isWorkingNotHolder
+ label: 'Right'
+ isVisible: isTwoColumnHolder
+ submenuChannel: list2MenuHolder
+ )
+ (MenuItem
+ label: 'View'
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'List'
+ choice: navigatorSpecHolder
+ choiceValue: oneColumnNavigatorSpec
+ )
+ (MenuItem
+ label: 'Hierarchical List'
+ choice: navigatorSpecHolder
+ choiceValue: hierarchicalNavigatorSpec
+ )
+ (MenuItem
+ label: 'Browser Like'
+ choice: navigatorSpecHolder
+ choiceValue: twoColumnNavigatorSpec
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Show Deleted'
+ indication: showRemovedAspect
+ )
+ (MenuItem
+ label: 'Show Same'
+ indication: showSameAspect
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Show Filter'
+ indication: showFilterHolder
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Show Timestamp'
+ indication: showTimestampHolder
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: 'Loading'
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Set Target Package...'
+ itemValue: setTargetPackage
+ )
+ (MenuItem
+ label: 'Set Target Namespace...'
+ itemValue: setTargetNamespace
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Update Changefile'
+ indication: updateChangeFileHolder
+ )
+ )
+ nil
+ nil
+ )
+ )
+ )
+ nil
+ nil
)
"Modified: / 27-07-2012 / 21:17:20 / cg"
@@ -1616,117 +1616,117 @@
<resource: #menu>
- ^
+ ^
#(Menu
- (
- (MenuItem
- activeHelpKey: fileLoad
- enabled: isWorkingNotHolder
- label: 'Load'
- itemValue: doOpen
- translateLabel: true
- isButton: true
- labelImage: (ResourceRetriever XPToolbarIconLibrary loadFromFileIcon)
- )
- (MenuItem
- activeHelpKey: fileSave
- enabled: isWorkingNotHolder
- label: 'Save'
- itemValue: doSave
- translateLabel: true
- isButton: true
- labelImage: (ResourceRetriever XPToolbarIconLibrary saveToFileIcon)
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- activeHelpKey: applyLine
- enabled: hasSelectionHolder
- label: 'Apply'
- itemValue: doApply
- translateLabel: true
- isButton: true
- labelImage: (ResourceRetriever nil applyIcon)
- )
- (MenuItem
- activeHelpKey: applyToEnd
- enabled: hasSelectionHolder
- label: 'Apply To End'
- itemValue: doApplyToEnd
- translateLabel: true
- isButton: true
- labelImage: (ResourceRetriever nil applyToEndIcon)
- )
- (MenuItem
- activeHelpKey: applyFromLastSnapshot
- enabled: hasSelectionHolder
- label: 'Apply From Last Snapshot'
- itemValue: doApplyFromLastSnapshot
- translateLabel: true
- isButton: true
- labelImage: (ResourceRetriever nil applyFromLastSnapshotIcon)
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- activeHelpKey: deleteLine
- enabled: hasSelectionHolder
- label: 'Delete'
- itemValue: doDelete
- translateLabel: true
- isButton: true
- labelImage: (ResourceRetriever nil deleteIcon)
- )
- (MenuItem
- activeHelpKey: deleteToEnd
- enabled: hasSelectionHolder
- label: 'Delete To End'
- itemValue: doDeleteToEnd
- translateLabel: true
- isButton: true
- labelImage: (ResourceRetriever nil deleteToEndIcon)
- )
- (MenuItem
- activeHelpKey: deleteCompress
- enabled: isWorkingNotHolder
- label: 'Compress'
- itemValue: doCompress
- translateLabel: true
- isButton: true
- isVisible: showingRegularChangesetHolder
- labelImage: (ResourceRetriever nil compressIcon)
- )
- (MenuItem
- label: '-'
- isVisible: showingRegularChangesetHolder
- )
- (MenuItem
- activeHelpKey: testFindPreviousSnapshot
- enabled: hasSelectionHolder
- label: 'Find Previous Snapshot'
- itemValue: doFindSnapshot:
- translateLabel: true
- isButton: true
- isVisible: showingRegularChangesetHolder
- labelImage: (ResourceRetriever nil findPreviousSnapshotIcon)
- argument: 'previous'
- )
- (MenuItem
- activeHelpKey: testFindNextSnapshot
- enabled: hasSelectionHolder
- label: 'Find Next Snapshot'
- itemValue: doFindSnapshot:
- translateLabel: true
- isButton: true
- isVisible: showingRegularChangesetHolder
- labelImage: (ResourceRetriever nil findNextSnapshotIcon)
- argument: 'next'
- )
- )
- nil
- nil
+ (
+ (MenuItem
+ activeHelpKey: fileLoad
+ enabled: isWorkingNotHolder
+ label: 'Load'
+ itemValue: doOpen
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever XPToolbarIconLibrary loadFromFileIcon)
+ )
+ (MenuItem
+ activeHelpKey: fileSave
+ enabled: isWorkingNotHolder
+ label: 'Save'
+ itemValue: doSave
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever XPToolbarIconLibrary saveToFileIcon)
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ activeHelpKey: applyLine
+ enabled: hasSelectionHolder
+ label: 'Apply'
+ itemValue: doApply
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever nil applyIcon)
+ )
+ (MenuItem
+ activeHelpKey: applyToEnd
+ enabled: hasSelectionHolder
+ label: 'Apply To End'
+ itemValue: doApplyToEnd
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever nil applyToEndIcon)
+ )
+ (MenuItem
+ activeHelpKey: applyFromLastSnapshot
+ enabled: hasSelectionHolder
+ label: 'Apply From Last Snapshot'
+ itemValue: doApplyFromLastSnapshot
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever nil applyFromLastSnapshotIcon)
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ activeHelpKey: deleteLine
+ enabled: hasSelectionHolder
+ label: 'Delete'
+ itemValue: doDelete
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever nil deleteIcon)
+ )
+ (MenuItem
+ activeHelpKey: deleteToEnd
+ enabled: hasSelectionHolder
+ label: 'Delete To End'
+ itemValue: doDeleteToEnd
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever nil deleteToEndIcon)
+ )
+ (MenuItem
+ activeHelpKey: deleteCompress
+ enabled: isWorkingNotHolder
+ label: 'Compress'
+ itemValue: doCompress
+ translateLabel: true
+ isButton: true
+ isVisible: showingRegularChangesetHolder
+ labelImage: (ResourceRetriever nil compressIcon)
+ )
+ (MenuItem
+ label: '-'
+ isVisible: showingRegularChangesetHolder
+ )
+ (MenuItem
+ activeHelpKey: testFindPreviousSnapshot
+ enabled: hasSelectionHolder
+ label: 'Find Previous Snapshot'
+ itemValue: doFindSnapshot:
+ translateLabel: true
+ isButton: true
+ isVisible: showingRegularChangesetHolder
+ labelImage: (ResourceRetriever nil findPreviousSnapshotIcon)
+ argument: 'previous'
+ )
+ (MenuItem
+ activeHelpKey: testFindNextSnapshot
+ enabled: hasSelectionHolder
+ label: 'Find Next Snapshot'
+ itemValue: doFindSnapshot:
+ translateLabel: true
+ isButton: true
+ isVisible: showingRegularChangesetHolder
+ labelImage: (ResourceRetriever nil findNextSnapshotIcon)
+ argument: 'next'
+ )
+ )
+ nil
+ nil
)
! !
@@ -1744,7 +1744,7 @@
(if this app is embedded in a subCanvas)."
^ #(
- #changesetHolder
+ #changesetHolder
).
! !
@@ -1803,20 +1803,6 @@
self changesetHolder value: aChangeSet
!
-list1View: aSubApplicationView
-
- list1 := aSubApplicationView application
-
- "Created: / 04-08-2011 / 17:56:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-list2View: aSubApplicationView
-
- list2 := aSubApplicationView application
-
- "Created: / 04-08-2011 / 17:57:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
readOnly: aBoolean
self allowAcceptHolder value:false.
@@ -1844,15 +1830,15 @@
change := nil.
sel := selection2Holder value.
sel isNil ifTrue:[
- sel := selection1Holder value.
+ sel := selection1Holder value.
].
sel isNil ifTrue:[
- ^nil
+ ^nil
].
sel do:
- [:each|
- change notNil ifTrue:[nil].
- change isNil ifTrue:[change := each]].
+ [:each|
+ change notNil ifTrue:[nil].
+ change isNil ifTrue:[change := each]].
^change
"Modified: / 26-07-2012 / 19:33:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1877,11 +1863,11 @@
list1MenuHolder
^ [
- |menu|
-
- menu := builder menuFor:#changeMenu1.
- menu allItemsDo:[:item | item argument:list1 ].
- menu
+ |menu|
+
+ menu := builder menuFor:#changeMenu1.
+ menu allItemsDo:[:item | item argument:list1 ].
+ menu
]
"Created: / 04-08-2011 / 18:11:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1890,11 +1876,11 @@
list2MenuHolder
^ [
- |menu|
-
- menu := builder menuFor:#changeMenu2.
- menu allItemsDo:[:item | item argument:list2 ].
- menu
+ |menu|
+
+ menu := builder menuFor:#changeMenu2.
+ menu allItemsDo:[:item | item argument:list2 ].
+ menu
]
"Created: / 04-08-2011 / 18:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1909,7 +1895,7 @@
(entry := self theSingleSelectedChange) isNil ifTrue:[^self].
chg := entry change.
chg isMethodCodeChange ifTrue:
- [chg source: source asString]
+ [chg source: source asString]
"Modified: / 29-11-2010 / 22:40:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 18-11-2011 / 14:56:53 / cg"
@@ -1928,7 +1914,7 @@
"return/create the 'selectionHolder' value holder (automatically generated)"
allowAcceptHolder isNil ifTrue:[
- allowAcceptHolder := ValueHolder with: true.
+ allowAcceptHolder := ValueHolder with: true.
].
^ allowAcceptHolder
@@ -1940,7 +1926,7 @@
"return/create the 'allowOpenHolder' value holder (automatically generated)"
allowOpenHolder isNil ifTrue:[
- allowOpenHolder := ValueHolder with: true.
+ allowOpenHolder := ValueHolder with: true.
].
^ allowOpenHolder
@@ -1950,45 +1936,45 @@
allowOpenHolderAndCypressPresent
^BlockValue
- with: [:value|
- value and: [ ConfigurableFeatures includesFeature:#Cypress ]
- ]
- argument: self allowOpenHolder.
+ with: [:value|
+ value and: [ ConfigurableFeatures includesFeature:#Cypress ]
+ ]
+ argument: self allowOpenHolder.
"Modified (format): / 07-09-2012 / 20:09:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
allowRemoveHolder
"return/create the 'allowRemoveHolder' value holder (automatically generated)"
-
+
allowRemoveHolder isNil ifTrue:[
- allowRemoveHolder := ValueHolder with:false.
- allowRemoveHolder addDependent:self.
+ allowRemoveHolder := ValueHolder with:false.
+ allowRemoveHolder addDependent:self.
].
^ allowRemoveHolder
"Modified: / 24-01-2012 / 19:59:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-allowRemoveHolder:something
+allowRemoveHolder:something
"set the 'showRemovedHolder' value holder (automatically generated)"
-
+
|oldValue newValue|
allowRemoveHolder notNil ifTrue:[
- oldValue := allowRemoveHolder value.
- allowRemoveHolder removeDependent:self.
+ oldValue := allowRemoveHolder value.
+ allowRemoveHolder removeDependent:self.
].
allowRemoveHolder := something.
allowRemoveHolder notNil ifTrue:[
- allowRemoveHolder addDependent:self.
+ allowRemoveHolder addDependent:self.
].
newValue := allowRemoveHolder value.
oldValue ~~ newValue ifTrue:[
- self
- update:#value
- with:newValue
- from:allowRemoveHolder.
+ self
+ update:#value
+ with:newValue
+ from:allowRemoveHolder.
].
"Modified (format): / 24-01-2012 / 19:48:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1997,7 +1983,7 @@
changeSourceHolder
<resource: #uiAspect>
changeSourceHolder isNil ifTrue: [
- changeSourceHolder := nil asValue.
+ changeSourceHolder := nil asValue.
].
^ changeSourceHolder.
@@ -2008,8 +1994,8 @@
"return/create the 'changesetHolder' value holder (automatically generated)"
changesetHolder isNil ifTrue:[
- changesetHolder := ValueHolder new.
- changesetHolder addDependent:self.
+ changesetHolder := ValueHolder new.
+ changesetHolder addDependent:self.
].
^ changesetHolder
!
@@ -2020,16 +2006,16 @@
|oldValue newValue|
changesetHolder notNil ifTrue:[
- oldValue := changesetHolder value.
- changesetHolder removeDependent:self.
+ oldValue := changesetHolder value.
+ changesetHolder removeDependent:self.
].
changesetHolder := something.
changesetHolder notNil ifTrue:[
- changesetHolder addDependent:self.
+ changesetHolder addDependent:self.
].
newValue := changesetHolder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:changesetHolder.
+ self update:#value with:newValue from:changesetHolder.
].
!
@@ -2037,7 +2023,7 @@
"return/create the 'classHolder' value holder (automatically generated)"
classHolder isNil ifTrue:[
- classHolder := ValueHolder with:nil.
+ classHolder := ValueHolder with:nil.
].
^ classHolder
@@ -2048,7 +2034,7 @@
"return/create the 'codeAspectHolder' value holder (automatically generated)"
codeAspectHolder isNil ifTrue:[
- codeAspectHolder := SyntaxHighlighter codeAspectMethod asValue.
+ codeAspectHolder := SyntaxHighlighter codeAspectMethod asValue.
].
^ codeAspectHolder
@@ -2058,7 +2044,7 @@
imageSourceHolder
<resource: #uiAspect>
imageSourceHolder isNil ifTrue: [
- imageSourceHolder := nil asValue.
+ imageSourceHolder := nil asValue.
].
^ imageSourceHolder.
@@ -2067,7 +2053,7 @@
infoPanel
infoPanel isNil ifTrue:[
- infoPanel := InlineMessageDialog new
+ infoPanel := InlineMessageDialog new
].
^ infoPanel
@@ -2078,9 +2064,9 @@
| holder |
holder := builder bindings at: #isTwoColumnHolder ifAbsentPut:[
- BlockValue
- with:[:v| v value == #twoColumnNavigatorSpec]
- argument: self navigatorSpecHolder.
+ BlockValue
+ with:[:v| v value == #twoColumnNavigatorSpec]
+ argument: self navigatorSpecHolder.
].
^holder
@@ -2091,9 +2077,9 @@
| holder |
holder := builder bindings at: #isTwoColumnHolderNot ifAbsentPut:[
- BlockValue
- with:[:v| v value ~~ #twoColumnNavigatorSpec]
- argument: self navigatorSpecHolder.
+ BlockValue
+ with:[:v| v value ~~ #twoColumnNavigatorSpec]
+ argument: self navigatorSpecHolder.
].
^holder
@@ -2116,7 +2102,7 @@
languageHolder
languageHolder isNil ifTrue:[
- languageHolder := ValueHolder with:nil.
+ languageHolder := ValueHolder with:nil.
].
^ languageHolder
@@ -2128,7 +2114,7 @@
"return/create the 'list1Holder' value holder (automatically generated)"
list1Holder isNil ifTrue:[
- list1Holder := ValueHolder new.
+ list1Holder := ValueHolder new.
].
^ list1Holder
!
@@ -2143,7 +2129,7 @@
"return/create the 'list2Holder' value holder (automatically generated)"
list2Holder isNil ifTrue:[
- list2Holder := ValueHolder new.
+ list2Holder := ValueHolder new.
].
^ list2Holder
!
@@ -2158,7 +2144,7 @@
"return/create the 'navigatorChangesetHolder' value holder (automatically generated)"
navigatorChangesetHolder isNil ifTrue:[
- navigatorChangesetHolder := ValueHolder new.
+ navigatorChangesetHolder := ValueHolder new.
].
^ navigatorChangesetHolder
!
@@ -2167,11 +2153,11 @@
<resource: #uiAspect>
navigatorSpecHolder isNil ifTrue:[
- navigatorSpecHolder := ValueHolder with:
- "/#hierarchicalNavigatorSpec
- "/#twoColumnNavigatorSpec
- #oneColumnNavigatorSpec.
- navigatorSpecHolder addDependent: self.
+ navigatorSpecHolder := ValueHolder with:
+ "/#hierarchicalNavigatorSpec
+ "/#twoColumnNavigatorSpec
+ #oneColumnNavigatorSpec.
+ navigatorSpecHolder addDependent: self.
].
^ navigatorSpecHolder.
@@ -2183,8 +2169,8 @@
"return/create the 'selection1Holder' value holder (automatically generated)"
selection1Holder isNil ifTrue:[
- selection1Holder := ValueHolder new.
- selection1Holder addDependent:self.
+ selection1Holder := ValueHolder new.
+ selection1Holder addDependent:self.
].
^ selection1Holder
!
@@ -2195,16 +2181,16 @@
|oldValue newValue|
selection1Holder notNil ifTrue:[
- oldValue := selection1Holder value.
- selection1Holder removeDependent:self.
+ oldValue := selection1Holder value.
+ selection1Holder removeDependent:self.
].
selection1Holder := something.
selection1Holder notNil ifTrue:[
- selection1Holder addDependent:self.
+ selection1Holder addDependent:self.
].
newValue := selection1Holder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:selection1Holder.
+ self update:#value with:newValue from:selection1Holder.
].
!
@@ -2212,8 +2198,8 @@
"return/create the 'selection2Holder' value holder (automatically generated)"
selection2Holder isNil ifTrue:[
- selection2Holder := ValueHolder new.
- selection2Holder addDependent:self.
+ selection2Holder := ValueHolder new.
+ selection2Holder addDependent:self.
].
^ selection2Holder
!
@@ -2224,16 +2210,16 @@
|oldValue newValue|
selection2Holder notNil ifTrue:[
- oldValue := selection2Holder value.
- selection2Holder removeDependent:self.
+ oldValue := selection2Holder value.
+ selection2Holder removeDependent:self.
].
selection2Holder := something.
selection2Holder notNil ifTrue:[
- selection2Holder addDependent:self.
+ selection2Holder addDependent:self.
].
newValue := selection2Holder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:selection2Holder.
+ self update:#value with:newValue from:selection2Holder.
].
!
@@ -2241,7 +2227,7 @@
"return/create the 'showFilterHolder' value holder (automatically generated)"
showFilterHolder isNil ifTrue:[
- showFilterHolder := false asValue.
+ showFilterHolder := false asValue.
].
^ showFilterHolder
@@ -2258,8 +2244,8 @@
"return/create the 'showDeletedAspect' value holder (automatically generated)"
showRemovedAspect isNil ifTrue:[
- showRemovedAspect := (AspectAdaptor forAspect:#showRemoved)
- subject: self class.
+ showRemovedAspect := (AspectAdaptor forAspect:#showRemoved)
+ subject: self class.
].
^ showRemovedAspect
!
@@ -2272,7 +2258,7 @@
"return/create the 'showSameAspect' value holder (automatically generated)"
showSameAspect isNil ifTrue:[
- showSameAspect := ValueHolder with: true.
+ showSameAspect := ValueHolder with: true.
].
^ showSameAspect
@@ -2289,7 +2275,7 @@
"return/create the 'showTimestampHolder' value holder (automatically generated)"
showTimestampHolder isNil ifTrue:[
- showTimestampHolder := ValueHolder with: false.
+ showTimestampHolder := ValueHolder with: false.
].
^ showTimestampHolder
@@ -2306,8 +2292,8 @@
"return/create the 'showingRegularChangesetHolder' value holder (automatically generated)"
showingRegularChangesetHolder isNil ifTrue:[
- showingRegularChangesetHolder := ValueHolder with: false.
- showingRegularChangesetHolder addDependent:self.
+ showingRegularChangesetHolder := ValueHolder with: false.
+ showingRegularChangesetHolder addDependent:self.
].
^ showingRegularChangesetHolder
@@ -2320,16 +2306,16 @@
|oldValue newValue|
showingRegularChangesetHolder notNil ifTrue:[
- oldValue := showingRegularChangesetHolder value.
- showingRegularChangesetHolder removeDependent:self.
+ oldValue := showingRegularChangesetHolder value.
+ showingRegularChangesetHolder removeDependent:self.
].
showingRegularChangesetHolder := something.
showingRegularChangesetHolder notNil ifTrue:[
- showingRegularChangesetHolder addDependent:self.
+ showingRegularChangesetHolder addDependent:self.
].
newValue := showingRegularChangesetHolder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:showingRegularChangesetHolder.
+ self update:#value with:newValue from:showingRegularChangesetHolder.
].
!
@@ -2337,7 +2323,7 @@
"return/create the 'titleHolder' value holder (automatically generated)"
titleHolder isNil
- ifTrue:[ titleHolder := ValueHolder with:self defaultTitle. ].
+ ifTrue:[ titleHolder := ValueHolder with:self defaultTitle. ].
^ titleHolder
"Modified: / 26-10-2010 / 22:54:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2345,7 +2331,7 @@
updateChangeFileHolder
updateChangeFileHolder isNil ifTrue:[
- updateChangeFileHolder := false asValue.
+ updateChangeFileHolder := false asValue.
].
^ updateChangeFileHolder
@@ -2358,13 +2344,13 @@
hasSelectionHolder
hasSelectionHolder isNil ifTrue:[
- hasSelectionHolder :=
- BlockValue
- with:[:sel1 :sel2|
- sel1 value notEmptyOrNil or:[sel2 value notEmptyOrNil]
- ]
- argument: self selection1Holder
- argument: self selection2Holder
+ hasSelectionHolder :=
+ BlockValue
+ with:[:sel1 :sel2|
+ sel1 value notEmptyOrNil or:[sel2 value notEmptyOrNil]
+ ]
+ argument: self selection1Holder
+ argument: self selection2Holder
].
^hasSelectionHolder
@@ -2374,7 +2360,7 @@
isWorkingHolder
isWorkingHolder isNil ifTrue:[
- isWorkingHolder := ValueHolder with: false.
+ isWorkingHolder := ValueHolder with: false.
].
^isWorkingHolder
@@ -2384,7 +2370,7 @@
isWorkingNotHolder
isWorkingNotHolder isNil ifTrue:[
- isWorkingNotHolder := BlockValue forLogicalNot: self isWorkingHolder
+ isWorkingNotHolder := BlockValue forLogicalNot: self isWorkingHolder
].
^isWorkingNotHolder
@@ -2407,21 +2393,21 @@
listEntry := self theSingleSelectedChange.
(listEntry notNil and:[(change := listEntry change) isCompositeChange not]) ifTrue:[
- self classHolder value: listEntry changeClass.
- changeSourceHolder setValue: change changeSource; changed: #value.
- imageSourceHolder setValue: change imageSource; changed: #value.
-
- codeAspectHolder value:
- (change isMethodCodeChange
- ifTrue:[SyntaxHighlighter codeAspectMethod]
- ifFalse:[SyntaxHighlighter codeAspectExpression]).
-
- self showSource: true
+ self classHolder value: listEntry changeClass.
+ changeSourceHolder setValue: change changeSource; changed: #value.
+ imageSourceHolder setValue: change imageSource; changed: #value.
+
+ codeAspectHolder value:
+ (change isMethodCodeChange
+ ifTrue:[SyntaxHighlighter codeAspectMethod]
+ ifFalse:[SyntaxHighlighter codeAspectExpression]).
+
+ self showSource: true
] ifFalse:[
- self showSource: false.
- self classHolder value: nil.
- changeSourceHolder setValue: nil; changed: #value.
- imageSourceHolder setValue: nil; changed: #value.
+ self showSource: false.
+ self classHolder value: nil.
+ changeSourceHolder setValue: nil; changed: #value.
+ imageSourceHolder setValue: nil; changed: #value.
].
"Created: / 24-10-2009 / 19:49:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2438,32 +2424,50 @@
update: aspect with: param from: sender
- sender == changesetHolder ifTrue: [
- self changesetChanged .
- ^self
+ sender == changesetHolder ifTrue: [
+ self changesetChanged .
+ ^self
].
- sender == navigatorSpecHolder ifTrue: [
- self changesetChanged .
- ^self
+ sender == navigatorSpecHolder ifTrue: [
+ self changesetChanged .
+ ^self
].
- sender == selection1Holder ifTrue: [
- self selectionChanged.
- ^self
+ sender == selection1Holder ifTrue: [
+ self selectionChanged.
+ ^self
].
- sender == selection2Holder ifTrue: [
- self selectionChanged.
- ^self
+ sender == selection2Holder ifTrue: [
+ self selectionChanged.
+ ^self
].
sender == showingRegularChangesetHolder ifTrue:[
- self showingRegularChangesetChanged.
- ^self.
+ self showingRegularChangesetChanged.
+ ^self.
].
super update: aspect with: param from: sender
"Created: / 24-10-2009 / 19:29:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!ChangeSetBrowser2 methodsFor:'initialization'!
+
+list1View: aSubApplicationView
+ aSubApplicationView application applyAction:[:change | self changeMenuApplyChange:change].
+ list1 := aSubApplicationView application
+
+ "Created: / 04-08-2011 / 17:56:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 10-09-2012 / 14:22:37 / cg"
+!
+
+list2View: aSubApplicationView
+ aSubApplicationView application applyAction:[:change | self changeMenuApplyChange:change].
+ list2 := aSubApplicationView application
+
+ "Created: / 04-08-2011 / 17:57:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 10-09-2012 / 14:22:50 / cg"
+! !
+
!ChangeSetBrowser2 methodsFor:'menu actions'!
doApply
@@ -2527,33 +2531,33 @@
selection := self theSingleSelectedChange.
searchBlock := [:listEntry|
- listEntry == selection ifTrue:[
- snapshot notNil ifTrue:[
- changeList selection: (OrderedCollection with: snapshot).
- ] ifFalse:[
- self infoPanel showMessage: notFoundMessage closeAfter: 5"sec".
- ].
- ^self.
- ] ifFalse:[
- (listEntry change isOtherChange and:[listEntry change type == #snapshot]) ifTrue:[
- snapshot := listEntry
- ].
- ].
+ listEntry == selection ifTrue:[
+ snapshot notNil ifTrue:[
+ changeList selection: (OrderedCollection with: snapshot).
+ ] ifFalse:[
+ self infoPanel showMessage: notFoundMessage closeAfter: 5"sec".
+ ].
+ ^self.
+ ] ifFalse:[
+ (listEntry change isOtherChange and:[listEntry change type == #snapshot]) ifTrue:[
+ snapshot := listEntry
+ ].
+ ].
].
previousOrNext = 'previous' ifTrue:[
- selection isNil ifTrue:[
- selection := changeList list last.
- changeList selection: (Array with: selection).
- ].
- notFoundMessage := resources string:'No snapshot prior selected change found.'.
- changeList list do: searchBlock.
+ selection isNil ifTrue:[
+ selection := changeList list last.
+ changeList selection: (Array with: selection).
+ ].
+ notFoundMessage := resources string:'No snapshot prior selected change found.'.
+ changeList list do: searchBlock.
] ifFalse:[
- selection isNil ifTrue:[
- selection := changeList list first.
- changeList selection: (Array with: selection).
- ].
- notFoundMessage := resources string:'No snapshot after selected change found.'.
- changeList list reverseDo: searchBlock.
+ selection isNil ifTrue:[
+ selection := changeList list first.
+ changeList selection: (Array with: selection).
+ ].
+ notFoundMessage := resources string:'No snapshot after selected change found.'.
+ changeList list reverseDo: searchBlock.
]
"Created: / 27-07-2012 / 15:38:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2562,13 +2566,13 @@
doOpen
| file |
[
- file := Dialog requestFileName:'Select Changeset to Load' pattern:'*.chg;*.st'.
+ file := Dialog requestFileName:'Select Changeset to Load' pattern:'*.chg;*.st'.
] on: Dialog aboutToOpenBoxNotificationSignal do:[:ex|
- | dialog |
-
- dialog := ex parameter.
-
- ex pass.
+ | dialog |
+
+ dialog := ex parameter.
+
+ ex pass.
].
file isNil ifTrue:[^self].
self doOpenFile: file
@@ -2596,7 +2600,7 @@
doOpenCurrentChangeFile
self withWaitCursorDo:[
- self class openOn: (ChangeSet fromFile: ObjectMemory nameForChanges)
+ self class openOn: (ChangeSet fromFile: ObjectMemory nameForChanges)
].
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2607,13 +2611,13 @@
| file |
[
- file := Dialog requestDirectoryName:(resources string: 'Select Cypress Package')."/ pattern:'*.package'.
+ file := Dialog requestDirectoryName:(resources string: 'Select Cypress Package')."/ pattern:'*.package'.
] on: Dialog aboutToOpenBoxNotificationSignal do:[:ex|
- | dialog |
-
- dialog := ex parameter.
-
- ex pass.
+ | dialog |
+
+ dialog := ex parameter.
+
+ ex pass.
].
file isNil ifTrue:[^self].
@@ -2629,21 +2633,21 @@
dir := aStringOrFilename asFilename.
dir exists ifFalse:[
- Dialog warn: (resources string:'Selected directory does not exists').
- ^self.
+ Dialog warn: (resources string:'Selected directory does not exists').
+ ^self.
].
dir isDirectory ifFalse:[
- Dialog warn: (resources string:'Selected file is not a directory').
- ^self.
+ Dialog warn: (resources string:'Selected file is not a directory').
+ ^self.
].
(dir / 'properties.json') isReadable ifFalse:[
- Dialog warn: (resources string:'No properties.json found. Perhaps not a Cypress package directory?').
- ^self.
+ Dialog warn: (resources string:'No properties.json found. Perhaps not a Cypress package directory?').
+ ^self.
].
self showProgress: (resources string: 'Reading Cypress Package...') while: [
- changeset := ((Smalltalk at:#CypressPackageReader) readPackageFrom: dir) asChangeSet.
- self doOpen: changeset.
+ changeset := ((Smalltalk at:#CypressPackageReader) readPackageFrom: dir) asChangeSet.
+ self doOpen: changeset.
].
"Created: / 03-09-2012 / 11:44:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2653,15 +2657,15 @@
| cs fn |
self showProgress: 'Reading ' , (fn := aStringOrFilename asFilename) baseName while:[
- cs := ChangeSet fromFile: aStringOrFilename.
- ((fn suffix = 'chg') or:[fn pathName = ObjectMemory nameForChanges]) ifTrue:[
- self list scrollToBottom: true.
- self showingRegularChangesetHolder value: true.
- ] ifFalse:[
- self showingRegularChangesetHolder value: false.
- ].
- self allowRemove: false."/true.
- self doOpen: cs.
+ cs := ChangeSet fromFile: aStringOrFilename.
+ ((fn suffix = 'chg') or:[fn pathName = ObjectMemory nameForChanges]) ifTrue:[
+ self list scrollToBottom: true.
+ self showingRegularChangesetHolder value: true.
+ ] ifFalse:[
+ self showingRegularChangesetHolder value: false.
+ ].
+ self allowRemove: false."/true.
+ self doOpen: cs.
].
"Created: / 09-02-2012 / 19:11:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2671,12 +2675,12 @@
self doOpen: ChangeSet new.
self showFilterHolder value: false.
self infoPanel
- reset;
- beInformation;
- message: (resources string:'Open file or drag''n''drop changes from other changeset/diff browser');
- addButtonWithLabel: (resources string:'Open File') action:[self doOpen];
- addButtonOK;
- show.
+ reset;
+ beInformation;
+ message: (resources string:'Open file or drag''n''drop changes from other changeset/diff browser');
+ addButtonWithLabel: (resources string:'Open File') action:[self doOpen];
+ addButtonOK;
+ show.
"Modified: / 01-08-2012 / 18:36:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -2704,8 +2708,8 @@
doSave
changesetFile
- ifNil:[self doSaveAs]
- ifNotNil:[self doSaveAs: changesetFile]
+ ifNil:[self doSaveAs]
+ ifNotNil:[self doSaveAs: changesetFile]
"Modified: / 24-10-2009 / 22:55:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -2717,12 +2721,12 @@
"/ | box |
"/ box := ex parameter.
-"/ box verticalPanel
+"/ box verticalPanel
"/ add:(CheckBox label:'x'
"/ model:true asValue).
- ex pass.
+ ex pass.
] do:[
- file := Dialog requestFileName:'Select File for Save' default: (changesetFile ? 'somechanges.chg') pattern:('*.chg').
+ file := Dialog requestFileName:'Select File for Save' default: (changesetFile ? 'somechanges.chg') pattern:('*.chg').
].
file isNil ifTrue:[^self].
self doSaveAs: file.
@@ -2736,16 +2740,16 @@
changesetToSave := ChangeSet new.
self list1Holder value do:[:e|
- e removed ~~ true ifTrue:[changesetToSave add:e].
+ e removed ~~ true ifTrue:[changesetToSave add:e].
].
"/ [
- (newFile asFilename suffix = 'st') ifTrue:[
- changesetToSave saveToFile: newFile format: #classSource.
- ] ifFalse:[
- changesetToSave saveToFile: newFile
- ].
- changesetFile := newFile.
+ (newFile asFilename suffix = 'st') ifTrue:[
+ changesetToSave saveToFile: newFile format: #classSource.
+ ] ifFalse:[
+ changesetToSave saveToFile: newFile
+ ].
+ changesetFile := newFile.
"/ ] on: Error do:
"/ [:ex|Dialog warn: 'Erorr saving changes: ' , ex description]
@@ -2769,7 +2773,7 @@
loadCurrentChangeFile
self withWaitCursorDo:[
- self loadChangeSet: (ChangeSet fromFile: ObjectMemory nameForChanges)
+ self loadChangeSet: (ChangeSet fromFile: ObjectMemory nameForChanges)
].
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2781,19 +2785,19 @@
| nsName |
- nsName := Dialog
- requestNameSpace:'Namepace to load code into:'
- initialAnswer:targetNamespace.
+ nsName := Dialog
+ requestNameSpace:'Namepace to load code into:'
+ initialAnswer:targetNamespace.
nsName isEmptyOrNil ifTrue:[^self].
targetNamespace := nsName.
"/ self targetNamespaceNameHolder value:('Target-Namespace: ',targetNamespace).
list1 list do:[:each |
- each change nameSpaceOverride:nsName
+ each change nameSpaceOverride:nsName
].
list2 list do:[:each |
- each change nameSpaceOverride:nsName
+ each change nameSpaceOverride:nsName
].
self changeset do:[:chg | chg nameSpaceOverride:nsName].
@@ -2805,12 +2809,18 @@
| package |
- package := Dialog
- requestProject:'Default Smalltalk/X package to load code into:'
- initialAnswer:targetPackage
- suggestions:#().
+ package := Dialog
+ requestProject:'Default Smalltalk/X package to load code into:'
+ initialAnswer:targetPackage
+ suggestions:(RecentTargetPackages ? #()).
package isNil ifTrue:[^self].
+ RecentTargetPackages isNil ifTrue:[
+ RecentTargetPackages := OrderedCollection new.
+ ].
+ RecentTargetPackages remove:package ifAbsent:[].
+ RecentTargetPackages addFirst:package.
+
targetPackage := "lastPackage := "package.
"/ self targetPackageHolder value:('Target-Package: ',targetPackage).
@@ -2826,8 +2836,8 @@
self changesDo:[:chg|chg removed ifFalse:[changesToApply add: chg]].
self changeMenuApplyChanges: changesToApply.
list2 notNil ifTrue:[
- "/ to get the =-icons
- list2 updateList
+ "/ to get the =-icons
+ list2 updateList
].
"Created: / 04-08-2011 / 17:26:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2837,15 +2847,15 @@
changeMenuApplySelection: changeList
changeList selection do:[:change|
- | changeIdx |
-
- self changeMenuApplyChange:change change.
-
- "Advance to next change"
- changeIdx := changeList list identityIndexOf: change.
- changeIdx < changeList list size ifTrue:[
- changeList selection: { changeList list at: changeIdx + 1 }
- ].
+ | changeIdx |
+
+ self changeMenuApplyChange:change change.
+
+ "Advance to next change"
+ changeIdx := changeList list identityIndexOf: change.
+ changeIdx < changeList list size ifTrue:[
+ changeList selection: { changeList list at: changeIdx + 1 }
+ ].
].
"Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2861,16 +2871,16 @@
stop := list size.
start to: stop do:[:idx|
- | chg |
-
- chg := list at: idx.
- changeList selection: { chg }.
- self changeMenuApplyChange:chg change.
+ | chg |
+
+ chg := list at: idx.
+ changeList selection: { chg }.
+ self changeMenuApplyChange:chg change.
].
list2 notNil ifTrue:[
- "/ to get the =-icons
- list2 updateList
+ "/ to get the =-icons
+ list2 updateList
].
"Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2885,27 +2895,27 @@
"/ changes := changeList listHolder value collect:[:c | c change].
(changes conform:[:c | c isClassDefinitionChange]) ifTrue:[
- classes := (changes collect:[:c | c changeClass]).
- UserPreferences current systemBrowserClass
- browseClasses:classes title:'selected monticello classes'.
+ classes := (changes collect:[:c | c changeClass]).
+ UserPreferences current systemBrowserClass
+ browseClasses:classes title:'selected monticello classes'.
] ifFalse:[
- methods := OrderedCollection new.
- changes do:[:each |
- each isCompositeChange ifTrue:[
- each changes do:[:each2 | each2 isMethodChange ifTrue:[ methods add:each2 changeMethod ]]
- ] ifFalse:[
- each isMethodChange ifTrue:[
- methods add:(each changeMethod).
- ]
- ]
- ].
- (methods includes:nil) ifTrue:[
- Dialog warn:('%1 methods are not present in the image' bindWith:(methods occurrencesOf:nil)).
- methods := methods reject:[:m | m isNil].
- methods isEmpty ifTrue:[^ self].
- ].
- UserPreferences current systemBrowserClass
- browseMethods:methods title:'selected monticello methods' sort:false.
+ methods := OrderedCollection new.
+ changes do:[:each |
+ each isCompositeChange ifTrue:[
+ each changes do:[:each2 | each2 isMethodChange ifTrue:[ methods add:each2 changeMethod ]]
+ ] ifFalse:[
+ each isMethodChange ifTrue:[
+ methods add:(each changeMethod).
+ ]
+ ]
+ ].
+ (methods includes:nil) ifTrue:[
+ Dialog warn:('%1 methods are not present in the image' bindWith:(methods occurrencesOf:nil)).
+ methods := methods reject:[:m | m isNil].
+ methods isEmpty ifTrue:[^ self].
+ ].
+ UserPreferences current systemBrowserClass
+ browseMethods:methods title:'selected monticello methods' sort:false.
].
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2918,34 +2928,34 @@
changes := self selectedChangesIn: changeList.
classes := Set new.
- addThemChanges :=
- [:c |
- c isClassDefinitionChange ifTrue:[
- classes add:c changeClass theNonMetaclass
- ] ifFalse:[
- c isMethodChange ifTrue:[
- cls := c changeMethod isNil
- ifTrue:[ c changeClass ]
- ifFalse:[ c changeMethod mclass theNonMetaclass ].
- classes add:cls
- ] ifFalse:[
- c isCompositeChange ifTrue:[
- c changes do:addThemChanges
- ]
- ]
- ]
- ].
+ addThemChanges :=
+ [:c |
+ c isClassDefinitionChange ifTrue:[
+ classes add:c changeClass theNonMetaclass
+ ] ifFalse:[
+ c isMethodChange ifTrue:[
+ cls := c changeMethod isNil
+ ifTrue:[ c changeClass ]
+ ifFalse:[ c changeMethod mclass theNonMetaclass ].
+ classes add:cls
+ ] ifFalse:[
+ c isCompositeChange ifTrue:[
+ c changes do:addThemChanges
+ ]
+ ]
+ ]
+ ].
changes do:addThemChanges.
- UserPreferences current systemBrowserClass
- browseClasses:classes title:'selected monticello classes'.
+ UserPreferences current systemBrowserClass
+ browseClasses:classes title:'selected monticello classes'.
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 05-09-2011 / 16:08:35 / cg"
!
changeMenuCompareClass: changeList
- |changes classNames classNameToClassMapping lastNameSpace
+ |changes classNames classNameToClassMapping lastNameSpace
addClassName addThemChanges existingClasses
allChanges changeSet1 changeSet2 diffSet|
@@ -2956,73 +2966,73 @@
allChanges := ChangeSet new.
existingClasses := Set new.
- addClassName :=
- [:nmArg |
- |nm ns existingClass goodAnswer cls|
-
- nm := nmArg.
- existingClass := Smalltalk classNamed:nm.
-
- existingClass notNil ifTrue:[
- goodAnswer := nm
- ] ifFalse:[
- ns := NameSpace allNameSpaces
- detect:[:ns | (ns classNamed:nm) notNil ]
- ifNone:nil.
- ns notNil ifTrue:[
- goodAnswer := (ns classNamed:nm) name.
- ] ifFalse:[
- goodAnswer := nm.
- (lastNameSpace notNil
- and:[ lastNameSpace isNameSpace
- and:[(cls := lastNameSpace classNamed:nm) notNil ]]
- ) ifTrue:[
- goodAnswer := cls name.
- ] ifFalse:[
- (lastNameSpace notNil
- and:[ lastNameSpace isBehavior
- and:[(cls := lastNameSpace privateClassesAt:nm asSymbol) notNil ]]
- ) ifTrue:[
- goodAnswer := cls name.
- ]
- ].
- ].
- ].
- nm := Dialog
- request:('Class to compare for "%1"?' bindWith:nmArg)
- initialAnswer:goodAnswer.
- nm isNil ifTrue:[^ self].
- nm notEmpty ifTrue:[
- existingClass := Smalltalk at:nm asSymbol.
- ].
- existingClass notNil ifTrue:[
- classNameToClassMapping at:nmArg put:existingClass.
- existingClasses add:existingClass.
- ].
- classNames add:nmArg
- ].
+ addClassName :=
+ [:nmArg |
+ |nm ns existingClass goodAnswer cls|
+
+ nm := nmArg.
+ existingClass := Smalltalk classNamed:nm.
+
+ existingClass notNil ifTrue:[
+ goodAnswer := nm
+ ] ifFalse:[
+ ns := NameSpace allNameSpaces
+ detect:[:ns | (ns classNamed:nm) notNil ]
+ ifNone:nil.
+ ns notNil ifTrue:[
+ goodAnswer := (ns classNamed:nm) name.
+ ] ifFalse:[
+ goodAnswer := nm.
+ (lastNameSpace notNil
+ and:[ lastNameSpace isNameSpace
+ and:[(cls := lastNameSpace classNamed:nm) notNil ]]
+ ) ifTrue:[
+ goodAnswer := cls name.
+ ] ifFalse:[
+ (lastNameSpace notNil
+ and:[ lastNameSpace isBehavior
+ and:[(cls := lastNameSpace privateClassesAt:nm asSymbol) notNil ]]
+ ) ifTrue:[
+ goodAnswer := cls name.
+ ]
+ ].
+ ].
+ ].
+ nm := Dialog
+ request:('Class to compare for "%1"?' bindWith:nmArg)
+ initialAnswer:goodAnswer.
+ nm isNil ifTrue:[^ self].
+ nm notEmpty ifTrue:[
+ existingClass := Smalltalk at:nm asSymbol.
+ ].
+ existingClass notNil ifTrue:[
+ classNameToClassMapping at:nmArg put:existingClass.
+ existingClasses add:existingClass.
+ ].
+ classNames add:nmArg
+ ].
addThemChanges := [:changes |
- "/ collect classes and mappings
- changes do:[:c |
- c isClassDefinitionChange ifTrue:[
- addClassName value:(c className).
- allChanges add:c.
- ]].
-
- changes do:[:c |
- c isMethodChange ifTrue:[
- (classNames includes:(c className)) ifFalse:[
- addClassName value:(c className).
- ].
- allChanges add:c.
- ]].
-
- changes do:[:c |
- c isCompositeChange ifTrue:[
- addThemChanges value:(c changes)
- ].
- ].
+ "/ collect classes and mappings
+ changes do:[:c |
+ c isClassDefinitionChange ifTrue:[
+ addClassName value:(c className).
+ allChanges add:c.
+ ]].
+
+ changes do:[:c |
+ c isMethodChange ifTrue:[
+ (classNames includes:(c className)) ifFalse:[
+ addClassName value:(c className).
+ ].
+ allChanges add:c.
+ ]].
+
+ changes do:[:c |
+ c isCompositeChange ifTrue:[
+ addThemChanges value:(c changes)
+ ].
+ ].
].
changes do:addThemChanges.
@@ -3031,16 +3041,16 @@
changeSet1 := allChanges.
changeSet2 := ChangeSet new.
existingClasses do:[:cls |
- changeSet2 addAll:(ChangeSet forExistingClass:cls).
+ changeSet2 addAll:(ChangeSet forExistingClass:cls).
].
diffSet := changeSet1 diffSetsAgainst:changeSet2.
(UserPreferences versionDiffViewerClass)
- openOnDiffSet:diffSet
- labelA:'Monticello'
- labelB:'Current (In Image)'
- title:'Diffs'
- ignoreExtensions:false.
+ openOnDiffSet:diffSet
+ labelA:'Monticello'
+ labelB:'Current (In Image)'
+ title:'Diffs'
+ ignoreExtensions:false.
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 01-12-2011 / 18:36:44 / cg"
@@ -3051,8 +3061,8 @@
changeList selection do:[:change|self changeMenuDeleteChange:change change].
changeList updateList.
(list2 notNil and:[changeList ~~ list2]) ifTrue:[
- "/ to get the =-icons
- list2 updateList
+ "/ to get the =-icons
+ list2 updateList
].
"Created: / 04-08-2011 / 17:28:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3063,14 +3073,14 @@
sel := changeList selection ? #().
changeList list do:[:change|
- (sel includes: change) ifFalse:[
- self changeMenuDeleteChange:change change
- ].
+ (sel includes: change) ifFalse:[
+ self changeMenuDeleteChange:change change
+ ].
].
changeList updateList.
(list2 notNil and:[changeList ~~ list2]) ifTrue:[
- "/ to get the =-icons
- list2 updateList
+ "/ to get the =-icons
+ list2 updateList
].
"Created: / 17-05-2012 / 22:55:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3082,8 +3092,8 @@
lastIdx := changeList selectionIndices max.
changeList list from:lastIdx do:[:change | self changeMenuDeleteChange:change change].
list2 notNil ifTrue:[
- "/ to get the =-icons
- list2 updateList
+ "/ to get the =-icons
+ list2 updateList
].
"Created: / 27-12-2011 / 10:53:00 / cg"
@@ -3093,9 +3103,9 @@
changeMenuInspect: changeList
changeList selection size == 1 ifTrue:[
- changeList selection anyOne change inspect
+ changeList selection anyOne change inspect
] ifFalse:[
- (changeList selection collect:[:each|each change]) inspect
+ (changeList selection collect:[:each|each change]) inspect
]
"Created: / 04-08-2011 / 17:28:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3134,9 +3144,9 @@
oldSel := changeList selection.
newSel := OrderedCollection new.
changeList list do:[:change|
- (oldSel includes: change) ifFalse:[
- newSel add: change.
- ]
+ (oldSel includes: change) ifFalse:[
+ newSel add: change.
+ ]
].
changeList selection: newSel.
@@ -3182,17 +3192,17 @@
'.
LastSelectionConditionString isNil ifTrue:[
- LastSelectionConditionString := template.
+ LastSelectionConditionString := template.
].
textHolder := ValueHolder new.
dialog := Dialog
- forRequestText:(resources string:'Enter condition for selection')
- lines:20
- columns:70
- initialAnswer:LastSelectionConditionString
- model:textHolder.
+ forRequestText:(resources string:'Enter condition for selection')
+ lines:20
+ columns:70
+ initialAnswer:LastSelectionConditionString
+ model:textHolder.
dialog addButton:(Button label:'Template' action:[textHolder value:template. textHolder changed:#value.]).
dialog open.
dialog accepted ifFalse:[^ self].
@@ -3202,8 +3212,8 @@
conditionBlock := Parser evaluate:conditionBlockString.
conditionBlock isBlock ifFalse:[
- self error:'Bad selection block (syntax error?)'.
- ^ self
+ self error:'Bad selection block (syntax error?)'.
+ ^ self
].
self changeMenuSelectIn: changeList suchThat: conditionBlock
@@ -3223,9 +3233,9 @@
selectedChangesIn: changeList
|changes|
- changes := (changeList == list1
- ifTrue:[ selection1Holder ]
- ifFalse:[ selection2Holder ]) value.
+ changes := (changeList == list1
+ ifTrue:[ selection1Holder ]
+ ifFalse:[ selection2Holder ]) value.
^ changes collect:[:eachListEntry | eachListEntry change].
"Created: / 23-07-2012 / 13:13:11 / cg"
@@ -3241,24 +3251,24 @@
aChange removed ifTrue:[ ^ self ].
- self withWaitCursorDo:[
- (MCStXNamespaceQuery , Class nameSpaceQuerySignal)
- answer:(NameSpace name:(targetNamespace ? 'Smalltalk'))
- do: [
- (MCStXPackageQuery , Class packageQuerySignal)
- answer: self targetPackage
- do: [
- MCInteractiveLoadingQuery answer: true do:[
- updateChangeFileHolder value ifTrue:[
- aChange apply
- ] ifFalse:[
- Class withoutUpdatingChangesDo:[
- aChange apply
- ]
- ].
- ]
- ].
- ].
+ self withWaitCursorDo:[
+ (MCStXNamespaceQuery , Class nameSpaceQuerySignal)
+ answer:(NameSpace name:(targetNamespace ? 'Smalltalk'))
+ do: [
+ (MCStXPackageQuery , Class packageQuerySignal)
+ answer: self targetPackage
+ do: [
+ MCInteractiveLoadingQuery answer: true do:[
+ updateChangeFileHolder value ifTrue:[
+ aChange apply
+ ] ifFalse:[
+ Class withoutUpdatingChangesDo:[
+ aChange apply
+ ]
+ ].
+ ]
+ ].
+ ].
].
"Modified: / 07-09-2011 / 22:24:57 / cg"
@@ -3271,15 +3281,15 @@
changesThatFailToApply := ChangeSet new.
ProgressIndicator
- displayProgress:'Applying changes...'
- at:(Screen default center)
- from:200 to:400
- during:[:val |
- 1 to: changesToApply size do:
- [:i|
- val value:((100 / changesToApply size) * i) rounded.
- [self changeMenuApplyChange: (changesToApply at: i)]
- on: Error do:[changesThatFailToApply add: (changesToApply at: i)]]]
+ displayProgress:'Applying changes...'
+ at:(Screen default center)
+ from:200 to:400
+ during:[:val |
+ 1 to: changesToApply size do:
+ [:i|
+ val value:((100 / changesToApply size) * i) rounded.
+ [self changeMenuApplyChange: (changesToApply at: i)]
+ on: Error do:[changesThatFailToApply add: (changesToApply at: i)]]]
"Created: / 04-08-2011 / 17:26:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -3314,12 +3324,12 @@
| changeset |
changeset := changesetHolder value. "/deepCopy.
(changeset isKindOf: ChangeSet) ifFalse:
- [changeset := ChangeSet withAll: changeset].
+ [changeset := ChangeSet withAll: changeset].
^ (self navigatorSpecHolder value ~~ #oneColumnNavigatorSpec) ifTrue:[
- changeset groupByClass
+ changeset groupByClass
] ifFalse:[
- changeset flatten
+ changeset flatten
]
"Created: / 24-10-2009 / 19:31:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3337,10 +3347,10 @@
redrawChangeListViews
list1 notNil ifTrue:[
- list1 builder window allSubViewsDo: [:v|v redraw]
+ list1 builder window allSubViewsDo: [:v|v redraw]
].
list2 notNil ifTrue:[
- list2 builder window allSubViewsDo: [:v|v redraw]
+ list2 builder window allSubViewsDo: [:v|v redraw]
].
"Created: / 16-03-2011 / 22:41:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3355,9 +3365,9 @@
"/ selectionHolder value isEmptyOrNil ifTrue:[
"/ (self navigatorChangesetHolder value ? #()) do: aBlock
"/ ] ifFalse:[
- selection2Holder value isEmptyOrNil not
- ifTrue:[selection2Holder value do: [:e|e notNil ifTrue:[applyBlock value:e]]]
- ifFalse:[selection1Holder value do: [:e|e notNil ifTrue:[applyBlock value:e]]].
+ selection2Holder value isEmptyOrNil not
+ ifTrue:[selection2Holder value do: [:e|e notNil ifTrue:[applyBlock value:e]]]
+ ifFalse:[selection1Holder value do: [:e|e notNil ifTrue:[applyBlock value:e]]].
"/ ].
self redrawChangeListViews
@@ -3369,12 +3379,12 @@
showProgress: label while: block
self infoPanel progress: label while: [
- [
- self isWorkingHolder value: true.
- block value
- ] ensure:[
- self isWorkingHolder value: false.
- ]
+ [
+ self isWorkingHolder value: true.
+ block value
+ ] ensure:[
+ self isWorkingHolder value: false.
+ ]
]
"Created: / 10-02-2012 / 10:35:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3482,7 +3492,7 @@
allowed to edit the change (i.e., modify the source code)
[author:]
- Jan Vrany <jan.vrany@fit.cvut.cz>
+ Jan Vrany <jan.vrany@fit.cvut.cz>
[instance variables:]
@@ -3496,16 +3506,16 @@
examples
"
Starting the application:
- [exBegin]
+ [exBegin]
Tools::ChangeEditor open
- [exEnd]
+ [exEnd]
more examples to be added:
- [exBegin]
- ... add code fragment for
+ [exBegin]
+ ... add code fragment for
... executable example here ...
- [exEnd]
+ [exEnd]
"
! !
@@ -3526,67 +3536,67 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: windowSpec
- window:
+ name: windowSpec
+ window:
(WindowSpec
- label: 'Change Editor'
- name: 'Change Editor'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 579 341)
- )
- component:
+ label: 'Change Editor'
+ name: 'Change Editor'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 579 341)
+ )
+ component:
(SpecCollection
- collection: (
- (SubCanvasSpec
- name: 'TextDiffTool'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::TextDiff2Tool'
- minorKey: windowSpecForEmbedding
- subAspectHolders:
- (Array
-
- (SubChannelInfoSpec
- subAspect: classHolder
- aspect: classAspect
- )
- (SubChannelInfoSpec
- subAspect: codeAspectHolder
- aspect: codeAspect
- )
-
- (SubChannelInfoSpec
- subAspect: labelAHolder
- aspect: labelAHolder
- )
- (SubChannelInfoSpec
- subAspect: labelBHolder
- aspect: labelBHolder
- )
-
- (SubChannelInfoSpec
- subAspect: showDiffHolder
- aspect: showdiffHolder
- )
- (SubChannelInfoSpec
- subAspect: textAHolder
- aspect: sourceChangeHolder
- )
-
- (SubChannelInfoSpec
- subAspect: textBHolder
- aspect: sourceImageHolder
- )
- )
- createNewApplication: true
- createNewBuilder: true
- )
- )
-
- )
+ collection: (
+ (SubCanvasSpec
+ name: 'TextDiffTool'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: #'Tools::TextDiff2Tool'
+ minorKey: windowSpecForEmbedding
+ subAspectHolders:
+ (Array
+
+ (SubChannelInfoSpec
+ subAspect: classHolder
+ aspect: classAspect
+ )
+ (SubChannelInfoSpec
+ subAspect: codeAspectHolder
+ aspect: codeAspect
+ )
+
+ (SubChannelInfoSpec
+ subAspect: labelAHolder
+ aspect: labelAHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: labelBHolder
+ aspect: labelBHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: showDiffHolder
+ aspect: showdiffHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: textAHolder
+ aspect: sourceChangeHolder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: textBHolder
+ aspect: sourceImageHolder
+ )
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ )
+ )
+
+ )
)
"Modified: / 16-03-2012 / 13:08:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3616,8 +3626,8 @@
"return/create the 'changeHolder' value holder (automatically generated)"
changeHolder isNil ifTrue:[
- changeHolder := ValueHolder new.
- changeHolder addDependent:self.
+ changeHolder := ValueHolder new.
+ changeHolder addDependent:self.
].
^ changeHolder
!
@@ -3628,23 +3638,23 @@
|oldValue newValue|
changeHolder notNil ifTrue:[
- oldValue := changeHolder value.
- changeHolder removeDependent:self.
+ oldValue := changeHolder value.
+ changeHolder removeDependent:self.
].
changeHolder := something.
changeHolder notNil ifTrue:[
- changeHolder addDependent:self.
+ changeHolder addDependent:self.
].
newValue := changeHolder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:changeHolder.
+ self update:#value with:newValue from:changeHolder.
].
!
classAspect
- ^(AspectAdaptor forAspect: #changeClass)
- subjectChannel: self changeHolder
+ ^(AspectAdaptor forAspect: #changeClass)
+ subjectChannel: self changeHolder
"Created: / 29-11-2011 / 11:21:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -3652,11 +3662,11 @@
codeAspect
^BlockValue
- with: [:change|
- change isMethodCodeChange
- ifTrue:[ SyntaxHighlighter codeAspectMethod ]
- ifFalse:[ SyntaxHighlighter codeAspectExpression ]
- ] argument: self changeHolder
+ with: [:change|
+ change isMethodCodeChange
+ ifTrue:[ SyntaxHighlighter codeAspectMethod ]
+ ifFalse:[ SyntaxHighlighter codeAspectExpression ]
+ ] argument: self changeHolder
"Created: / 29-11-2011 / 11:21:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 27-07-2012 / 22:03:31 / cg"
@@ -3680,8 +3690,8 @@
"return/create the 'readonlyHolder' value holder (automatically generated)"
readonlyHolder isNil ifTrue:[
- readonlyHolder := ValueHolder new.
- readonlyHolder addDependent:self.
+ readonlyHolder := ValueHolder new.
+ readonlyHolder addDependent:self.
].
^ readonlyHolder
!
@@ -3692,16 +3702,16 @@
|oldValue newValue|
readonlyHolder notNil ifTrue:[
- oldValue := readonlyHolder value.
- readonlyHolder removeDependent:self.
+ oldValue := readonlyHolder value.
+ readonlyHolder removeDependent:self.
].
readonlyHolder := something.
readonlyHolder notNil ifTrue:[
- readonlyHolder addDependent:self.
+ readonlyHolder addDependent:self.
].
newValue := readonlyHolder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:readonlyHolder.
+ self update:#value with:newValue from:readonlyHolder.
].
!
@@ -3709,7 +3719,7 @@
"return/create the 'showdiffHolder' value holder (automatically generated)"
showdiffHolder isNil ifTrue:[
- showdiffHolder := ValueHolder new.
+ showdiffHolder := ValueHolder new.
].
^ showdiffHolder
!
@@ -3741,8 +3751,8 @@
changedObject == changeHolder ifTrue:[
- self changeChanged.
- ^ self.
+ self changeChanged.
+ ^ self.
].
super update:something with:aParameter from:changedObject
@@ -3752,13 +3762,13 @@
!ChangeSetBrowser2 class methodsFor:'documentation'!
version
- ^ '$Id: Tools__ChangeSetBrowser2.st 8051 2012-09-10 09:34:46Z vranyj1 $'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.42 2012/09/10 12:42:37 cg Exp §'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.40 2012/07/29 11:20:13 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.42 2012/09/10 12:42:37 cg Exp §'
!
version_SVN
- ^ '$Id: Tools__ChangeSetBrowser2.st 8051 2012-09-10 09:34:46Z vranyj1 $'
+ ^ '$Id: Tools__ChangeSetBrowser2.st 8054 2012-09-13 09:15:20Z vranyj1 $'
! !