--- a/VersionDiffBrowser.st Thu Mar 22 07:34:51 2012 +0100
+++ b/VersionDiffBrowser.st Thu Mar 22 09:32:02 2012 +0100
@@ -1,6 +1,6 @@
"
COPYRIGHT (c) 2000 by eXept Software AG
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -37,7 +37,7 @@
copyright
"
COPYRIGHT (c) 2000 by eXept Software AG
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -84,199 +84,199 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: windowSpec
- window:
+ name: windowSpec
+ window:
(WindowSpec
- label: 'Version DiffBrowser'
- name: 'Version DiffBrowser'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 865 504)
- menu: mainMenu
- )
- component:
+ label: 'Version DiffBrowser'
+ name: 'Version DiffBrowser'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 865 504)
+ menu: mainMenu
+ )
+ component:
(SpecCollection
- collection: (
- (VariableVerticalPanelSpec
- name: 'VariableVerticalPanel1'
- layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
- component:
- (SpecCollection
- collection: (
- (HorizontalPanelViewSpec
- name: 'TopHorizontalPanel'
- horizontalLayout: fit
- verticalLayout: fit
- horizontalSpace: 3
- verticalSpace: 3
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'BoxA'
- level: 0
- visibilityChannel: boxAVisible
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Only in A'
- name: 'OnlyInALabel'
- layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
- translateLabel: true
- labelChannel: onlyInALabelHolder
- )
- (SequenceViewSpec
- name: 'ListA'
- layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
- model: methodsOnlyInASelection
- menu: menuA
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- miniScrollerHorizontal: true
- doubleClickSelector: methodInADoubleClicked:
- valueChangeSelector: methodsOnlyInASelectionChanged
- useIndex: true
- sequenceList: methodsOnlyInA
- )
- )
-
- )
- extent: (Point 286 199)
- )
- (ViewSpec
- name: 'BoxM'
- visibilityChannel: boxMVisible
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Changed'
- name: 'ChangedLabel'
- layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
- translateLabel: true
- labelChannel: changedLabelHolder
- )
- (SequenceViewSpec
- name: 'ListM'
- layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
- model: methodsChangedSelection
- menu: menuM
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- miniScrollerHorizontal: true
- doubleClickSelector: methodInChangedDoubleClicked:
- valueChangeSelector: methodsChangedSelectionChanged
- useIndex: true
- sequenceList: methodsChanged
- )
- )
-
- )
- extent: (Point 286 199)
- )
- (ViewSpec
- name: 'BoxB'
- visibilityChannel: boxBVisible
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Only in B'
- name: 'OnlyInBLabel'
- layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
- translateLabel: true
- labelChannel: onlyInBLabelHolder
- )
- (SequenceViewSpec
- name: 'ListB'
- layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
- model: methodsOnlyInBSelection
- menu: menuB
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- miniScrollerHorizontal: true
- doubleClickSelector: methodInBDoubleClicked:
- valueChangeSelector: methodsOnlyInBSelectionChanged
- useIndex: true
- sequenceList: methodsOnlyInB
- )
- )
-
- )
- extent: (Point 287 199)
- )
- )
-
- )
- )
- (ViewSpec
- name: 'Box4'
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'diffTextViewBox'
- layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
- initiallyInvisible: true
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'A'
- name: 'DiffTextLabelA'
- layout: (LayoutFrame 0 0 0 0 0 0.5 20 0)
- translateLabel: true
- labelChannel: diffTextLabelA
- )
- (LabelSpec
- label: 'B'
- name: 'DiffTextLabelB'
- layout: (LayoutFrame 0 0.5 0 0 0 1 20 0)
- translateLabel: true
- labelChannel: diffTextLabelB
- )
- (ArbitraryComponentSpec
- name: 'diffTextView'
- layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0)
- hasBorder: false
- component: diffTextView
- )
- )
-
- )
- )
- (CodeViewSpec
- name: 'singleTextView'
- layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
- model: methodText
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- miniScrollerHorizontal: true
- isReadOnly: true
- hasKeyboardFocusInitially: false
- )
- )
-
- )
- )
- )
-
- )
- handles: (Any 0.42379958246347 1.0)
- )
- (LabelSpec
- name: 'InfoLabel'
- layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
- level: -1
- translateLabel: true
- labelChannel: infoHolder
- adjust: left
- )
- )
-
- )
+ collection: (
+ (VariableVerticalPanelSpec
+ name: 'VariableVerticalPanel1'
+ layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
+ component:
+ (SpecCollection
+ collection: (
+ (HorizontalPanelViewSpec
+ name: 'TopHorizontalPanel'
+ horizontalLayout: fit
+ verticalLayout: fit
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'BoxA'
+ level: 0
+ visibilityChannel: boxAVisible
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Only in A'
+ name: 'OnlyInALabel'
+ layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
+ translateLabel: true
+ labelChannel: onlyInALabelHolder
+ )
+ (SequenceViewSpec
+ name: 'ListA'
+ layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
+ model: methodsOnlyInASelection
+ menu: menuA
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ miniScrollerHorizontal: true
+ doubleClickSelector: methodInADoubleClicked:
+ valueChangeSelector: methodsOnlyInASelectionChanged
+ useIndex: true
+ sequenceList: methodsOnlyInA
+ )
+ )
+
+ )
+ extent: (Point 286 199)
+ )
+ (ViewSpec
+ name: 'BoxM'
+ visibilityChannel: boxMVisible
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Changed'
+ name: 'ChangedLabel'
+ layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
+ translateLabel: true
+ labelChannel: changedLabelHolder
+ )
+ (SequenceViewSpec
+ name: 'ListM'
+ layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
+ model: methodsChangedSelection
+ menu: menuM
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ miniScrollerHorizontal: true
+ doubleClickSelector: methodInChangedDoubleClicked:
+ valueChangeSelector: methodsChangedSelectionChanged
+ useIndex: true
+ sequenceList: methodsChanged
+ )
+ )
+
+ )
+ extent: (Point 286 199)
+ )
+ (ViewSpec
+ name: 'BoxB'
+ visibilityChannel: boxBVisible
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Only in B'
+ name: 'OnlyInBLabel'
+ layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
+ translateLabel: true
+ labelChannel: onlyInBLabelHolder
+ )
+ (SequenceViewSpec
+ name: 'ListB'
+ layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
+ model: methodsOnlyInBSelection
+ menu: menuB
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ miniScrollerHorizontal: true
+ doubleClickSelector: methodInBDoubleClicked:
+ valueChangeSelector: methodsOnlyInBSelectionChanged
+ useIndex: true
+ sequenceList: methodsOnlyInB
+ )
+ )
+
+ )
+ extent: (Point 287 199)
+ )
+ )
+
+ )
+ )
+ (ViewSpec
+ name: 'Box4'
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'diffTextViewBox'
+ layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+ initiallyInvisible: true
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'A'
+ name: 'DiffTextLabelA'
+ layout: (LayoutFrame 0 0 0 0 0 0.5 20 0)
+ translateLabel: true
+ labelChannel: diffTextLabelA
+ )
+ (LabelSpec
+ label: 'B'
+ name: 'DiffTextLabelB'
+ layout: (LayoutFrame 0 0.5 0 0 0 1 20 0)
+ translateLabel: true
+ labelChannel: diffTextLabelB
+ )
+ (ArbitraryComponentSpec
+ name: 'diffTextView'
+ layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0)
+ hasBorder: false
+ component: diffTextView
+ )
+ )
+
+ )
+ )
+ (CodeViewSpec
+ name: 'singleTextView'
+ layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+ model: methodText
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ miniScrollerHorizontal: true
+ isReadOnly: true
+ hasKeyboardFocusInitially: false
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ handles: (Any 0.42379958246347 1.0)
+ )
+ (LabelSpec
+ name: 'InfoLabel'
+ layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
+ level: -1
+ translateLabel: true
+ labelChannel: infoHolder
+ adjust: left
+ )
+ )
+
+ )
)
! !
@@ -297,79 +297,79 @@
<resource: #menu>
- ^
+ ^
#(Menu
- (
- (MenuItem
- label: 'File'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Create PatchFile...'
- itemValue: createPatchFile
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Exit'
- itemValue: closeRequest
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: 'View'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- enabled: canIncludeExtensionsHolder
- label: 'Include Extensions'
- itemValue: includeExtensions:
- translateLabel: true
- indication: includeExtensionsHolder
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: 'Help'
- translateLabel: true
- startGroup: conditionalRight
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Documentation'
- itemValue: openDocumentation
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'About this Application...'
- itemValue: openAboutThisApplication
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- )
- nil
- nil
+ (
+ (MenuItem
+ label: 'File'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Create PatchFile...'
+ itemValue: createPatchFile
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Exit'
+ itemValue: closeRequest
+ translateLabel: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: 'View'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ enabled: canIncludeExtensionsHolder
+ label: 'Include Extensions'
+ itemValue: includeExtensions:
+ translateLabel: true
+ indication: includeExtensionsHolder
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: 'Help'
+ translateLabel: true
+ startGroup: conditionalRight
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Documentation'
+ itemValue: openDocumentation
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'About this Application...'
+ itemValue: openAboutThisApplication
+ translateLabel: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ )
+ nil
+ nil
)
!
@@ -387,34 +387,34 @@
<resource: #menu>
- ^
+ ^
#(#Menu
- #(
- #(#MenuItem
- #label: 'Apply'
- #translateLabel: true
- #value: #applySelectedChangeInA
- #enabled: #hasChangeSelectedInA
- )
- #(#MenuItem
- #label: 'Browse'
- #translateLabel: true
- #value: #browseClassInA
- #enabled: #hasChangeSelectedInA
- )
- #(#MenuItem
- #label: '-'
- )
- #(#MenuItem
- #label: 'Inspect'
- #translateLabel: true
- #value: #inspectSelectedChangeInA
- #choiceValue: 'nil "UndefinedObject" '
- #enabled: #hasChangeSelectedInA
- )
- )
- nil
- nil
+ #(
+ #(#MenuItem
+ #label: 'Apply'
+ #translateLabel: true
+ #value: #applySelectedChangeInA
+ #enabled: #hasChangeSelectedInA
+ )
+ #(#MenuItem
+ #label: 'Browse'
+ #translateLabel: true
+ #value: #browseClassInA
+ #enabled: #hasChangeSelectedInA
+ )
+ #(#MenuItem
+ #label: '-'
+ )
+ #(#MenuItem
+ #label: 'Inspect'
+ #translateLabel: true
+ #value: #inspectSelectedChangeInA
+ #choiceValue: 'nil "UndefinedObject" '
+ #enabled: #hasChangeSelectedInA
+ )
+ )
+ nil
+ nil
)
!
@@ -432,43 +432,43 @@
<resource: #menu>
- ^
+ ^
#(#Menu
- #(
- #(#MenuItem
- #label: 'Apply'
- #translateLabel: true
- #value: #applySelectedChangeInB
- #enabled: #hasChangeSelectedInB
- )
- #(#MenuItem
- #label: 'Browse'
- #translateLabel: true
- #value: #browseClassInB
- #enabled: #hasChangeSelectedInB
- )
- #(#MenuItem
- #label: '-'
- )
- #(#MenuItem
- #label: 'Remove in Image'
- #translateLabel: true
- #value: #removeSelectedChangeInBFromImage
- #enabled: #hasChangeSelectedInB
- )
- #(#MenuItem
- #label: '-'
- )
- #(#MenuItem
- #label: 'Inspect'
- #translateLabel: true
- #value: #inspectSelectedChangeInB
- #choiceValue: 'nil "UndefinedObject" '
- #enabled: #hasChangeSelectedInB
- )
- )
- nil
- nil
+ #(
+ #(#MenuItem
+ #label: 'Apply'
+ #translateLabel: true
+ #value: #applySelectedChangeInB
+ #enabled: #hasChangeSelectedInB
+ )
+ #(#MenuItem
+ #label: 'Browse'
+ #translateLabel: true
+ #value: #browseClassInB
+ #enabled: #hasChangeSelectedInB
+ )
+ #(#MenuItem
+ #label: '-'
+ )
+ #(#MenuItem
+ #label: 'Remove in Image'
+ #translateLabel: true
+ #value: #removeSelectedChangeInBFromImage
+ #enabled: #hasChangeSelectedInB
+ )
+ #(#MenuItem
+ #label: '-'
+ )
+ #(#MenuItem
+ #label: 'Inspect'
+ #translateLabel: true
+ #value: #inspectSelectedChangeInB
+ #choiceValue: 'nil "UndefinedObject" '
+ #enabled: #hasChangeSelectedInB
+ )
+ )
+ nil
+ nil
)
"Modified: / 15-08-2010 / 21:24:49 / cg"
@@ -488,43 +488,43 @@
<resource: #menu>
- ^
+ ^
#(#Menu
- #(
- #(#MenuItem
- #label: 'Browse'
- #translateLabel: true
- #value: #browseClassInM
- #enabled: #hasChangeSelectedInM
- )
- #(#MenuItem
- #label: '-'
- )
- #(#MenuItem
- #label: 'Apply Left Version'
- #translateLabel: true
- #value: #acceptInLeftView
- #enabled: #hasChangeSelectedInM
- )
- #(#MenuItem
- #label: 'Apply Right Version'
- #translateLabel: true
- #value: #acceptInRightView
- #enabled: #hasChangeSelectedInM
- )
- #(#MenuItem
- #label: '-'
- )
- #(#MenuItem
- #label: 'Inspect both'
- #translateLabel: true
- #value: #inspectSelectedChangeInM
- #choiceValue: 'nil "UndefinedObject" '
- #enabled: #hasChangeSelectedInM
- )
- )
- nil
- nil
+ #(
+ #(#MenuItem
+ #label: 'Browse'
+ #translateLabel: true
+ #value: #browseClassInM
+ #enabled: #hasChangeSelectedInM
+ )
+ #(#MenuItem
+ #label: '-'
+ )
+ #(#MenuItem
+ #label: 'Apply Left Version'
+ #translateLabel: true
+ #value: #acceptInLeftView
+ #enabled: #hasChangeSelectedInM
+ )
+ #(#MenuItem
+ #label: 'Apply Right Version'
+ #translateLabel: true
+ #value: #acceptInRightView
+ #enabled: #hasChangeSelectedInM
+ )
+ #(#MenuItem
+ #label: '-'
+ )
+ #(#MenuItem
+ #label: 'Inspect both'
+ #translateLabel: true
+ #value: #inspectSelectedChangeInM
+ #choiceValue: 'nil "UndefinedObject" '
+ #enabled: #hasChangeSelectedInM
+ )
+ )
+ nil
+ nil
)
"Modified: / 31-08-2007 / 14:16:39 / cg"
@@ -544,16 +544,16 @@
(if this app is embedded in a subCanvas)."
^ #(
- #changedLabelHolder
- #onlyInALabelHolder
- #onlyInBLabelHolder
+ #changedLabelHolder
+ #onlyInALabelHolder
+ #onlyInBLabelHolder
).
! !
!VersionDiffBrowser class methodsFor:'startup'!
-openOnClass:aClass againstVersion:aVersionA
+openOnClass:aClass againstVersion:aVersionA
"create a VersionDiffBrowser instance and set the class change set of the
browser. The class diff set is generated from aClasses current against some version
via the source code manager."
@@ -578,20 +578,20 @@
"
!
-openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:ignoredTitle
+openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:ignoredTitle
"create a VersionDiffBrowser instance and set the class change set of the
browser. The class diff set is generated from two classes."
^ self
- openOnClass:classA labelA:aLabelA
- andClass:classB labelB:aLabelB
- title:ignoredTitle ifSame:nil
+ openOnClass:classA labelA:aLabelA
+ andClass:classB labelB:aLabelB
+ title:ignoredTitle ifSame:nil
"
- self
- openOnClass:Array labelA:'Array'
- andClass:Collection labelB:'Collection'
- title:'Array vs. Collection'
+ self
+ openOnClass:Array labelA:'Array'
+ andClass:Collection labelB:'Collection'
+ title:'Array vs. Collection'
"
!
@@ -604,35 +604,35 @@
classChangeSet := ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB.
classChangeSet removeAllVersionMethods.
sameAction notNil ifTrue:[
- "/ check if same ...
- (classChangeSet methodsOnlyInA isEmpty
- and:[classChangeSet methodsOnlyInB isEmpty
- and:[classChangeSet diffSet isEmpty]]) ifTrue:[
- sameAction value.
- ^ self "/ do not open
- ]
+ "/ check if same ...
+ (classChangeSet methodsOnlyInA isEmpty
+ and:[classChangeSet methodsOnlyInB isEmpty
+ and:[classChangeSet diffSet isEmpty]]) ifTrue:[
+ sameAction value.
+ ^ self "/ do not open
+ ]
].
^ self openOnClassChangeSet:classChangeSet title:ignoredTitle
!
-openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
+openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
"create a VersionDiffBrowser instance and set the class change set of the
browser. The class diff set is generated from two source files."
^ self
- openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
- title:nil
+ openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
+ title:nil
!
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB title:ignoredTitle
"create a VersionDiffBrowser instance and set the class change set of the
browser. The class diff set is generated from two source files."
- ^ self
- openOnClass:aClass labelA:aLabelA sourceA:aSourceA
- labelB:aLabelB sourceB:aSourceB
- title:ignoredTitle ifSame:nil
+ ^ self
+ openOnClass:aClass labelA:aLabelA sourceA:aSourceA
+ labelB:aLabelB sourceB:aSourceB
+ title:ignoredTitle ifSame:nil
!
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB title:ignoredTitle ifSame:sameAction
@@ -644,41 +644,41 @@
classChangeSet := ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB.
classChangeSet removeAllVersionMethods.
sameAction notNil ifTrue:[
- "/ check if same ...
- (classChangeSet methodsOnlyInA isEmpty
- and:[classChangeSet methodsOnlyInB isEmpty]) ifTrue:[
- diffs := classChangeSet diffSet.
+ "/ check if same ...
+ (classChangeSet methodsOnlyInA isEmpty
+ and:[classChangeSet methodsOnlyInB isEmpty]) ifTrue:[
+ diffs := classChangeSet diffSet.
- hasChangedMethods := diffs changed notEmpty.
- hasChangedMethods ifTrue:[
- versionMethodChanges := diffs changed select:[:eachDifference |
- |eachChange|
- eachChange := eachDifference first.
- (eachChange isMethodChange
- and:[ (AbstractSourceCodeManager isVersionMethodSelector:eachChange selector)
- and:[ eachChange changeClass isMeta ]]).
- ].
- diffs changed size == versionMethodChanges size ifTrue: [
- hasChangedMethods := false.
- ].
+ hasChangedMethods := diffs changed notEmpty.
+ hasChangedMethods ifTrue:[
+ versionMethodChanges := diffs changed select:[:eachDifference |
+ |eachChange|
+ eachChange := eachDifference first.
+ (eachChange isMethodChange
+ and:[ (AbstractSourceCodeManager isVersionMethodSelector:eachChange selector)
+ and:[ eachChange changeClass isMeta ]]).
+ ].
+ diffs changed size == versionMethodChanges size ifTrue: [
+ hasChangedMethods := false.
+ ].
"/ diffs changed size == 1 ifTrue:[
"/ theOnlyDifference := diffs changed first.
"/ theOnlyChange := theOnlyDifference first.
-"/ (theOnlyChange isMethodChange
+"/ (theOnlyChange isMethodChange
"/ and:[ ((theOnlyChange selector == #version) or:[theOnlyChange selector startsWith:'version_'])
"/ and:[ theOnlyChange changeClass isMeta ]]) ifTrue:[
"/ hasChangedMethods := false
"/ ]
"/ ]
- ].
+ ].
- (hasChangedMethods not
- and:[diffs onlyInArg isEmpty
- and:[diffs onlyInReceiver isEmpty]]) ifTrue:[
- sameAction value.
- ^ self "/ do not open
- ].
- ]
+ (hasChangedMethods not
+ and:[diffs onlyInArg isEmpty
+ and:[diffs onlyInReceiver isEmpty]]) ifTrue:[
+ sameAction value.
+ ^ self "/ do not open
+ ].
+ ]
].
^ self openOnClassChangeSet:classChangeSet title:ignoredTitle
@@ -719,8 +719,8 @@
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle
^ self
- openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle
- ignoreExtensions:false
+ openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle
+ ignoreExtensions:false
"Modified: / 12-09-2011 / 11:52:44 / cg"
!
@@ -754,9 +754,9 @@
^ theBrowser.
"
- VersionDiffBrowser
- openOnDiffsBetweenFile:'/phys/exept/tmp/ws/Workflow::BlockDescription.st'
- and:'/phys/exept/tmp/workflowClasses/Workflow::BlockDescription.st'
+ VersionDiffBrowser
+ openOnDiffsBetweenFile:'/phys/exept/tmp/ws/Workflow::BlockDescription.st'
+ and:'/phys/exept/tmp/workflowClasses/Workflow::BlockDescription.st'
"
! !
@@ -799,12 +799,12 @@
gets the class from the change set which is compared.
<return: Class>
- "
+ "
^ self classChangeSet classBeingCompared
!
classChangeSet
- "returns the class change set which is the model of the version diff browser."
+ "returns the class change set which is the model of the version diff browser."
^ classChangeSet
!
@@ -852,7 +852,7 @@
sel := self methodsOnlyInASelection value.
sel notNil ifTrue:[
- change := self changeSetA at:sel.
+ change := self changeSetA at:sel.
].
^ change
!
@@ -867,7 +867,7 @@
sel := self methodsOnlyInBSelection value.
sel notNil ifTrue:[
- change := (self changeSetB at:sel).
+ change := (self changeSetB at:sel).
].
^ change
!
@@ -882,11 +882,11 @@
sel := self methodsChangedSelection value.
sel notNil ifTrue:[
- theTwoChanges := self classChangeSet methodsChanged at:sel.
+ theTwoChanges := self classChangeSet methodsChanged at:sel.
"/ changeA := theTwoChanges first.
"/ changeB := theTwoChanges second.
"/ ^ Array with:changeA with:changeB.
- ^ theTwoChanges.
+ ^ theTwoChanges.
].
^ #(nil nil)
!
@@ -914,35 +914,35 @@
!VersionDiffBrowser methodsFor:'actions'!
acceptInLeftView
- |change|
+ |change|
change := self selectedChangesInM first.
self applyChange:change
!
acceptInRightView
- |change|
+ |change|
change := self selectedChangesInM second.
self applyChange:change
!
acceptInSingleView
- |change|
+ |change|
change := self selectedChangeInA.
change isNil ifTrue:[
- change := self selectedChangeInB
+ change := self selectedChangeInB
].
self applyChange:change
!
applySelectedChangeInA
- self applyChange:(self selectedChangeInA)
+ self applyChange:(self selectedChangeInA)
!
applySelectedChangeInB
- self applyChange:(self selectedChangeInB)
+ self applyChange:(self selectedChangeInB)
!
methodInADoubleClicked:index
@@ -978,31 +978,31 @@
sel := self methodsChangedSelection value.
sel notNil ifTrue:[
- self methodsOnlyInASelection value:nil.
- self methodsOnlyInBSelection value:nil.
- methodsChanged := self classChangeSet methodsChanged.
- changeA := (methodsChanged at:sel) first.
- changeB := (methodsChanged at:sel) second.
- self withReadCursorDo:[
- "/ see if the semantics have changed (or only prettyPrinted)
- RBParser notNil ifTrue:[
- (classChangeSet notNil
- and:[ classChangeSet classBeingCompared notNil ]) ifTrue:[
- parseError := false.
- treeA := RBParser parseMethod:changeA source onError: [:str :pos | parseError := true].
- treeB := RBParser parseMethod:changeB source onError: [:str :pos | parseError := true].
- parseError ifFalse:[
- (treeA equalTo:treeB withMapping:(Dictionary new)) ifTrue:[
- self infoHolder value:'Methods only differ in formatting / comments.'.
- ]
- ]
- ].
- ].
- self diffTextView
- text1:(changeA prettyPrintedSource) text2:(changeB prettyPrintedSource);
- moveToNextChanged
- ].
- self showDiffTextView.
+ self methodsOnlyInASelection value:nil.
+ self methodsOnlyInBSelection value:nil.
+ methodsChanged := self classChangeSet methodsChanged.
+ changeA := (methodsChanged at:sel) first.
+ changeB := (methodsChanged at:sel) second.
+ self withReadCursorDo:[
+ "/ see if the semantics have changed (or only prettyPrinted)
+ RBParser notNil ifTrue:[
+ (classChangeSet notNil
+ and:[ classChangeSet classBeingCompared notNil ]) ifTrue:[
+ parseError := false.
+ treeA := RBParser parseMethod:changeA source onError: [:str :pos | parseError := true].
+ treeB := RBParser parseMethod:changeB source onError: [:str :pos | parseError := true].
+ parseError ifFalse:[
+ (treeA equalTo:treeB withMapping:(Dictionary new)) ifTrue:[
+ self infoHolder value:'Methods only differ in formatting / comments.'.
+ ]
+ ]
+ ].
+ ].
+ self diffTextView
+ text1:(changeA prettyPrintedSource) text2:(changeB prettyPrintedSource);
+ moveToNextChanged
+ ].
+ self showDiffTextView.
]
"Modified: / 3.9.1999 / 15:01:30 / ps"
@@ -1022,11 +1022,11 @@
sel := self methodsOnlyInASelection value.
sel notNil ifTrue:[
- self methodsOnlyInBSelection value:nil.
- self methodsChangedSelection value:nil.
- change := self changeSetA at:sel.
- self methodText value:(change prettyPrintedSource).
- self showSingleTextView.
+ self methodsOnlyInBSelection value:nil.
+ self methodsChangedSelection value:nil.
+ change := self changeSetA at:sel.
+ self methodText value:(change prettyPrintedSource).
+ self showSingleTextView.
]
!
@@ -1044,11 +1044,11 @@
sel := self methodsOnlyInBSelection value.
sel notNil ifTrue:[
- self methodsOnlyInASelection value:nil.
- self methodsChangedSelection value:nil.
- change := self changeSetB at:sel.
- self methodText value:(change prettyPrintedSource).
- self showSingleTextView.
+ self methodsOnlyInASelection value:nil.
+ self methodsChangedSelection value:nil.
+ change := self changeSetB at:sel.
+ self methodText value:(change prettyPrintedSource).
+ self showSingleTextView.
]
!
@@ -1057,16 +1057,16 @@
change := self selectedChangeInB.
change isMethodChange ifTrue:[
- (cls := change changeClass) notNil ifTrue:[
- (sel := change selector) notNil ifTrue:[
- RefactoryChangeManager notNil ifTrue:[
- op := RemoveMethodChange remove:sel from:cls.
- RefactoryChangeManager performChange: op.
- ] ifFalse:[
- cls removeSelector:sel
- ]
- ]
- ]
+ (cls := change changeClass) notNil ifTrue:[
+ (sel := change selector) notNil ifTrue:[
+ RefactoryChangeManager notNil ifTrue:[
+ op := RemoveMethodChange remove:sel from:cls.
+ RefactoryChangeManager performChange: op.
+ ] ifFalse:[
+ cls removeSelector:sel
+ ]
+ ]
+ ]
]
"Modified: / 15-08-2010 / 21:35:00 / cg"
@@ -1076,21 +1076,21 @@
boxAVisible
boxAVisible isNil ifTrue:[
- boxAVisible := true asValue.
+ boxAVisible := true asValue.
].
^ boxAVisible.
!
boxBVisible
boxBVisible isNil ifTrue:[
- boxBVisible := true asValue.
+ boxBVisible := true asValue.
].
^ boxBVisible.
!
boxMVisible
boxMVisible isNil ifTrue:[
- boxMVisible := true asValue.
+ boxMVisible := true asValue.
].
^ boxMVisible.
!
@@ -1099,7 +1099,7 @@
"can include extensions ? (menu item enabler)"
canIncludeExtensionsHolder isNil ifTrue:[
- canIncludeExtensionsHolder := true asValue.
+ canIncludeExtensionsHolder := true asValue.
].
^ canIncludeExtensionsHolder.
!
@@ -1112,7 +1112,7 @@
"
changedLabelHolder isNil ifTrue:[
- changedLabelHolder := ValueHolder new.
+ changedLabelHolder := ValueHolder new.
].
^ changedLabelHolder.
!
@@ -1125,7 +1125,7 @@
"
diffTextLabelA isNil ifTrue:[
- diffTextLabelA := ValueHolder new.
+ diffTextLabelA := ValueHolder new.
].
^ diffTextLabelA.
!
@@ -1138,7 +1138,7 @@
"
diffTextLabelB isNil ifTrue:[
- diffTextLabelB := ValueHolder new.
+ diffTextLabelB := ValueHolder new.
].
^ diffTextLabelB.
!
@@ -1152,13 +1152,13 @@
|v|
diffTextView isNil ifTrue:[
- v := DiffCodeView basicNew.
- v textViewClass:CodeView.
- v initialize.
- diffTextView := HVScrollableView
- forView:v
- miniScrollerH:true miniScrollerV:false.
- diffTextView addNextPreviousButtons.
+ v := DiffCodeView basicNew.
+ v textViewClass:CodeView.
+ v initialize.
+ diffTextView := HVScrollableView
+ forView:v
+ miniScrollerH:true miniScrollerV:false.
+ diffTextView addNextPreviousButtons.
].
^ diffTextView
@@ -1181,8 +1181,8 @@
"only compare base-methods or include extensions ?"
includeExtensionsHolder isNil ifTrue:[
- includeExtensionsHolder := false asValue.
- includeExtensionsHolder addDependent:self.
+ includeExtensionsHolder := false asValue.
+ includeExtensionsHolder addDependent:self.
].
^ includeExtensionsHolder.
@@ -1191,7 +1191,7 @@
infoHolder
infoHolder isNil ifTrue:[
- infoHolder := ValueHolder new.
+ infoHolder := ValueHolder new.
].
^ infoHolder.
!
@@ -1204,7 +1204,7 @@
"
methodText isNil ifTrue:[
- methodText := ValueHolder new.
+ methodText := ValueHolder new.
].
^ methodText.
!
@@ -1217,7 +1217,7 @@
"
methodsChanged isNil ifTrue:[
- methodsChanged := List new.
+ methodsChanged := List new.
].
^ methodsChanged.
!
@@ -1230,7 +1230,7 @@
"
methodsChangedSelection isNil ifTrue:[
- methodsChangedSelection := ValueHolder new.
+ methodsChangedSelection := ValueHolder new.
].
^ methodsChangedSelection.
!
@@ -1239,7 +1239,7 @@
"aspect for the 'method only in version A' list."
methodsOnlyInA isNil ifTrue:[
- methodsOnlyInA := List new.
+ methodsOnlyInA := List new.
].
^ methodsOnlyInA.
@@ -1250,7 +1250,7 @@
"aspect for the selection holder of 'method only in version A'-list."
methodsOnlyInASelection isNil ifTrue:[
- methodsOnlyInASelection := ValueHolder new.
+ methodsOnlyInASelection := ValueHolder new.
].
^ methodsOnlyInASelection.
@@ -1261,7 +1261,7 @@
"aspect for the 'method only in version B' list"
methodsOnlyInB isNil ifTrue:[
- methodsOnlyInB := List new.
+ methodsOnlyInB := List new.
].
^ methodsOnlyInB.
@@ -1272,7 +1272,7 @@
"aspect for the selection holder of 'method only in version B'-list."
methodsOnlyInBSelection isNil ifTrue:[
- methodsOnlyInBSelection := ValueHolder new.
+ methodsOnlyInBSelection := ValueHolder new.
].
^ methodsOnlyInBSelection.
@@ -1283,7 +1283,7 @@
"aspect for the label for 'method only in version A'."
onlyInALabelHolder isNil ifTrue:[
- onlyInALabelHolder := ValueHolder new.
+ onlyInALabelHolder := ValueHolder new.
].
^ onlyInALabelHolder.
@@ -1294,7 +1294,7 @@
"aspect for the label for 'method only in version B'."
onlyInBLabelHolder isNil ifTrue:[
- onlyInBLabelHolder := ValueHolder new.
+ onlyInBLabelHolder := ValueHolder new.
].
^ onlyInBLabelHolder.
@@ -1310,11 +1310,11 @@
classHolder:aValueHolder
classHolder notNil ifTrue:[
- classHolder removeDependent:self
+ classHolder removeDependent:self
].
classHolder := aValueHolder.
classHolder notNil ifTrue:[
- classHolder addDependent:self
+ classHolder addDependent:self
]
!
@@ -1328,21 +1328,21 @@
versionAHolder:aValueHolder
versionAHolder notNil ifTrue:[
- versionAHolder removeDependent:self
+ versionAHolder removeDependent:self
].
versionAHolder := aValueHolder.
versionAHolder notNil ifTrue:[
- versionAHolder addDependent:self
+ versionAHolder addDependent:self
]
!
versionBHolder:aValueHolder
versionBHolder notNil ifTrue:[
- versionBHolder removeDependent:self
+ versionBHolder removeDependent:self
].
versionBHolder := aValueHolder.
versionBHolder notNil ifTrue:[
- versionBHolder addDependent:self
+ versionBHolder addDependent:self
]
! !
@@ -1369,16 +1369,16 @@
!VersionDiffBrowser methodsFor:'change & update'!
update:something with:parameter from:changedObject
- changedObject == includeExtensionsHolder ifTrue:[
- self updateLists.
- ^ self
+ changedObject == includeExtensionsHolder ifTrue:[
+ self updateLists.
+ ^ self
].
- (changedObject == classHolder
+ (changedObject == classHolder
or:[changedObject == versionAHolder
- or:[changedObject == versionBHolder]]) ifTrue:[
- self setupForClass:(classHolder value) versionA:(versionAHolder value) versionB:(versionBHolder value).
- ^ self
+ or:[changedObject == versionBHolder]]) ifTrue:[
+ self setupForClass:(classHolder value) versionA:(versionAHolder value) versionB:(versionBHolder value).
+ ^ self
].
super update:something with:parameter from:changedObject
@@ -1411,7 +1411,7 @@
cls := aChange changeClass.
aChange isMethodChange ifTrue:[
- sel := aChange changeSelector.
+ sel := aChange changeSelector.
"/ (cls compiledMethodAt:sel) isNil ifTrue:[
"/ (self confirm:'Method does not exist.\\Browse Class ?' withCRs) ifTrue:[
"/ browserClass openInClass:cls
@@ -1420,7 +1420,7 @@
"/ ]
].
self withWaitCursorDo:[
- browserClass openInClass:cls selector:sel.
+ browserClass openInClass:cls selector:sel.
]
"Modified: / 12-10-2006 / 23:58:40 / cg"
@@ -1458,36 +1458,36 @@
classBeingCompared := classChangeSet classBeingCompared.
classBeingCompared notNil ifTrue:[
- defaultName := classBeingCompared nameWithoutPrefix.
- classChangeSet versionA notNil ifTrue:[
- defaultName := defaultName , '-'.
- defaultName := defaultName , classChangeSet versionA.
- classChangeSet versionB notNil ifTrue:[
- defaultName := defaultName , '-'.
- defaultName := defaultName , classChangeSet versionB.
- ].
- ].
- defaultName := defaultName , '.chg'.
+ defaultName := classBeingCompared nameWithoutPrefix.
+ classChangeSet versionA notNil ifTrue:[
+ defaultName := defaultName , '-'.
+ defaultName := defaultName , classChangeSet versionA.
+ classChangeSet versionB notNil ifTrue:[
+ defaultName := defaultName , '-'.
+ defaultName := defaultName , classChangeSet versionB.
+ ].
+ ].
+ defaultName := defaultName , '.chg'.
].
- f := Dialog
- requestFileNameForSave:'Name of patchFile:'
- default:defaultName.
+ f := Dialog
+ requestFileNameForSave:'Name of patchFile:'
+ default:defaultName.
self warn:'Sorry: This function is not yet implemented'.
^ self.
-"/ vsnMthdA := self changeSetA
+"/ vsnMthdA := self changeSetA
"/ detect:[:ch | ch isMethodChange
"/ and:[ch changeClass isMeta
"/ and:[ch changeSelector = #version]]]
"/ ifNone:nil.
-"/ vsnMthdB := self changeSetA
+"/ vsnMthdB := self changeSetA
"/ detect:[:ch | ch isMethodChange
"/ and:[ch changeClass isMeta
"/ and:[ch changeSelector = #version]]]
"/ ifNone:nil.
"/
"/ vsnMthdA notNil ifTrue:[
-"/ "/ extract the version
+"/ "/ extract the version
"/ vsnA := Class revisionStringFromSource:vsnMthdA source.
"/ vsnA notNil ifTrue:[
"/ info := Class revisionInfoFromString:vsnA.
@@ -1499,7 +1499,7 @@
"/ ].
"/ ].
"/ vsnMthdB notNil ifTrue:[
-"/ "/ extract the version
+"/ "/ extract the version
"/ vsnB := Class revisionStringFromSource:vsnMthdB source.
"/ vsnB notNil ifTrue:[
"/ info := Class revisionInfoFromString:vsnB.
@@ -1543,7 +1543,7 @@
changes := self selectedChangesInM.
changes do:[:change |
- change inspect
+ change inspect
].
"Modified: / 25-07-2006 / 11:13:13 / cg"
@@ -1554,7 +1554,7 @@
the menu bar should not be used."
self masterApplication isNil ifTrue:[
- ^ self class mainMenu
+ ^ self class mainMenu
].
^ nil
@@ -1582,107 +1582,107 @@
rightView := diffTextView rightTextView.
singleView := self componentAt:#singleTextView.
- (Array
- with:leftView
- with:rightView
- with:singleView)
+ (Array
+ with:leftView
+ with:rightView
+ with:singleView)
do:[:v |
- |mGen|
+ |mGen|
- mGen := [
- |m|
+ mGen := [
+ |m|
- m := v editMenu.
+ m := v editMenu.
- (m selectorAt:#accept) isNil ifTrue:[
- m addLabels:(resources array:#('-' 'Accept'))
- selectors:(Array with:nil with:#accept)
- after:#copySelection.
- ].
- m
- actionAt:#accept
- put:[
- v == singleView ifTrue:[
- self acceptInSingleView
- ] ifFalse:[
- v == leftView ifTrue:[
- self acceptInLeftView
- ] ifFalse:[
- self acceptInRightView
- ].
- ].
- ].
- m selectorAt:#accept put:nil.
- m enable:#copySelection.
- m setEnable:#accept to:[self canAcceptInCodeView].
- m
- ].
- v menuHolder:mGen.
- v menuMessage:#value.
+ (m selectorAt:#accept) isNil ifTrue:[
+ m addLabels:(resources array:#('-' 'Accept'))
+ selectors:(Array with:nil with:#accept)
+ after:#copySelection.
+ ].
+ m
+ actionAt:#accept
+ put:[
+ v == singleView ifTrue:[
+ self acceptInSingleView
+ ] ifFalse:[
+ v == leftView ifTrue:[
+ self acceptInLeftView
+ ] ifFalse:[
+ self acceptInRightView
+ ].
+ ].
+ ].
+ m selectorAt:#accept put:nil.
+ m enable:#copySelection.
+ m setEnable:#accept to:[self canAcceptInCodeView].
+ m
+ ].
+ v menuHolder:mGen.
+ v menuMessage:#value.
]
!
applyChange:change
change notNil ifTrue:[
- change apply
+ change apply
]
!
printStringForChange:aChange
"generate a print string for a change."
- |m changeClassName useChangesString selectorString
+ |m changeClassName useChangesString selectorString
singleComparedClass singleComparedClassesName singleComparedMetaclassesName|
(singleComparedClass := self classBeingCompared) notNil ifTrue:[
- singleComparedClassesName := singleComparedClass name.
- singleComparedMetaclassesName := singleComparedClass theMetaclass name.
+ singleComparedClassesName := singleComparedClass name.
+ singleComparedMetaclassesName := singleComparedClass theMetaclass name.
].
aChange isClassDefinitionChange ifTrue:[
- ^ aChange printStringWithoutClassName
+ ^ aChange printStringWithoutClassName
].
aChange isDoIt ifTrue:[
- ^ aChange source , ' (doIt)'
+ ^ aChange source , ' (doIt)'
].
aChange isNameSpaceCreationChange ifTrue:[
- ^ aChange source
+ ^ aChange source
].
changeClassName := aChange className.
changeClassName isNil ifTrue:[
- ^ aChange source
+ ^ aChange source
].
useChangesString := false.
(changeClassName = singleComparedClassesName) ifTrue:[
- changeClassName := ''.
- useChangesString := true.
+ changeClassName := ''.
+ useChangesString := true.
] ifFalse:[
- (changeClassName = singleComparedMetaclassesName) ifTrue:[
- changeClassName := 'class '.
- useChangesString := true.
- ] ifFalse:[
- ((changeClassName includes:$:) and:[ changeClassName startsWith:((singleComparedClassesName ? ''),'::') ]) ifTrue:[
- changeClassName := changeClassName copyFrom:(singleComparedClassesName,'::') size+1.
- ].
- ].
+ (changeClassName = singleComparedMetaclassesName) ifTrue:[
+ changeClassName := 'class '.
+ useChangesString := true.
+ ] ifFalse:[
+ ((changeClassName includes:$:) and:[ changeClassName startsWith:((singleComparedClassesName ? ''),'::') ]) ifTrue:[
+ changeClassName := changeClassName copyFrom:(singleComparedClassesName,'::') size+1.
+ ].
+ ].
].
selectorString := ''.
- (aChange isMethodChange
+ (aChange isMethodChange
and:[ aChange changeClass notNil ]) ifTrue:[
- selectorString := aChange selector.
- m := aChange changeMethod.
- m notNil ifTrue:[
- m := m originalMethodIfWrapped.
- selectorString := m printStringForBrowserWithSelector:aChange selector inClass:aChange changeClass.
- ].
- selectorString := ' ',selectorString
+ selectorString := aChange selector.
+ m := aChange changeMethod.
+ m notNil ifTrue:[
+ m := m originalMethodIfWrapped.
+ selectorString := m printStringForBrowserWithSelector:aChange selector inClass:aChange changeClass.
+ ].
+ selectorString := ' ',selectorString
].
aChange isMethodCategoryChange ifTrue:[
- ^ changeClassName,selectorString, ' (category)'
+ ^ changeClassName,selectorString, ' (category)'
].
^ changeClassName,selectorString
@@ -1692,7 +1692,7 @@
resetSelectionHolders
"
reset all selection holders when a new change set is given.
- First set the selection to nil.
+ First set the selection to nil.
<return: self>
"
@@ -1745,18 +1745,18 @@
builder := self builder.
(theVersionA := self versionA) notNil ifTrue:[
- self diffTextLabelA value:theVersionA.
- self onlyInALabelHolder value:('Only in ' , theVersionA).
- (self componentAt:#OnlyInALabel)
- foregroundColor:Color white;
- backgroundColor:Color green darkened.
+ self diffTextLabelA value:theVersionA.
+ self onlyInALabelHolder value:('Only in ' , theVersionA).
+ (self componentAt:#OnlyInALabel)
+ foregroundColor:Color white;
+ backgroundColor:Color green darkened.
].
(theVersionB :=self versionB) notNil ifTrue:[
- self diffTextLabelB value:theVersionB.
- self onlyInBLabelHolder value:('Only in ' , theVersionB).
- (self componentAt:#OnlyInBLabel)
- foregroundColor:Color white;
- backgroundColor:Color red darkened.
+ self diffTextLabelB value:theVersionB.
+ self onlyInBLabelHolder value:('Only in ' , theVersionB).
+ (self componentAt:#OnlyInBLabel)
+ foregroundColor:Color white;
+ backgroundColor:Color red darkened.
].
self changedLabelHolder value:('Different').
@@ -1765,7 +1765,7 @@
!
updateLists
- |classChangeSet listOnlyInA listOnlyInB listChanged
+ |classChangeSet listOnlyInA listOnlyInB listChanged
printStringGenerator sortBlockForChangeLists filteredList
isIgnoredChange numIgnoredExtensions|
@@ -1776,76 +1776,78 @@
numIgnoredExtensions := 0.
- isIgnoredChange :=
- [:change |
- |packageOfMethodInChange packageOfMethodInImage changeMethod ignored|
+ isIgnoredChange :=
+ [:change |
+ |packageOfMethodInChange packageOfMethodInImage changeMethod ignored|
- ignored := false.
- change isMethodCodeChange ifTrue:[
- packageOfMethodInChange := change package.
- (packageOfMethodInChange notNil
- and:[ packageOfMethodInChange ~= PackageId noProjectID
- and:[ packageOfMethodInChange ~= change changeClass package ]]) ifTrue:[
- ignored := true
- ].
+ ignored := false.
+ change isMethodCodeChange ifTrue:[
+ packageOfMethodInChange := change package.
+ (packageOfMethodInChange notNil
+ and:[ packageOfMethodInChange ~= PackageId noProjectID
+ and:[ packageOfMethodInChange ~= change changeClass package ]]) ifTrue:[
+ ignored := true
+ ].
- changeMethod := change changeMethod.
- changeMethod notNil ifTrue:[
- packageOfMethodInImage := changeMethod package.
- (true "packageOfMethodInImage notNil"
- and:[ packageOfMethodInImage ~= PackageId noProjectID
- and:[ packageOfMethodInImage ~= changeMethod mclass package ]]) ifTrue:[
- ignored := true
- ].
- ].
- numIgnoredExtensions := numIgnoredExtensions + (ignored ifTrue:[1] ifFalse:[0]).
- ].
- ignored.
- ].
+ changeMethod := change changeMethod.
+ changeMethod notNil ifTrue:[
+ packageOfMethodInImage := changeMethod package.
+ (true "packageOfMethodInImage notNil"
+ and:[ packageOfMethodInImage ~= PackageId noProjectID
+ and:[ packageOfMethodInImage ~= changeMethod mclass package ]]) ifTrue:[
+ ignored := true
+ ].
+ ].
+ numIgnoredExtensions := numIgnoredExtensions + (ignored ifTrue:[1] ifFalse:[0]).
+ ].
+ ignored.
+ ].
- listOnlyInA := self methodsOnlyInA.
+ listOnlyInA := self methodsOnlyInA.
listOnlyInA removeAll.
classChangeSet notNil ifTrue:[
- "/ classChangeSet methodsOnlyInA sort:sortBlockForChangeLists.
- filteredList := classChangeSet methodsOnlyInA.
- self includeExtensions ifFalse:[
- filteredList := filteredList reject:isIgnoredChange.
- ].
- listOnlyInA addAll: (filteredList collect:printStringGenerator).
+ "/ classChangeSet methodsOnlyInA sort:sortBlockForChangeLists.
+ filteredList := classChangeSet methodsOnlyInA.
+ self includeExtensions ifFalse:[
+ filteredList := filteredList reject:isIgnoredChange.
+ ].
+ listOnlyInA addAll: (filteredList collect:printStringGenerator).
].
- listOnlyInB := self methodsOnlyInB.
+ listOnlyInB := self methodsOnlyInB.
listOnlyInB removeAll.
classChangeSet notNil ifTrue:[
- "/ classChangeSet methodsOnlyInB sort:sortBlockForChangeLists.
- filteredList := classChangeSet methodsOnlyInB.
- self includeExtensions ifFalse:[
- filteredList := filteredList reject:isIgnoredChange.
- ].
- listOnlyInB addAll: (filteredList collect:printStringGenerator).
+ "/ classChangeSet methodsOnlyInB sort:sortBlockForChangeLists.
+ filteredList := classChangeSet methodsOnlyInB.
+ self includeExtensions ifFalse:[
+ filteredList := filteredList reject:isIgnoredChange.
+ ].
+ listOnlyInB addAll: (filteredList collect:printStringGenerator).
].
- listChanged := self methodsChanged.
+ listChanged := self methodsChanged.
listChanged removeAll.
classChangeSet notNil ifTrue:[
- "/ classChangeSet methodsChanged sort:[:a :b | sortBlockForChangeLists value:a first value:b first].
- filteredList := classChangeSet methodsChanged.
- self includeExtensions ifFalse:[
- filteredList := filteredList reject:[:entry | isIgnoredChange value:entry first].
- ].
- listChanged addAll: (filteredList collect:[:entry| printStringGenerator value:(entry first)]).
+ "/ classChangeSet methodsChanged sort:[:a :b | sortBlockForChangeLists value:a first value:b first].
+ filteredList := classChangeSet methodsChanged.
+ self includeExtensions ifFalse:[
+ filteredList := filteredList reject:[:entry | isIgnoredChange value:entry first].
+ ].
+ listChanged addAll: (filteredList collect:[:entry| printStringGenerator value:(entry first)]).
].
self boxAVisible value:(listOnlyInA notEmpty).
self boxBVisible value:(listOnlyInB notEmpty).
- self boxMVisible value:(listChanged isEmpty
- and: [(listOnlyInA notEmpty
- or:[listOnlyInB notEmpty])]) not.
- self infoHolder value:(
- numIgnoredExtensions ~~ 0
- ifTrue:[('%1 extension methods ignored.' bindWith:numIgnoredExtensions)]
- ifFalse:[nil])
+ self boxMVisible value:(listChanged isEmpty
+ and: [(listOnlyInA notEmpty
+ or:[listOnlyInB notEmpty])]) not.
+
+ numIgnoredExtensions ~~ 0 ifTrue:[
+ self infoHolder value:('%1 extension methods ignored.' bindWith:numIgnoredExtensions)
+ ] ifFalse:[
+ self infoHolder value:nil
+ ].
"Modified: / 21-03-2012 / 17:00:13 / cg"
! !
@@ -1860,19 +1862,19 @@
|changeSet|
aClass isNil ifTrue:[
- changeSet := nil
+ changeSet := nil
] ifFalse:[
- aClass isNameSpace ifFalse:[
- aClass isLoaded ifTrue:[
- changeSet := (ClassChangeSet newForClass:aClass againstVersion:aVersionA).
- ]
- ].
+ aClass isNameSpace ifFalse:[
+ aClass isLoaded ifTrue:[
+ changeSet := (ClassChangeSet newForClass:aClass againstVersion:aVersionA).
+ ]
+ ].
].
self classChangeSet:changeSet.
aVersionA isNil ifTrue:[
- self class:aClass versionA:'Repository' versionB:'Current'.
+ self class:aClass versionA:'Repository' versionB:'Current'.
] ifFalse:[
- self class:aClass versionA:aVersionA versionB:(aVersionA , 'm').
+ self class:aClass versionA:aVersionA versionB:(aVersionA , 'm').
]
!
@@ -1895,9 +1897,9 @@
|changeSet|
aClass isRealNameSpace ifFalse:[
- aClass isLoaded ifTrue:[
- changeSet := (ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB).
- ]
+ aClass isLoaded ifTrue:[
+ changeSet := (ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB).
+ ]
].
self classChangeSet:changeSet
@@ -1912,9 +1914,9 @@
|changeSet|
aClass isNameSpace ifFalse:[
- aClass isLoaded ifTrue:[
- changeSet := (ClassChangeSet newForClass:aClass versionA:aVersionA versionB:aVersionB).
- ]
+ aClass isLoaded ifTrue:[
+ changeSet := (ClassChangeSet newForClass:aClass versionA:aVersionA versionB:aVersionB).
+ ]
].
self classChangeSet:changeSet.
self class:aClass versionA:aVersionA versionB:aVersionB.
@@ -1929,7 +1931,7 @@
!VersionDiffBrowser::ClassChangeSet class methodsFor:'instance creation'!
-changeSetForClass:aClass
+changeSetForClass:aClass
"return a ChangeSet for the class aClass and its current source.
The source is generated into a stream and then the change set is generated
from the source stream."
@@ -1946,11 +1948,11 @@
theSourceCodeManager := SourceCodeManagerUtilities default sourceCodeManagerFor:aClass.
[
- theSourceStream := theSourceCodeManager getSourceStreamFor:aClass revision:aVersion.
- theSourceStream notNil
- ifTrue:[theChangeSet := ChangeSet fromStream:theSourceStream]
+ theSourceStream := theSourceCodeManager getSourceStreamFor:aClass revision:aVersion.
+ theSourceStream notNil
+ ifTrue:[theChangeSet := ChangeSet fromStream:theSourceStream]
] ensure:[
- theSourceStream notNil ifTrue:[theSourceStream close]
+ theSourceStream notNil ifTrue:[theSourceStream close]
].
self sortChangeSet:theChangeSet.
^ theChangeSet
@@ -1958,7 +1960,7 @@
"Modified: / 12-09-2006 / 14:24:51 / cg"
!
-changeSetForClass:aClass andSource:aSource
+changeSetForClass:aClass andSource:aSource
"return a ChangeSet for the class aClass and source aSource.
The source is converted to a stream and then the change set is generated
from the source stream.
@@ -1967,12 +1969,12 @@
|theChangeSet theSourceStream|
[
- theSourceStream := aSource readStream.
- theChangeSet := ChangeSet fromStream:(theSourceStream := aSource readStream)
+ theSourceStream := aSource readStream.
+ theChangeSet := ChangeSet fromStream:(theSourceStream := aSource readStream)
] ensure:[
- theSourceStream notNil ifTrue:[
- theSourceStream close
- ]
+ theSourceStream notNil ifTrue:[
+ theSourceStream close
+ ]
].
self sortChangeSet:theChangeSet.
^ theChangeSet
@@ -1980,7 +1982,7 @@
newForClass:aClass againstVersion:aVersionA
"return a ClassChangeSet for the class aClass against some verson in the repository.
- A new instance of ClassChangeSet is generated containing
+ A new instance of ClassChangeSet is generated containing
the correspondenting changes."
|theClassChangeSet|
@@ -2011,28 +2013,28 @@
classB fileOutOn:aStream withTimeStamp:false.
sourceB := aStream contents asString.
- theChangeSetA:=self changeSetForClass:classA andSource:sourceA.
+ theChangeSetA:=self changeSetForClass:classA andSource:sourceA.
theChangeSetB:=self changeSetForClass:classB andSource:sourceB.
theChangeSetA isNil
- ifTrue: [theChangeSetA := ChangeSet new].
+ ifTrue: [theChangeSetA := ChangeSet new].
theChangeSetB isNil
- ifTrue: [theChangeSetB := ChangeSet new].
+ ifTrue: [theChangeSetB := ChangeSet new].
"/ just in case (if comparing a class against another),
"/ unify the classes of the changes (to avoid that all changes are detected as different)
theChangeSetB do:[:eachChange |
- eachChange isMethodChange ifTrue:[
- eachChange changeClass isMeta ifTrue:[
- eachChange changeClass ~~ classA theMetaclass ifTrue:[
- eachChange changeClass:classA theMetaclass.
- ]
- ] ifFalse:[
- eachChange changeClass ~~ classA theNonMetaclass ifTrue:[
- eachChange changeClass:classA theNonMetaclass.
- ]
- ].
- ].
+ eachChange isMethodChange ifTrue:[
+ eachChange changeClass isMeta ifTrue:[
+ eachChange changeClass ~~ classA theMetaclass ifTrue:[
+ eachChange changeClass:classA theMetaclass.
+ ]
+ ] ifFalse:[
+ eachChange changeClass ~~ classA theNonMetaclass ifTrue:[
+ eachChange changeClass:classA theNonMetaclass.
+ ]
+ ].
+ ].
].
"/ remove all #initialize doIts
theChangeSetA := theChangeSetA select:[:eachChange | eachChange isDoIt not or:[eachChange isInitialize not]].
@@ -2044,7 +2046,7 @@
newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
"return a ClassChangeSet for the class aClass and the two sources.
- The two classes are compared via the source files. A new instance of
+ The two classes are compared via the source files. A new instance of
ClassChangeSet is generated containing the correspondenting changes."
|theChangeSetA theChangeSetB theClassChangeSet className metaClassName|
@@ -2053,32 +2055,32 @@
theClassChangeSet classBeingCompared:aClass.
theClassChangeSet labelA:aLabelA.
theClassChangeSet labelB:aLabelB.
- theChangeSetA:=self changeSetForClass:aClass andSource:aSourceA.
+ theChangeSetA:=self changeSetForClass:aClass andSource:aSourceA.
theChangeSetB:=self changeSetForClass:aClass andSource:aSourceB.
className := aClass name.
metaClassName := aClass class name.
aClass isPrivate ifTrue:[
- theChangeSetA := theChangeSetA select:[:change | change isMethodChange not
- or:[change className = className or:[change className = metaClassName]]].
- theChangeSetA := theChangeSetA select:[:change | change isClassDefinitionChange not
- or:[change className = className or:[change className = metaClassName]]].
- theChangeSetA := theChangeSetA select:[:change | change isDoIt not
- or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]].
- theChangeSetB := theChangeSetB select:[:change | change isMethodChange not
- or:[change className = className or:[change className = metaClassName]]].
- theChangeSetB := theChangeSetB select:[:change | change isClassDefinitionChange not
- or:[change className = className or:[change className = metaClassName]]].
- theChangeSetB := theChangeSetB select:[:change | change isDoIt not
- or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]].
- "/ there might be more needed...
+ theChangeSetA := theChangeSetA select:[:change | change isMethodChange not
+ or:[change className = className or:[change className = metaClassName]]].
+ theChangeSetA := theChangeSetA select:[:change | change isClassDefinitionChange not
+ or:[change className = className or:[change className = metaClassName]]].
+ theChangeSetA := theChangeSetA select:[:change | change isDoIt not
+ or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]].
+ theChangeSetB := theChangeSetB select:[:change | change isMethodChange not
+ or:[change className = className or:[change className = metaClassName]]].
+ theChangeSetB := theChangeSetB select:[:change | change isClassDefinitionChange not
+ or:[change className = className or:[change className = metaClassName]]].
+ theChangeSetB := theChangeSetB select:[:change | change isDoIt not
+ or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]].
+ "/ there might be more needed...
].
theChangeSetA isNil
- ifTrue: [theChangeSetA := ChangeSet new].
+ ifTrue: [theChangeSetA := ChangeSet new].
theChangeSetB isNil
- ifTrue: [theChangeSetB := ChangeSet new].
+ ifTrue: [theChangeSetB := ChangeSet new].
theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB).
^ theClassChangeSet
@@ -2087,7 +2089,7 @@
newForClass:aClass versionA:aVersionA versionB:aVersionB
"return a ClassChangeSet for the class aClass and the two versions.
The two class version are checked out from the repository and then being
- compared. A new instance of ClassChangeSet is generated containing
+ compared. A new instance of ClassChangeSet is generated containing
the correspondenting changes."
|theChangeSetA theChangeSetB theClassChangeSet|
@@ -2109,38 +2111,38 @@
sortChangeSet:aChangeSet
"/ sort by meta and selector
- aChangeSet
- sort:[:a :b |
- a == b ifTrue:[
- false
- ] ifFalse:[
- a isClassDefinitionChange == b isClassDefinitionChange ifTrue:[
- a isClassChange == b isClassChange ifTrue:[
- a isClassChange ifTrue:[
- a isForMeta == b isForMeta ifTrue:[
- a isMethodChange == b isMethodChange ifTrue:[
- a className < b className
- or:[ a className = b className
- and:[ a isPrimitiveChange not
- and:[ b isPrimitiveChange not
- and:[ a selector < b selector ]]]]
- ] ifFalse:[
- a isMethodChange not
- ].
- ] ifFalse:[
- a isForMeta
- ].
- ] ifFalse:[
- a printString < b printString
- ].
- ] ifFalse:[
- a isClassChange
- ].
- ] ifFalse:[
- a isClassDefinitionChange
- ].
- ]
- ].
+ aChangeSet
+ sort:[:a :b |
+ a == b ifTrue:[
+ false
+ ] ifFalse:[
+ a isClassDefinitionChange == b isClassDefinitionChange ifTrue:[
+ a isClassChange == b isClassChange ifTrue:[
+ a isClassChange ifTrue:[
+ a isForMeta == b isForMeta ifTrue:[
+ a isMethodChange == b isMethodChange ifTrue:[
+ a className < b className
+ or:[ a className = b className
+ and:[ a isPrimitiveChange not
+ and:[ b isPrimitiveChange not
+ and:[ a selector < b selector ]]]]
+ ] ifFalse:[
+ a isMethodChange not
+ ].
+ ] ifFalse:[
+ a isForMeta
+ ].
+ ] ifFalse:[
+ a printString < b printString
+ ].
+ ] ifFalse:[
+ a isClassChange
+ ].
+ ] ifFalse:[
+ a isClassDefinitionChange
+ ].
+ ]
+ ].
! !
!VersionDiffBrowser::ClassChangeSet methodsFor:'accessing'!
@@ -2161,11 +2163,11 @@
"returns a diffSet containing the different changes.
it responds to:
- changed OrderedCollection of arrays containing ChangeSets for methods
- which are changed and exists in the class versionA and versionB
+ changed OrderedCollection of arrays containing ChangeSets for methods
+ which are changed and exists in the class versionA and versionB
onlyInArg ChangeSet for the methods which exists only in the class versionB
onlyInReceiver ChangeSet for the methods which exists only in the class versionA
- "
+ "
^ diffSet
!
@@ -2174,11 +2176,11 @@
"sets the diffSet containing the different changes.
it responds to:
- changed OrderedCollection of arrays containing ChangeSets for methods
- which are changed and exists in the class versionA and versionB
+ changed OrderedCollection of arrays containing ChangeSets for methods
+ which are changed and exists in the class versionA and versionB
onlyInArg ChangeSet for the methods which exists only in the class versionB
onlyInReceiver ChangeSet for the methods which exists only in the class versionA
- "
+ "
diffSet := something.
!
@@ -2208,7 +2210,7 @@
!
methodsChanged
- "returns an OrderedCollection of arrays containing ChangeSets for methods
+ "returns an OrderedCollection of arrays containing ChangeSets for methods
which are changed and exists in the class versionA and versionB
<return: OrderedCollection of Array(2)>
@@ -2218,13 +2220,13 @@
!
methodsOnlyInA
- "returns a ChangeSet for the methods which exists only in the class versionA"
+ "returns a ChangeSet for the methods which exists only in the class versionA"
^ self diffSet onlyInReceiver
!
methodsOnlyInB
- "returns a ChangeSet for the methods which exists only in the class versionB"
+ "returns a ChangeSet for the methods which exists only in the class versionB"
^ self diffSet onlyInArg
!
@@ -2255,7 +2257,7 @@
setupForClass:aClass againstVersion:aVersionA
"return a ClassChangeSet for the class aClass against some verison in the repository.
- A new instance of ClassChangeSet is generated containing
+ A new instance of ClassChangeSet is generated containing
the correspondenting changes."
|theChangeSetA theChangeSetB versionCompared|
@@ -2263,15 +2265,15 @@
self classBeingCompared:aClass.
versionCompared := aVersionA.
aVersionA isNil ifTrue:[
- self labelA:(versionCompared := aClass revision).
- self versionA:versionCompared.
+ self labelA:(versionCompared := aClass revision).
+ self versionA:versionCompared.
] ifFalse:[
- aVersionA == #newest ifTrue:[
- self labelA:(VersionDiffBrowser resources string:'Newest').
- ] ifFalse:[
- self labelA:versionCompared.
- self versionA:versionCompared.
- ]
+ aVersionA == #newest ifTrue:[
+ self labelA:(VersionDiffBrowser resources string:'Newest').
+ ] ifFalse:[
+ self labelA:versionCompared.
+ self versionA:versionCompared.
+ ]
].
self labelB:(VersionDiffBrowser resources string:'Current').
theChangeSetA := self class changeSetForClass: aClass andRevision: versionCompared.
@@ -2281,8 +2283,8 @@
"/ if we are comparing a private class, prune out other changes
aClass isPrivate ifTrue:[
- theChangeSetA removeAllSuchThat:[:aChange | aChange className ~= aClass name ].
- theChangeSetB removeAllSuchThat:[:aChange | aChange className ~= aClass name ].
+ theChangeSetA removeAllSuchThat:[:aChange | aChange className ~= aClass name ].
+ theChangeSetB removeAllSuchThat:[:aChange | aChange className ~= aClass name ].
].
self activityNotification:'Generating diff-set...'.
self diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB).
@@ -2293,9 +2295,9 @@
!VersionDiffBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.103 2012-03-21 16:00:23 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.104 2012-03-22 08:32:02 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.103 2012-03-21 16:00:23 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.104 2012-03-22 08:32:02 cg Exp $'
! !