"{ Encoding: utf8 }"

"

 Copyright (c) 2007-2010 Jan Vrany

 Copyright (c) 2009-2010 eXept Software AG

 Permission is hereby granted, free of charge, to any person

 obtaining a copy of this software and associated documentation

 files (the 'Software'), to deal in the Software without

 restriction, including without limitation the rights to use,

 copy, modify, merge, publish, distribute, sublicense, and/or sell

 copies of the Software, and to permit persons to whom the

 Software is furnished to do so, subject to the following

 conditions:

 The above copyright notice and this permission notice shall be

 included in all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,

 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 OTHER DEALINGS IN THE SOFTWARE.

"

"{ Package: 'stx:libtool' }"

"{ NameSpace: Tools }"

ApplicationModel subclass:#ChangeSetDiffTool

	instanceVariableNames:'infoPanel diffInfoHolder listHolder singleSelectionHolder

		diffsetHolder titleHolder firstColSelectionHolder

		navigatorPanelSpecHolder diffMenuHolder diffsetHolderPrivate

		selectionHolder versionATextHolder versionBTextHolder

		versionBaseTextHolder textDiffToolHolder

		textDiffToolWindowSpecHolder mergeHolder mergeData

		mergeDataHolder showVersionMethodDiffsHolder

		showCopyrightMethodDiffsHolder highlightConflictsHolder

		hasDiffsetHolder mergeSavedHolder canSaveHolder

		autoMoveToNextConflictHolder textDiff2App textDiff3App list1App

		list2App alreadyWarnedAboutUnsavedMerge labelSpecHolder

		labelsView navigatorAndDiffPanelView codeAspectHolder'

	classVariableNames:'LastDiffInfo AutoMoveToNextConflict'

	poolDictionaries:''

	category:'Interface-Diff'

!

SimpleDialog subclass:#OpenDialog

	instanceVariableNames:'doAcceptEnabled changesetSpecAHolder changesetSpecBHolder

		changesetSpecBaseHolder changesetSpecBaseEnabledHolder

		changesetSpecMergedHolder changesetSpecMergedEnabledHolder'

	classVariableNames:'LastDirectory'

	poolDictionaries:''

	privateIn:ChangeSetDiffTool

!

!ChangeSetDiffTool class methodsFor:'documentation'!

copyright

"

 Copyright (c) 2007-2010 Jan Vrany

 Copyright (c) 2009-2010 eXept Software AG

 Permission is hereby granted, free of charge, to any person

 obtaining a copy of this software and associated documentation

 files (the 'Software'), to deal in the Software without

 restriction, including without limitation the rights to use,

 copy, modify, merge, publish, distribute, sublicense, and/or sell

 copies of the Software, and to permit persons to whom the

 Software is furnished to do so, subject to the following

 conditions:

 The above copyright notice and this permission notice shall be

 included in all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,

 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 OTHER DEALINGS IN THE SOFTWARE.

"

!

documentation

"

    Tool for viewing/merging differences between two change sets

    [author:]

	Jan Vrany <jan.vrany@fit.cvut.cz>

    [instance variables:]

    [class variables:]

    [see also:]

"

!

examples

"

  Starting the application:

								[exBegin]

    Tools::ChangeSetDiffTool open

								[exEnd]

  Show differences between CVS HEAD and SVN jv-branch

  NewSystemBrowser:

								[exBegin]

    | cvsCs svnCs |

    cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'.

    svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'.

    Tools::ChangeSetDiffTool new

	open;

	fileMenuOpenOnDiffBetween: cvsCs and: svnCs.

								[exEnd]

  Show differences between CVS HEAD and SVN jv-branch and

  base version of NewSystemBrowser:

								[exBegin]

    | cvsBaseCs cvsCs svnCs |

    cvsBaseCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@2012-01-01/stx/libtool/Tools__NewSystemBrowser.st'.

    cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'.

    svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'.

    Tools::ChangeSetDiffTool new

	open;

	fileMenuOpenOnDiffBetween: cvsCs and: svnCs base: cvsBaseCs

								[exEnd]

"

! !

!ChangeSetDiffTool class methodsFor:'accessing'!

autoMoveToNextConflict

    ^AutoMoveToNextConflict == true

    "Created: / 17-01-2013 / 19:49:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

autoMoveToNextConflict: aBoolean

    AutoMoveToNextConflict := aBoolean

    "Created: / 17-01-2013 / 19:49:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"

! !

!ChangeSetDiffTool class methodsFor:'accessing - defaults'!

versionAColor

    ^Color green lightened lightened

    "Created: / 01-11-2009 / 10:14:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

versionBColor

    ^Color blue lightened lightened

    "Created: / 01-11-2009 / 10:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

versionBaseColor

    ^Color yellow lightened lightened

    "Created: / 01-11-2009 / 10:14:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

versionNotPresentText

    ^ 'Not present' allItalic withColor:Color gray lighter

! !

!ChangeSetDiffTool class methodsFor:'image specs'!

mergeDiff3AToMergedArrow30x30

    <resource: #programImage>

    ^ToolbarIconLibrary mergeDiff3AToMergedArrow30x30

    "Created: / 17-01-2013 / 23:51:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"

    "Modified: / 28-07-2018 / 09:50:51 / Claus Gittinger"

!

mergeDiff3BToMergedArrow30x30

    <resource: #programImage>

    ^ToolbarIconLibrary mergeDiff3BToMergedArrow30x30

    "Created: / 17-01-2013 / 23:51:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"

    "Modified: / 28-07-2018 / 09:50:48 / Claus Gittinger"

!

mergeDiff3BaseToAArrow30x30

    <resource: #programImage>

    ^ToolbarIconLibrary mergeDiff3BaseToAArrow30x30

    "Created: / 17-01-2013 / 23:52:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"

    "Modified: / 28-07-2018 / 09:50:45 / Claus Gittinger"

!

mergeDiff3BaseToBArrow30x30

    <resource: #programImage>

    ^ToolbarIconLibrary mergeDiff3BaseToBArrow30x30

    "Created: / 17-01-2013 / 23:51:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"

    "Modified: / 28-07-2018 / 09:50:43 / Claus Gittinger"

!

versionA24x24

    <resource: #programImage>

    ^ToolbarIconLibrary versionA24x24

    "Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"

    "Modified: / 28-07-2018 / 09:50:40 / Claus Gittinger"

!

versionB24x24

    <resource: #programImage>

    ^ToolbarIconLibrary versionB24x24

    "Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"

    "Modified: / 28-07-2018 / 09:50:38 / Claus Gittinger"

!

versionBase24x24

    <resource: #programImage>

    ^ToolbarIconLibrary versionBase24x24

    "Created: / 17-01-2013 / 22:53:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"

    "Modified: / 28-07-2018 / 09:50:35 / Claus Gittinger"

!

versionMerged24x24

    <resource: #programImage>

    ^ToolbarIconLibrary versionMerged24x24

    "Created: / 17-01-2013 / 22:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"

    "Modified: / 28-07-2018 / 09:50:30 / Claus Gittinger"

! !

!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'!

labelDiff2Spec

    "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::ChangeSetDiffTool andSelector:#labelDiff2Spec

     Tools::ChangeSetDiffTool new openInterface:#labelDiff2Spec

    "

    <resource: #canvas>

    ^

     #(FullSpec

	name: labelDiff2Spec

	window:

       (WindowSpec

	  label: 'Label'

	  name: 'Label'

	  min: (Point 10 10)

	  bounds: (Rectangle 0 0 600 60)

	)

	component:

       (SpecCollection

	  collection: (

	   (UISubSpecification

	      name: 'LabelA'

	      layout: (LayoutFrame 0 0 0 0 0 1 0 0.5)

	      minorKey: versionALabelSpec

	    )

	   (UISubSpecification

	      name: 'LabelB'

	      layout: (LayoutFrame 0 0 0 0.5 0 1 0 1)

	      minorKey: versionBLabelSpec

	    )

	   )

	)

      )

!

labelDiff3Spec

    "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::ChangeSetDiffTool andSelector:#labelDiff3Spec

     Tools::ChangeSetDiffTool new openInterface:#labelDiff3Spec

    "

    <resource: #canvas>

    ^

     #(FullSpec

	name: labelDiff3Spec

	window:

       (WindowSpec

	  label: 'Label'

	  name: 'Label'

	  min: (Point 10 10)

	  bounds: (Rectangle 0 0 600 90)

	)

	component:

       (SpecCollection

	  collection: (

	   (UISubSpecification

	      name: 'LabelBase'

	      layout: (LayoutFrame 0 0 0 0 0 1 30 0)

	      minorKey: versionBaseLabelSpec

	    )

	   (UISubSpecification

	      name: 'LabelA'

	      layout: (LayoutFrame 0 0 30 0 0 1 60 0)

	      minorKey: versionALabelSpec

	    )

	   (UISubSpecification

	      name: 'LabelB'

	      layout: (LayoutFrame 0 0 60 0 0 1 0 1)

	      minorKey: versionBLabelSpec

	    )

	   )

	)

      )

!

labelMergeSpec

    "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::ChangeSetDiffTool andSelector:#labelMergeSpec

     Tools::ChangeSetDiffTool new openInterface:#labelMergeSpec

    "

    <resource: #canvas>

    ^

     #(FullSpec

	name: labelMergeSpec

	window:

       (WindowSpec

	  label: 'Label'

	  name: 'Label'

	  min: (Point 10 10)

	  bounds: (Rectangle 0 0 600 120)

	)

	component:

       (SpecCollection

	  collection: (

	   (UISubSpecification

	      name: 'LabelBase'

	      layout: (LayoutFrame 0 0 0 0 0 1 30 0)

	      minorKey: mergeBaseLabelSpec

	    )

	   (UISubSpecification

	      name: 'LabelA'

	      layout: (LayoutFrame 0 0 30 0 0 1 60 0)

	      minorKey: mergeALabelSpec

	    )

	   (UISubSpecification

	      name: 'LabelB'

	      layout: (LayoutFrame 0 0 60 0 0 1 90 0)

	      minorKey: mergeBLabelSpec

	    )

	   (UISubSpecification

	      name: 'SubSpecification1'

	      layout: (LayoutFrame 0 0 90 0 0 1 0 1)

	      minorKey: mergeMergeLabelSpec

	    )

	   )

	)

      )

    "Modified: / 17-01-2013 / 23:47:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

labelSpec

    "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:SVN::DiffBrowser andSelector:#labelSpec

     SVN::DiffBrowser new openInterface:#labelSpec

    "

    <resource: #canvas>

    ^ 

     #(FullSpec

        name: labelSpec

        window: 

       (WindowSpec

          label: 'Label'

          name: 'Label'

          min: (Point 10 10)

          bounds: (Rectangle 0 0 600 48)

        )

        component: 

       (SpecCollection

          collection: (

           (UISubSpecification

              name: 'LabelA'

              layout: (LayoutFrame 0 0 0 0 0 1 0 0.5)

              minorKey: versionALabelSpec

            )

           (UISubSpecification

              name: 'LabelB'

              layout: (LayoutFrame 0 0 0 0.5 0 1 0 1)

              minorKey: versionBLabelSpec

            )

           )

        )

      )

!

oneColumnNavigatorSpec

    "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::ChangeSetDiffTool andSelector:#oneColumnNavigatorSpec

     Tools::ChangeSetDiffTool new openInterface:#oneColumnNavigatorSpec

    "

    <resource: #canvas>

    ^

     #(FullSpec

	name: oneColumnNavigatorSpec

	window:

       (WindowSpec

	  label: 'One Column Navigator'

	  name: 'One Column Navigator'

	  min: (Point 10 10)

	  bounds: (Rectangle 0 0 300 300)

	)

	component:

       (SpecCollection

	  collection: (

	   (SubCanvasSpec

	      name: 'DiffList'

	      layout: (LayoutFrame 0 0 0 0 0 1 0 1)

	      hasHorizontalScrollBar: false

	      hasVerticalScrollBar: false

	      majorKey: #'Tools::ChangeSetDiffList'

	      subAspectHolders:

	     (Array

	       (SubChannelInfoSpec