"

 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 mergeDataHolder

		showVersionMethodDiffsHolder showCopyrightMethodDiffsHolder

		highlightConflictsHolder hasDiffsetHolder mergeSavedHolder'

	classVariableNames:'LastDiffInfo'

	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 - 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' asText allItalic colorizeAllWith:Color gray lighter

! !

!ChangeSetDiffTool class methodsFor:'image specs'!

versionA24x24

    ^ToolbarIconLibrary versionA24x24

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

!

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

    "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

                  subAspect: inGeneratorHolder

                  aspect: diffsetHolderPrivate

                ) 

               (SubChannelInfoSpec

                  subAspect: listEntryLabelGenerator

                  aspect: diffListEntryLabelGeneratorAspect

                )

               (SubChannelInfoSpec

                  subAspect: menuHolder

                  aspect: listMenuHolder

                ) 

               (SubChannelInfoSpec

                  subAspect: outGeneratorHolder

                  aspect: selectionHolder

                )

               (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."

    "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:#twoColumnNavigatorSpec

     Tools::ChangeSetDiffTool new openInterface:#twoColumnNavigatorSpec

    "

    <resource: #canvas>

    ^ 

     #(FullSpec

        name: twoColumnNavigatorSpec

        window: 

       (WindowSpec

          label: 'Two Column Navigator'

          name: 'Two Column Navigator'

          min: (Point 10 10)

          bounds: (Rectangle 0 0 300 300)

        )

        component: 

       (SpecCollection

          collection: (

           (VariableHorizontalPanelSpec

              name: 'Columns'

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

              component: 

             (SpecCollection

                collection: (

                 (SubCanvasSpec

                    name: 'FirstColumn'

                    hasHorizontalScrollBar: false

                    hasVerticalScrollBar: false

                    majorKey: #'Tools::ChangeSetDiffList'

                    subAspectHolders: 

                   (Array

                     (SubChannelInfoSpec

                        subAspect: inGeneratorHolder

                        aspect: diffsetHolderPrivate

                      ) 

                     (SubChannelInfoSpec

                        subAspect: listEntryLabelGenerator

                        aspect: diffListEntryLabelGeneratorAspect

                      )

                     (SubChannelInfoSpec

                        subAspect: menuHolder

                        aspect: listMenuHolder

                      ) 

                     (SubChannelInfoSpec

                        subAspect: outGeneratorHolder

                        aspect: firstColSelectionHolder

                      )

                     (SubChannelInfoSpec

                        subAspect: showVersionMethodDiffsHolder

                        aspect: showVersionMethodDiffsHolder

                      )

                      (SubChannelInfoSpec

                  subAspect: showCopyrightMethodDiffsHolder

                  aspect: showCopyrightMethodDiffsHolder

                )

                (SubChannelInfoSpec

                  subAspect: highlightConflictsHolder

                  aspect: highlightConflictsHolder

                )

                    )

                    createNewApplication: true

                    createNewBuilder: true

                  )

                 (SubCanvasSpec

                    name: 'SecondColumn'

                    hasHorizontalScrollBar: false

                    hasVerticalScrollBar: false

                    majorKey: #'Tools::ChangeSetDiffList'

                    subAspectHolders: 

                   (Array

                     (SubChannelInfoSpec

                        subAspect: inGeneratorHolder

                        aspect: firstColSelectionHolder

                      ) 

                     (SubChannelInfoSpec

                        subAspect: listEntryLabelGenerator

                        aspect: diffListEntryLabelGeneratorAspect

                      )

                     (SubChannelInfoSpec

                        subAspect: menuHolder

                        aspect: listMenuHolder

                      ) 

                     (SubChannelInfoSpec

                        subAspect: outGeneratorHolder

                        aspect: selectionHolder

                      )

                     (SubChannelInfoSpec

                        subAspect: showVersionMethodDiffsHolder

                        aspect: showVersionMethodDiffsHolder

                      )

                      (SubChannelInfoSpec

                  subAspect: showCopyrightMethodDiffsHolder

                  aspect: showCopyrightMethodDiffsHolder

                )

                (SubChannelInfoSpec

                  subAspect: highlightConflictsHolder

                  aspect: highlightConflictsHolder

                )

                    )

                    createNewApplication: true

                    createNewBuilder: true

                  )

                 )

              )

              handles: (Any 0.5 1.0)

            )

           )

        )

      )

    "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."

    "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:#windowSpec

     Tools::ChangeSetDiffTool new openInterface:#windowSpec

     Tools::ChangeSetDiffTool open

    "

    <resource: #canvas>

    ^ 

     #(FullSpec

        name: windowSpec

        window: 

       (WindowSpec

          label: 'Diff Browser'

          name: 'Diff Browser'

          min: (Point 10 10)

          bounds: (Rectangle 0 0 1024 768)

          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

                    name: 'NavigatorPanel'

                    hasHorizontalScrollBar: false

                    hasVerticalScrollBar: false

                    specHolder: navigatorPanelSpecHolder

                    createNewBuilder: false

                  )

                 (SubCanvasSpec

                    name: 'SubCanvas1'

                    specHolder: textDiffToolWindowSpecHolder

                    clientHolder: textDiffToolHolder