hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:61082bd39539
+:1e0599b8a007
 "{ Package: 'stx:libtool' }"
 "{ NameSpace: Tools }"
 ApplicationModel subclass:#ChangeSetDiffTool
-	instanceVariableNames:'diffInfoHolder listHolder singleSelectionHolder diffsetHolder
+	instanceVariableNames:'infoPanel diffInfoHolder listHolder singleSelectionHolder
-		titleHolder firstColSelectionHolder navigatorPanelSpecHolder
+		diffsetHolder titleHolder firstColSelectionHolder
-		diffMenuHolder diffsetHolderPrivate selectionHolder
+		navigatorPanelSpecHolder diffMenuHolder diffsetHolderPrivate
-		versionATextHolder versionBTextHolder versionBaseTextHolder
+		selectionHolder versionATextHolder versionBTextHolder
-		textDiffToolHolder textDiffToolWindowSpecHolder mergeHolder
+		versionBaseTextHolder textDiffToolHolder
-		mergeDataHolder showVersionMethodDiffsHolder'
+		textDiffToolWindowSpecHolder mergeHolder mergeDataHolder
-	classVariableNames:''
+		showVersionMethodDiffsHolder showCopyrightMethodDiffsHolder
+		highlightConflictsHolder hasDiffsetHolder'
+	classVariableNames:'LastDiffInfo'
 	poolDictionaries:''
 	category:'Interface-Diff'
 !
 SimpleDialog subclass:#OpenDialog
 versionB24x24
 ^ToolbarIconLibrary versionB24x24
 "Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+!ChangeSetDiffTool class methodsFor:'interface opening'!
+open
+| tool |
+tool := self new.
+tool open.
+tool window sensor pushUserEvent: #fileMenuOpen for: tool.
+"Created: / 01-08-2012 / 15:13:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !ChangeSetDiffTool class methodsFor:'interface specs'!
 labelSpec
 (SubChannelInfoSpec
 subAspect: showVersionMethodDiffsHolder
 aspect: showVersionMethodDiffsHolder
 )
+(SubChannelInfoSpec
+subAspect: showCopyrightMethodDiffsHolder
+aspect: showCopyrightMethodDiffsHolder
+)
+(SubChannelInfoSpec
+subAspect: highlightConflictsHolder
+aspect: highlightConflictsHolder
+)
 )
 createNewApplication: true
 createNewBuilder: false
 )
 )
 )
 )
+"Modified: / 01-08-2012 / 17:05:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 twoColumnNavigatorSpec
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 (SubChannelInfoSpec
 subAspect: showVersionMethodDiffsHolder
 aspect: showVersionMethodDiffsHolder
 )
+(SubChannelInfoSpec
+subAspect: showCopyrightMethodDiffsHolder
+aspect: showCopyrightMethodDiffsHolder
+)
+(SubChannelInfoSpec
+subAspect: highlightConflictsHolder
+aspect: highlightConflictsHolder
+)
 )
 createNewApplication: true
 createNewBuilder: true
 )
 (SubCanvasSpec
 (SubChannelInfoSpec
 subAspect: showVersionMethodDiffsHolder
 aspect: showVersionMethodDiffsHolder
 )
+(SubChannelInfoSpec
+subAspect: showCopyrightMethodDiffsHolder
+aspect: showCopyrightMethodDiffsHolder
+)
+(SubChannelInfoSpec
+subAspect: highlightConflictsHolder
+aspect: highlightConflictsHolder
+)
 )
 createNewApplication: true
 createNewBuilder: true
 )
 )
 )
 )
 )
 )
+"Modified: / 01-08-2012 / 17:05:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 windowSpec
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 menu: mainMenu
 )
 component:
 (SpecCollection
 collection: (
+(SubCanvasSpec
+name: 'InfoPanel'
+layout: (LayoutFrame 0 0 0 0 0 1 40 0)
+level: 0
+initiallyInvisible: true
+hasHorizontalScrollBar: false
+hasVerticalScrollBar: false
+clientKey: infoPanel
+createNewBuilder: false
+)
 (UISubSpecification
 name: 'Label'
 layout: (LayoutFrame 0 0 0 0 0 1 56 0)
+initiallyInvisible: true
+visibilityChannel: hasDiffsetHolder
 minorKey: labelSpec
 )
 (VariableVerticalPanelSpec
 name: 'Panel'
 layout: (LayoutFrame 0 0 56 0 0 1 0 1)
+initiallyInvisible: true
+visibilityChannel: hasDiffsetHolder
 showHandle: true
 component:
 (SpecCollection
 collection: (
 (SubCanvasSpec
 hasVerticalScrollBar: false
 specHolder: navigatorPanelSpecHolder
 createNewBuilder: false
 )
 (SubCanvasSpec
+name: 'SubCanvas1'
 specHolder: textDiffToolWindowSpecHolder
 clientHolder: textDiffToolHolder
 createNewBuilder: false
 )
 )
 (MenuItem
 label: 'Show Diffs in Version Methods'
 translateLabel: true
 indication: showVersionMethodDiffsHolder
 )
+(MenuItem
+label: 'Show Diff in #copyright Methods'
+translateLabel: true
+indication: showCopyrightMethodDiffsHolder
+)
+(MenuItem
+label: 'Highlight Conflicts'
+translateLabel: true
+indication: highlightConflictsHolder
+)
 )
 nil
 nil
 )
 )
 firstColSelectionHolder := ValueHolder with:nil "defaultValue here".
 ].
 ^ firstColSelectionHolder
 !
+hasDiffsetHolder
+"return/create the 'hasDiffsetHolder' value holder (automatically generated)"
+hasDiffsetHolder isNil ifTrue:[
+hasDiffsetHolder := false asValue
+].
+^ hasDiffsetHolder
+"Modified: / 01-08-2012 / 17:16:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+hasDiffsetHolder:something
+"set the 'hasDiffsetHolder' value holder (automatically generated)"
+hasDiffsetHolder := something.
+!
 hasSelectionHolder
 |holder|
 (holder := builder bindingAt:#hasSelectionHolder) isNil ifTrue:[
 "Created: / 22-10-2008 / 11:34:36 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 22-10-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
+highlightConflictsHolder
+"return/create the 'highlightConflictsHolder' value holder (automatically generated)"
+highlightConflictsHolder isNil ifTrue:[
+highlightConflictsHolder := true asValue
+].
+^ highlightConflictsHolder
+"Modified: / 01-08-2012 / 17:07:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+highlightConflictsHolder:something
+"set the 'highlightConflictsHolder' value holder (automatically generated)"
+highlightConflictsHolder := something.
+!
+infoPanel
+infoPanel isNil ifTrue:[
+infoPanel := InlineMessageDialog new
+].
+^ infoPanel
+"Created: / 09-02-2012 / 19:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 listHolder
 "return/create the 'listHolder' value holder (automatically generated)"
 listHolder isNil ifTrue:[
 listHolder := ValueHolder new.
 ^ selectionHolder
 "Modified (format): / 06-07-2011 / 12:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
+showCopyrightMethodDiffsHolder
+"return/create the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)"
+showCopyrightMethodDiffsHolder isNil ifTrue:[
+showCopyrightMethodDiffsHolder := true asValue
+].
+^ showCopyrightMethodDiffsHolder
+"Modified: / 01-08-2012 / 17:06:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+showCopyrightMethodDiffsHolder:something
+"set the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)"
+showCopyrightMethodDiffsHolder := something.
+!
 showVersionMethodDiffsHolder
 "return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
 showVersionMethodDiffsHolder isNil ifTrue:[
 showVersionMethodDiffsHolder := true asValue.
 diffInfoChanged
 | info |
 info := self diffInfoHolder value.
-info read.
+self hasDiffsetHolder value: false.
-self diffset: info diffset.
+info notNil ifTrue:[
-self updateViews
+self infoPanel showProgressLabeled: (resources string:'Reading changesets') while: [
+info read.
+self diffset: info diffset.
+self updateViews.
+self hasDiffsetHolder value: true.
+].
+]
 "Created: / 19-03-2012 / 23:40:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 diffsetChanged
 fileMenuOpen
 | dlg info |
 dlg := OpenDialog new.
+dlg diffInfo: LastDiffInfo.
 dlg open ifFalse:[^self].
-info := ChangeSetDiffInfo new.
+info := dlg diffInfo.
-info specA: dlg changeSetASpec.
-info specB: dlg changeSetBSpec.
-info specBase: dlg changeSetBaseSpec.
-info specMerge: dlg changeSetMergedSpec.
 ^self fileMenuOpenOnDiffInfo: info
-"Modified: / 20-03-2012 / 11:12:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 01-08-2012 / 15:53:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 fileMenuOpenOnDiffInfo: info
+LastDiffInfo := info.
 self diffInfoHolder value: info
 "Created: / 20-03-2012 / 00:04:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 ^self changesetSpecBaseHolder value.
 "Created: / 20-03-2012 / 00:01:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
+changeSetBaseSpec: spec
+^self changesetSpecBaseHolder value: spec
+"Created: / 01-08-2012 / 15:38:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 changeSetMerged
 | specMerged |
 specMerged := self changesetSpecMergedHolder value.
 changeSetMergedSpec
 ^self changesetSpecMergedHolder value.
 "Created: / 20-03-2012 / 00:01:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+changeSetMergedSpec: spec
+^self changesetSpecMergedHolder value: spec
+"Created: / 01-08-2012 / 15:38:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+diffInfo
+"Returns a ChangeSetDiffInfo based on current data"
+| info |
+info := ChangeSetDiffInfo new.
+info specA: self changeSetASpec.
+info specB: self changeSetBSpec.
+info specBase: self changeSetBaseSpec.
+info specMerge: self changeSetMergedSpec.
+^info
+"Created: / 01-08-2012 / 15:41:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+diffInfo: info
+"Sets up dialog for given diff info"
+info isNil ifTrue:[ ^ self ].
+self changeSetASpec: info specA.
+self changeSetBSpec: info specB.
+self changeSetBaseSpec: info specBase.
+self changeSetMergedSpec: info specMerge.
+"Created: / 01-08-2012 / 15:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !ChangeSetDiffTool::OpenDialog methodsFor:'aspects'!
 changesetSpecAHolder
 version_CVS
 ^ '�Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp �'
 !
 version_SVN
-^ '$Id: Tools__ChangeSetDiffTool.st 8009 2012-06-22 08:44:31Z vranyj1 $'
+^ '$Id: Tools__ChangeSetDiffTool.st 8034 2012-08-03 13:08:30Z vranyj1 $'
 ! !

branch	jv
changeset 12274	1e0599b8a007
parent 12256	abdcf041d2ce
child 12275	a416cf8a4b50