Tools__TextDiffTool.st
author Claus Gittinger <cg@exept.de>
Mon, 22 Jul 2013 11:38:33 +0200
changeset 13197 74bdfa87c71d
parent 12574 4b07dbee292f
child 12626 7ae48abfedac
child 13861 85705b58dba5
permissions -rw-r--r--
class: DebugView comment/format in: #doStep: changed: #stepOrNext don't step into breakpoints (skip)
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
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
    17
	instanceVariableNames:'titleHolder labelAHolder textAHolder labelBHolder textBHolder
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
    18
		classHolder languageHolder codeAspectHolder showDiffHolder
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
    19
		diffSpecHolder diffView textAChanged textBChanged 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
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   129
nothingSpec
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   130
    "This resource specification was automatically generated
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   131
     by the UIPainter of ST/X."
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   132
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   133
    "Do not manually edit this!! If it is corrupted,
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   134
     the UIPainter may not be able to read the specification."
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   135
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   136
    "
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   137
     UIPainter new openOnClass:Tools::TextDiffTool andSelector:#nothingSpec
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   138
     Tools::TextDiffTool new openInterface:#nothingSpec
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   139
    "
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   140
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   141
    <resource: #canvas>
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   142
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   143
    ^ 
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   144
     #(FullSpec
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   145
        name: nothingSpec
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   146
        window: 
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   147
       (WindowSpec
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   148
          label: 'NewApplication'
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   149
          name: 'NewApplication'
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   150
          bounds: (Rectangle 0 0 300 300)
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   151
        )
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   152
        component: 
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   153
       (SpecCollection
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   154
          collection: (
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   155
           (LabelSpec
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   156
              label: 'Nothing selected...'
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   157
              name: 'Label1'
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   158
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   159
              translateLabel: true
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   160
            )
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   161
           )
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   162
         
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   163
        )
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   164
      )
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   165
!
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   166
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   167
textViewSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   168
    "This resource specification was automatically generated
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   169
     by the UIPainter of ST/X."
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   170
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   171
    "Do not manually edit this!! If it is corrupted,
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   172
     the UIPainter may not be able to read the specification."
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   173
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   174
    "
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   175
     UIPainter new openOnClass:Tools::TextDiffTool andSelector:#textViewSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   176
     Tools::TextDiffTool new openInterface:#textViewSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   177
    "
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   178
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   179
    <resource: #canvas>
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   180
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   181
    ^ 
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   182
     #(FullSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   183
        name: 'textViewSpec'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   184
        window: 
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   185
       (WindowSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   186
          label: 'Text Only'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   187
          name: 'Text Only'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   188
          min: (Point 10 10)
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   189
          bounds: (Rectangle 0 0 782 506)
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   190
        )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   191
        component: 
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   192
       (SpecCollection
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   193
          collection: (
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   194
           (ArbitraryComponentSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   195
              name: 'CodeView'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   196
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   197
              model: textAHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   198
              hasHorizontalScrollBar: false
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   199
              hasVerticalScrollBar: false
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   200
              autoHideScrollBars: false
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   201
              hasBorder: false
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   202
              component: #'Tools::CodeView2'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   203
              postBuildCallback: postBuildCodeView:
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   204
            )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   205
           )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   206
         
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   207
        )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   208
      )
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
versionAOnlySpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   212
    "This resource specification was automatically generated
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   213
     by the UIPainter of ST/X."
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   214
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   215
    "Do not manually edit this!! If it is corrupted,
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   216
     the UIPainter may not be able to read the specification."
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   217
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   218
    "
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   219
     UIPainter new openOnClass:Tools::TextDiffTool andSelector:#versionAOnlySpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   220
     Tools::TextDiffTool new openInterface:#versionAOnlySpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   221
    "
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   222
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   223
    <resource: #canvas>
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   224
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   225
    ^ 
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   226
     #(FullSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   227
        name: versionAOnlySpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   228
        window: 
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   229
       (WindowSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   230
          label: 'Version A Only'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   231
          name: 'Version A Only'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   232
          min: (Point 10 10)
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   233
          bounds: (Rectangle 0 0 782 506)
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   234
        )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   235
        component: 
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   236
       (SpecCollection
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   237
          collection: (
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   238
           (UISubSpecification
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   239
              name: 'VersionA'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   240
              layout: (LayoutFrame 0 0 0 0 0 1 30 0)
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   241
              minorKey: versionALabelSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   242
            )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   243
           (UISubSpecification
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   244
              name: 'Text'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   245
              layout: (LayoutFrame 0 0 30 0 0 1 0 1)
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   246
              minorKey: textViewSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   247
            )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   248
           )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   249
         
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   250
        )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   251
      )
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
versionBOnlySpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   255
    "This resource specification was automatically generated
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   256
     by the UIPainter of ST/X."
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   257
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   258
    "Do not manually edit this!! If it is corrupted,
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   259
     the UIPainter may not be able to read the specification."
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   260
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   261
    "
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   262
     UIPainter new openOnClass:Tools::TextDiffTool andSelector:#versionBOnlySpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   263
     Tools::TextDiffTool new openInterface:#versionBOnlySpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   264
    "
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   265
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   266
    <resource: #canvas>
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   267
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   268
    ^ 
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   269
     #(FullSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   270
        name: 'versionBOnlySpec'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   271
        window: 
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   272
       (WindowSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   273
          label: 'Version B Only'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   274
          name: 'Version B Only'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   275
          min: (Point 10 10)
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   276
          bounds: (Rectangle 0 0 782 506)
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   277
        )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   278
        component: 
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   279
       (SpecCollection
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   280
          collection: (
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   281
           (UISubSpecification
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   282
              name: 'VersionB'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   283
              layout: (LayoutFrame 0 0 0 0 0 1 30 0)
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   284
              minorKey: versionBLabelSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   285
            )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   286
          (UISubSpecification
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   287
              name: 'Text'
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   288
              layout: (LayoutFrame 0 0 30 0 0 1 0 1)
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   289
              minorKey: textViewSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   290
            )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   291
           )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   292
         
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   293
        )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   294
      )
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   295
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   296
    "Created: / 19-07-2011 / 10:06:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   297
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   298
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   299
windowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   300
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   301
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   302
3942434287fe initial checkin
vrany
parents:
diff changeset
   303
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   304
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   305
3942434287fe initial checkin
vrany
parents:
diff changeset
   306
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   307
     UIPainter new openOnClass:Tools::TextDiffTool andSelector:#windowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   308
     Tools::TextDiffTool new openInterface:#windowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   309
     Tools::TextDiffTool open
3942434287fe initial checkin
vrany
parents:
diff changeset
   310
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   311
3942434287fe initial checkin
vrany
parents:
diff changeset
   312
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   313
3942434287fe initial checkin
vrany
parents:
diff changeset
   314
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   315
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   316
        name: windowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   317
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   318
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   319
          label: 'Text Diff Tool'
3942434287fe initial checkin
vrany
parents:
diff changeset
   320
          name: 'Text Diff Tool'
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   321
          labelChannel: titleHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   322
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   323
          bounds: (Rectangle 0 0 640 480)
3942434287fe initial checkin
vrany
parents:
diff changeset
   324
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   325
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   326
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   327
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   328
           (UISubSpecification
3942434287fe initial checkin
vrany
parents:
diff changeset
   329
              name: 'Contents'
3942434287fe initial checkin
vrany
parents:
diff changeset
   330
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   331
              minorKey: windowSpecForEmbedding
3942434287fe initial checkin
vrany
parents:
diff changeset
   332
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   333
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   334
         
3942434287fe initial checkin
vrany
parents:
diff changeset
   335
        )
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
windowSpecForEmbedding
3942434287fe initial checkin
vrany
parents:
diff changeset
   340
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   341
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   342
3942434287fe initial checkin
vrany
parents:
diff changeset
   343
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   344
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   345
3942434287fe initial checkin
vrany
parents:
diff changeset
   346
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   347
     UIPainter new openOnClass:Tools::TextDiffTool andSelector:#windowSpecForEmbedding
3942434287fe initial checkin
vrany
parents:
diff changeset
   348
     Tools::TextDiffTool new openInterface:#windowSpecForEmbedding
3942434287fe initial checkin
vrany
parents:
diff changeset
   349
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   350
3942434287fe initial checkin
vrany
parents:
diff changeset
   351
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   352
3942434287fe initial checkin
vrany
parents:
diff changeset
   353
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   354
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   355
        name: windowSpecForEmbedding
3942434287fe initial checkin
vrany
parents:
diff changeset
   356
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   357
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   358
          label: 'Text Diff Tool (for embedding)'
3942434287fe initial checkin
vrany
parents:
diff changeset
   359
          name: 'Text Diff Tool (for embedding)'
3942434287fe initial checkin
vrany
parents:
diff changeset
   360
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   361
          bounds: (Rectangle 0 0 782 506)
3942434287fe initial checkin
vrany
parents:
diff changeset
   362
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   363
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   364
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   365
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   366
           (SubCanvasSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   367
              name: 'Contents'
3942434287fe initial checkin
vrany
parents:
diff changeset
   368
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   369
              hasHorizontalScrollBar: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   370
              hasVerticalScrollBar: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   371
              specHolder: diffSpecHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   372
              createNewBuilder: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   373
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   374
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   375
         
3942434287fe initial checkin
vrany
parents:
diff changeset
   376
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   377
      )
3942434287fe initial checkin
vrany
parents:
diff changeset
   378
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   379
3942434287fe initial checkin
vrany
parents:
diff changeset
   380
!TextDiffTool class methodsFor:'interface specs - labels'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   381
3942434287fe initial checkin
vrany
parents:
diff changeset
   382
versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   383
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   384
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   385
3942434287fe initial checkin
vrany
parents:
diff changeset
   386
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   387
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   388
3942434287fe initial checkin
vrany
parents:
diff changeset
   389
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   390
     UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   391
     SVN::DiffViewApp new openInterface:#versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   392
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   393
3942434287fe initial checkin
vrany
parents:
diff changeset
   394
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   395
3942434287fe initial checkin
vrany
parents:
diff changeset
   396
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   397
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   398
        name: versionALabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   399
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   400
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   401
          label: 'Version A'
3942434287fe initial checkin
vrany
parents:
diff changeset
   402
          name: 'Version A'
3942434287fe initial checkin
vrany
parents:
diff changeset
   403
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   404
          bounds: (Rectangle 0 0 300 30)
3942434287fe initial checkin
vrany
parents:
diff changeset
   405
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   406
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   407
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   408
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   409
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   410
              label: 'versionA24x24'
3942434287fe initial checkin
vrany
parents:
diff changeset
   411
              name: 'VersionAIcon'
3942434287fe initial checkin
vrany
parents:
diff changeset
   412
              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
3942434287fe initial checkin
vrany
parents:
diff changeset
   413
              hasCharacterOrientedLabel: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   414
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   415
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   416
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   417
              label: 'Version A'
3942434287fe initial checkin
vrany
parents:
diff changeset
   418
              name: 'VersionALabel'
3942434287fe initial checkin
vrany
parents:
diff changeset
   419
              layout: (LayoutFrame 30 0 0 0 0 1 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   420
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   421
              labelChannel: labelAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   422
              resizeForLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   423
              adjust: left
3942434287fe initial checkin
vrany
parents:
diff changeset
   424
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   425
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   426
         
3942434287fe initial checkin
vrany
parents:
diff changeset
   427
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   428
      )
3942434287fe initial checkin
vrany
parents:
diff changeset
   429
3942434287fe initial checkin
vrany
parents:
diff changeset
   430
    "Modified: / 30-06-2011 / 20:53:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
   431
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   432
3942434287fe initial checkin
vrany
parents:
diff changeset
   433
versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   434
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   435
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   436
3942434287fe initial checkin
vrany
parents:
diff changeset
   437
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   438
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   439
3942434287fe initial checkin
vrany
parents:
diff changeset
   440
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   441
     UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   442
     SVN::DiffViewApp new openInterface:#versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   443
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   444
3942434287fe initial checkin
vrany
parents:
diff changeset
   445
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   446
3942434287fe initial checkin
vrany
parents:
diff changeset
   447
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   448
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   449
        name: versionBLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   450
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   451
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   452
          label: 'Version B'
3942434287fe initial checkin
vrany
parents:
diff changeset
   453
          name: 'Version B'
3942434287fe initial checkin
vrany
parents:
diff changeset
   454
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   455
          bounds: (Rectangle 0 0 300 30)
3942434287fe initial checkin
vrany
parents:
diff changeset
   456
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   457
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   458
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   459
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   460
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   461
              label: 'versionB24x24'
3942434287fe initial checkin
vrany
parents:
diff changeset
   462
              name: 'VersionBIcon'
3942434287fe initial checkin
vrany
parents:
diff changeset
   463
              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
3942434287fe initial checkin
vrany
parents:
diff changeset
   464
              hasCharacterOrientedLabel: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   465
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   466
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   467
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   468
              label: 'Version B'
3942434287fe initial checkin
vrany
parents:
diff changeset
   469
              name: 'VersionBLabel'
3942434287fe initial checkin
vrany
parents:
diff changeset
   470
              layout: (LayoutFrame 30 0 0 0 0 1 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   471
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   472
              labelChannel: labelBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   473
              resizeForLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   474
              adjust: left
3942434287fe initial checkin
vrany
parents:
diff changeset
   475
              useDynamicPreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   476
              usePreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   477
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   478
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   479
         
3942434287fe initial checkin
vrany
parents:
diff changeset
   480
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   481
      )
3942434287fe initial checkin
vrany
parents:
diff changeset
   482
3942434287fe initial checkin
vrany
parents:
diff changeset
   483
    "Modified: / 30-06-2011 / 20:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
   484
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   485
3942434287fe initial checkin
vrany
parents:
diff changeset
   486
versionBaseLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   487
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   488
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   489
3942434287fe initial checkin
vrany
parents:
diff changeset
   490
    "Do not manually edit this!! If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   491
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   492
3942434287fe initial checkin
vrany
parents:
diff changeset
   493
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   494
     UIPainter new openOnClass:SVN::DiffViewApp andSelector:#versionBaseLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   495
     SVN::DiffViewApp new openInterface:#versionBaseLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   496
    "
3942434287fe initial checkin
vrany
parents:
diff changeset
   497
3942434287fe initial checkin
vrany
parents:
diff changeset
   498
    <resource: #canvas>
3942434287fe initial checkin
vrany
parents:
diff changeset
   499
3942434287fe initial checkin
vrany
parents:
diff changeset
   500
    ^ 
3942434287fe initial checkin
vrany
parents:
diff changeset
   501
     #(FullSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   502
        name: versionBaseLabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   503
        window: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   504
       (WindowSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   505
          label: 'Version Base'
3942434287fe initial checkin
vrany
parents:
diff changeset
   506
          name: 'Version Base'
3942434287fe initial checkin
vrany
parents:
diff changeset
   507
          min: (Point 10 10)
3942434287fe initial checkin
vrany
parents:
diff changeset
   508
          bounds: (Rectangle 0 0 300 30)
3942434287fe initial checkin
vrany
parents:
diff changeset
   509
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   510
        component: 
3942434287fe initial checkin
vrany
parents:
diff changeset
   511
       (SpecCollection
3942434287fe initial checkin
vrany
parents:
diff changeset
   512
          collection: (
3942434287fe initial checkin
vrany
parents:
diff changeset
   513
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   514
              label: 'versionBase24x24'
3942434287fe initial checkin
vrany
parents:
diff changeset
   515
              name: 'VersionBaseIcon'
3942434287fe initial checkin
vrany
parents:
diff changeset
   516
              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
3942434287fe initial checkin
vrany
parents:
diff changeset
   517
              hasCharacterOrientedLabel: false
3942434287fe initial checkin
vrany
parents:
diff changeset
   518
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   519
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   520
           (LabelSpec
3942434287fe initial checkin
vrany
parents:
diff changeset
   521
              label: 'Version Base'
3942434287fe initial checkin
vrany
parents:
diff changeset
   522
              name: 'VersionBaseLabel'
3942434287fe initial checkin
vrany
parents:
diff changeset
   523
              layout: (LayoutFrame 30 0 5 0 191 0 0 1)
3942434287fe initial checkin
vrany
parents:
diff changeset
   524
              translateLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   525
              labelChannel: versionBaseLabelAspect
3942434287fe initial checkin
vrany
parents:
diff changeset
   526
              resizeForLabel: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   527
              adjust: left
3942434287fe initial checkin
vrany
parents:
diff changeset
   528
              useDynamicPreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   529
              usePreferredWidth: true
3942434287fe initial checkin
vrany
parents:
diff changeset
   530
            )
3942434287fe initial checkin
vrany
parents:
diff changeset
   531
           )
3942434287fe initial checkin
vrany
parents:
diff changeset
   532
         
3942434287fe initial checkin
vrany
parents:
diff changeset
   533
        )
3942434287fe initial checkin
vrany
parents:
diff changeset
   534
      )
3942434287fe initial checkin
vrany
parents:
diff changeset
   535
3942434287fe initial checkin
vrany
parents:
diff changeset
   536
    "Modified: / 24-03-2010 / 20:51:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
   537
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   538
3942434287fe initial checkin
vrany
parents:
diff changeset
   539
!TextDiffTool class methodsFor:'plugIn spec'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   540
3942434287fe initial checkin
vrany
parents:
diff changeset
   541
aspectSelectors
3942434287fe initial checkin
vrany
parents:
diff changeset
   542
    "This resource specification was automatically generated
3942434287fe initial checkin
vrany
parents:
diff changeset
   543
     by the UIPainter of ST/X."
3942434287fe initial checkin
vrany
parents:
diff changeset
   544
3942434287fe initial checkin
vrany
parents:
diff changeset
   545
    "Do not manually edit this. If it is corrupted,
3942434287fe initial checkin
vrany
parents:
diff changeset
   546
     the UIPainter may not be able to read the specification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   547
3942434287fe initial checkin
vrany
parents:
diff changeset
   548
    "Return a description of exported aspects;
3942434287fe initial checkin
vrany
parents:
diff changeset
   549
     these can be connected to aspects of an embedding application
3942434287fe initial checkin
vrany
parents:
diff changeset
   550
     (if this app is embedded in a subCanvas)."
3942434287fe initial checkin
vrany
parents:
diff changeset
   551
3942434287fe initial checkin
vrany
parents:
diff changeset
   552
    ^ #(
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   553
        #classHolder
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   554
        #codeAspectHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   555
        #labelAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   556
        #labelBHolder
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   557
        #languageHolder
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   558
        #showDiffHolder
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   559
        #textAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   560
        #textBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   561
      ).
3942434287fe initial checkin
vrany
parents:
diff changeset
   562
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   563
! !
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   564
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   565
!TextDiffTool methodsFor:'accessing'!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   566
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   567
labelA: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   568
    ^self labelAHolder value: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   569
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   570
    "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   571
    "Created: / 30-08-2011 / 09:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   572
    "Modified (format): / 27-07-2012 / 21:57:10 / cg"
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   573
!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   574
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   575
labelB: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   576
    ^self labelBHolder value: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   577
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   578
    "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   579
    "Created: / 30-08-2011 / 09:42:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   580
    "Modified (format): / 27-07-2012 / 21:57:15 / cg"
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   581
!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   582
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   583
textA: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   584
    ^self textAHolder value: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   585
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   586
    "Created: / 30-08-2011 / 09:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   587
    "Modified (format): / 27-07-2012 / 21:57:37 / cg"
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   588
!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   589
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   590
textB: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   591
    ^self textBHolder value: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   592
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   593
    "Created: / 30-08-2011 / 09:43:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   594
    "Modified (format): / 27-07-2012 / 21:57:41 / cg"
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   595
!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   596
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   597
title: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   598
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   599
    ^self titleHolder value: aString
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   600
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   601
    "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   602
    "Created: / 30-08-2011 / 09:45:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   603
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   604
3942434287fe initial checkin
vrany
parents:
diff changeset
   605
!TextDiffTool methodsFor:'aspects'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   606
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   607
classHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   608
    "return/create the 'classHolder' value holder (automatically generated)"
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   609
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   610
    classHolder isNil ifTrue:[
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   611
        classHolder := ValueHolder new.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   612
    ].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   613
    ^ classHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   614
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   615
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   616
classHolder: aValueHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   617
    classHolder := aValueHolder.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   618
    codeView notNil ifTrue:[codeView classHolder: aValueHolder].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   619
    diffView notNil ifTrue:[diffView classHolder: aValueHolder].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   620
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   621
    "Modified: / 19-07-2011 / 12:54:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   622
    "Modified (format): / 27-07-2012 / 21:57:00 / cg"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   623
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   624
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   625
codeAspectHolder
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   626
    "return/create the 'codeAspectHolder' value holder (automatically generated)"
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   627
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   628
    codeAspectHolder isNil ifTrue:[
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   629
        codeAspectHolder := ValueHolder with: (SyntaxHighlighter codeAspectExpression).
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   630
        codeAspectHolder addDependent:self
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   631
    ].
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   632
    ^ codeAspectHolder
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   633
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   634
    "Modified: / 19-07-2011 / 19:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   635
    "Modified: / 27-07-2012 / 23:46:11 / cg"
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   636
!
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   637
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   638
codeAspectHolder:something
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   639
    "set the 'codeAspectHolder' value holder (automatically generated)"
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   640
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   641
    codeAspectHolder notNil ifTrue:[
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   642
        codeAspectHolder removeDependent:self
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   643
    ].
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   644
    codeAspectHolder := something.
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   645
    codeAspectHolder notNil ifTrue:[
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   646
        codeAspectHolder addDependent:self
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   647
    ].
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   648
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   649
    "Modified: / 27-07-2012 / 22:55:42 / cg"
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   650
!
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   651
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   652
diffSpecHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   653
    "return/create the 'diffSpecHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   654
3942434287fe initial checkin
vrany
parents:
diff changeset
   655
    diffSpecHolder isNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   656
        diffSpecHolder := ValueHolder with: #diffSpec.
3942434287fe initial checkin
vrany
parents:
diff changeset
   657
        diffSpecHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   658
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   659
    ^ diffSpecHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   660
3942434287fe initial checkin
vrany
parents:
diff changeset
   661
    "Modified: / 06-07-2011 / 11:57:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
   662
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   663
3942434287fe initial checkin
vrany
parents:
diff changeset
   664
diffSpecHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   665
    "set the 'diffSpecHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   666
3942434287fe initial checkin
vrany
parents:
diff changeset
   667
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   668
3942434287fe initial checkin
vrany
parents:
diff changeset
   669
    diffSpecHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   670
        oldValue := diffSpecHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   671
        diffSpecHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   672
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   673
    diffSpecHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   674
    diffSpecHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   675
        diffSpecHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   676
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   677
    newValue := diffSpecHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   678
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   679
        self update:#value with:newValue from:diffSpecHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   680
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   681
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   682
3942434287fe initial checkin
vrany
parents:
diff changeset
   683
labelAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   684
    "return/create the 'labelAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   685
3942434287fe initial checkin
vrany
parents:
diff changeset
   686
    labelAHolder isNil ifTrue:[
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   687
        labelAHolder := ValueHolder with:'Version A'.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   688
        labelAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   689
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   690
    ^ labelAHolder
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   691
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   692
    "Modified: / 19-07-2011 / 11:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   693
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   694
3942434287fe initial checkin
vrany
parents:
diff changeset
   695
labelAHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   696
    "set the 'labelAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   697
3942434287fe initial checkin
vrany
parents:
diff changeset
   698
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   699
3942434287fe initial checkin
vrany
parents:
diff changeset
   700
    labelAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   701
        oldValue := labelAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   702
        labelAHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   703
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   704
    labelAHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   705
    labelAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   706
        labelAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   707
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   708
    newValue := labelAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   709
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   710
        self update:#value with:newValue from:labelAHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   711
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   712
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   713
3942434287fe initial checkin
vrany
parents:
diff changeset
   714
labelBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   715
    "return/create the 'labelBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   716
3942434287fe initial checkin
vrany
parents:
diff changeset
   717
    labelBHolder isNil ifTrue:[
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   718
        labelBHolder := ValueHolder with:'Version B'.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   719
        labelBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   720
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   721
    ^ labelBHolder
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   722
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   723
    "Modified: / 19-07-2011 / 11:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   724
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   725
3942434287fe initial checkin
vrany
parents:
diff changeset
   726
labelBHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   727
    "set the 'labelBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   728
3942434287fe initial checkin
vrany
parents:
diff changeset
   729
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   730
3942434287fe initial checkin
vrany
parents:
diff changeset
   731
    labelBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   732
        oldValue := labelBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   733
        labelBHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   734
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   735
    labelBHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   736
    labelBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   737
        labelBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   738
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   739
    newValue := labelBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   740
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   741
        self update:#value with:newValue from:labelBHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   742
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   743
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   744
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   745
languageHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   746
    "return/create the 'languageHolder' value holder (automatically generated)"
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   747
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   748
    languageHolder isNil ifTrue:[
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   749
        languageHolder := ValueHolder new.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   750
    ].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   751
    ^ languageHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   752
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   753
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   754
languageHolder:aValueHolder
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   755
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   756
    languageHolder := aValueHolder.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   757
    codeView notNil ifTrue:[codeView languageHolder: aValueHolder].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   758
    diffView notNil ifTrue:[diffView languageHolder: aValueHolder].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   759
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   760
    "Modified: / 19-07-2011 / 12:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   761
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   762
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   763
showDiffHolder
12574
4b07dbee292f class: Tools::TextDiffTool
Claus Gittinger <cg@exept.de>
parents: 11703
diff changeset
   764
    "this holder controls if one or two code-text views are show in the lower area"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   765
3942434287fe initial checkin
vrany
parents:
diff changeset
   766
    showDiffHolder isNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   767
        showDiffHolder := ValueHolder with: true.
3942434287fe initial checkin
vrany
parents:
diff changeset
   768
        showDiffHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   769
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   770
    ^ showDiffHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   771
3942434287fe initial checkin
vrany
parents:
diff changeset
   772
    "Modified: / 30-06-2011 / 20:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3942434287fe initial checkin
vrany
parents:
diff changeset
   773
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   774
3942434287fe initial checkin
vrany
parents:
diff changeset
   775
showDiffHolder:something
12574
4b07dbee292f class: Tools::TextDiffTool
Claus Gittinger <cg@exept.de>
parents: 11703
diff changeset
   776
    "set the 'showDiffHolder' value holder (automatically generated).
4b07dbee292f class: Tools::TextDiffTool
Claus Gittinger <cg@exept.de>
parents: 11703
diff changeset
   777
     this holder controls if one or two code-text views are show in the lower area"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   778
3942434287fe initial checkin
vrany
parents:
diff changeset
   779
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   780
3942434287fe initial checkin
vrany
parents:
diff changeset
   781
    showDiffHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   782
        oldValue := showDiffHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   783
        showDiffHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   784
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   785
    showDiffHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   786
    showDiffHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   787
        showDiffHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   788
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   789
    newValue := showDiffHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   790
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   791
        self update:#value with:newValue from:showDiffHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   792
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   793
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   794
3942434287fe initial checkin
vrany
parents:
diff changeset
   795
textAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   796
    "return/create the 'textAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   797
3942434287fe initial checkin
vrany
parents:
diff changeset
   798
    textAHolder isNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   799
        textAHolder := ValueHolder new.
3942434287fe initial checkin
vrany
parents:
diff changeset
   800
        textAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   801
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   802
    ^ textAHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   803
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   804
3942434287fe initial checkin
vrany
parents:
diff changeset
   805
textAHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   806
    "set the 'textAHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   807
3942434287fe initial checkin
vrany
parents:
diff changeset
   808
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   809
3942434287fe initial checkin
vrany
parents:
diff changeset
   810
    textAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   811
        oldValue := textAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   812
        textAHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   813
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   814
    textAHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   815
    textAHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   816
        textAHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   817
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   818
    newValue := textAHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   819
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   820
        self update:#value with:newValue from:textAHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   821
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   822
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   823
3942434287fe initial checkin
vrany
parents:
diff changeset
   824
textBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   825
    "return/create the 'textBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   826
3942434287fe initial checkin
vrany
parents:
diff changeset
   827
    textBHolder isNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   828
        textBHolder := ValueHolder new.
3942434287fe initial checkin
vrany
parents:
diff changeset
   829
        textBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   830
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   831
    ^ textBHolder
3942434287fe initial checkin
vrany
parents:
diff changeset
   832
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   833
3942434287fe initial checkin
vrany
parents:
diff changeset
   834
textBHolder:something
3942434287fe initial checkin
vrany
parents:
diff changeset
   835
    "set the 'textBHolder' value holder (automatically generated)"
3942434287fe initial checkin
vrany
parents:
diff changeset
   836
3942434287fe initial checkin
vrany
parents:
diff changeset
   837
    |oldValue newValue|
3942434287fe initial checkin
vrany
parents:
diff changeset
   838
3942434287fe initial checkin
vrany
parents:
diff changeset
   839
    textBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   840
        oldValue := textBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   841
        textBHolder removeDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   842
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   843
    textBHolder := something.
3942434287fe initial checkin
vrany
parents:
diff changeset
   844
    textBHolder notNil ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   845
        textBHolder addDependent:self.
3942434287fe initial checkin
vrany
parents:
diff changeset
   846
    ].
3942434287fe initial checkin
vrany
parents:
diff changeset
   847
    newValue := textBHolder value.
3942434287fe initial checkin
vrany
parents:
diff changeset
   848
    oldValue ~~ newValue ifTrue:[
3942434287fe initial checkin
vrany
parents:
diff changeset
   849
        self update:#value with:newValue from:textBHolder.
3942434287fe initial checkin
vrany
parents:
diff changeset
   850
    ].
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   851
!
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   852
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   853
titleHolder
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   854
    "return/create the 'labelAHolder' value holder (automatically generated)"
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   855
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   856
    titleHolder isNil ifTrue:[
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   857
        titleHolder := ValueHolder with:'Text diff'.
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   858
        "/titleHolder addDependent:self.
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   859
    ].
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   860
    ^ titleHolder
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   861
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   862
    "Created: / 30-08-2011 / 09:45:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   863
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   864
3942434287fe initial checkin
vrany
parents:
diff changeset
   865
!TextDiffTool methodsFor:'change & update'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   866
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   867
codeAspect
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   868
    ^self codeAspectHolder value
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   869
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   870
    "Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   871
    "Modified (format): / 27-07-2012 / 21:56:52 / cg"
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   872
!
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   873
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   874
codeAspect:aSymbol
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   875
    self codeAspectHolder value:aSymbol
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   876
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   877
    "Created: / 19-07-2011 / 19:07:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   878
    "Created: / 27-07-2012 / 21:56:48 / cg"
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   879
!
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   880
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   881
update:something with:aParameter from:changedObject
3942434287fe initial checkin
vrany
parents:
diff changeset
   882
    "Invoked when an object that I depend upon sends a change notification."
3942434287fe initial checkin
vrany
parents:
diff changeset
   883
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   884
    changedObject == textAHolder ifTrue:[
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   885
        textAChanged := true.
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   886
        self updateAfterAorBChanged.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   887
        ^ self.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   888
    ].
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   889
    changedObject == textBHolder ifTrue:[
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   890
        textBChanged := true.
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   891
        self updateAfterAorBChanged.
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   892
        ^ self.
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   893
    ].
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   894
    changedObject == codeAspectHolder ifTrue:[
12574
4b07dbee292f class: Tools::TextDiffTool
Claus Gittinger <cg@exept.de>
parents: 11703
diff changeset
   895
        |v|
4b07dbee292f class: Tools::TextDiffTool
Claus Gittinger <cg@exept.de>
parents: 11703
diff changeset
   896
4b07dbee292f class: Tools::TextDiffTool
Claus Gittinger <cg@exept.de>
parents: 11703
diff changeset
   897
        (codeView notNil and:[(v := codeView scrolledView) notNil ]) ifTrue:[v codeAspect: codeAspectHolder value].
4b07dbee292f class: Tools::TextDiffTool
Claus Gittinger <cg@exept.de>
parents: 11703
diff changeset
   898
        (diffView notNil and:[(v := diffView scrolledView) notNil ]) ifTrue:[v codeAspect: codeAspectHolder value].
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   899
        self updateViews.            
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   900
        ^ self.
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   901
    ].
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   902
    (changedObject == showDiffHolder) ifTrue:[
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   903
        self updateViews.            
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   904
        ^self.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   905
    ].
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   906
    super update:something with:aParameter from:changedObject
3942434287fe initial checkin
vrany
parents:
diff changeset
   907
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   908
    "Modified: / 19-07-2011 / 19:44:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   909
    "Modified: / 27-07-2012 / 23:44:32 / cg"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   910
!
3942434287fe initial checkin
vrany
parents:
diff changeset
   911
3942434287fe initial checkin
vrany
parents:
diff changeset
   912
updateAfterAorBChanged
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   913
    (textAChanged & textBChanged) ifTrue:[
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   914
        textAChanged := textBChanged := false.
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   915
        self updateViews
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   916
    ].
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   917
3942434287fe initial checkin
vrany
parents:
diff changeset
   918
    "Created: / 06-07-2011 / 12:12:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   919
    "Modified (format): / 27-07-2012 / 23:00:28 / cg"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   920
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   921
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   922
updateViews
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   923
    | a b |
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   924
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   925
    a := self textAHolder value.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   926
    b := self textBHolder value.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   927
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   928
    self showDiffHolder value ifFalse:[
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   929
        self showTextOnly.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   930
        ^ self
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   931
    ].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   932
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   933
    (a notNil and:[b notNil]) ifTrue:[
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   934
        self showDiff.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   935
        ^self
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   936
    ].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   937
    a notNil ifTrue:[
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   938
        self showVersionA.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   939
        ^self
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   940
    ].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   941
    b notNil ifTrue:[
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   942
        self showVersionB.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   943
        ^self
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   944
    ].
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   945
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   946
   self showNothing.
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   947
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   948
    "Created: / 19-07-2011 / 11:29:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   949
    "Modified (format): / 27-07-2012 / 23:00:32 / cg"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   950
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   951
3942434287fe initial checkin
vrany
parents:
diff changeset
   952
!TextDiffTool methodsFor:'hooks'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   953
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   954
postBuildCodeView:aScrollableView
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   955
    codeView := aScrollableView.
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   956
    codeView notNil ifTrue:[codeView languageHolder: self languageHolder].
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   957
    codeView notNil ifTrue:[codeView classHolder: self classHolder].
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   958
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   959
    "Created: / 19-07-2011 / 10:17:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   960
    "Modified (format): / 27-07-2012 / 21:57:23 / cg"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   961
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   962
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   963
postBuildDiffView:aScrollableView
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   964
    diffView := aScrollableView.
10654
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   965
    diffView notNil ifTrue:[
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   966
        diffView languageHolder: self languageHolder.
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   967
        diffView classHolder: self classHolder.
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   968
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   969
        (self textAHolder value notNil and:[self textBHolder value notNil]) ifTrue:[
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   970
            diffView scrolledView
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   971
                text1: self textAHolder value
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   972
                text2: self textBHolder value
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   973
        ]
b6a976a399ab class definition
vrany
parents: 10344
diff changeset
   974
    ].
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   975
3942434287fe initial checkin
vrany
parents:
diff changeset
   976
    "Created: / 30-06-2011 / 20:55:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   977
    "Modified (format): / 27-07-2012 / 21:57:21 / cg"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   978
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   979
3942434287fe initial checkin
vrany
parents:
diff changeset
   980
!TextDiffTool methodsFor:'initialization'!
3942434287fe initial checkin
vrany
parents:
diff changeset
   981
3942434287fe initial checkin
vrany
parents:
diff changeset
   982
initialize
3942434287fe initial checkin
vrany
parents:
diff changeset
   983
    super initialize.
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   984
    textAChanged := textBChanged := false.
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   985
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
   986
    "Modified: / 19-07-2011 / 19:43:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
   987
    "Modified (format): / 27-07-2012 / 21:57:08 / cg"
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
   988
! !
3942434287fe initial checkin
vrany
parents:
diff changeset
   989
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   990
!TextDiffTool methodsFor:'private'!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   991
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   992
showDiff
10868
d6063f9a6ebd ifNil: / format
Claus Gittinger <cg@exept.de>
parents: 10654
diff changeset
   993
    |scrolledView|
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   994
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   995
    self diffSpecHolder value: #diffSpec.
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
   996
    
10868
d6063f9a6ebd ifNil: / format
Claus Gittinger <cg@exept.de>
parents: 10654
diff changeset
   997
    diffView isNil ifTrue:[^self].
d6063f9a6ebd ifNil: / format
Claus Gittinger <cg@exept.de>
parents: 10654
diff changeset
   998
    (scrolledView := diffView scrolledView) isNil ifTrue:[^self].
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
   999
    scrolledView codeAspect: codeAspectHolder value.
10868
d6063f9a6ebd ifNil: / format
Claus Gittinger <cg@exept.de>
parents: 10654
diff changeset
  1000
    scrolledView
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1001
        text1: self textAHolder value
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1002
        text2: self textBHolder value
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1003
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1004
    "Created: / 19-07-2011 / 10:22:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11703
100f3c5ed545 fixed some (but not all) missing codeAspect settings
Claus Gittinger <cg@exept.de>
parents: 11700
diff changeset
  1005
    "Modified: / 27-07-2012 / 23:31:04 / cg"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1006
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1007
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
  1008
showNothing
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
  1009
    self diffSpecHolder value: #nothingSpec
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
  1010
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
  1011
    "Created: / 19-07-2011 / 19:34:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
  1012
    "Modified (format): / 27-07-2012 / 21:57:28 / cg"
10344
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
  1013
!
956791655804 More improvements fixes in diff tools
vrany
parents: 10332
diff changeset
  1014
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1015
showTextOnly
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1016
    self diffSpecHolder value: #textViewSpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1017
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1018
    "Created: / 19-07-2011 / 11:39:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
  1019
    "Modified (format): / 27-07-2012 / 21:57:30 / cg"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1020
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1021
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1022
showVersionA
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1023
    self diffSpecHolder value: #versionAOnlySpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1024
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1025
    "Created: / 19-07-2011 / 10:22:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
  1026
    "Modified (format): / 27-07-2012 / 21:57:33 / cg"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1027
!
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1028
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1029
showVersionB
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1030
    self diffSpecHolder value: #versionBOnlySpec
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1031
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1032
    "Created: / 19-07-2011 / 10:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
11700
0040c834b1cc added: #codeAspect:
Claus Gittinger <cg@exept.de>
parents: 10870
diff changeset
  1033
    "Modified (format): / 27-07-2012 / 21:57:35 / cg"
10332
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1034
! !
1aac52034cda Improvements in diffing tools
vrany
parents: 10196
diff changeset
  1035
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
  1036
!TextDiffTool class methodsFor:'documentation'!
3942434287fe initial checkin
vrany
parents:
diff changeset
  1037
10870
b263e62a7ea1 cleanup
Claus Gittinger <cg@exept.de>
parents: 10868
diff changeset
  1038
version
12574
4b07dbee292f class: Tools::TextDiffTool
Claus Gittinger <cg@exept.de>
parents: 11703
diff changeset
  1039
    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.9 2013-03-29 07:27:32 cg Exp $'
10870
b263e62a7ea1 cleanup
Claus Gittinger <cg@exept.de>
parents: 10868
diff changeset
  1040
!
b263e62a7ea1 cleanup
Claus Gittinger <cg@exept.de>
parents: 10868
diff changeset
  1041
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
  1042
version_CVS
12574
4b07dbee292f class: Tools::TextDiffTool
Claus Gittinger <cg@exept.de>
parents: 11703
diff changeset
  1043
    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.9 2013-03-29 07:27:32 cg Exp $'
10196
3942434287fe initial checkin
vrany
parents:
diff changeset
  1044
!
3942434287fe initial checkin
vrany
parents:
diff changeset
  1045
3942434287fe initial checkin
vrany
parents:
diff changeset
  1046
version_SVN
3942434287fe initial checkin
vrany
parents:
diff changeset
  1047
    ^ '§Id§'
3942434287fe initial checkin
vrany
parents:
diff changeset
  1048
! !
12574
4b07dbee292f class: Tools::TextDiffTool
Claus Gittinger <cg@exept.de>
parents: 11703
diff changeset
  1049