Tools__TextDiffTool.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 30 Jan 2013 11:15:09 +0000
branchjv
changeset 12401 4714b9640528
parent 12318 1dda95be3d40
parent 11703 100f3c5ed545
child 12406 1fbd331e4489
permissions -rw-r--r--
Merged 235b77901045 and 8332590c5a41 (branch default)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
     1
"
3942434287fe initial checkin
vrany
parents:
diff changeset
     2
 COPYRIGHT (c) 2006 by eXept Software AG
3942434287fe initial checkin
vrany
parents:
diff changeset
     3
              All Rights Reserved
3942434287fe initial checkin
vrany
parents:
diff changeset
     4
3942434287fe initial checkin
vrany
parents:
diff changeset
     5
 This software is furnished under a license and may be used
3942434287fe initial checkin
vrany
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
3942434287fe initial checkin
vrany
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
3942434287fe initial checkin
vrany
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
3942434287fe initial checkin
vrany
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
3942434287fe initial checkin
vrany
parents:
diff changeset
    10
 hereby transferred.
3942434287fe initial checkin
vrany
parents:
diff changeset
    11
"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
    12
"{ Package: 'stx:libtool' }"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
    13
3942434287fe initial checkin
vrany
parents:
diff changeset
    14
"{ NameSpace: Tools }"
3942434287fe initial checkin
vrany
parents:
diff changeset
    15
3942434287fe initial checkin
vrany
parents:
diff changeset
    16
ApplicationModel subclass:#TextDiffTool
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    17
	instanceVariableNames:'labelHolder labelAHolder textAHolder labelBHolder textBHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    18
		labelCHolder textCHolder languageHolder codeAspectHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    19
		textAChanged textBChanged textCChanged contentSpecHolder diffView
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    20
		classHolder'
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
    21
	classVariableNames:''
3942434287fe initial checkin
vrany
parents:
diff changeset
    22
	poolDictionaries:''
3942434287fe initial checkin
vrany
parents:
diff changeset
    23
	category:'Interface-Diff'
3942434287fe initial checkin
vrany
parents:
diff changeset
    24
!
3942434287fe initial checkin
vrany
parents:
diff changeset
    25
3942434287fe initial checkin
vrany
parents:
diff changeset
    26
!TextDiffTool class methodsFor:'documentation'!
3942434287fe initial checkin
vrany
parents:
diff changeset
    27
3942434287fe initial checkin
vrany
parents:
diff changeset
    28
copyright
3942434287fe initial checkin
vrany
parents:
diff changeset
    29
"
3942434287fe initial checkin
vrany
parents:
diff changeset
    30
 COPYRIGHT (c) 2006 by eXept Software AG
3942434287fe initial checkin
vrany
parents:
diff changeset
    31
              All Rights Reserved
3942434287fe initial checkin
vrany
parents:
diff changeset
    32
3942434287fe initial checkin
vrany
parents:
diff changeset
    33
 This software is furnished under a license and may be used
3942434287fe initial checkin
vrany
parents:
diff changeset
    34
 only in accordance with the terms of that license and with the
3942434287fe initial checkin
vrany
parents:
diff changeset
    35
 inclusion of the above copyright notice.   This software may not
3942434287fe initial checkin
vrany
parents:
diff changeset
    36
 be provided or otherwise made available to, or used by, any
3942434287fe initial checkin
vrany
parents:
diff changeset
    37
 other person.  No title to or ownership of the software is
3942434287fe initial checkin
vrany
parents:
diff changeset
    38
 hereby transferred.
3942434287fe initial checkin
vrany
parents:
diff changeset
    39
"
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    40
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    41
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    42
documentation
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    43
"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    44
    documentation to be added.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    45
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    46
    [author:]
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    47
        Jan Vrany <jan.vrany@fit.cvut.cz>
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    48
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    49
    [instance variables:]
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    50
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    51
    [class variables:]
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    52
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    53
    [see also:]
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    54
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    55
"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    56
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    57
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    58
examples
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    59
"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    60
    See
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    61
        - TextDiff2Tool examples
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    62
        - TextDiff3Tool examples
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
    63
"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
    64
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
    65
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
    66
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
    67
!TextDiffTool class methodsFor:'image specs'!
3942434287fe initial checkin
vrany
parents:
diff changeset
    68
3942434287fe initial checkin
vrany
parents:
diff changeset
    69
versionA24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    70
3942434287fe initial checkin
vrany
parents:
diff changeset
    71
    ^ToolbarIconLibrary versionA24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    72
3942434287fe initial checkin
vrany
parents:
diff changeset
    73
    "Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
    74
!
3942434287fe initial checkin
vrany
parents:
diff changeset
    75
3942434287fe initial checkin
vrany
parents:
diff changeset
    76
versionB24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    77
3942434287fe initial checkin
vrany
parents:
diff changeset
    78
    ^ToolbarIconLibrary versionB24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    79
3942434287fe initial checkin
vrany
parents:
diff changeset
    80
    "Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
    81
!
3942434287fe initial checkin
vrany
parents:
diff changeset
    82
3942434287fe initial checkin
vrany
parents:
diff changeset
    83
versionBase24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    84
3942434287fe initial checkin
vrany
parents:
diff changeset
    85
    ^ToolbarIconLibrary versionBase24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    86
3942434287fe initial checkin
vrany
parents:
diff changeset
    87
    "Created: / 24-03-2010 / 20:50:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12193
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
    88
!
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
    89
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
    90
versionMerged24x24
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
    91
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
    92
    ^ToolbarIconLibrary versionMerged24x24
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
    93
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
    94
    "Created: / 17-03-2012 / 12:18:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
    95
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
    96
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
    97
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
    98
!TextDiffTool class methodsFor:'interface specs'!
3942434287fe initial checkin
vrany
parents:
diff changeset
    99
3942434287fe initial checkin
vrany
parents:
diff changeset
   100
3942434287fe initial checkin
vrany
parents:
diff changeset
   101
3942434287fe initial checkin
vrany
parents:
diff changeset
   102
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   103
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   104
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   105
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   106
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   107
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   108
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   109
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   110
windowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   111
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   112
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   113
3942434287fe initial checkin
vrany
parents:
diff changeset
   114
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   115
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   116
3942434287fe initial checkin
vrany
parents:
diff changeset
   117
    "
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   118
     UIPainter new openOnClass:Tools::TextDiff2Tool andSelector:#windowSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   119
     Tools::TextDiff2Tool new openInterface:#windowSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   120
     Tools::TextDiff2Tool open
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   121
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   122
3942434287fe initial checkin
vrany
parents:
diff changeset
   123
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   124
3942434287fe initial checkin
vrany
parents:
diff changeset
   125
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   126
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   127
        name: windowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   128
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   129
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   130
          label: 'Text Diff Tool'
3942434287fe initial checkin
vrany
parents:
diff changeset
   131
          name: 'Text Diff Tool'
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   132
          labelChannel: titleHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   133
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   134
          bounds: (Rectangle 0 0 640 480)
3942434287fe initial checkin
vrany
parents:
diff changeset
   135
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   136
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   137
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   138
          collection: (
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   139
           (LabelSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   140
              label: 'Label'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   141
              name: 'Label1'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   142
              layout: (LayoutFrame 0 0 0 0 0 1 30 0)
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   143
              translateLabel: true
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   144
              labelChannel: labelHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   145
            )
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   146
           (UISubSpecification
3942434287fe initial checkin
vrany
parents:
diff changeset
   147
              name: 'Contents'
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   148
              layout: (LayoutFrame 0 0 30 0 0 1 0 1)
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   149
              minorKey: windowSpecForEmbedding
3942434287fe initial checkin
vrany
parents:
diff changeset
   150
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   151
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   152
         
3942434287fe initial checkin
vrany
parents:
diff changeset
   153
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   154
      )
3942434287fe initial checkin
vrany
parents:
diff changeset
   155
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   156
3942434287fe initial checkin
vrany
parents:
diff changeset
   157
windowSpecForEmbedding
3942434287fe initial checkin
vrany
parents:
diff changeset
   158
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   159
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   160
3942434287fe initial checkin
vrany
parents:
diff changeset
   161
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   162
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   163
3942434287fe initial checkin
vrany
parents:
diff changeset
   164
    "
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   165
     UIPainter new openOnClass:Tools::TextDiff2Tool andSelector:#windowSpecForEmbedding
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   166
     Tools::TextDiff2Tool new openInterface:#windowSpecForEmbedding
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   167
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   168
3942434287fe initial checkin
vrany
parents:
diff changeset
   169
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   170
3942434287fe initial checkin
vrany
parents:
diff changeset
   171
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   172
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   173
        name: windowSpecForEmbedding
3942434287fe initial checkin
vrany
parents:
diff changeset
   174
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   175
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   176
          label: 'Text Diff Tool (for embedding)'
3942434287fe initial checkin
vrany
parents:
diff changeset
   177
          name: 'Text Diff Tool (for embedding)'
3942434287fe initial checkin
vrany
parents:
diff changeset
   178
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   179
          bounds: (Rectangle 0 0 782 506)
3942434287fe initial checkin
vrany
parents:
diff changeset
   180
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   181
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   182
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   183
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   184
           (SubCanvasSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   185
              name: 'Contents'
3942434287fe initial checkin
vrany
parents:
diff changeset
   186
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   187
              hasHorizontalScrollBar: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   188
              hasVerticalScrollBar: false
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   189
              specHolder: contentSpecHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   190
              createNewBuilder: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   191
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   192
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   193
         
3942434287fe initial checkin
vrany
parents:
diff changeset
   194
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   195
      )
3942434287fe initial checkin
vrany
parents:
diff changeset
   196
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   197
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   198
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   199
!TextDiffTool class methodsFor:'interface specs - labels'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   200
3942434287fe initial checkin
vrany
parents:
diff changeset
   201
versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   202
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   203
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   204
3942434287fe initial checkin
vrany
parents:
diff changeset
   205
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   206
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   207
3942434287fe initial checkin
vrany
parents:
diff changeset
   208
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   209
     UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   210
     SVN::DiffViewApp new openInterface:#versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   211
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   212
3942434287fe initial checkin
vrany
parents:
diff changeset
   213
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   214
3942434287fe initial checkin
vrany
parents:
diff changeset
   215
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   216
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   217
        name: versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   218
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   219
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   220
          label: 'Version A'
3942434287fe initial checkin
vrany
parents:
diff changeset
   221
          name: 'Version A'
3942434287fe initial checkin
vrany
parents:
diff changeset
   222
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   223
          bounds: (Rectangle 0 0 300 30)
3942434287fe initial checkin
vrany
parents:
diff changeset
   224
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   225
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   226
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   227
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   228
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   229
              label: 'versionA24x24'
3942434287fe initial checkin
vrany
parents:
diff changeset
   230
              name: 'VersionAIcon'
3942434287fe initial checkin
vrany
parents:
diff changeset
   231
              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
3942434287fe initial checkin
vrany
parents:
diff changeset
   232
              hasCharacterOrientedLabel: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   233
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   234
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   235
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   236
              label: 'Version A'
3942434287fe initial checkin
vrany
parents:
diff changeset
   237
              name: 'VersionALabel'
3942434287fe initial checkin
vrany
parents:
diff changeset
   238
              layout: (LayoutFrame 30 0 0 0 0 1 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   239
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   240
              labelChannel: labelAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   241
              resizeForLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   242
              adjust: left
3942434287fe initial checkin
vrany
parents:
diff changeset
   243
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   244
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   245
         
3942434287fe initial checkin
vrany
parents:
diff changeset
   246
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   247
      )
3942434287fe initial checkin
vrany
parents:
diff changeset
   248
3942434287fe initial checkin
vrany
parents:
diff changeset
   249
    "Modified: / 30-06-2011 / 20:53:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
   250
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   251
3942434287fe initial checkin
vrany
parents:
diff changeset
   252
versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   253
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   254
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   255
3942434287fe initial checkin
vrany
parents:
diff changeset
   256
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   257
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   258
3942434287fe initial checkin
vrany
parents:
diff changeset
   259
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   260
     UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   261
     SVN::DiffViewApp new openInterface:#versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   262
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   263
3942434287fe initial checkin
vrany
parents:
diff changeset
   264
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   265
3942434287fe initial checkin
vrany
parents:
diff changeset
   266
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   267
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   268
        name: versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   269
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   270
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   271
          label: 'Version B'
3942434287fe initial checkin
vrany
parents:
diff changeset
   272
          name: 'Version B'
3942434287fe initial checkin
vrany
parents:
diff changeset
   273
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   274
          bounds: (Rectangle 0 0 300 30)
3942434287fe initial checkin
vrany
parents:
diff changeset
   275
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   276
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   277
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   278
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   279
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   280
              label: 'versionB24x24'
3942434287fe initial checkin
vrany
parents:
diff changeset
   281
              name: 'VersionBIcon'
3942434287fe initial checkin
vrany
parents:
diff changeset
   282
              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
3942434287fe initial checkin
vrany
parents:
diff changeset
   283
              hasCharacterOrientedLabel: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   284
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   285
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   286
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   287
              label: 'Version B'
3942434287fe initial checkin
vrany
parents:
diff changeset
   288
              name: 'VersionBLabel'
3942434287fe initial checkin
vrany
parents:
diff changeset
   289
              layout: (LayoutFrame 30 0 0 0 0 1 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   290
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   291
              labelChannel: labelBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   292
              resizeForLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   293
              adjust: left
3942434287fe initial checkin
vrany
parents:
diff changeset
   294
              useDynamicPreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   295
              usePreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   296
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   297
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   298
         
3942434287fe initial checkin
vrany
parents:
diff changeset
   299
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   300
      )
3942434287fe initial checkin
vrany
parents:
diff changeset
   301
3942434287fe initial checkin
vrany
parents:
diff changeset
   302
    "Modified: / 30-06-2011 / 20:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
   303
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   304
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   305
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   306
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   307
versionCLabelSpec
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   308
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   309
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   310
3942434287fe initial checkin
vrany
parents:
diff changeset
   311
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   312
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   313
3942434287fe initial checkin
vrany
parents:
diff changeset
   314
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   315
     UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBaseLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   316
     SVN::DiffViewApp new openInterface:#versionBaseLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   317
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   318
3942434287fe initial checkin
vrany
parents:
diff changeset
   319
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   320
3942434287fe initial checkin
vrany
parents:
diff changeset
   321
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   322
     #(FullSpec
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   323
        name: versionCLabelSpec
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   324
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   325
       (WindowSpec
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   326
          label: 'Version C'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   327
          name: 'Version C'
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   328
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   329
          bounds: (Rectangle 0 0 300 30)
3942434287fe initial checkin
vrany
parents:
diff changeset
   330
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   331
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   332
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   333
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   334
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   335
              label: 'versionBase24x24'
3942434287fe initial checkin
vrany
parents:
diff changeset
   336
              name: 'VersionBaseIcon'
3942434287fe initial checkin
vrany
parents:
diff changeset
   337
              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
3942434287fe initial checkin
vrany
parents:
diff changeset
   338
              hasCharacterOrientedLabel: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   339
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   340
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   341
           (LabelSpec
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   342
              label: 'Version C'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   343
              name: 'VersionCLabel'
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   344
              layout: (LayoutFrame 30 0 5 0 191 0 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   345
              translateLabel: true
12190
2a77dea2eceb Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12180
diff changeset
   346
              labelChannel: labelCHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   347
              resizeForLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   348
              adjust: left
3942434287fe initial checkin
vrany
parents:
diff changeset
   349
              useDynamicPreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   350
              usePreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   351
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   352
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   353
         
3942434287fe initial checkin
vrany
parents:
diff changeset
   354
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   355
      )
3942434287fe initial checkin
vrany
parents:
diff changeset
   356
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   357
    "Created: / 16-03-2012 / 12:16:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   358
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   359
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   360
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   361
!TextDiffTool class methodsFor:'plugIn spec'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   362
3942434287fe initial checkin
vrany
parents:
diff changeset
   363
aspectSelectors
3942434287fe initial checkin
vrany
parents:
diff changeset
   364
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   365
    ^#( 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   366
        #labelHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   367
3942434287fe initial checkin
vrany
parents:
diff changeset
   368
        #labelAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   369
        #labelBHolder
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   370
        #labelCHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   371
3942434287fe initial checkin
vrany
parents:
diff changeset
   372
        #textAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   373
        #textBHolder
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   374
        #textCHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   375
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   376
        #languageHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   377
        #codeAspectHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   378
    )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   379
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   380
    "Created: / 16-03-2012 / 12:18:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   381
! !
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   382
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   383
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   384
!TextDiffTool methodsFor:'accessing'!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   385
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   386
label: aString
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   387
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   388
    ^self labelHolder value: aString
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   389
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   390
    "Created: / 16-03-2012 / 13:07:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   391
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   392
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   393
labelA: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   394
    ^self labelAHolder value: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   395
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   396
    "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   397
    "Created: / 30-08-2011 / 09:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   398
    "Modified (format): / 27-07-2012 / 21:57:10 / cg"
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   399
!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   400
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   401
labelB: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   402
    ^self labelBHolder value: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   403
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   404
    "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   405
    "Created: / 30-08-2011 / 09:42:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   406
    "Modified (format): / 27-07-2012 / 21:57:15 / cg"
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   407
!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   408
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   409
labelC: aString
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   410
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   411
    ^self labelCHolder value: aString
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   412
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   413
    "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   414
    "Created: / 16-03-2012 / 13:05:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   415
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   416
12198
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   417
textA
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   418
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   419
    ^self textAHolder value
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   420
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   421
    "Created: / 19-03-2012 / 12:24:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   422
!
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   423
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   424
textA: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   425
    ^self textAHolder value: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   426
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   427
    "Created: / 30-08-2011 / 09:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   428
    "Modified (format): / 27-07-2012 / 21:57:37 / cg"
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   429
!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   430
12198
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   431
textB
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   432
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   433
    ^self textBHolder value
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   434
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   435
    "Created: / 19-03-2012 / 12:24:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   436
!
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   437
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   438
textB: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   439
    ^self textBHolder value: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   440
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   441
    "Created: / 30-08-2011 / 09:43:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   442
    "Modified (format): / 27-07-2012 / 21:57:41 / cg"
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   443
!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   444
12198
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   445
textC
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   446
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   447
    ^self textCHolder value
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   448
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   449
    "Created: / 19-03-2012 / 12:24:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   450
!
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   451
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   452
textC: aString
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   453
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   454
    ^self textCHolder value: aString
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   455
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   456
    "Created: / 16-03-2012 / 13:05:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12209
44647f143fd0 Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12198
diff changeset
   457
!
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   458
12209
44647f143fd0 Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12198
diff changeset
   459
title: aString
44647f143fd0 Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12198
diff changeset
   460
    <resource: #obsolete>
44647f143fd0 Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12198
diff changeset
   461
44647f143fd0 Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12198
diff changeset
   462
    ^self label: aString
44647f143fd0 Compatibility method in TextDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12198
diff changeset
   463
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   464
    "Created: / 30-08-2011 / 09:45:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   465
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   466
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   467
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   468
!TextDiffTool methodsFor:'aspects'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   469
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   470
classHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   471
    "return/create the 'classHolder' value holder (automatically generated)"
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   472
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   473
    classHolder isNil ifTrue:[
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   474
        classHolder := ValueHolder new.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   475
    ].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   476
    ^ classHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   477
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   478
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   479
classHolder: aValueHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   480
    classHolder := aValueHolder.
12180
8ff612c17953 stx fixes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12179
diff changeset
   481
    "codeView notNil ifTrue:[codeView classHolder: aValueHolder]."
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   482
    diffView notNil ifTrue:[diffView classHolder: aValueHolder].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   483
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   484
    "Modified: / 19-07-2011 / 12:54:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   485
    "Modified (format): / 27-07-2012 / 21:57:00 / cg"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   486
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   487
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   488
codeAspectHolder
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   489
    "return/create the 'codeAspectHolder' value holder (automatically generated)"
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   490
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   491
    codeAspectHolder isNil ifTrue:[
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   492
        codeAspectHolder := ValueHolder with: (SyntaxHighlighter codeAspectExpression).
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   493
        codeAspectHolder addDependent:self
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   494
    ].
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   495
    ^ codeAspectHolder
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   496
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   497
    "Modified: / 19-07-2011 / 19:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   498
    "Modified: / 27-07-2012 / 23:46:11 / cg"
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   499
!
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   500
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   501
codeAspectHolder:something
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   502
    "set the 'codeAspectHolder' value holder (automatically generated)"
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   503
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   504
    codeAspectHolder notNil ifTrue:[
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   505
        codeAspectHolder removeDependent:self
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   506
    ].
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   507
    codeAspectHolder := something.
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   508
    codeAspectHolder notNil ifTrue:[
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   509
        codeAspectHolder addDependent:self
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   510
    ].
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   511
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   512
    "Modified: / 27-07-2012 / 22:55:42 / cg"
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   513
!
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   514
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   515
contentSpecHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   516
    "return/create the 'contentSpecHolder' value holder (automatically generated)"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   517
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   518
    contentSpecHolder isNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   519
        contentSpecHolder := ValueHolder new.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   520
        contentSpecHolder addDependent:self.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   521
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   522
    ^ contentSpecHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   523
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   524
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   525
contentSpecHolder:something
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   526
    "set the 'contentSpecHolder' value holder (automatically generated)"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   527
3942434287fe initial checkin
vrany
parents:
diff changeset
   528
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   529
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   530
    contentSpecHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   531
        oldValue := contentSpecHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   532
        contentSpecHolder removeDependent:self.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   533
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   534
    contentSpecHolder := something.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   535
    contentSpecHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   536
        contentSpecHolder addDependent:self.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   537
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   538
    newValue := contentSpecHolder value.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   539
    oldValue ~~ newValue ifTrue:[
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   540
        self update:#value with:newValue from:contentSpecHolder.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   541
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   542
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   543
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   544
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   545
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   546
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   547
12318
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   548
diffView
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   549
"/    diffView isNil ifTrue:[
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   550
        diffView := self initializeDiffView.
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   551
"/    ].
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   552
    ^diffView
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   553
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   554
    "Created: / 16-01-2013 / 09:45:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   555
!
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   556
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   557
labelHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   558
    "return/create the 'labelAHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   559
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   560
    labelHolder isNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   561
        labelHolder := ValueHolder with:'Text diff'.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   562
        "/titleHolder addDependent:self.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   563
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   564
    ^ labelHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   565
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   566
    "Created: / 16-03-2012 / 13:06:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   567
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   568
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   569
languageHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   570
    "return/create the 'languageHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   571
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   572
    languageHolder isNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   573
        languageHolder := ValueHolder new.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   574
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   575
    ^ languageHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   576
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   577
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   578
languageHolder:aValueHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   579
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   580
    languageHolder := aValueHolder.
12180
8ff612c17953 stx fixes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12179
diff changeset
   581
    "codeView notNil ifTrue:[codeView languageHolder: aValueHolder]."
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   582
    diffView notNil ifTrue:[diffView languageHolder: aValueHolder].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   583
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   584
    "Modified: / 19-07-2011 / 12:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   585
!
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   586
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   587
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   588
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   589
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   590
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   591
 !
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   592
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   593
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   594
!TextDiffTool methodsFor:'aspects-versions'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   595
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   596
labelAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   597
    "return/create the 'labelAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   598
3942434287fe initial checkin
vrany
parents:
diff changeset
   599
    labelAHolder isNil ifTrue:[
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   600
        labelAHolder := ValueHolder with:'Version A'.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   601
        labelAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   602
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   603
    ^ labelAHolder
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   604
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   605
    "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   606
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   607
3942434287fe initial checkin
vrany
parents:
diff changeset
   608
labelAHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   609
    "set the 'labelAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   610
3942434287fe initial checkin
vrany
parents:
diff changeset
   611
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   612
3942434287fe initial checkin
vrany
parents:
diff changeset
   613
    labelAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   614
        oldValue := labelAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   615
        labelAHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   616
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   617
    labelAHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   618
    labelAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   619
        labelAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   620
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   621
    newValue := labelAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   622
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   623
        self update:#value with:newValue from:labelAHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   624
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   625
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   626
3942434287fe initial checkin
vrany
parents:
diff changeset
   627
labelBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   628
    "return/create the 'labelBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   629
3942434287fe initial checkin
vrany
parents:
diff changeset
   630
    labelBHolder isNil ifTrue:[
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   631
        labelBHolder := ValueHolder with:'Version B'.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   632
        labelBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   633
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   634
    ^ labelBHolder
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   635
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   636
    "Modified: / 19-07-2011 / 11:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   637
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   638
3942434287fe initial checkin
vrany
parents:
diff changeset
   639
labelBHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   640
    "set the 'labelBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   641
3942434287fe initial checkin
vrany
parents:
diff changeset
   642
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   643
3942434287fe initial checkin
vrany
parents:
diff changeset
   644
    labelBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   645
        oldValue := labelBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   646
        labelBHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   647
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   648
    labelBHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   649
    labelBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   650
        labelBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   651
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   652
    newValue := labelBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   653
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   654
        self update:#value with:newValue from:labelBHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   655
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   656
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   657
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   658
labelCHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   659
    "return/create the 'labelBHolder' value holder (automatically generated)"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   660
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   661
    labelCHolder isNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   662
        labelCHolder := ValueHolder with:'Version Base'.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   663
        labelCHolder addDependent:self.
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   664
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   665
    ^ labelCHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   666
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   667
    "Created: / 16-03-2012 / 12:14:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   668
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   669
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   670
labelCHolder:something
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   671
    "set the 'labelBHolder' value holder (automatically generated)"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   672
3942434287fe initial checkin
vrany
parents:
diff changeset
   673
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   674
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   675
    labelCHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   676
        oldValue := labelCHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   677
        labelCHolder removeDependent:self.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   678
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   679
    labelCHolder := something.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   680
    labelCHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   681
        labelCHolder addDependent:self.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   682
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   683
    newValue := labelCHolder value.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   684
    oldValue ~~ newValue ifTrue:[
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   685
        self update:#value with:newValue from:labelCHolder.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   686
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   687
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   688
    "Created: / 16-03-2012 / 12:15:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   689
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   690
3942434287fe initial checkin
vrany
parents:
diff changeset
   691
textAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   692
    "return/create the 'textAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   693
3942434287fe initial checkin
vrany
parents:
diff changeset
   694
    textAHolder isNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   695
        textAHolder := ValueHolder new.
3942434287fe initial checkin
vrany
parents:
diff changeset
   696
        textAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   697
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   698
    ^ textAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   699
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   700
3942434287fe initial checkin
vrany
parents:
diff changeset
   701
textAHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   702
    "set the 'textAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   703
3942434287fe initial checkin
vrany
parents:
diff changeset
   704
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   705
3942434287fe initial checkin
vrany
parents:
diff changeset
   706
    textAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   707
        oldValue := textAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   708
        textAHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   709
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   710
    textAHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   711
    textAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   712
        textAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   713
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   714
    newValue := textAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   715
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   716
        self update:#value with:newValue from:textAHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   717
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   718
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   719
3942434287fe initial checkin
vrany
parents:
diff changeset
   720
textBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   721
    "return/create the 'textBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   722
3942434287fe initial checkin
vrany
parents:
diff changeset
   723
    textBHolder isNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   724
        textBHolder := ValueHolder new.
3942434287fe initial checkin
vrany
parents:
diff changeset
   725
        textBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   726
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   727
    ^ textBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   728
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   729
3942434287fe initial checkin
vrany
parents:
diff changeset
   730
textBHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   731
    "set the 'textBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   732
3942434287fe initial checkin
vrany
parents:
diff changeset
   733
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   734
3942434287fe initial checkin
vrany
parents:
diff changeset
   735
    textBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   736
        oldValue := textBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   737
        textBHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   738
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   739
    textBHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   740
    textBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   741
        textBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   742
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   743
    newValue := textBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   744
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   745
        self update:#value with:newValue from:textBHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   746
    ].
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   747
!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   748
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   749
textCHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   750
    "return/create the 'textBHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   751
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   752
    textCHolder isNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   753
        textCHolder := ValueHolder new.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   754
        textCHolder addDependent:self.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   755
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   756
    ^ textCHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   757
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   758
    "Created: / 16-03-2012 / 12:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   759
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   760
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   761
textCHolder:something
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   762
    "set the 'textBHolder' value holder (automatically generated)"
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   763
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   764
    |oldValue newValue|
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   765
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   766
    textCHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   767
        oldValue := textCHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   768
        textCHolder removeDependent:self.
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   769
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   770
    textCHolder := something.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   771
    textCHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   772
        textCHolder addDependent:self.
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   773
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   774
    newValue := textCHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   775
    oldValue ~~ newValue ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   776
        self update:#value with:newValue from:textCHolder.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   777
    ].
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   778
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   779
    "Created: / 16-03-2012 / 12:14:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   780
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   781
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   782
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   783
!TextDiffTool methodsFor:'change & update'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   784
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   785
codeAspect
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   786
    ^self codeAspectHolder value
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   787
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   788
    "Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   789
    "Modified (format): / 27-07-2012 / 21:56:52 / cg"
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   790
!
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   791
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   792
codeAspect:aSymbol
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   793
    self codeAspectHolder value:aSymbol
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   794
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   795
    "Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   796
    "Created: / 27-07-2012 / 21:56:48 / cg"
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   797
!
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   798
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   799
update:something with:aParameter from:changedObject
3942434287fe initial checkin
vrany
parents:
diff changeset
   800
    "Invoked when an object that I depend upon sends a change notification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   801
3942434287fe initial checkin
vrany
parents:
diff changeset
   802
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   803
    changedObject == textAHolder ifTrue:[
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   804
        textAChanged := true.
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   805
        self updateAfterAorBorCChanged.
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   806
        ^ self.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   807
    ].
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   808
    changedObject == textBHolder ifTrue:[
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   809
        textBChanged := true.
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   810
        self updateAfterAorBorCChanged.
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   811
        ^ self.
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   812
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   813
    changedObject == textCHolder ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   814
        textCChanged := true.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   815
        self updateAfterAorBorCChanged.
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   816
        ^ self.
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   817
    ].
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   818
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   819
    ^super update:something with:aParameter from:changedObject
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   820
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   821
    "Created: / 16-03-2012 / 12:36:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   822
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   823
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   824
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   825
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   826
updateAfterAorBorCChanged
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   827
    "Called whenever one of the texts changes"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   828
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   829
    ^ self subclassResponsibility
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   830
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   831
    "Modified (comment): / 16-03-2012 / 12:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   832
!
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   833
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   834
 !
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   835
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   836
3942434287fe initial checkin
vrany
parents:
diff changeset
   837
!TextDiffTool methodsFor:'hooks'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   838
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   839
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   840
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   841
postBuildDiffView:aScrollableView
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   842
    diffView := aScrollableView.
12269
79f87eee62e5 ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12209
diff changeset
   843
    self setupCodeView: aScrollableView.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   844
3942434287fe initial checkin
vrany
parents:
diff changeset
   845
    "Created: / 30-06-2011 / 20:55:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   846
    "Modified (format): / 27-07-2012 / 21:57:21 / cg"
12269
79f87eee62e5 ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12209
diff changeset
   847
!
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   848
12269
79f87eee62e5 ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12209
diff changeset
   849
setupCodeView: codeView2
79f87eee62e5 ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12209
diff changeset
   850
    codeView2 notNil ifTrue:[
79f87eee62e5 ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12209
diff changeset
   851
        codeView2
79f87eee62e5 ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12209
diff changeset
   852
            languageHolder: self languageHolder;
79f87eee62e5 ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12209
diff changeset
   853
            classHolder: self classHolder;
79f87eee62e5 ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12209
diff changeset
   854
            modeHolder: self codeAspectHolder
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   855
    ].
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   856
12269
79f87eee62e5 ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12209
diff changeset
   857
    "Created: / 26-07-2012 / 19:13:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   858
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   859
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   860
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   861
!TextDiffTool methodsFor:'initialization'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   862
3942434287fe initial checkin
vrany
parents:
diff changeset
   863
initialize
3942434287fe initial checkin
vrany
parents:
diff changeset
   864
    super initialize.
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   865
    textAChanged := textBChanged := false.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   866
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   867
    "Modified: / 19-07-2011 / 19:43:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   868
    "Modified (format): / 27-07-2012 / 21:57:08 / cg"
12318
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   869
!
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   870
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   871
initializeDiffView
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   872
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   873
    self subclassResponsibility
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   874
1dda95be3d40 Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12269
diff changeset
   875
    "Created: / 16-01-2013 / 09:45:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   876
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   877
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   878
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   879
!TextDiffTool methodsFor:'private'!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   880
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   881
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   882
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   883
showNothing
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   884
    self diffSpecHolder value: #nothingSpec
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   885
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   886
    "Created: / 19-07-2011 / 19:34:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   887
    "Modified (format): / 27-07-2012 / 21:57:28 / cg"
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   888
!
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   889
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   890
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   891
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   892
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   893
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   894
 !
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   895
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   896
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   897
!TextDiffTool methodsFor:'testing'!
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   898
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   899
isDiff2
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   900
    ^false
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   901
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   902
    "Created: / 16-03-2012 / 15:21:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   903
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   904
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   905
isDiff3
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   906
    ^false
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   907
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   908
    "Created: / 16-03-2012 / 15:21:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   909
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   910
12198
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   911
isMerge
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   912
    ^false
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   913
12198
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12193
diff changeset
   914
    "Created: / 19-03-2012 / 11:53:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   915
! !
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   916
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   917
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   918
!TextDiffTool class methodsFor:'documentation'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   919
10870
b263e62a7ea1 cleanup
Claus Gittinger <cg@exept.de>
parents: 10868
diff changeset
   920
version
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   921
    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.8 2012-07-27 21:48:04 cg Exp $'
10870
b263e62a7ea1 cleanup
Claus Gittinger <cg@exept.de>
parents: 10868
diff changeset
   922
!
b263e62a7ea1 cleanup
Claus Gittinger <cg@exept.de>
parents: 10868
diff changeset
   923
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   924
version_CVS
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   925
    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.8 2012-07-27 21:48:04 cg Exp $'
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   926
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   927
3942434287fe initial checkin
vrany
parents:
diff changeset
   928
version_SVN
3942434287fe initial checkin
vrany
parents:
diff changeset
   929
    ^ '§Id§'
3942434287fe initial checkin
vrany
parents:
diff changeset
   930
! !
12401
4714b9640528 Merged 235b77901045 and 8332590c5a41 (branch default)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12318 11703
diff changeset
   931