--- a/Tools__ChangeSetBrowser2.st Sun Mar 01 00:43:11 2015 +0100
+++ b/Tools__ChangeSetBrowser2.st Sun Mar 01 00:46:38 2015 +0100
@@ -2,7 +2,7 @@
"
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
@@ -30,28 +30,28 @@
"{ NameSpace: Tools }"
ToolApplicationModel subclass:#ChangeSetBrowser2
- instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile
- navigatorChangesetHolder navigatorSpecHolder list1 list1Holder
- selection1Holder list2 list2Holder selection2Holder classHolder
- languageHolder codeAspectHolder showRemovedAspect showSameAspect
- showTimestampHolder sourceView changeSourceHolder
- imageSourceHolder targetPackage allowRemoveHolder
- allowAcceptHolder infoPanel updateChangeFileHolder
- showFilterHolder showingRegularChangesetHolder isWorkingHolder
- isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect
- targetNameSpaceName showDefinitionsOnlyAspect'
- classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages
- LastConfirmersExtent'
- poolDictionaries:''
- category:'Interface-Browsers-ChangeSet'
+ instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile
+ navigatorChangesetHolder navigatorSpecHolder list1 list1Holder
+ selection1Holder list2 list2Holder selection2Holder classHolder
+ languageHolder codeAspectHolder showRemovedAspect showSameAspect
+ showTimestampHolder sourceView changeSourceHolder
+ imageSourceHolder targetPackage allowRemoveHolder
+ allowAcceptHolder infoPanel updateChangeFileHolder
+ showFilterHolder showingRegularChangesetHolder isWorkingHolder
+ isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect
+ targetNameSpaceName showDefinitionsOnlyAspect'
+ classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages
+ LastConfirmersExtent'
+ poolDictionaries:''
+ category:'Interface-Browsers-ChangeSet'
!
ApplicationModel subclass:#ChangeEditor
- instanceVariableNames:'changeHolder readonlyHolder showdiffHolder sourceChangeHolder
- sourceImageHolder'
- classVariableNames:''
- poolDictionaries:''
- privateIn:ChangeSetBrowser2
+ instanceVariableNames:'changeHolder readonlyHolder showdiffHolder sourceChangeHolder
+ sourceImageHolder'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:ChangeSetBrowser2
!
!ChangeSetBrowser2 class methodsFor:'documentation'!
@@ -59,7 +59,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
@@ -113,8 +113,8 @@
browser := self new.
browser
- changeset: aChangeSet;
- title: label.
+ changeset: aChangeSet;
+ title: label.
aBlock value: browser.
^browser
@@ -838,11 +838,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.
]
@@ -1258,43 +1258,43 @@
^
#(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
+ )
+ )
+
+ )
)
!
@@ -1867,115 +1867,115 @@
^
#(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
)
! !
@@ -2201,7 +2201,7 @@
"return/create the 'selectionHolder' value holder (automatically generated)"
allowAcceptHolder isNil ifTrue:[
- allowAcceptHolder := ValueHolder with: true.
+ allowAcceptHolder := ValueHolder with: true.
].
^ allowAcceptHolder
@@ -2213,7 +2213,7 @@
"return/create the 'allowOpenHolder' value holder (automatically generated)"
allowOpenHolder isNil ifTrue:[
- allowOpenHolder := ValueHolder with: true.
+ allowOpenHolder := ValueHolder with: true.
].
^ allowOpenHolder
@@ -2223,10 +2223,10 @@
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>"
!
@@ -2235,8 +2235,8 @@
"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
@@ -2249,19 +2249,19 @@
|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>"
@@ -2270,7 +2270,7 @@
changeSourceHolder
<resource: #uiAspect>
changeSourceHolder isNil ifTrue: [
- changeSourceHolder := nil asValue.
+ changeSourceHolder := nil asValue.
].
^ changeSourceHolder.
@@ -2281,8 +2281,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
!
@@ -2293,16 +2293,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.
].
!
@@ -2310,7 +2310,7 @@
"return/create the 'classHolder' value holder (automatically generated)"
classHolder isNil ifTrue:[
- classHolder := ValueHolder with:nil.
+ classHolder := ValueHolder with:nil.
].
^ classHolder
@@ -2332,7 +2332,7 @@
imageSourceHolder
<resource: #uiAspect>
imageSourceHolder isNil ifTrue: [
- imageSourceHolder := nil asValue.
+ imageSourceHolder := nil asValue.
].
^ imageSourceHolder.
@@ -2341,7 +2341,7 @@
infoPanel
infoPanel isNil ifTrue:[
- infoPanel := InlineMessageDialog new
+ infoPanel := InlineMessageDialog new
].
^ infoPanel
@@ -2352,9 +2352,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
@@ -2365,9 +2365,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
@@ -2390,7 +2390,7 @@
languageHolder
languageHolder isNil ifTrue:[
- languageHolder := ValueHolder with:nil.
+ languageHolder := ValueHolder with:nil.
].
^ languageHolder
@@ -2402,7 +2402,7 @@
"return/create the 'list1Holder' value holder (automatically generated)"
list1Holder isNil ifTrue:[
- list1Holder := ValueHolder new.
+ list1Holder := ValueHolder new.
].
^ list1Holder
!
@@ -2417,7 +2417,7 @@
"return/create the 'list2Holder' value holder (automatically generated)"
list2Holder isNil ifTrue:[
- list2Holder := ValueHolder new.
+ list2Holder := ValueHolder new.
].
^ list2Holder
!
@@ -2432,7 +2432,7 @@
"return/create the 'navigatorChangesetHolder' value holder (automatically generated)"
navigatorChangesetHolder isNil ifTrue:[
- navigatorChangesetHolder := ValueHolder new.
+ navigatorChangesetHolder := ValueHolder new.
].
^ navigatorChangesetHolder
!
@@ -2471,8 +2471,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
!
@@ -2483,16 +2483,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.
].
!
@@ -2500,8 +2500,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
!
@@ -2512,16 +2512,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.
].
!
@@ -2555,7 +2555,7 @@
"return/create the 'showFilterHolder' value holder (automatically generated)"
showFilterHolder isNil ifTrue:[
- showFilterHolder := false asValue.
+ showFilterHolder := false asValue.
].
^ showFilterHolder
@@ -2572,8 +2572,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
!
@@ -2586,7 +2586,7 @@
"return/create the 'showSameAspect' value holder (automatically generated)"
showSameAspect isNil ifTrue:[
- showSameAspect := ValueHolder with: true.
+ showSameAspect := ValueHolder with: true.
].
^ showSameAspect
@@ -2603,7 +2603,7 @@
"return/create the 'showTimestampHolder' value holder (automatically generated)"
showTimestampHolder isNil ifTrue:[
- showTimestampHolder := ValueHolder with: false.
+ showTimestampHolder := ValueHolder with: false.
].
^ showTimestampHolder
@@ -2620,8 +2620,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
@@ -2634,16 +2634,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.
].
!
@@ -2651,7 +2651,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>"
@@ -2659,7 +2659,7 @@
updateChangeFileHolder
updateChangeFileHolder isNil ifTrue:[
- updateChangeFileHolder := false asValue.
+ updateChangeFileHolder := false asValue.
].
^ updateChangeFileHolder
@@ -2672,13 +2672,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
@@ -2688,7 +2688,7 @@
isWorkingHolder
isWorkingHolder isNil ifTrue:[
- isWorkingHolder := ValueHolder with: false.
+ isWorkingHolder := ValueHolder with: false.
].
^isWorkingHolder
@@ -2698,7 +2698,7 @@
isWorkingNotHolder
isWorkingNotHolder isNil ifTrue:[
- isWorkingNotHolder := BlockValue forLogicalNot: self isWorkingHolder
+ isWorkingNotHolder := BlockValue forLogicalNot: self isWorkingHolder
].
^isWorkingNotHolder
@@ -2790,25 +2790,25 @@
update: aspect with: param from: sender
sender == changesetHolder ifTrue: [
- self changesetChanged .
- ^self
+ self changesetChanged .
+ ^self
].
sender == navigatorSpecHolder ifTrue: [
- self changesetChanged .
- ^self
+ self changesetChanged .
+ ^self
].
sender == selection1Holder ifTrue: [
- self selectionChanged.
- ^self
+ self selectionChanged.
+ ^self
].
sender == selection2Holder ifTrue: [
- self selectionChanged.
- ^self
+ self selectionChanged.
+ ^self
].
sender == showingRegularChangesetHolder ifTrue:[
- self showingRegularChangesetChanged.
- ^self.
+ self showingRegularChangesetChanged.
+ ^self.
].
super update: aspect with: param from: sender
@@ -2916,33 +2916,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>"
@@ -2990,7 +2990,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>"
@@ -3023,21 +3023,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>"
@@ -3070,12 +3070,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>"
!
@@ -3103,8 +3103,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>"
!
@@ -3135,16 +3135,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]
@@ -3168,7 +3168,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>"
@@ -3187,18 +3187,18 @@
| nsName |
nsName := Dialog
- requestNameSpace:'Namepace to load code into:'
- initialAnswer:targetNameSpaceName.
+ requestNameSpace:'Namepace to load code into:'
+ initialAnswer:targetNameSpaceName.
nsName isEmptyOrNil ifTrue:[^self].
targetNameSpaceName := 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].
@@ -3211,13 +3211,13 @@
| package |
package := Dialog
- requestProject:'Default Smalltalk/X package to load code into:'
- initialAnswer:targetPackage
- suggestions:(RecentTargetPackages ? #()).
+ requestProject:'Default Smalltalk/X package to load code into:'
+ initialAnswer:targetPackage
+ suggestions:(RecentTargetPackages ? #()).
package isNil ifTrue:[^self].
RecentTargetPackages isNil ifTrue:[
- RecentTargetPackages := OrderedCollection new.
+ RecentTargetPackages := OrderedCollection new.
].
RecentTargetPackages remove:package ifAbsent:[].
RecentTargetPackages addFirst:package.
@@ -3237,8 +3237,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>"
@@ -3248,15 +3248,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>"
@@ -3272,16 +3272,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>"
@@ -3369,72 +3369,72 @@
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
- ].
+ [: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.
@@ -3443,16 +3443,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"
@@ -3463,8 +3463,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>"
@@ -3475,14 +3475,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>"
@@ -3494,8 +3494,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"
@@ -3505,9 +3505,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>"
@@ -3573,9 +3573,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.
@@ -3677,8 +3677,8 @@
|changes|
changes := (changeList == list1
- ifTrue:[ selection1Holder ]
- ifFalse:[ selection2Holder ]) value.
+ ifTrue:[ selection1Holder ]
+ ifFalse:[ selection2Holder ]) value.
^ changes collect:[:eachListEntry | eachListEntry change].
"Created: / 23-07-2012 / 13:13:11 / cg"
@@ -3744,7 +3744,6 @@
!
changeMenuApplyChanges: changesToApply
-
| changesThatFailToApply |
changesThatFailToApply := ChangeSet new.
@@ -3753,11 +3752,18 @@
at:(Screen default centerOfMonitorHavingPointer)
from:200 to:400
during:[:val |
- 1 to: changesToApply size do:
- [:i|
+ 1 to: changesToApply size do:[:i|
+ |change|
+
+ change := changesToApply at: i.
val value:((100 / changesToApply size) * i) rounded.
- [self changeMenuApplyChange: (changesToApply at: i)]
- on: Error do:[changesThatFailToApply add: (changesToApply at: i)]]]
+ [
+ self changeMenuApplyChange: change
+ ] on: Error do:[
+ changesThatFailToApply add: change
+ ]
+ ]
+ ]
"Created: / 04-08-2011 / 17:26:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -3793,12 +3799,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>"
@@ -3831,10 +3837,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>"
@@ -3863,12 +3869,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>"
@@ -3984,7 +3990,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:]
@@ -3998,16 +4004,16 @@
examples
"
Starting the application:
- [exBegin]
+ [exBegin]
Tools::ChangeEditor open
- [exEnd]
+ [exEnd]
more examples to be added:
- [exBegin]
+ [exBegin]
... add code fragment for
... executable example here ...
- [exEnd]
+ [exEnd]
"
! !
@@ -4030,65 +4036,65 @@
^
#(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>"
@@ -4118,8 +4124,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
!
@@ -4130,23 +4136,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
+ subjectChannel: self changeHolder
"Created: / 29-11-2011 / 11:21:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -4154,11 +4160,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"
@@ -4182,8 +4188,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
!
@@ -4194,16 +4200,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.
].
!
@@ -4211,7 +4217,7 @@
"return/create the 'showdiffHolder' value holder (automatically generated)"
showdiffHolder isNil ifTrue:[
- showdiffHolder := ValueHolder new.
+ showdiffHolder := ValueHolder new.
].
^ showdiffHolder
!
@@ -4243,8 +4249,8 @@
changedObject == changeHolder ifTrue:[
- self changeChanged.
- ^ self.
+ self changeChanged.
+ ^ self.
].
super update:something with:aParameter from:changedObject
@@ -4254,11 +4260,11 @@
!ChangeSetBrowser2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.67 2015-02-27 18:56:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.68 2015-02-28 23:46:38 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.67 2015-02-27 18:56:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.68 2015-02-28 23:46:38 cg Exp $'
!
version_HG
@@ -4267,6 +4273,6 @@
!
version_SVN
- ^ '$Id: Tools__ChangeSetBrowser2.st,v 1.67 2015-02-27 18:56:01 cg Exp $'
+ ^ '$Id: Tools__ChangeSetBrowser2.st,v 1.68 2015-02-28 23:46:38 cg Exp $'
! !