- Tools::ChangeSetDiffList
class definition
added:
#showVersionMethodDiffsHolder
#showVersionMethodDiffsHolder:
changed:
#aspectSelectors
#update:with:from:
#updateList
- Tools::ChangeSetDiffTool
class definition
added:
#showVersionMethodDiffsHolder
#showVersionMethodDiffsHolder:
changed:
#mainMenu
#oneColumnNavigatorSpec
#twoColumnNavigatorSpec
#windowSpec
- Tools::TextDiff2Tool
added:
#textAViewSpec
#textBViewSpec
changed:
#versionAOnlySpec
#versionBOnlySpec
- extensions
...
--- a/Make.proto Wed Apr 18 08:18:46 2012 +0100
+++ b/Make.proto Wed Apr 18 21:29:40 2012 +0100
@@ -243,7 +243,7 @@
$(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(INCLUDE_TOP)/stx/libtool/AbstractLauncherApplication.$(H) $(INCLUDE_TOP)/stx/libview2/ToolApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(STCHDR)
+$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(STCHDR)
$(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)/stx/libtool/CodeGeneratorTool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BackgroundSourceProcessingService.$(O) Tools__BackgroundSourceProcessingService.$(H): Tools__BackgroundSourceProcessingService.st $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BreakpointService.$(O) Tools__BreakpointService.$(H): Tools__BreakpointService.st $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Tools__ChangeSetDiffList.st Wed Apr 18 08:18:46 2012 +0100
+++ b/Tools__ChangeSetDiffList.st Wed Apr 18 21:29:40 2012 +0100
@@ -28,7 +28,8 @@
"{ NameSpace: Tools }"
BrowserListWithFilter subclass:#ChangeSetDiffList
- instanceVariableNames:'listHolder listEntryLabelGenerator listEntryIconGenerator'
+ instanceVariableNames:'listHolder listEntryLabelGenerator listEntryIconGenerator
+ showVersionMethodDiffsHolder'
classVariableNames:''
poolDictionaries:''
category:'Interface-Diff'
@@ -154,8 +155,10 @@
#listEntryLabelGenerator
#menuHolder
#outGeneratorHolder
+ #showVersionMethodDiffsHolder
).
+ "Modified: / 18-04-2012 / 19:01:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeSetDiffList methodsFor:'accessing'!
@@ -185,6 +188,35 @@
listHolder := ValueHolder new.
].
^ listHolder
+!
+
+showVersionMethodDiffsHolder
+ "return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
+
+ showVersionMethodDiffsHolder isNil ifTrue:[
+ showVersionMethodDiffsHolder := ValueHolder new.
+ showVersionMethodDiffsHolder addDependent:self.
+ ].
+ ^ showVersionMethodDiffsHolder
+!
+
+showVersionMethodDiffsHolder:something
+ "set the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
+
+ |oldValue newValue|
+
+ showVersionMethodDiffsHolder notNil ifTrue:[
+ oldValue := showVersionMethodDiffsHolder value.
+ showVersionMethodDiffsHolder removeDependent:self.
+ ].
+ showVersionMethodDiffsHolder := something.
+ showVersionMethodDiffsHolder notNil ifTrue:[
+ showVersionMethodDiffsHolder addDependent:self.
+ ].
+ newValue := showVersionMethodDiffsHolder value.
+ oldValue ~~ newValue ifTrue:[
+ self update:#value with:newValue from:showVersionMethodDiffsHolder.
+ ].
! !
!ChangeSetDiffList methodsFor:'change & update'!
@@ -193,10 +225,18 @@
aspect == #resolution ifTrue:[^(self componentAt: #List) invalidateRepairNow: true].
- sender == selectionHolder ifTrue:[^self selectionChanged].
+ sender == selectionHolder ifTrue:[
+ self selectionChanged.
+ ^self.
+ ].
+ sender == showVersionMethodDiffsHolder ifTrue:[
+ ^self updateList.
+ self.
+
+ ].
super update: aspect with: param from: sender.
- "Modified: / 24-11-2009 / 18:34:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 18-04-2012 / 18:57:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeSetDiffList methodsFor:'generators'!
@@ -275,6 +315,10 @@
newDiffs := self inGeneratorHolder value ? #().
(newDiffs isKindOf: ChangeSetDiffComponent) ifTrue:
[newDiffs := newDiffs diffs].
+ showVersionMethodDiffsHolder value ifFalse:[
+ newDiffs := newDiffs reject:[:diff|diff isForVersionMethod]
+ ].
+
newDiffs := self filterList: newDiffs.
newList := OrderedCollection new:16.
newDiffs do:
@@ -286,7 +330,7 @@
self listHolder value:newList
"Modified: / 07-07-2011 / 14:17:26 / jv"
- "Modified: / 29-11-2011 / 16:08:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 18-04-2012 / 19:01:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeSetDiffList::ListEntry class methodsFor:'instance creation'!
@@ -363,5 +407,5 @@
!
version_SVN
- ^ '$Id: Tools__ChangeSetDiffList.st 7948 2012-03-21 01:52:35Z vranyj1 $'
+ ^ '$Id: Tools__ChangeSetDiffList.st 7981 2012-04-18 20:29:40Z vranyj1 $'
! !
--- a/Tools__ChangeSetDiffTool.st Wed Apr 18 08:18:46 2012 +0100
+++ b/Tools__ChangeSetDiffTool.st Wed Apr 18 21:29:40 2012 +0100
@@ -33,7 +33,7 @@
diffMenuHolder diffsetHolderPrivate selectionHolder
versionATextHolder versionBTextHolder versionBaseTextHolder
textDiffToolHolder textDiffToolWindowSpecHolder mergeHolder
- mergeDataHolder'
+ mergeDataHolder showVersionMethodDiffsHolder'
classVariableNames:''
poolDictionaries:''
category:'Interface-Diff'
@@ -234,8 +234,8 @@
the UIPainter may not be able to read the specification."
"
- UIPainter new openOnClass:Tools::ChangeSetDiffBrowser andSelector:#oneColumnNavigatorSpec
- Tools::ChangeSetDiffBrowser new openInterface:#oneColumnNavigatorSpec
+ UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#oneColumnNavigatorSpec
+ Tools::ChangeSetDiffTool new openInterface:#oneColumnNavigatorSpec
"
<resource: #canvas>
@@ -279,6 +279,11 @@
subAspect: outGeneratorHolder
aspect: selectionHolder
)
+
+ (SubChannelInfoSpec
+ subAspect: showVersionMethodDiffsHolder
+ aspect: showVersionMethodDiffsHolder
+ )
)
createNewApplication: true
createNewBuilder: false
@@ -297,8 +302,8 @@
the UIPainter may not be able to read the specification."
"
- UIPainter new openOnClass:Tools::ChangeSetDiffBrowser andSelector:#twoColumnNavigatorSpec
- Tools::ChangeSetDiffBrowser new openInterface:#twoColumnNavigatorSpec
+ UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#twoColumnNavigatorSpec
+ Tools::ChangeSetDiffTool new openInterface:#twoColumnNavigatorSpec
"
<resource: #canvas>
@@ -347,6 +352,11 @@
subAspect: outGeneratorHolder
aspect: firstColSelectionHolder
)
+
+ (SubChannelInfoSpec
+ subAspect: showVersionMethodDiffsHolder
+ aspect: showVersionMethodDiffsHolder
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -376,6 +386,11 @@
subAspect: outGeneratorHolder
aspect: selectionHolder
)
+
+ (SubChannelInfoSpec
+ subAspect: showVersionMethodDiffsHolder
+ aspect: showVersionMethodDiffsHolder
+ )
)
createNewApplication: true
createNewBuilder: true
@@ -440,9 +455,6 @@
createNewBuilder: false
)
(SubCanvasSpec
- name: 'TextDiff'
- majorKey: #'Tools::TextDiffTool'
- minorKey: windowSpecForEmbedding
specHolder: textDiffToolWindowSpecHolder
clientHolder: textDiffToolHolder
createNewBuilder: false
@@ -761,6 +773,22 @@
translateLabel: true
submenuChannel: listMenu
)
+ (MenuItem
+ label: 'View'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Show Diffs in Version Methods'
+ translateLabel: true
+ indication: showVersionMethodDiffsHolder
+ )
+ )
+ nil
+ nil
+ )
+ )
)
nil
nil
@@ -1112,6 +1140,23 @@
"Modified (format): / 06-07-2011 / 12:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+showVersionMethodDiffsHolder
+ "return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
+
+ showVersionMethodDiffsHolder isNil ifTrue:[
+ showVersionMethodDiffsHolder := true asValue.
+ ].
+ ^ showVersionMethodDiffsHolder
+
+ "Modified: / 18-04-2012 / 19:02:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+showVersionMethodDiffsHolder:something
+ "set the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
+
+ showVersionMethodDiffsHolder := something.
+!
+
singleSelectionHolder
"return/create the 'singleSelectionHolder' value holder (automatically generated)"
@@ -2453,5 +2498,5 @@
!
version_SVN
- ^ '$Id: Tools__ChangeSetDiffTool.st 7963 2012-04-03 12:32:03Z vranyj1 $'
+ ^ '$Id: Tools__ChangeSetDiffTool.st 7981 2012-04-18 20:29:40Z vranyj1 $'
! !
--- a/Tools__TextDiff2Tool.st Wed Apr 18 08:18:46 2012 +0100
+++ b/Tools__TextDiff2Tool.st Wed Apr 18 21:29:40 2012 +0100
@@ -197,7 +197,7 @@
)
!
-textViewSpec
+textAViewSpec
"This resource specification was automatically generated
by the UIPainter of ST/X."
@@ -213,7 +213,7 @@
^
#(FullSpec
- name: 'textViewSpec'
+ name: 'textAViewSpec'
window:
(WindowSpec
label: 'Text Only'
@@ -239,6 +239,54 @@
)
)
+
+ "Created: / 18-04-2012 / 18:43:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+textBViewSpec
+ "This resource specification was automatically generated
+ by the UIPainter of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the UIPainter may not be able to read the specification."
+
+ "
+ UIPainter new openOnClass:Tools::TextDiffTool andSelector:#textViewSpec
+ Tools::TextDiffTool new openInterface:#textViewSpec
+ "
+
+ <resource: #canvas>
+
+ ^
+ #(FullSpec
+ name: 'textAViewSpec'
+ window:
+ (WindowSpec
+ label: 'Text Only'
+ name: 'Text Only'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 782 506)
+ )
+ component:
+ (SpecCollection
+ collection: (
+ (ArbitraryComponentSpec
+ name: 'CodeView'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ model: textBHolder
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ autoHideScrollBars: false
+ hasBorder: false
+ component: #'Tools::CodeView2'
+ postBuildCallback: postBuildCodeView:
+ )
+ )
+
+ )
+ )
+
+ "Created: / 18-04-2012 / 18:43:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
versionAOnlySpec
@@ -276,12 +324,14 @@
(UISubSpecification
name: 'Text'
layout: (LayoutFrame 0 0 30 0 0 1 0 1)
- minorKey: textViewSpec
+ minorKey: textAViewSpec
)
)
)
)
+
+ "Modified: / 18-04-2012 / 18:43:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
versionBOnlySpec
@@ -319,7 +369,7 @@
(UISubSpecification
name: 'Text'
layout: (LayoutFrame 0 0 30 0 0 1 0 1)
- minorKey: textViewSpec
+ minorKey: textBViewSpec
)
)
@@ -543,7 +593,7 @@
!TextDiff2Tool class methodsFor:'documentation'!
version
- ^ '$Id: Tools__TextDiff2Tool.st 7959 2012-03-29 17:51:50Z vranyj1 $'
+ ^ '$Id: Tools__TextDiff2Tool.st 7981 2012-04-18 20:29:40Z vranyj1 $'
!
version_CVS
@@ -551,5 +601,5 @@
!
version_SVN
- ^ '$Id: Tools__TextDiff2Tool.st 7959 2012-03-29 17:51:50Z vranyj1 $'
+ ^ '$Id: Tools__TextDiff2Tool.st 7981 2012-04-18 20:29:40Z vranyj1 $'
! !
--- a/bc.mak Wed Apr 18 08:18:46 2012 +0100
+++ b/bc.mak Wed Apr 18 21:29:40 2012 +0100
@@ -185,7 +185,7 @@
$(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(INCLUDE_TOP)\stx\libtool\AbstractLauncherApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ToolApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(STCHDR)
+$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(STCHDR)
$(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)\stx\libtool\CodeGeneratorTool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BackgroundSourceProcessingService.$(O) Tools__BackgroundSourceProcessingService.$(H): Tools__BackgroundSourceProcessingService.st $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BreakpointService.$(O) Tools__BreakpointService.$(H): Tools__BreakpointService.st $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/libtool.rc Wed Apr 18 08:18:46 2012 +0100
+++ b/libtool.rc Wed Apr 18 21:29:40 2012 +0100
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.1.1\0"
- VALUE "ProductDate", "Fri, 13 Apr 2012 18:14:47 GMT\0"
+ VALUE "ProductDate", "Wed, 18 Apr 2012 20:24:28 GMT\0"
END
END