Tools__TextDiff2Tool.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 16 Jan 2013 11:53:38 +0000
branchjv
changeset 12318 1dda95be3d40
parent 12232 4d9b62c111fc
child 12319 6a14a7bd7539
permissions -rw-r--r--
Fixes in changeset merge tool
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     1
"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     2
 COPYRIGHT (c) 2006 by eXept Software AG
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     3
              All Rights Reserved
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     4
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     5
 This software is furnished under a license and may be used
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    10
 hereby transferred.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    11
"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    12
"{ Package: 'stx:libtool' }"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    13
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    14
"{ NameSpace: Tools }"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    15
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    16
TextDiffTool subclass:#TextDiff2Tool
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    17
	instanceVariableNames:'showDiffHolder diffSpecHolder codeView'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    18
	classVariableNames:''
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    19
	poolDictionaries:''
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    20
	category:'Interface-Diff'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    21
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    22
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    23
!TextDiff2Tool class methodsFor:'documentation'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    24
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    25
copyright
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    26
"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    27
 COPYRIGHT (c) 2006 by eXept Software AG
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    28
              All Rights Reserved
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    29
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    30
 This software is furnished under a license and may be used
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    31
 only in accordance with the terms of that license and with the
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    32
 inclusion of the above copyright notice.   This software may not
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    33
 be provided or otherwise made available to, or used by, any
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    34
 other person.  No title to or ownership of the software is
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    35
 hereby transferred.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    36
"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    37
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    38
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    39
documentation
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    40
"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    41
    documentation to be added.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    42
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    43
    [author:]
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    44
        Jan Vrany <jan.vrany@fit.cvut.cz>
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    45
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    46
    [instance variables:]
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    47
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    48
    [class variables:]
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    49
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    50
    [see also:]
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    51
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    52
"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    53
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    54
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    55
examples
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    56
"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    57
                                                        [exBegin]
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    58
    |text1 text2|
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    59
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    60
    text1 := 'hello world
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    61
here is some difference
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    62
more text
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    63
this line has been removed
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    64
more text
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    65
more text
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    66
'.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    67
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    68
    text2 := 'hello world
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    69
where is the difference ?
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    70
more text
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    71
more text
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    72
more text
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    73
this line has been added
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    74
'.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    75
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    76
    TextDiff2Tool openOn:text1 label:'text1'
12190
2a77dea2eceb Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12179
diff changeset
    77
                     and:text2 label:'text2'
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    78
                                                        [exEnd]
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    79
"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    80
! !
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    81
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    82
!TextDiff2Tool class methodsFor:'interface opening'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    83
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    84
openOn:textA label:labelA and: textB label: labelB
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    85
    | app |
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    86
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    87
    app := self new.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    88
    app labelA: labelA; textA: textA.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    89
    app labelB: labelB; textB: textB.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    90
    app open
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    91
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    92
    "Created: / 16-03-2012 / 13:15:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    93
! !
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    94
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    95
!TextDiff2Tool class methodsFor:'interface specs'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    96
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    97
diffSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    98
    "This resource specification was automatically generated
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    99
     by the UIPainter of ST/X."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   100
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   101
    "Do not manually edit this!! If it is corrupted,
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   102
     the UIPainter may not be able to read the specification."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   103
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   104
    "
12318
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   105
     UIPainter new openOnClass:Tools::TextDiff2Tool andSelector:#diffSpec
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   106
     Tools::TextDiff2Tool new openInterface:#diffSpec
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   107
    "
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   108
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   109
    <resource: #canvas>
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   110
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   111
    ^ 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   112
     #(FullSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   113
        name: diffSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   114
        window: 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   115
       (WindowSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   116
          label: 'Text Diff Tool (for embedding)'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   117
          name: 'Text Diff Tool (for embedding)'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   118
          min: (Point 10 10)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   119
          bounds: (Rectangle 0 0 782 506)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   120
        )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   121
        component: 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   122
       (SpecCollection
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   123
          collection: (
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   124
           (ViewSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   125
              name: '2Labels'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   126
              layout: (LayoutFrame 0 0 0 0 -16 1 30 0)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   127
              component: 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   128
             (SpecCollection
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   129
                collection: (
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   130
                 (UISubSpecification
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   131
                    name: 'VersionA'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   132
                    layout: (LayoutFrame 0 0 0 0 0 0.5 30 0)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   133
                    minorKey: versionALabelSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   134
                  )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   135
                 (UISubSpecification
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   136
                    name: 'VersionB'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   137
                    layout: (LayoutFrame 5 0.5 0 0 0 1 30 0)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   138
                    minorKey: versionBLabelSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   139
                  )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   140
                 )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   141
               
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   142
              )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   143
            )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   144
           (ArbitraryComponentSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   145
              name: 'Diff2TextView'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   146
              layout: (LayoutFrame 0 0 30 0 0 1 0 1)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   147
              hasHorizontalScrollBar: false
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   148
              hasVerticalScrollBar: false
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   149
              autoHideScrollBars: false
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   150
              hasBorder: false
12318
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   151
              component: diffView
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   152
              postBuildCallback: postBuildDiffView:
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   153
            )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   154
           )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   155
         
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   156
        )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   157
      )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   158
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   159
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   160
nothingSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   161
    "This resource specification was automatically generated
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   162
     by the UIPainter of ST/X."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   163
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   164
    "Do not manually edit this!! If it is corrupted,
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   165
     the UIPainter may not be able to read the specification."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   166
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   167
    "
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   168
     UIPainter new openOnClass:Tools::TextDiffTool andSelector:#nothingSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   169
     Tools::TextDiffTool new openInterface:#nothingSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   170
    "
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   171
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   172
    <resource: #canvas>
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   173
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   174
    ^ 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   175
     #(FullSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   176
        name: nothingSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   177
        window: 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   178
       (WindowSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   179
          label: 'NewApplication'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   180
          name: 'NewApplication'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   181
          bounds: (Rectangle 0 0 300 300)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   182
        )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   183
        component: 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   184
       (SpecCollection
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   185
          collection: (
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   186
           (LabelSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   187
              label: 'Nothing selected...'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   188
              name: 'Label1'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   189
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   190
              translateLabel: true
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   191
            )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   192
           )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   193
         
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   194
        )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   195
      )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   196
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   197
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   198
textAViewSpec
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   199
    "This resource specification was automatically generated
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   200
     by the UIPainter of ST/X."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   201
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   202
    "Do not manually edit this!! If it is corrupted,
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   203
     the UIPainter may not be able to read the specification."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   204
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   205
    "
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   206
     UIPainter new openOnClass:Tools::TextDiffTool andSelector:#textViewSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   207
     Tools::TextDiffTool new openInterface:#textViewSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   208
    "
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   209
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   210
    <resource: #canvas>
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   211
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   212
    ^ 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   213
     #(FullSpec
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   214
        name: 'textAViewSpec'
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   215
        window: 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   216
       (WindowSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   217
          label: 'Text Only'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   218
          name: 'Text Only'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   219
          min: (Point 10 10)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   220
          bounds: (Rectangle 0 0 782 506)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   221
        )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   222
        component: 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   223
       (SpecCollection
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   224
          collection: (
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   225
           (ArbitraryComponentSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   226
              name: 'CodeView'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   227
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   228
              model: textAHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   229
              hasHorizontalScrollBar: false
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   230
              hasVerticalScrollBar: false
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   231
              autoHideScrollBars: false
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   232
              hasBorder: false
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   233
              component: #'Tools::CodeView2'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   234
              postBuildCallback: postBuildCodeView:
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   235
            )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   236
           )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   237
         
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   238
        )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   239
      )
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   240
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   241
    "Created: / 18-04-2012 / 18:43:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   242
!
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   243
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   244
textBViewSpec
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   245
    "This resource specification was automatically generated
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   246
     by the UIPainter of ST/X."
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   247
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   248
    "Do not manually edit this!! If it is corrupted,
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   249
     the UIPainter may not be able to read the specification."
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   250
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   251
    "
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   252
     UIPainter new openOnClass:Tools::TextDiffTool andSelector:#textViewSpec
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   253
     Tools::TextDiffTool new openInterface:#textViewSpec
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   254
    "
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   255
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   256
    <resource: #canvas>
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   257
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   258
    ^ 
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   259
     #(FullSpec
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   260
        name: 'textAViewSpec'
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   261
        window: 
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   262
       (WindowSpec
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   263
          label: 'Text Only'
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   264
          name: 'Text Only'
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   265
          min: (Point 10 10)
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   266
          bounds: (Rectangle 0 0 782 506)
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   267
        )
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   268
        component: 
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   269
       (SpecCollection
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   270
          collection: (
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   271
           (ArbitraryComponentSpec
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   272
              name: 'CodeView'
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   273
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   274
              model: textBHolder
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   275
              hasHorizontalScrollBar: false
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   276
              hasVerticalScrollBar: false
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   277
              autoHideScrollBars: false
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   278
              hasBorder: false
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   279
              component: #'Tools::CodeView2'
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   280
              postBuildCallback: postBuildCodeView:
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   281
            )
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   282
           )
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   283
         
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   284
        )
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   285
      )
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   286
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   287
    "Created: / 18-04-2012 / 18:43:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   288
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   289
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   290
versionAOnlySpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   291
    "This resource specification was automatically generated
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   292
     by the UIPainter of ST/X."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   293
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   294
    "Do not manually edit this!! If it is corrupted,
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   295
     the UIPainter may not be able to read the specification."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   296
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   297
    "
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   298
     UIPainter new openOnClass:Tools::TextDiffTool andSelector:#versionAOnlySpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   299
     Tools::TextDiffTool new openInterface:#versionAOnlySpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   300
    "
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   301
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   302
    <resource: #canvas>
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   303
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   304
    ^ 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   305
     #(FullSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   306
        name: versionAOnlySpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   307
        window: 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   308
       (WindowSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   309
          label: 'Version A Only'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   310
          name: 'Version A Only'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   311
          min: (Point 10 10)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   312
          bounds: (Rectangle 0 0 782 506)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   313
        )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   314
        component: 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   315
       (SpecCollection
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   316
          collection: (
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   317
           (UISubSpecification
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   318
              name: 'VersionA'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   319
              layout: (LayoutFrame 0 0 0 0 0 1 30 0)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   320
              minorKey: versionALabelSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   321
            )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   322
           (UISubSpecification
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   323
              name: 'Text'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   324
              layout: (LayoutFrame 0 0 30 0 0 1 0 1)
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   325
              minorKey: textAViewSpec
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   326
            )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   327
           )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   328
         
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   329
        )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   330
      )
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   331
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   332
    "Modified: / 18-04-2012 / 18:43:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   333
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   334
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   335
versionBOnlySpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   336
    "This resource specification was automatically generated
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   337
     by the UIPainter of ST/X."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   338
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   339
    "Do not manually edit this!! If it is corrupted,
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   340
     the UIPainter may not be able to read the specification."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   341
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   342
    "
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   343
     UIPainter new openOnClass:Tools::TextDiffTool andSelector:#versionBOnlySpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   344
     Tools::TextDiffTool new openInterface:#versionBOnlySpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   345
    "
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   346
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   347
    <resource: #canvas>
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   348
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   349
    ^ 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   350
     #(FullSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   351
        name: 'versionBOnlySpec'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   352
        window: 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   353
       (WindowSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   354
          label: 'Version B Only'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   355
          name: 'Version B Only'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   356
          min: (Point 10 10)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   357
          bounds: (Rectangle 0 0 782 506)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   358
        )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   359
        component: 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   360
       (SpecCollection
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   361
          collection: (
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   362
           (UISubSpecification
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   363
              name: 'VersionB'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   364
              layout: (LayoutFrame 0 0 0 0 0 1 30 0)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   365
              minorKey: versionBLabelSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   366
            )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   367
          (UISubSpecification
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   368
              name: 'Text'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   369
              layout: (LayoutFrame 0 0 30 0 0 1 0 1)
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12212
diff changeset
   370
              minorKey: textBViewSpec
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   371
            )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   372
           )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   373
         
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   374
        )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   375
      )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   376
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   377
    "Created: / 19-07-2011 / 10:06:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   378
! !
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   379
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   380
!TextDiff2Tool class methodsFor:'plugIn spec'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   381
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   382
aspectSelectors
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   383
    "This resource specification was automatically generated
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   384
     by the UIPainter of ST/X."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   385
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   386
    "Do not manually edit this. If it is corrupted,
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   387
     the UIPainter may not be able to read the specification."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   388
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   389
    "Return a description of exported aspects;
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   390
     these can be connected to aspects of an embedding application
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   391
     (if this app is embedded in a subCanvas)."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   392
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   393
    ^ #(
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   394
        #classHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   395
        #codeAspectHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   396
        #labelAHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   397
        #labelBHolde
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   398
        #labelCHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   399
        #labelHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   400
        #languageHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   401
        #showDiffHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   402
        #textAHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   403
        #textBHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   404
        #textCHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   405
      ).
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   406
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   407
! !
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   408
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   409
!TextDiff2Tool methodsFor:'accessing'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   410
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   411
title: aString
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   412
12212
1208b3e4d64b Build files regenerated
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
   413
    ^self label: aString
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   414
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   415
    "Created: / 30-08-2011 / 09:45:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   416
! !
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   417
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   418
!TextDiff2Tool methodsFor:'aspects'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   419
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   420
showDiffHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   421
    "return/create the 'showDiffHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   422
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   423
    showDiffHolder isNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   424
        showDiffHolder := ValueHolder with: true.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   425
        showDiffHolder addDependent:self.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   426
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   427
    ^ showDiffHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   428
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   429
    "Modified: / 30-06-2011 / 20:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   430
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   431
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   432
showDiffHolder:something
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   433
    "set the 'showDiffHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   434
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   435
    |oldValue newValue|
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   436
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   437
    showDiffHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   438
        oldValue := showDiffHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   439
        showDiffHolder removeDependent:self.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   440
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   441
    showDiffHolder := something.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   442
    showDiffHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   443
        showDiffHolder addDependent:self.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   444
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   445
    newValue := showDiffHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   446
    oldValue ~~ newValue ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   447
        self update:#value with:newValue from:showDiffHolder.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   448
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   449
! !
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   450
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   451
!TextDiff2Tool methodsFor:'change & update'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   452
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   453
codeAspect
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   454
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   455
    ^self codeAspectHolder value
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   456
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   457
    "Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   458
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   459
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   460
update:something with:aParameter from:changedObject
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   461
    "Invoked when an object that I depend upon sends a change notification."
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   462
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   463
    (changedObject == showDiffHolder) ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   464
        self updateViews.            
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   465
        ^self.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   466
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   467
    super update:something with:aParameter from:changedObject
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   468
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   469
    "Modified: / 16-03-2012 / 12:36:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   470
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   471
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   472
updateAfterAorBorCChanged
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   473
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   474
    (textAChanged & textBChanged) ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   475
        textAChanged := textBChanged := false.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   476
        self updateViews
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   477
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   478
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   479
    "Created: / 16-03-2012 / 12:37:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   480
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   481
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   482
updateViews
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   483
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   484
    | a b |
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   485
    a := self textAHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   486
    b := self textBHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   487
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   488
    self showDiffHolder value ifFalse:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   489
        self showTextOnly.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   490
        ^ self
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   491
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   492
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   493
    (a notNil and:[b notNil]) ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   494
        self showDiff.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   495
        ^self
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   496
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   497
    a notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   498
        self showVersionA.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   499
        ^self
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   500
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   501
    b notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   502
        self showVersionB.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   503
        ^self
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   504
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   505
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   506
   self showNothing.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   507
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   508
    "Created: / 19-07-2011 / 11:29:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   509
! !
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   510
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   511
!TextDiff2Tool methodsFor:'hooks'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   512
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   513
postBuildCodeView:aScrollableView
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   514
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   515
    codeView := aScrollableView.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   516
    codeView notNil ifTrue:[codeView languageHolder: self languageHolder].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   517
    codeView notNil ifTrue:[codeView classHolder: self classHolder].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   518
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   519
    "Created: / 19-07-2011 / 10:17:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   520
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   521
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   522
postBuildDiffView:aScrollableView
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   523
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   524
    super postBuildDiffView:aScrollableView.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   525
    diffView notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   526
       (self textAHolder value notNil and:[self textBHolder value notNil]) ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   527
            diffView scrolledView
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   528
                text1: self textAHolder value
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   529
                text2: self textBHolder value
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   530
        ]
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   531
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   532
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   533
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   534
    "Created: / 16-03-2012 / 13:30:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   535
! !
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   536
12318
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   537
!TextDiff2Tool methodsFor:'initialization'!
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   538
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   539
initializeDiffView
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   540
    "superclass Tools::TextDiffTool says that I am responsible to implement this method"
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   541
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   542
    ^ Tools::Diff3CodeView2 new
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   543
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   544
    "Modified: / 16-01-2013 / 09:52:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   545
! !
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   546
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   547
!TextDiff2Tool methodsFor:'private'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   548
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   549
showDiff
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   550
    |scrolledView|
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   551
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   552
    self contentSpecHolder value: #diffSpec.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   553
    
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   554
    diffView isNil ifTrue:[^self].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   555
    (scrolledView := diffView scrolledView) isNil ifTrue:[^self].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   556
    scrolledView
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   557
        text1: self textAHolder value
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   558
        text2: self textBHolder value
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   559
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   560
    "Created: / 19-07-2011 / 10:22:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   561
    "Modified: / 18-11-2011 / 15:01:12 / cg"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   562
    "Modified: / 16-03-2012 / 13:21:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   563
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   564
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   565
showNothing
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   566
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   567
    self contentSpecHolder value: #nothingSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   568
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   569
    "Created: / 19-07-2011 / 19:34:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   570
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   571
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   572
showTextOnly
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   573
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   574
    self contentSpecHolder value: #textViewSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   575
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   576
    "Created: / 19-07-2011 / 11:39:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   577
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   578
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   579
showVersionA
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   580
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   581
    self contentSpecHolder value: #versionAOnlySpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   582
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   583
    "Created: / 19-07-2011 / 10:22:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   584
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   585
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   586
showVersionB
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   587
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   588
    self contentSpecHolder value: #versionBOnlySpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   589
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   590
    "Created: / 19-07-2011 / 10:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   591
! !
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   592
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   593
!TextDiff2Tool methodsFor:'testing'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   594
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   595
isDiff2
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   596
    ^true
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   597
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   598
    "Created: / 16-03-2012 / 15:21:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   599
! !
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   600
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   601
!TextDiff2Tool class methodsFor:'documentation'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   602
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   603
version
12318
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   604
    ^ '$Id: Tools__TextDiff2Tool.st 8087 2013-01-16 11:53:38Z vranyj1 $'
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   605
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   606
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   607
version_CVS
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   608
    ^ '§Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.6 2011/11/18 14:05:39 cg Exp §'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   609
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   610
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   611
version_SVN
12318
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12232
diff changeset
   612
    ^ '$Id: Tools__TextDiff2Tool.st 8087 2013-01-16 11:53:38Z vranyj1 $'
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   613
! !