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