ExpandableRevisionItem.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Mon, 16 Nov 2015 13:33:19 +0000
branchjv
changeset 15950 23be8cf85415
parent 12650 e0f607754b9a
child 17379 028adf14bc05
permissions -rw-r--r--
Bugfix in merge tool. Due to a bug, even an unmerged code has been treated as merged and wrong .st file has been written (with <conflict> lines. This commit should fix this problem.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2626
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
     1
"
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
     2
 COPYRIGHT (c) 2000 by eXept Software AG
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
     3
              All Rights Reserved
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
     4
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
     5
 This software is furnished under a license and may be used
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
     6
 only in accordance with the terms of that license and with the
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
     8
 be provided or otherwise made available to, or used by, any
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
     9
 other person.  No title to or ownership of the software is
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    10
 hereby transferred.
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    11
"
12650
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12125
diff changeset
    12
"{ Package: 'stx:libtool' }"
2626
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    13
15950
23be8cf85415 Bugfix in merge tool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12650
diff changeset
    14
"{ NameSpace: Smalltalk }"
23be8cf85415 Bugfix in merge tool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12650
diff changeset
    15
2537
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    16
AbstractRevisionItem subclass:#ExpandableRevisionItem
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    17
	instanceVariableNames:''
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    18
	classVariableNames:''
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    19
	poolDictionaries:''
2547
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    20
	category:'Interface-Browsers-Support'
2537
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    21
!
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    22
2547
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    23
!ExpandableRevisionItem class methodsFor:'documentation'!
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    24
2626
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    25
copyright
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    26
"
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    27
 COPYRIGHT (c) 2000 by eXept Software AG
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    28
              All Rights Reserved
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    29
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    30
 This software is furnished under a license and may be used
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    31
 only in accordance with the terms of that license and with the
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    32
 inclusion of the above copyright notice.   This software may not
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    33
 be provided or otherwise made available to, or used by, any
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    34
 other person.  No title to or ownership of the software is
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    35
 hereby transferred.
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    36
"
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    37
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    38
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    39
!
Claus Gittinger <cg@exept.de>
parents: 2612
diff changeset
    40
2547
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    41
documentation
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    42
"
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    43
    documentation to be added.
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    44
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    45
    [author:]
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    46
        Pierre Schwarz (ps@exept.de)
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    47
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    48
    [see also:]
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    49
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    50
    [instance variables:]
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    51
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    52
    [class variables:]
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    53
"
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    54
49e7cb306cd5 category change
Claus Gittinger <cg@exept.de>
parents: 2545
diff changeset
    55
! !
2537
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    56
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    57
!ExpandableRevisionItem methodsFor:'accessing'!
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    58
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    59
icon
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    60
2545
a99be3f7193e *** empty log message ***
ps
parents: 2537
diff changeset
    61
    ^nil
2537
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    62
!
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    63
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    64
revisionString
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    65
    "return the value of the instance variable 'revision' (automatically generated)"
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    66
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    67
    ^ 'more revisions ...'
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    68
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    69
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    70
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    71
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    72
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    73
! !
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    74
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    75
!ExpandableRevisionItem methodsFor:'actions'!
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    76
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    77
recursiveToggleExpand
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    78
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    79
    self parent addAllRevisionsBefore:self
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    80
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    81
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    82
!
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    83
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    84
toggleExpand
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    85
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    86
    self parent addNewRevisionsBefore:self
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    87
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    88
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    89
! !
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    90
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    91
!ExpandableRevisionItem methodsFor:'testing'!
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    92
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    93
isExpandableRevisionItem
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    94
"
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    95
the receiver is a expandable revision item. Used for testing tree items.
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    96
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    97
<return: Boolean>
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    98
"
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
    99
    ^true
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
   100
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
   101
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
   102
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
   103
! !
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
   104
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
   105
!ExpandableRevisionItem class methodsFor:'documentation'!
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
   106
13c0cdca9c7a initial checkin
ps
parents:
diff changeset
   107
version
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   108
    ^ '$Header: /cvs/stx/stx/libtool/ExpandableRevisionItem.st,v 1.5 2000/02/18 14:08:35 cg Exp $'
12650
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12125
diff changeset
   109
!
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12125
diff changeset
   110
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12125
diff changeset
   111
version_HG
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12125
diff changeset
   112
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12125
diff changeset
   113
    ^ '$Changeset: <not expanded> $'
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   114
! !
12650
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12125
diff changeset
   115