"

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

TextDiffTool subclass:#TextDiff3Tool

	instanceVariableNames:'labelMergedHolder textMergedHolder mergeHolder mergeDataHolder

		mergeIntervalHolder mergeView mergeService'

	classVariableNames:''

	poolDictionaries:''

	category:'Interface-Diff'

!

CodeViewService subclass:#MergeService

	instanceVariableNames:'dataHolder data sectionIntervalHolder ignoreLinesModifiedFromTo'

	classVariableNames:''

	poolDictionaries:''

	privateIn:TextDiff3Tool

!

!TextDiff3Tool 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.

"

!

documentation

"

    documentation to be added.

    [author:]

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

    [instance variables:]

    [class variables:]

    [see also:]

"

!

examples

"

  Starting the application:

                                                                [exBegin]

    Tools::TextDiff3Tool open

                                                                [exEnd]

  more examples to be added:

                                                                [exBegin]

    ... add code fragment for 

    ... executable example here ...

                                                                [exEnd]

"

! !

!TextDiff3Tool class methodsFor:'defaults - colors'!

colorA

    ^(Color red:54.1176470588235 green:75.2941176470588 blue:28.6274509803922) lighter

    "Created: / 19-03-2012 / 13:11:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

colorB

    ^(Color red:96.078431372549 green:73.7254901960784 blue:0.0) lighter

    "Created: / 19-03-2012 / 13:11:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

colorBase

    ^(Color red:5.88235294117647 green:58.8235294117647 blue:80.3921568627451) lighter

    "Created: / 19-03-2012 / 13:12:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

colorConflict

    ^Color red

    "Created: / 19-03-2012 / 13:12:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

colorMerged

    ^(Color red:83.921568627451 green:17.2549019607843 blue:85.0980392156863) lighter

    "Created: / 19-03-2012 / 13:11:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"

! !

!TextDiff3Tool class methodsFor:'interface specs'!

diff3Spec

    "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::TextDiff3Tool andSelector:#diff3Spec

     Tools::TextDiff3Tool new openInterface:#diff3Spec

    "

    <resource: #canvas>

    ^ 

     #(FullSpec

        name: diff3Spec

        window: 

       (WindowSpec

          label: 'Text Diff Tool (for embedding)'

          name: 'Text Diff Tool (for embedding)'

          min: (Point 10 10)

          bounds: (Rectangle 0 0 782 506)

        )

        component: 

       (SpecCollection

          collection: (

           (ViewSpec

              name: '3Labels'

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

              component: 

             (SpecCollection

                collection: (

                 (UISubSpecification

                    name: 'VersionC'

                    layout: (LayoutFrame 0 0 0 0 0 0.33333 30 0)

                    minorKey: versionCLabelSpec

                  )

                 (UISubSpecification

                    name: 'VersionA'

                    layout: (LayoutFrame 5 0.3333 0 0 0 0.67 30 0)

                    minorKey: versionALabelSpec

                  )

                 (UISubSpecification

                    name: 'VersionB'

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

                    minorKey: versionBLabelSpec

                  )

                 )

              )

            )

           (ArbitraryComponentSpec

              name: 'Diff3TextView'

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

              hasHorizontalScrollBar: false

              hasVerticalScrollBar: false

              autoHideScrollBars: false

              hasBorder: false

              component: diffView

              postBuildCallback: postBuildDiffView:

            )

           )

        )

      )

!

mergeSpec

    "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::TextDiff3Tool andSelector:#mergeSpec

     Tools::TextDiff3Tool new openInterface:#mergeSpec

    "

    <resource: #canvas>

    ^ 

     #(FullSpec

        name: mergeSpec

        window: 

       (WindowSpec

          label: 'Merge view'

          name: 'Merge view'

          min: (Point 10 10)

          bounds: (Rectangle 0 0 782 506)

        )

        component: 

       (SpecCollection

          collection: (

           (VariableVerticalPanelSpec

              name: 'DiffAndMergePanel'

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

              component: 

             (SpecCollection

                collection: (

                 (ViewSpec

                    name: 'Box1'

                    component: 

                   (SpecCollection

                      collection: (

                       (ViewSpec

                          name: '3Labels'

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

                          component: 

                         (SpecCollection

                            collection: (

                             (UISubSpecification

                                name: 'VersionC'

                                layout: (LayoutFrame 0 0 0 0 0 0.33333 30 0)

                                minorKey: versionCLabelSpec

                              )

                             (UISubSpecification

                                name: 'VersionA'

                                layout: (LayoutFrame 5 0.3333 0 0 0 0.67 30 0)

                                minorKey: versionALabelSpec

                              )

                             (UISubSpecification

                                name: 'VersionB'

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

                                minorKey: versionBLabelSpec

                              )

                             )

                          )

                        )

                       (ArbitraryComponentSpec

                          name: 'Diff3TextView'

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

                          hasHorizontalScrollBar: false

                          hasVerticalScrollBar: false

                          autoHideScrollBars: false

                          hasBorder: false

                          component: diffView

                          postBuildCallback: postBuildDiffView:

                        )

                       )

                    )

                  )

                 (TransparentBoxSpec

                    name: 'MergeView'

                    component: 

                   (SpecCollection

                      collection: (

                       (UISubSpecification

                          name: 'MergeLabel'

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

                          minorKey: versionMergedLabelSpec

                        )

                       (TextEditorSpec

                          name: 'MergeCode'

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

                          model: textMergedHolder

                          hasHorizontalScrollBar: true

                          hasVerticalScrollBar: true

                          hasKeyboardFocusInitially: false

                          viewClassName: 'Tools::CodeView2'

                          postBuildCallback: postBuildMergeView:

                        )

                       )

                    )

                  )

                 )

              )

              handles: (Any 0.5 1.0)

            )

           (MenuPanelSpec

              name: 'ToolBar'

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

              menu: toolbarMenuMerge

              textDefault: true

            )

           )

        )

      )

    "Modified: / 17-01-2013 / 20:32:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"

! !

!TextDiff3Tool class methodsFor:'interface specs - labels'!

versionMergedLabelSpec

    "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::TextDiff3Tool andSelector:#versionMergedLabelSpec

     Tools::TextDiff3Tool new openInterface:#versionMergedLabelSpec

    "

    <resource: #canvas>

    ^ 

     #(FullSpec

        name: versionMergedLabelSpec

        window: 

       (WindowSpec

          label: 'Merge'

          name: 'Merge'

          min: (Point 10 10)

          bounds: (Rectangle 0 0 774 30)

        )

        component: 

       (SpecCollection

          collection: (

           (LabelSpec

              label: 'versionMerged24x24'

              name: 'VersionMergedIcon'

              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)

              hasCharacterOrientedLabel: false

              translateLabel: true

            )

           (LabelSpec

              label: 'Merge'

              name: 'VersionMergeLabel'

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

              translateLabel: true

              labelChannel: labelMergedHolder

              resizeForLabel: true

              adjust: left

              useDynamicPreferredWidth: true

              usePreferredWidth: true

            )

           )

        )

      )

! !

!TextDiff3Tool class methodsFor:'menu specs'!

toolbarMenuMerge

    "This resource specification was automatically generated

     by the MenuEditor of ST/X."

    "Do not manually edit this!! If it is corrupted,

     the MenuEditor may not be able to read the specification."

    "

     MenuEditor new openOnClass:Tools::TextDiff3Tool andSelector:#toolbarMenuMerge

     (Menu new fromLiteralArrayEncoding:(Tools::TextDiff3Tool toolbarMenuMerge)) startUp

    "

    <resource: #menu>

    ^ 

     #(Menu

        (

         (MenuItem

            enabled: canMergeCurrentHolder

            label: 'Use Base for Current Delta'

            itemValue: doMergeCurrentUsingBase

            isButton: true

            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBase24x24)

          )

         (MenuItem

            enabled: canMergeCurrentHolder

            label: 'Use A for Current '

            itemValue: doMergeCurrentUsingA

            isButton: true

            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingA24x24)

          )

         (MenuItem

            enabled: canMergeCurrentHolder

            label: 'Use B for Current '

            itemValue: doMergeCurrentUsingB

            isButton: true

            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingB24x24)

          )

         (MenuItem

            label: 'Use Base Everywhere'

            itemValue: doMergeAllUsingBase

            isButton: true

            startGroup: right

            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBaseAll24x24)

          )

         (MenuItem

            label: 'Use A Everywhere'

            itemValue: doMergeAllUsingA

            isButton: true

            startGroup: right

            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingAAll24x24)

          )

         (MenuItem

            label: 'Use Be Everywhere '

            itemValue: doMergeAllUsingB

            isButton: true

            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBAll24x24)

          )

         (MenuItem

            label: 'Auto Merge'

            itemValue: doMergeAllAuto

            isButton: true

            startGroup: right

            labelImage: (ResourceRetriever ToolbarIconLibrary mergeMerge24x24)

          )

         (MenuItem

            label: 'External Merge'

            itemValue: doMergeAllExternal

            isButton: true

            startGroup: right

            labelImage: (ResourceRetriever ToolbarIconLibrary mergeMergeExternal24x24)

          )

         )

        nil

        nil

      )

    "Modified: / 17-01-2013 / 22:31:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"

! !

!TextDiff3Tool class methodsFor:'plugIn spec'!

aspectSelectors

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

    "Return a description of exported aspects;

     these can be connected to aspects of an embedding application

     (if this app is embedded in a subCanvas)."

    ^ #(

        #codeAspectHolder

        #labelAHolder

        #labelBHolde

        #labelCHolder

        #labelHolder

        #languageHolder

        #mergeDataHolder

        #mergeHolder

        #textAHolder

        #textBHolder

        #textCHolder

      ).

! !

!TextDiff3Tool methodsFor:'accessing'!

beDiff3Tool

    self mergeHolder value: false

    "Created: / 17-03-2012 / 12:23:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

beMergeTool

    self mergeHolder value: true

    "Created: / 17-03-2012 / 12:23:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

mergeData

    ^self mergeDataHolder value

    "Created: / 20-03-2012 / 14:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"

! !

!TextDiff3Tool methodsFor:'aspects'!

contentSpecHolder

    "return/create the 'contentSpecHolder' value holder (automatically generated)"

    contentSpecHolder isNil ifTrue:[

        contentSpecHolder := ValueHolder new.

        self mergeHolder value 

            ifTrue:[contentSpecHolder setValue: #mergeSpec]

            ifFalse:[contentSpecHolder setValue: #diff3Spec].

        contentSpecHolder addDependent:self.

    ].

    ^ contentSpecHolder

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

!

diffView

    diffView notNil  ifTrue:[

        self breakPoint: #jv.

    ].

    diffView := self initializeDiffView.

    ^diffView

    "Created: / 17-01-2013 / 20:24:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"

!

mergeDataHolder

    "return/create the 'mergeDataHolder' value holder (automatically generated)"

    mergeDataHolder isNil ifTrue:[

        mergeDataHolder := ValueHolder new.

        mergeDataHolder addDependent:self.

    ].

    ^ mergeDataHolder