RCSConflictEditTextView.st
author Claus Gittinger <cg@exept.de>
Wed, 05 Jun 2019 14:16:59 +0200
changeset 18805 f6df57c6dbfb
parent 18280 d1c9b824bb21
permissions -rw-r--r--
#BUGFIX by cg class: AbstractFileBrowser changed: #currentFileNameHolder endless loop if file not present.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18280
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
     1
"{ Encoding: utf8 }"
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
     2
1750
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
     3
"
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
     4
 COPYRIGHT (c) 1998 by eXept Software AG
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
     5
              All Rights Reserved
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
     6
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
     7
 This software is furnished under a license and may be used
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
     8
 only in accordance with the terms of that license and with the
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
     9
 inclusion of the above copyright notice.   This software may not
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    10
 be provided or otherwise made available to, or used by, any
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    11
 other person.  No title to or ownership of the software is
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    12
 hereby transferred.
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    13
"
17937
1c80d22d6bda #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 6816
diff changeset
    14
"{ Package: 'stx:libtool' }"
1750
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    15
17937
1c80d22d6bda #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 6816
diff changeset
    16
"{ NameSpace: Smalltalk }"
6816
39ecd68cc04a CRLF management
fm
parents: 1750
diff changeset
    17
1749
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    18
EditTextView subclass:#RCSConflictEditTextView
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    19
	instanceVariableNames:''
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    20
	classVariableNames:''
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    21
	poolDictionaries:''
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    22
	category:'Views-Text'
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    23
!
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    24
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    25
!RCSConflictEditTextView class methodsFor:'documentation'!
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    26
1750
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    27
copyright
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    28
"
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    29
 COPYRIGHT (c) 1998 by eXept Software AG
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    30
              All Rights Reserved
1749
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    31
1750
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    32
 This software is furnished under a license and may be used
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    33
 only in accordance with the terms of that license and with the
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    34
 inclusion of the above copyright notice.   This software may not
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    35
 be provided or otherwise made available to, or used by, any
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    36
 other person.  No title to or ownership of the software is
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    37
 hereby transferred.
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    38
"
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    39
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    40
!
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    41
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    42
documentation
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    43
"
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    44
    like an editTextView, but adds two buttons to search forward/backward
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    45
    for next change.
1e7547bc0724 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1749
diff changeset
    46
"
1749
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    47
! !
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    48
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    49
!RCSConflictEditTextView methodsFor:'actions'!
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    50
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    51
moveToNextChanged
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    52
    "somewhat of a kludge - simply search for the next text-item"
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    53
18280
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
    54
    self moveToNextChangedAfter:self lastLineShown
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
    55
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
    56
    "Modified: / 27-07-1998 / 12:29:24 / cg"
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
    57
    "Modified: / 23-07-2018 / 09:53:59 / Claus Gittinger"
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
    58
!
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
    59
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
    60
moveToNextChangedAfter:startLine
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
    61
    "somewhat of a kludge - simply search for the next text-item"
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
    62
1749
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    63
    |start end lnNr max list|
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    64
18280
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
    65
    start := startLine + 1.
1749
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    66
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    67
    list := self list.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    68
    max  := list size.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    69
    lnNr := start.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    70
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    71
    [(lnNr > max or:[(list at:lnNr) isText])
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    72
    ] whileFalse:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    73
        lnNr := lnNr + 1
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    74
    ].
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    75
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    76
    (lnNr <= max) ifTrue:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    77
        (end isNil or:[lnNr < end]) ifTrue:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    78
            end := lnNr.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    79
        ]
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    80
    ].
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    81
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    82
    end notNil ifTrue:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    83
        self scrollToLine:end
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    84
    ] ifFalse:[
17937
1c80d22d6bda #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 6816
diff changeset
    85
        self beepInEditor
1749
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    86
    ].
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    87
18280
d1c9b824bb21 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 17937
diff changeset
    88
    "Created: / 23-07-2018 / 09:53:43 / Claus Gittinger"
1749
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    89
!
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    90
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    91
moveToPreviousChanged
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    92
    "somewhat of a kludge - simply search for the previous text-item"
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    93
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    94
    |start end found lnNr list|
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    95
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    96
    start := firstLineShown - 1.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    97
    end   := 1.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    98
    found := false.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    99
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   100
    start > 1 ifTrue:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   101
        list := self list.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   102
        lnNr := list size.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   103
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   104
        lnNr >= start ifTrue:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   105
            lnNr := start
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   106
        ].
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   107
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   108
        [(lnNr == end or:[(list at:lnNr) isText])
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   109
        ] whileFalse:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   110
            lnNr := lnNr - 1
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   111
        ].
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   112
        (list at:lnNr) isText ifTrue:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   113
            end   := lnNr.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   114
            found := true.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   115
            "/ skip multiple text-lines
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   116
            [end > 1 and:[(list at:(end-1)) isText]] whileTrue:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   117
                end := end - 1
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   118
            ].
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   119
        ]
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   120
    ].
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   121
    found ifTrue:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   122
        self scrollToLine:end
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   123
    ] ifFalse:[
17937
1c80d22d6bda #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 6816
diff changeset
   124
        self beepInEditor
1749
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   125
    ]
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   126
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   127
    "Created: / 27.7.1998 / 12:25:34 / cg"
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   128
    "Modified: / 27.7.1998 / 12:31:26 / cg"
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   129
! !
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   130
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   131
!RCSConflictEditTextView methodsFor:'initialization'!
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   132
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   133
initialize
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   134
    |panel buttonPrev buttonNext|
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   135
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   136
    super initialize.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   137
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   138
"set up-down buttons"
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   139
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   140
    panel := VerticalPanelView in:self.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   141
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   142
    buttonPrev := Button label:'-' in:panel.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   143
    buttonNext := Button label:'+' in:panel.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   144
    buttonPrev extent:15@22.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   145
    buttonNext extent:15@22.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   146
    panel origin:0.0 @ 1.0 corner:(15 + SimpleView viewSpacing) @ 1.0.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   147
    panel topInset:(2 * (buttonPrev preferredExtent y)) negated.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   148
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   149
"set actions"
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   150
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   151
    buttonPrev pressAction:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   152
        buttonPrev turnOff.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   153
        self moveToPreviousChanged
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   154
    ].
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   155
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   156
    buttonNext pressAction:[
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   157
        buttonNext turnOff.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   158
        self moveToNextChanged
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   159
    ].
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   160
    self moveToNextChanged.
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   161
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   162
    "Modified: / 27.7.1998 / 12:22:31 / cg"
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   163
! !
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   164
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   165
!RCSConflictEditTextView class methodsFor:'documentation'!
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   166
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   167
version
17937
1c80d22d6bda #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 6816
diff changeset
   168
    ^ '$Header$'
1749
044c5af08830 initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   169
! !
17937
1c80d22d6bda #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 6816
diff changeset
   170