"

 COPYRIGHT (c) 2006 by eXept Software AG

	      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

 inclusion of the above copyright notice.   This software may not

 be provided or otherwise made available to, or used by, any

 other person.  No title to or ownership of the software is

 hereby transferred.

"

"{ Package: 'stx:libtool' }"

"{ NameSpace: Tools }"

ApplicationModel subclass:#SmalltalkDiffTool

	instanceVariableNames:'diffSetHolder changeSetA changeSetB selectionHolder titleHolder

		showMergingChangeSetHolder versionsViewHolder ignoreExtensions'

	classVariableNames:''

	poolDictionaries:''

	category:'Interface-Diff & Merge tool'

!

Object subclass:#DiffItem

	instanceVariableNames:'versionA versionB'

	classVariableNames:''

	poolDictionaries:''

	privateIn:SmalltalkDiffTool

!

!SmalltalkDiffTool class methodsFor:'documentation'!

copyright

"

 COPYRIGHT (c) 2006 by eXept Software AG

	      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

 inclusion of the above copyright notice.   This software may not

 be provided or otherwise made available to, or used by, any

 other person.  No title to or ownership of the software is

 hereby transferred.

"

! !

!SmalltalkDiffTool class methodsFor:'interface opening'!

openOnDiffSet:diffSet labelA:labelA labelB: labelB title: title

    ^ self

        openOnDiffSet:diffSet labelA:labelA labelB: labelB title: title 

        ignoreExtensions:false

    "Created: / 19-04-2008 / 12:52:12 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 12-09-2011 / 11:52:20 / cg"

!

openOnDiffSet:diffSet labelA:labelA labelB: labelB title: title ignoreExtensions:aBoolean

    ^self new

        ignoreExtensions:aBoolean;

        diffSet: diffSet labelA: labelA labelB: labelB;

        title: title;

        open

    "Created: / 19-04-2008 / 12:52:12 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Created: / 12-09-2011 / 11:51:11 / cg"

! !

!SmalltalkDiffTool class methodsFor:'interface specs'!

conflictsListSpec

    "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::DiffTool andSelector:#conflictsListSpec

     Tools::DiffTool new openInterface:#conflictsListSpec

    "

    <resource: #canvas>

    ^ 

     #(FullSpec

        name: conflictsListSpec

        window: 

       (WindowSpec

          label: 'VersionBothListSpec'

          name: 'VersionBothListSpec'

          min: (Point 10 10)

          bounds: (Rectangle 0 0 306 406)

        )

        component: 

       (SpecCollection

          collection: (

           (LabelSpec

              label: 'Conflicts (present in both A and B)'

              name: 'VersionBothLabel'

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

              translateLabel: true

              labelChannel: conflictsLabelHolder

            )

           (SelectionInListModelViewSpec

              name: 'VersionBothList'

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

              model: selectionHolder

              hasHorizontalScrollBar: true

              hasVerticalScrollBar: true

              listModel: conflictsListHolder

              useIndex: false

              highlightMode: line

            )

           )

        )

      )

    "Modified: / 21-05-2008 / 14:20:31 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

inAOnlyListSpec

    "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:MergeTool andSelector:#inAOnlyListSpec

     MergeTool new openInterface:#inAOnlyListSpec

    "

    <resource: #canvas>

    ^ 

     #(FullSpec

        name: inAOnlyListSpec

        window: 

       (WindowSpec

          label: 'VersionAOnlyListSpec'

          name: 'VersionAOnlyListSpec'

          min: (Point 10 10)

          bounds: (Rectangle 0 0 306 406)

        )

        component: 

       (SpecCollection

          collection: (

           (LabelSpec

              label: 'In A only'

              name: 'VersionAOnlyLabel'

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

              translateLabel: true

              labelChannel: inAOnlyLabelHolder

            )

           (SelectionInListModelViewSpec

              name: 'VersionAOnlyList'

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

              model: selectionHolder

              hasHorizontalScrollBar: true

              hasVerticalScrollBar: true

              listModel: inAOnlyListHolder

              useIndex: false

              highlightMode: line

              postBuildCallback: postBuildVersionAListWidget:

            )

           )

        )

      )

    "Modified: / 11-12-2007 / 16:46:29 / janfrog"

    "Created: / 19-04-2008 / 12:52:08 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 21-05-2008 / 14:20:50 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

inBOnlyListSpec

    "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:MergeTool andSelector:#inBOnlyListSpec

     MergeTool new openInterface:#inBOnlyListSpec

    "

    <resource: #canvas>

    ^ 

     #(FullSpec

        name: inBOnlyListSpec

        window: 

       (WindowSpec

          label: 'VersionBOnlyListSpec'

          name: 'VersionBOnlyListSpec'

          min: (Point 10 10)

          bounds: (Rectangle 0 0 306 406)

        )

        component: 

       (SpecCollection

          collection: (

           (LabelSpec

              label: 'In B only'

              name: 'VersionBOnlyLabel'

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

              translateLabel: true

              labelChannel: inBOnlyLabelHolder

            )

           (SelectionInListModelViewSpec

              name: 'VersionBOnlyList'

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

              model: selectionHolder

              hasHorizontalScrollBar: true

              hasVerticalScrollBar: true

              listModel: inBOnlyListHolder

              postBuildCallback: postBuildVersionBListWidget:

              useIndex: false

              highlightMode: line

            )

           )

        )

      )

    "Modified: / 11-12-2007 / 16:46:33 / janfrog"

    "Created: / 19-04-2008 / 12:52:08 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 21-05-2008 / 14:20:56 / Jan Vrany <vranyj1@fel.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::DiffTool andSelector:#windowSpec

     Tools::DiffTool new openInterface:#windowSpec

     Tools::DiffTool open

    "

    <resource: #canvas>

    ^ 

     #(FullSpec

        name: windowSpec

        window: 

       (WindowSpec

          label: 'MergeTool'

          name: 'MergeTool'

          labelChannel: titleHolder

          min: (Point 10 10)

          max: (Point 1024 768)

          bounds: (Rectangle 0 0 602 508)

          menu: mainMenu

        )

        component: 

       (SpecCollection

          collection: (

           (VariableVerticalPanelSpec

              name: 'ContentPanel'

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

              showHandle: true

              snapMode: both

              component: 

             (SpecCollection

                collection: (

                 (VariableHorizontalPanelSpec

                    name: 'VersionListPanel'

                    component: 

                   (SpecCollection

                      collection: (

                       (UISubSpecification

                          name: 'VersionAOnlyListSpec'

                          minorKey: inAOnlyListSpec

                        )

                       (UISubSpecification

                          name: 'VersionBothListSpec'

                          minorKey: conflictsListSpec

                        )

                       (UISubSpecification

                          name: 'VersionBOnlyListSpec'

                          minorKey: inBOnlyListSpec

                        )

                       )

                    )

                    handles: (Any 0.33333333333333 0.66666666666667 1.0)

                  )

                 (ArbitraryComponentSpec

                    name: 'ArbitraryComponent1'

                    hasBorder: false

                    viewChannel: versionsViewHolder

                  )

                 )

              )

              handles: (Any 0.5 1.0)

            )

           )

        )

      )

    "Modified: / 07-10-2008 / 11:03:45 / Jan Vrany <vranyj1@fel.cvut.cz>"

! !

!SmalltalkDiffTool class methodsFor:'plugIn spec'!

aspectSelectors

    ^ #(

        #diffSetHolder

        #inAOnlyLabelHolder

        #inBOnlyLabelHolder

      ).

    "Created: / 02-04-2009 / 16:07:55 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 09-04-2009 / 09:19:57 / Jan Vrany <vranyj1@fel.cvut.cz>"

! !

!SmalltalkDiffTool methodsFor:'accessing'!

changeSetA

    ^ changeSetA

    "Created: / 07-10-2008 / 10:38:54 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

changeSetA:aChangeSet

    changeSetA := aChangeSet.

    "Created: / 07-10-2008 / 10:38:54 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

changeSetB

    ^ changeSetB

    "Created: / 07-10-2008 / 10:38:57 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

changeSetB:aChangeSet

    changeSetB := aChangeSet.

    self changeSetsChanged.

    "Created: / 07-10-2008 / 10:38:57 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

diffItemClass

    ^ SmalltalkDiffTool::DiffItem

    "Created: / 21-05-2008 / 14:38:26 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 09-08-2009 / 14:57:37 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

diffSet

    ^ diffSetHolder value

    "Created: / 07-10-2008 / 10:39:02 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 02-04-2009 / 16:10:20 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

diffSet:aDiffSet

    self diffSetHolder value: aDiffSet

    "Modified: / 07-12-2007 / 11:39:15 / janfrog"

    "Created: / 19-04-2008 / 12:58:05 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 07-04-2009 / 23:45:48 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

diffSet:aDiffSet labelA:labelA labelB:labelB 

    self onlyInALabel:labelA.

    self onlyInBLabel:labelB.

    self diffSet:aDiffSet

    "Modified: / 11-12-2007 / 17:10:49 / janfrog"

    "Created: / 19-04-2008 / 12:58:05 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 07-10-2008 / 10:24:24 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

ignoreExtensions:something

    ignoreExtensions := something.

!

onlyInALabel:labelA 

    self inAOnlyLabelHolder value:'Only in ', labelA

    "Created: / 07-10-2008 / 10:24:10 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

onlyInBLabel:labelB 

    self inBOnlyLabelHolder value:'Only in ', labelB

    "Created: / 07-10-2008 / 10:24:24 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

selection

    ^self selectionHolder value asCollection

    "Created: / 21-10-2008 / 09:32:15 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

selectionIsNonEmpty

    ^[self selection notEmptyOrNil ]

    "Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 22-10-2008 / 13:14:47 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 04-08-2011 / 21:31:28 / cg"

!

selectionIsNonEmptyAndAllHasVersionA

    ^[self selection notEmptyOrNil 

        and:[self selection allSatisfy:[:mergeItem|mergeItem hasVersionA]]]

    "Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 22-10-2008 / 13:14:32 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 04-08-2011 / 21:31:24 / cg"

!

selectionIsNonEmptyAndAllHasVersionB

    ^[self selection notEmptyOrNil 

        and:[self selection allSatisfy:[:mergeItem|mergeItem hasVersionB]]]

    "Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 22-10-2008 / 13:14:42 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 04-08-2011 / 21:31:19 / cg"

!

title

    self titleHolder value

    "Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

title: aString

    self titleHolder value: aString

    "Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

versionAColor

    ^Color green lightened lightened

    "Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

versionBColor

    ^Color red lightened lightened

    "Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>"

! !

!SmalltalkDiffTool methodsFor:'aspects'!

conflictsLabelHolder

    |holder|

    (holder := builder bindingAt:#conflictsLabelHolder) isNil ifTrue:[

        holder := 'Conflicts' asValue.

        builder aspectAt:#conflictsLabelHolder put:holder.

    ].

    ^ holder.

    "Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 07-10-2008 / 10:36:36 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

conflictsListHolder

    |holder|

    (holder := builder bindingAt:#conflictsListHolder) isNil ifTrue:[

        holder := #() asValue.

        builder aspectAt:#conflictsListHolder put:holder.

    ].

    ^ holder.

    "Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 07-10-2008 / 10:36:59 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

diffSetHolder

    diffSetHolder ifNil:

        [self diffSetHolder: ChangeSet::DiffSet new asValue].

    ^diffSetHolder

    "Created: / 02-04-2009 / 16:09:30 / Jan Vrany <vranyj1@fel.cvut.cz>"

    "Modified: / 02-04-2009 / 18:01:37 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

diffSetHolder:aValueHolder

    diffSetHolder := aValueHolder.

    diffSetHolder onChangeSend: #diffSetChanged to: self

    "Modified: / 02-04-2009 / 18:01:23 / Jan Vrany <vranyj1@fel.cvut.cz>"

!

inAOnlyLabelHolder

    |holder|

    (holder := builder bindingAt:#inAOnlyLabelHolder) isNil ifTrue:[

        holder := 'Only in A' asValue.

        builder aspectAt:#inAOnlyLabelHolder put:holder.

    ].

    ^ holder.