Tools__TextDiffTool.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Sat, 17 Mar 2012 13:13:35 +0000
branchjv
changeset 12193 c0bdf75cfde5
parent 12190 2a77dea2eceb
child 12198 414e7b69ecda
permissions -rw-r--r--
Improvements in Diff3Tool
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
3942434287fe initial checkin
vrany
parents:
diff changeset
    66
!TextDiffTool class methodsFor:'image specs'!
3942434287fe initial checkin
vrany
parents:
diff changeset
    67
3942434287fe initial checkin
vrany
parents:
diff changeset
    68
versionA24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    69
3942434287fe initial checkin
vrany
parents:
diff changeset
    70
    ^ToolbarIconLibrary versionA24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    71
3942434287fe initial checkin
vrany
parents:
diff changeset
    72
    "Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
    73
!
3942434287fe initial checkin
vrany
parents:
diff changeset
    74
3942434287fe initial checkin
vrany
parents:
diff changeset
    75
versionB24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    76
3942434287fe initial checkin
vrany
parents:
diff changeset
    77
    ^ToolbarIconLibrary versionB24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    78
3942434287fe initial checkin
vrany
parents:
diff changeset
    79
    "Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
    80
!
3942434287fe initial checkin
vrany
parents:
diff changeset
    81
3942434287fe initial checkin
vrany
parents:
diff changeset
    82
versionBase24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    83
3942434287fe initial checkin
vrany
parents:
diff changeset
    84
    ^ToolbarIconLibrary versionBase24x24
3942434287fe initial checkin
vrany
parents:
diff changeset
    85
3942434287fe initial checkin
vrany
parents:
diff changeset
    86
    "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
    87
!
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
versionMerged24x24
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
    90
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
    91
    ^ToolbarIconLibrary versionMerged24x24
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
    92
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
    93
    "Created: / 17-03-2012 / 12:18:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
    94
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
    95
3942434287fe initial checkin
vrany
parents:
diff changeset
    96
!TextDiffTool class methodsFor:'interface specs'!
3942434287fe initial checkin
vrany
parents:
diff changeset
    97
3942434287fe initial checkin
vrany
parents:
diff changeset
    98
windowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
    99
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   100
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   101
3942434287fe initial checkin
vrany
parents:
diff changeset
   102
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   103
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   104
3942434287fe initial checkin
vrany
parents:
diff changeset
   105
    "
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   106
     UIPainter new openOnClass:Tools::TextDiff2Tool andSelector:#windowSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   107
     Tools::TextDiff2Tool new openInterface:#windowSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   108
     Tools::TextDiff2Tool open
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   109
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   110
3942434287fe initial checkin
vrany
parents:
diff changeset
   111
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   112
3942434287fe initial checkin
vrany
parents:
diff changeset
   113
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   114
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   115
        name: windowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   116
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   117
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   118
          label: 'Text Diff Tool'
3942434287fe initial checkin
vrany
parents:
diff changeset
   119
          name: 'Text Diff Tool'
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   120
          labelChannel: titleHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   121
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   122
          bounds: (Rectangle 0 0 640 480)
3942434287fe initial checkin
vrany
parents:
diff changeset
   123
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   124
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   125
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   126
          collection: (
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   127
           (LabelSpec
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   128
              label: 'Label'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   129
              name: 'Label1'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   130
              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
   131
              translateLabel: true
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   132
              labelChannel: labelHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   133
            )
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   134
           (UISubSpecification
3942434287fe initial checkin
vrany
parents:
diff changeset
   135
              name: 'Contents'
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   136
              layout: (LayoutFrame 0 0 30 0 0 1 0 1)
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   137
              minorKey: windowSpecForEmbedding
3942434287fe initial checkin
vrany
parents:
diff changeset
   138
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   139
           )
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
windowSpecForEmbedding
3942434287fe initial checkin
vrany
parents:
diff changeset
   146
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   147
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   148
3942434287fe initial checkin
vrany
parents:
diff changeset
   149
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   150
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   151
3942434287fe initial checkin
vrany
parents:
diff changeset
   152
    "
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   153
     UIPainter new openOnClass:Tools::TextDiff2Tool andSelector:#windowSpecForEmbedding
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   154
     Tools::TextDiff2Tool new openInterface:#windowSpecForEmbedding
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   155
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   156
3942434287fe initial checkin
vrany
parents:
diff changeset
   157
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   158
3942434287fe initial checkin
vrany
parents:
diff changeset
   159
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   160
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   161
        name: windowSpecForEmbedding
3942434287fe initial checkin
vrany
parents:
diff changeset
   162
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   163
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   164
          label: 'Text Diff Tool (for embedding)'
3942434287fe initial checkin
vrany
parents:
diff changeset
   165
          name: 'Text Diff Tool (for embedding)'
3942434287fe initial checkin
vrany
parents:
diff changeset
   166
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   167
          bounds: (Rectangle 0 0 782 506)
3942434287fe initial checkin
vrany
parents:
diff changeset
   168
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   169
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   170
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   171
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   172
           (SubCanvasSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   173
              name: 'Contents'
3942434287fe initial checkin
vrany
parents:
diff changeset
   174
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   175
              hasHorizontalScrollBar: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   176
              hasVerticalScrollBar: false
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   177
              specHolder: contentSpecHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   178
              createNewBuilder: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   179
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   180
           )
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
!TextDiffTool class methodsFor:'interface specs - labels'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   187
3942434287fe initial checkin
vrany
parents:
diff changeset
   188
versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   189
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   190
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   191
3942434287fe initial checkin
vrany
parents:
diff changeset
   192
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   193
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   194
3942434287fe initial checkin
vrany
parents:
diff changeset
   195
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   196
     UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   197
     SVN::DiffViewApp new openInterface:#versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   198
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   199
3942434287fe initial checkin
vrany
parents:
diff changeset
   200
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   201
3942434287fe initial checkin
vrany
parents:
diff changeset
   202
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   203
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   204
        name: versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   205
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   206
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   207
          label: 'Version A'
3942434287fe initial checkin
vrany
parents:
diff changeset
   208
          name: 'Version A'
3942434287fe initial checkin
vrany
parents:
diff changeset
   209
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   210
          bounds: (Rectangle 0 0 300 30)
3942434287fe initial checkin
vrany
parents:
diff changeset
   211
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   212
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   213
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   214
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   215
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   216
              label: 'versionA24x24'
3942434287fe initial checkin
vrany
parents:
diff changeset
   217
              name: 'VersionAIcon'
3942434287fe initial checkin
vrany
parents:
diff changeset
   218
              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
3942434287fe initial checkin
vrany
parents:
diff changeset
   219
              hasCharacterOrientedLabel: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   220
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   221
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   222
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   223
              label: 'Version A'
3942434287fe initial checkin
vrany
parents:
diff changeset
   224
              name: 'VersionALabel'
3942434287fe initial checkin
vrany
parents:
diff changeset
   225
              layout: (LayoutFrame 30 0 0 0 0 1 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   226
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   227
              labelChannel: labelAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   228
              resizeForLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   229
              adjust: left
3942434287fe initial checkin
vrany
parents:
diff changeset
   230
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   231
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   232
         
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
    "Modified: / 30-06-2011 / 20:53:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
   237
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   238
3942434287fe initial checkin
vrany
parents:
diff changeset
   239
versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   240
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   241
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   242
3942434287fe initial checkin
vrany
parents:
diff changeset
   243
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   244
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   245
3942434287fe initial checkin
vrany
parents:
diff changeset
   246
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   247
     UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   248
     SVN::DiffViewApp new openInterface:#versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   249
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   250
3942434287fe initial checkin
vrany
parents:
diff changeset
   251
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   252
3942434287fe initial checkin
vrany
parents:
diff changeset
   253
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   254
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   255
        name: versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   256
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   257
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   258
          label: 'Version B'
3942434287fe initial checkin
vrany
parents:
diff changeset
   259
          name: 'Version B'
3942434287fe initial checkin
vrany
parents:
diff changeset
   260
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   261
          bounds: (Rectangle 0 0 300 30)
3942434287fe initial checkin
vrany
parents:
diff changeset
   262
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   263
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   264
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   265
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   266
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   267
              label: 'versionB24x24'
3942434287fe initial checkin
vrany
parents:
diff changeset
   268
              name: 'VersionBIcon'
3942434287fe initial checkin
vrany
parents:
diff changeset
   269
              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
3942434287fe initial checkin
vrany
parents:
diff changeset
   270
              hasCharacterOrientedLabel: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   271
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   272
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   273
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   274
              label: 'Version B'
3942434287fe initial checkin
vrany
parents:
diff changeset
   275
              name: 'VersionBLabel'
3942434287fe initial checkin
vrany
parents:
diff changeset
   276
              layout: (LayoutFrame 30 0 0 0 0 1 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   277
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   278
              labelChannel: labelBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   279
              resizeForLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   280
              adjust: left
3942434287fe initial checkin
vrany
parents:
diff changeset
   281
              useDynamicPreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   282
              usePreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   283
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   284
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   285
         
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
    "Modified: / 30-06-2011 / 20:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
   290
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   291
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   292
versionCLabelSpec
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   293
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   294
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   295
3942434287fe initial checkin
vrany
parents:
diff changeset
   296
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   297
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   298
3942434287fe initial checkin
vrany
parents:
diff changeset
   299
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   300
     UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBaseLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   301
     SVN::DiffViewApp new openInterface:#versionBaseLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   302
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   303
3942434287fe initial checkin
vrany
parents:
diff changeset
   304
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   305
3942434287fe initial checkin
vrany
parents:
diff changeset
   306
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   307
     #(FullSpec
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   308
        name: versionCLabelSpec
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   309
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   310
       (WindowSpec
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   311
          label: 'Version C'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   312
          name: 'Version C'
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   313
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   314
          bounds: (Rectangle 0 0 300 30)
3942434287fe initial checkin
vrany
parents:
diff changeset
   315
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   316
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   317
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   318
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   319
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   320
              label: 'versionBase24x24'
3942434287fe initial checkin
vrany
parents:
diff changeset
   321
              name: 'VersionBaseIcon'
3942434287fe initial checkin
vrany
parents:
diff changeset
   322
              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
3942434287fe initial checkin
vrany
parents:
diff changeset
   323
              hasCharacterOrientedLabel: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   324
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   325
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   326
           (LabelSpec
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   327
              label: 'Version C'
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   328
              name: 'VersionCLabel'
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   329
              layout: (LayoutFrame 30 0 5 0 191 0 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   330
              translateLabel: true
12190
2a77dea2eceb Improvements in Diff3CodeiView2 - now it highlights differences
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12180
diff changeset
   331
              labelChannel: labelCHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   332
              resizeForLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   333
              adjust: left
3942434287fe initial checkin
vrany
parents:
diff changeset
   334
              useDynamicPreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   335
              usePreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   336
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   337
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   338
         
3942434287fe initial checkin
vrany
parents:
diff changeset
   339
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   340
      )
3942434287fe initial checkin
vrany
parents:
diff changeset
   341
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   342
    "Created: / 16-03-2012 / 12:16:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   343
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   344
3942434287fe initial checkin
vrany
parents:
diff changeset
   345
!TextDiffTool class methodsFor:'plugIn spec'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   346
3942434287fe initial checkin
vrany
parents:
diff changeset
   347
aspectSelectors
3942434287fe initial checkin
vrany
parents:
diff changeset
   348
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   349
    ^#( 
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   350
        #labelHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   351
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   352
        #labelAHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   353
        #labelBHolde
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   354
        #labelCHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   355
3942434287fe initial checkin
vrany
parents:
diff changeset
   356
        #textAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   357
        #textBHolder
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   358
        #textCHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   359
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   360
        #languageHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   361
        #codeAspectHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   362
    )
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   363
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   364
    "Created: / 16-03-2012 / 12:18:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   365
! !
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   366
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   367
!TextDiffTool methodsFor:'accessing'!
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   368
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   369
label: aString
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   370
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   371
    ^self labelHolder value: aString
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   372
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   373
    "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
   374
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   375
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   376
labelA: aString
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   377
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   378
    ^self labelAHolder value: aString
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   379
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   380
    "Created: / 16-03-2012 / 13:05:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   381
!
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   382
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   383
labelB: aString
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   384
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   385
    ^self labelBHolder value: aString
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   386
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   387
    "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   388
    "Created: / 30-08-2011 / 09:42:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   389
!
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   390
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   391
labelC: aString
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   392
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   393
    ^self labelCHolder value: aString
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   394
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   395
    "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
   396
    "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
   397
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   398
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   399
textA: aString
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   400
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   401
    ^self textAHolder value: aString
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   402
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   403
    "Created: / 30-08-2011 / 09:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   404
!
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   405
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   406
textB: aString
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   407
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   408
    ^self textBHolder value: aString
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   409
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   410
    "Created: / 30-08-2011 / 09:43:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   411
!
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   412
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   413
textC: aString
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   414
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   415
    ^self textCHolder value: aString
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   416
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   417
    "Created: / 16-03-2012 / 13:05:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   418
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   419
3942434287fe initial checkin
vrany
parents:
diff changeset
   420
!TextDiffTool methodsFor:'aspects'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   421
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   422
classHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   423
    "return/create the 'classHolder' value holder (automatically generated)"
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   424
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   425
    classHolder isNil ifTrue:[
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   426
        classHolder := ValueHolder new.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   427
    ].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   428
    ^ classHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   429
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   430
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   431
classHolder: aValueHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   432
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   433
    classHolder := aValueHolder.
12180
8ff612c17953 stx fixes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12179
diff changeset
   434
    "codeView notNil ifTrue:[codeView classHolder: aValueHolder]."
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   435
    diffView notNil ifTrue:[diffView classHolder: aValueHolder].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   436
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   437
    "Modified: / 19-07-2011 / 12:54:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   438
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   439
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   440
codeAspectHolder
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   441
    "return/create the 'codeAspectHolder' value holder (automatically generated)"
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   442
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   443
    codeAspectHolder isNil ifTrue:[
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   444
        codeAspectHolder := ValueHolder with: #expression.
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   445
    ].
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   446
    ^ codeAspectHolder
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   447
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   448
    "Modified: / 19-07-2011 / 19:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   449
!
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   450
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   451
codeAspectHolder:something
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   452
    "set the 'codeAspectHolder' value holder (automatically generated)"
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   453
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   454
    codeAspectHolder := something.
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   455
!
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   456
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   457
contentSpecHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   458
    "return/create the 'contentSpecHolder' value holder (automatically generated)"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   459
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   460
    contentSpecHolder isNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   461
        contentSpecHolder := ValueHolder new.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   462
        contentSpecHolder addDependent:self.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   463
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   464
    ^ contentSpecHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   465
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   466
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   467
contentSpecHolder:something
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   468
    "set the 'contentSpecHolder' value holder (automatically generated)"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   469
3942434287fe initial checkin
vrany
parents:
diff changeset
   470
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   471
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   472
    contentSpecHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   473
        oldValue := contentSpecHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   474
        contentSpecHolder removeDependent:self.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   475
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   476
    contentSpecHolder := something.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   477
    contentSpecHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   478
        contentSpecHolder addDependent:self.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   479
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   480
    newValue := contentSpecHolder value.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   481
    oldValue ~~ newValue ifTrue:[
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   482
        self update:#value with:newValue from:contentSpecHolder.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   483
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   484
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   485
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   486
labelHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   487
    "return/create the 'labelAHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   488
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   489
    labelHolder isNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   490
        labelHolder := ValueHolder with:'Text diff'.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   491
        "/titleHolder addDependent:self.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   492
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   493
    ^ labelHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   494
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   495
    "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
   496
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   497
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   498
languageHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   499
    "return/create the 'languageHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   500
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   501
    languageHolder isNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   502
        languageHolder := ValueHolder new.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   503
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   504
    ^ languageHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   505
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   506
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   507
languageHolder:aValueHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   508
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   509
    languageHolder := aValueHolder.
12180
8ff612c17953 stx fixes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12179
diff changeset
   510
    "codeView notNil ifTrue:[codeView languageHolder: aValueHolder]."
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   511
    diffView notNil ifTrue:[diffView languageHolder: aValueHolder].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   512
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   513
    "Modified: / 19-07-2011 / 12:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   514
! !
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   515
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   516
!TextDiffTool methodsFor:'aspects-versions'!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   517
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   518
labelAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   519
    "return/create the 'labelAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   520
3942434287fe initial checkin
vrany
parents:
diff changeset
   521
    labelAHolder isNil ifTrue:[
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   522
        labelAHolder := ValueHolder with:'Version A'.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   523
        labelAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   524
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   525
    ^ labelAHolder
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   526
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   527
    "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
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
labelAHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   531
    "set the 'labelAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   532
3942434287fe initial checkin
vrany
parents:
diff changeset
   533
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   534
3942434287fe initial checkin
vrany
parents:
diff changeset
   535
    labelAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   536
        oldValue := labelAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   537
        labelAHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   538
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   539
    labelAHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   540
    labelAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   541
        labelAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   542
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   543
    newValue := labelAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   544
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   545
        self update:#value with:newValue from:labelAHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   546
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   547
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   548
3942434287fe initial checkin
vrany
parents:
diff changeset
   549
labelBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   550
    "return/create the 'labelBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   551
3942434287fe initial checkin
vrany
parents:
diff changeset
   552
    labelBHolder isNil ifTrue:[
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   553
        labelBHolder := ValueHolder with:'Version B'.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   554
        labelBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   555
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   556
    ^ labelBHolder
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   557
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   558
    "Modified: / 19-07-2011 / 11:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   559
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   560
3942434287fe initial checkin
vrany
parents:
diff changeset
   561
labelBHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   562
    "set the 'labelBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   563
3942434287fe initial checkin
vrany
parents:
diff changeset
   564
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   565
3942434287fe initial checkin
vrany
parents:
diff changeset
   566
    labelBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   567
        oldValue := labelBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   568
        labelBHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   569
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   570
    labelBHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   571
    labelBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   572
        labelBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   573
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   574
    newValue := labelBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   575
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   576
        self update:#value with:newValue from:labelBHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   577
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   578
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   579
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   580
labelCHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   581
    "return/create the 'labelBHolder' value holder (automatically generated)"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   582
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   583
    labelCHolder isNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   584
        labelCHolder := ValueHolder with:'Version Base'.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   585
        labelCHolder addDependent:self.
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   586
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   587
    ^ labelCHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   588
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   589
    "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
   590
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   591
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   592
labelCHolder:something
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   593
    "set the 'labelBHolder' value holder (automatically generated)"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   594
3942434287fe initial checkin
vrany
parents:
diff changeset
   595
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   596
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   597
    labelCHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   598
        oldValue := labelCHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   599
        labelCHolder removeDependent:self.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   600
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   601
    labelCHolder := something.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   602
    labelCHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   603
        labelCHolder addDependent:self.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   604
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   605
    newValue := labelCHolder value.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   606
    oldValue ~~ newValue ifTrue:[
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   607
        self update:#value with:newValue from:labelCHolder.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   608
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   609
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   610
    "Created: / 16-03-2012 / 12:15:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   611
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   612
3942434287fe initial checkin
vrany
parents:
diff changeset
   613
textAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   614
    "return/create the 'textAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   615
3942434287fe initial checkin
vrany
parents:
diff changeset
   616
    textAHolder isNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   617
        textAHolder := ValueHolder new.
3942434287fe initial checkin
vrany
parents:
diff changeset
   618
        textAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   619
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   620
    ^ textAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   621
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   622
3942434287fe initial checkin
vrany
parents:
diff changeset
   623
textAHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   624
    "set the 'textAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   625
3942434287fe initial checkin
vrany
parents:
diff changeset
   626
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   627
3942434287fe initial checkin
vrany
parents:
diff changeset
   628
    textAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   629
        oldValue := textAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   630
        textAHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   631
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   632
    textAHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   633
    textAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   634
        textAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   635
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   636
    newValue := textAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   637
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   638
        self update:#value with:newValue from:textAHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   639
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   640
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   641
3942434287fe initial checkin
vrany
parents:
diff changeset
   642
textBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   643
    "return/create the 'textBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   644
3942434287fe initial checkin
vrany
parents:
diff changeset
   645
    textBHolder isNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   646
        textBHolder := ValueHolder new.
3942434287fe initial checkin
vrany
parents:
diff changeset
   647
        textBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   648
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   649
    ^ textBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   650
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   651
3942434287fe initial checkin
vrany
parents:
diff changeset
   652
textBHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   653
    "set the 'textBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   654
3942434287fe initial checkin
vrany
parents:
diff changeset
   655
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   656
3942434287fe initial checkin
vrany
parents:
diff changeset
   657
    textBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   658
        oldValue := textBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   659
        textBHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   660
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   661
    textBHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   662
    textBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   663
        textBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   664
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   665
    newValue := textBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   666
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   667
        self update:#value with:newValue from:textBHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   668
    ].
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   669
!
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   670
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   671
textCHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   672
    "return/create the 'textBHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   673
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   674
    textCHolder isNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   675
        textCHolder := ValueHolder new.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   676
        textCHolder addDependent:self.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   677
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   678
    ^ textCHolder
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   679
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   680
    "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
   681
!
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   682
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   683
textCHolder:something
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   684
    "set the 'textBHolder' value holder (automatically generated)"
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   685
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   686
    |oldValue newValue|
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   687
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   688
    textCHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   689
        oldValue := textCHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   690
        textCHolder removeDependent:self.
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   691
    ].
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   692
    textCHolder := something.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   693
    textCHolder notNil ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   694
        textCHolder addDependent:self.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   695
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   696
    newValue := textCHolder value.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   697
    oldValue ~~ newValue ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   698
        self update:#value with:newValue from:textCHolder.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   699
    ].
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   700
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   701
    "Created: / 16-03-2012 / 12:14:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   702
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   703
3942434287fe initial checkin
vrany
parents:
diff changeset
   704
!TextDiffTool methodsFor:'change & update'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   705
3942434287fe initial checkin
vrany
parents:
diff changeset
   706
update:something with:aParameter from:changedObject
3942434287fe initial checkin
vrany
parents:
diff changeset
   707
    "Invoked when an object that I depend upon sends a change notification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   708
3942434287fe initial checkin
vrany
parents:
diff changeset
   709
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   710
    changedObject == textAHolder ifTrue:[
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   711
        textAChanged := true.
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   712
        self updateAfterAorBorCChanged.
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   713
        ^ self.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   714
    ].
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   715
    changedObject == textBHolder ifTrue:[
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   716
        textBChanged := true.
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   717
        self updateAfterAorBorCChanged.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   718
        ^ self.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   719
    ].
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   720
    changedObject == textCHolder ifTrue:[
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   721
        textCChanged := true.
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   722
        self updateAfterAorBorCChanged.
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   723
        ^ self.
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   724
    ].
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   725
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   726
    ^super update:something with:aParameter from:changedObject
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   727
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   728
    "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
   729
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   730
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   731
updateAfterAorBorCChanged
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   732
    "Called whenever one of the texts changes"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   733
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   734
    ^ self subclassResponsibility
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   735
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   736
    "Modified (comment): / 16-03-2012 / 12:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   737
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   738
3942434287fe initial checkin
vrany
parents:
diff changeset
   739
!TextDiffTool methodsFor:'hooks'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   740
3942434287fe initial checkin
vrany
parents:
diff changeset
   741
postBuildDiffView:aScrollableView
3942434287fe initial checkin
vrany
parents:
diff changeset
   742
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   743
    diffView := aScrollableView.
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   744
    diffView notNil ifTrue:[
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   745
        diffView languageHolder: self languageHolder.
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   746
        diffView classHolder: self classHolder.
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   747
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   748
    ].
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   749
3942434287fe initial checkin
vrany
parents:
diff changeset
   750
    "Created: / 30-06-2011 / 20:55:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
   751
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   752
3942434287fe initial checkin
vrany
parents:
diff changeset
   753
!TextDiffTool methodsFor:'initialization'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   754
3942434287fe initial checkin
vrany
parents:
diff changeset
   755
initialize
3942434287fe initial checkin
vrany
parents:
diff changeset
   756
3942434287fe initial checkin
vrany
parents:
diff changeset
   757
    super initialize.
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   758
    textAChanged := textBChanged := textBChanged := false.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   759
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   760
    "Modified: / 16-03-2012 / 12:40:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   761
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   762
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   763
!TextDiffTool methodsFor:'testing'!
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   764
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   765
isDiff2
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   766
    ^false
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   767
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   768
    "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
   769
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   770
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   771
isDiff3
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   772
    ^false
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   773
12179
47f98e7d6de1 Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   774
    "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
   775
! !
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   776
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   777
!TextDiffTool class methodsFor:'documentation'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   778
3942434287fe initial checkin
vrany
parents:
diff changeset
   779
version_SVN
12193
c0bdf75cfde5 Improvements in Diff3Tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12190
diff changeset
   780
    ^ '$Id: Tools__TextDiffTool.st 7939 2012-03-17 13:13:35Z vranyj1 $'
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   781
! !