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