SVN__UpdateLikeWizard.st
author convert-repo
Tue, 09 Aug 2016 03:35:30 +0000
changeset 1178 3a6dad9479fd
parent 656 5dc3ebfc3e4a
child 1162 6558c17e1a7f
permissions -rw-r--r--
update tags
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
656
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     1
"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     2
 Copyright (c) 2007-2010 Jan Vrany
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     3
 Copyright (c) 2009-2010 eXept Software AG
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     4
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     5
 Permission is hereby granted, free of charge, to any person
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     6
 obtaining a copy of this software and associated documentation
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     7
 files (the 'Software'), to deal in the Software without
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     8
 restriction, including without limitation the rights to use,
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     9
 copy, modify, merge, publish, distribute, sublicense, and/or sell
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    10
 copies of the Software, and to permit persons to whom the
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    11
 Software is furnished to do so, subject to the following
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    12
 conditions:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    13
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    14
 The above copyright notice and this permission notice shall be
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    15
 included in all copies or substantial portions of the Software.
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    16
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    17
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    18
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    19
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    20
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    21
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    22
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    23
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    24
 OTHER DEALINGS IN THE SOFTWARE.
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    25
"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    26
"{ Package: 'stx:libsvn' }"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    27
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    28
"{ NameSpace: SVN }"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    29
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    30
Wizard subclass:#UpdateLikeWizard
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    31
	instanceVariableNames:'branchAspect revisionAspect updatesAspect conflictsAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    32
		conflictsAspectValueCache resolutionAspect'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    33
	classVariableNames:''
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    34
	poolDictionaries:''
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    35
	category:'SVN-UI-Dialogs'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    36
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    37
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    38
WizardPane subclass:#ChangeSetPane
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    39
	instanceVariableNames:'changeSetHolder finalChangeSetHolder'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    40
	classVariableNames:''
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    41
	poolDictionaries:''
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    42
	privateIn:UpdateLikeWizard
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    43
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    44
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    45
WizardPane subclass:#MergePane
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    46
	instanceVariableNames:'diffSetHolder changeSetHolder'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    47
	classVariableNames:''
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    48
	poolDictionaries:''
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    49
	privateIn:UpdateLikeWizard
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    50
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    51
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    52
WizardPane subclass:#RevisionPane
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    53
	instanceVariableNames:'logHolder revisionHolder'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    54
	classVariableNames:''
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    55
	poolDictionaries:''
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    56
	privateIn:UpdateLikeWizard
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    57
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    58
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    59
!UpdateLikeWizard class methodsFor:'documentation'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    60
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    61
copyright
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    62
"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    63
 Copyright (c) 2007-2010 Jan Vrany
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    64
 Copyright (c) 2009-2010 eXept Software AG
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    65
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    66
 Permission is hereby granted, free of charge, to any person
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    67
 obtaining a copy of this software and associated documentation
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    68
 files (the 'Software'), to deal in the Software without
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    69
 restriction, including without limitation the rights to use,
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    70
 copy, modify, merge, publish, distribute, sublicense, and/or sell
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    71
 copies of the Software, and to permit persons to whom the
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    72
 Software is furnished to do so, subject to the following
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    73
 conditions:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    74
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    75
 The above copyright notice and this permission notice shall be
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    76
 included in all copies or substantial portions of the Software.
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    77
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    78
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    79
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    80
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    81
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    82
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    83
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    84
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    85
 OTHER DEALINGS IN THE SOFTWARE.
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    86
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    87
"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    88
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    89
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    90
!UpdateLikeWizard methodsFor:'accessing'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    91
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    92
branch
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    93
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    94
    ^self branchAspect value
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    95
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    96
    "Created: / 25-11-2009 / 20:13:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    97
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    98
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    99
branch: aBranch
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   100
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   101
    ^self branchAspect value: aBranch
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   102
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   103
    "Created: / 25-11-2009 / 20:11:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   104
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   105
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   106
defaultSubtitle
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   107
    "Superclass SVN::Dialog says that I am responsible to implement this method"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   108
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   109
    | subtitle |
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   110
    subtitle := 'Package' asText allBold, ' ' ,self task package asText allItalic.
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   111
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   112
    self task isMergeTask
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   113
        ifTrue:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   114
            [subtitle := subtitle , ' ',' branch ' asText allBold, ' ' ,self branch path asText allItalic].
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   115
    ^subtitle
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   116
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   117
    "Modified: / 09-04-2009 / 08:41:35 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   118
    "Created: / 09-12-2009 / 17:16:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   119
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   120
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   121
defaultTitle
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   122
    "Superclass SVN::Dialog says that I am responsible to implement this method"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   123
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   124
    ^self task isUpdateTask
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   125
        ifTrue:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   126
            [self revision == SVN::Revision head 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   127
                ifTrue:['Update']
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   128
                ifFalse:['Load revision ', self revision printString]]
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   129
        ifFalse:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   130
            ['Merge']
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   131
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   132
    "Created: / 03-10-2008 / 13:58:40 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   133
    "Modified: / 09-04-2009 / 08:41:35 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   134
    "Modified: / 09-12-2009 / 17:12:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   135
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   136
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   137
firstPane
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   138
    "
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   139
     Answers the very first pane to show"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   140
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   141
    ^self revision 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   142
        ifNotNil:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   143
            [MergePane new]
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   144
        ifNil:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   145
            [RevisionPane new]
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   146
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   147
    "Modified: / 02-04-2009 / 16:34:13 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   148
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   149
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   150
revision
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   151
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   152
    ^self revisionAspect value
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   153
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   154
    "Created: / 25-11-2009 / 20:13:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   155
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   156
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   157
revision: aRevision
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   158
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   159
    ^self revisionAspect value: aRevision
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   160
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   161
    "Created: / 25-11-2009 / 20:11:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   162
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   163
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   164
!UpdateLikeWizard methodsFor:'actions'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   165
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   166
doAccept
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   167
    self showProgressWhile: 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   168
            [self task doApplyUpdates.
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   169
            self accept value: true ].
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   170
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   171
    "Created: / 02-04-2009 / 23:19:59 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   172
    "Modified: / 19-08-2009 / 14:26:59 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   173
    "Modified: / 26-11-2009 / 14:05:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   174
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   175
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   176
!UpdateLikeWizard methodsFor:'aspects'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   177
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   178
branchAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   179
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   180
    branchAspect ifNil:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   181
        [branchAspect := (AspectAdaptor forAspect: #branch)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   182
                                subjectChannel: self task].
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   183
    ^branchAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   184
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   185
    "Created: / 25-11-2009 / 17:59:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   186
    "Modified: / 26-11-2009 / 12:49:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   187
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   188
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   189
conflictsAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   190
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   191
    conflictsAspect ifNil:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   192
        [conflictsAspect := (AspectAdaptor forAspect: #conflicts)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   193
                                subjectChannel: self task;
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   194
                                addDependent: self.
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   195
        self conflictsChanged.
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   196
        self resolutionChanged].
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   197
    ^conflictsAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   198
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   199
    "Created: / 25-11-2009 / 20:41:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   200
    "Modified: / 26-11-2009 / 14:15:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   201
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   202
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   203
resolutionAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   204
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   205
    resolutionAspect ifNil:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   206
        [resolutionAspect := (AspectAdaptor forAspect: #resolution)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   207
                                subjectChannel: self task].
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   208
    ^resolutionAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   209
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   210
    "Created: / 26-11-2009 / 08:54:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   211
    "Modified: / 26-11-2009 / 12:49:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   212
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   213
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   214
revisionAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   215
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   216
    revisionAspect ifNil:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   217
        [revisionAspect := (AspectAdaptor forAspect: #revision)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   218
                                subject: self task].
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   219
    ^revisionAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   220
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   221
    "Created: / 25-11-2009 / 17:58:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   222
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   223
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   224
updatesAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   225
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   226
    updatesAspect ifNil:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   227
        [updatesAspect := (AspectAdaptor forAspect: #updates)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   228
                                subjectChannel: self task].
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   229
    ^updatesAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   230
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   231
    "Created: / 25-11-2009 / 20:41:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   232
    "Modified: / 26-11-2009 / 12:49:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   233
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   234
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   235
!UpdateLikeWizard methodsFor:'change & update'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   236
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   237
conflictsChanged
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   238
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   239
    conflictsAspectValueCache 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   240
        ifNotNil:[conflictsAspectValueCache removeDependent: self].
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   241
    conflictsAspectValueCache := self conflictsAspect value.
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   242
    conflictsAspectValueCache 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   243
        ifNotNil:[conflictsAspectValueCache addDependent: self].
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   244
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   245
    "Created: / 26-11-2009 / 14:13:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   246
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   247
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   248
merged
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   249
    ^ (conflictsAspectValueCache 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   250
        ifNil:[ false ]
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   251
        ifNotNil:[ conflictsAspectValueCache merged ])
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   252
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   253
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   254
resolutionChanged
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   255
    self acceptEnabled:self merged
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   256
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   257
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   258
update: aspect with: param from: sender
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   259
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   260
    sender == conflictsAspect ifTrue:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   261
        [^self conflictsChanged].
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   262
    sender == conflictsAspectValueCache ifTrue:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   263
        [^self resolutionChanged].
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   264
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   265
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   266
    ^super update: aspect with: param from: self
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   267
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   268
    "Created: / 26-11-2009 / 12:23:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   269
    "Modified: / 26-11-2009 / 14:13:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   270
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   271
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   272
!UpdateLikeWizard::ChangeSetPane class methodsFor:'interface specs'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   273
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   274
windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   275
    "This resource specification was automatically generated
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   276
     by the UIPainter of ST/X."
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   277
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   278
    "Do not manually edit this!! If it is corrupted,
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   279
     the UIPainter may not be able to read the specification."
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   280
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   281
    "
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   282
     UIPainter new openOnClass:SVN::MergeWizard::ChangeSetPane andSelector:#windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   283
     SVN::MergeWizard::ChangeSetPane new openInterface:#windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   284
     SVN::MergeWizard::ChangeSetPane open
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   285
    "
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   286
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   287
    <resource: #canvas>
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   288
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   289
    ^ 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   290
     #(FullSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   291
        name: windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   292
        window: 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   293
       (WindowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   294
          label: 'UpdateChangeSet'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   295
          name: 'UpdateChangeSet'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   296
          min: (Point 10 10)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   297
          bounds: (Rectangle 0 0 300 300)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   298
        )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   299
        component: 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   300
       (SpecCollection
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   301
          collection: (
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   302
           (SubCanvasSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   303
              name: 'ChangeSetBrowser'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   304
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   305
              hasHorizontalScrollBar: false
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   306
              hasVerticalScrollBar: false
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   307
              majorKey: #'Tools::ChangeSetBrowser'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   308
              subAspectHolders: 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   309
             (Array
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   310
                
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   311
               (SubChannelInfoSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   312
                  subAspect: changesetHolder
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   313
                  aspect: resolutionAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   314
                )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   315
              )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   316
              createNewApplication: true
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   317
              createNewBuilder: true
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   318
            )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   319
           )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   320
         
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   321
        )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   322
      )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   323
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   324
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   325
!UpdateLikeWizard::ChangeSetPane methodsFor:'queries'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   326
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   327
acceptEnabled
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   328
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   329
    ^self wizard merged
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   330
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   331
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   332
canGoNext
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   333
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   334
    ^false
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   335
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   336
    "Created: / 02-04-2009 / 17:21:13 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   337
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   338
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   339
!UpdateLikeWizard::MergePane class methodsFor:'interface specs'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   340
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   341
windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   342
    "This resource specification was automatically generated
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   343
     by the UIPainter of ST/X."
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   344
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   345
    "Do not manually edit this!! If it is corrupted,
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   346
     the UIPainter may not be able to read the specification."
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   347
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   348
    "
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   349
     UIPainter new openOnClass:SVN::MergeWizard::MergePane andSelector:#windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   350
     SVN::MergeWizard::MergePane new openInterface:#windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   351
     SVN::MergeWizard::MergePane open
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   352
    "
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   353
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   354
    <resource: #canvas>
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   355
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   356
    ^ 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   357
     #(FullSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   358
        name: windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   359
        window: 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   360
       (WindowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   361
          label: 'Merge Pane'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   362
          name: 'Merge Pane'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   363
          min: (Point 10 10)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   364
          bounds: (Rectangle 0 0 300 300)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   365
        )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   366
        component: 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   367
       (SpecCollection
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   368
          collection: (
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   369
           (SubCanvasSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   370
              name: 'Merge'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   371
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   372
              hasHorizontalScrollBar: false
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   373
              hasVerticalScrollBar: false
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   374
              majorKey: #'SVN::MergeBrowser'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   375
              subAspectHolders: 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   376
             (Array
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   377
                
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   378
               (SubChannelInfoSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   379
                  subAspect: diffsetHolder
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   380
                  aspect: conflictsAspect
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   381
                )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   382
              )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   383
              createNewApplication: true
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   384
              createNewBuilder: true
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   385
            )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   386
           )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   387
         
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   388
        )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   389
      )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   390
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   391
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   392
!UpdateLikeWizard::MergePane methodsFor:'actions'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   393
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   394
enter
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   395
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   396
    self task notifications ifNil:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   397
        [self showProgressWhile:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   398
            [self task doComputeUpdates.
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   399
            self task hasChanges 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   400
                ifTrue:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   401
                    [self task conflicts isEmpty
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   402
                        ifTrue:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   403
                            [self canGoNext 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   404
                                ifTrue:[self goNext]
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   405
                                ifFalse:[self wizard doAccept]]]
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   406
                ifFalse:
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   407
                    [self wizard doAccept]]]
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   408
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   409
    "Created: / 02-04-2009 / 17:14:38 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   410
    "Modified: / 08-04-2009 / 20:14:33 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   411
    "Modified: / 09-12-2009 / 17:44:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   412
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   413
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   414
!UpdateLikeWizard::MergePane methodsFor:'private'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   415
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   416
createNext
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   417
    "Superclass SVN::Wizard::Pane says that I am responsible to implement this method"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   418
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   419
    ^UpdateLikeWizard::ChangeSetPane new
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   420
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   421
    "Modified: / 02-04-2009 / 22:32:08 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   422
    "Modified: / 09-12-2009 / 17:29:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   423
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   424
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   425
!UpdateLikeWizard::MergePane methodsFor:'queries'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   426
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   427
canGoNext
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   428
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   429
    ^(Smalltalk at: #'Tools::ChangeSetBrowser') notNil
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   430
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   431
    "Created: / 09-12-2009 / 16:55:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   432
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   433
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   434
!UpdateLikeWizard::RevisionPane class methodsFor:'interface specs'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   435
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   436
windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   437
    "This resource specification was automatically generated
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   438
     by the UIPainter of ST/X."
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   439
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   440
    "Do not manually edit this!! If it is corrupted,
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   441
     the UIPainter may not be able to read the specification."
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   442
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   443
    "
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   444
     UIPainter new openOnClass:SVN::MergeWizard::RevisionPane andSelector:#windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   445
     SVN::MergeWizard::RevisionPane new openInterface:#windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   446
     SVN::MergeWizard::RevisionPane open
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   447
    "
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   448
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   449
    <resource: #canvas>
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   450
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   451
    ^ 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   452
     #(FullSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   453
        name: windowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   454
        window: 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   455
       (WindowSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   456
          label: 'RevisionPane'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   457
          name: 'RevisionPane'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   458
          bounds: (Rectangle 0 0 300 300)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   459
        )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   460
        component: 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   461
       (SpecCollection
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   462
          collection: (
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   463
           (SubCanvasSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   464
              name: 'RevisionSelectionBrowser'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   465
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   466
              hasHorizontalScrollBar: false
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   467
              hasVerticalScrollBar: false
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   468
              majorKey: #'SVN::BranchAndRevisionSelectionDialog'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   469
              minorKey: contentSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   470
              subAspectHolders: 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   471
             (Array
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   472
                
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   473
               (SubChannelInfoSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   474
                  subAspect: model
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   475
                  aspect: logHolder
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   476
                ) 
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   477
               (SubChannelInfoSpec
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   478
                  subAspect: selectionHolder
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   479
                  aspect: revisionHolder
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   480
                )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   481
              )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   482
              createNewApplication: true
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   483
              createNewBuilder: true
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   484
            )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   485
           )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   486
         
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   487
        )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   488
      )
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   489
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   490
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   491
!UpdateLikeWizard::RevisionPane methodsFor:'private'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   492
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   493
createNext
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   494
    "Superclass SVN::Wizard::Pane says that I am responsible to implement this method"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   495
    
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   496
    ^UpdateLikeWizard::MergePane new
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   497
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   498
    "Modified: / 02-04-2009 / 17:05:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   499
    "Modified: / 09-12-2009 / 17:29:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   500
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   501
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   502
!UpdateLikeWizard::RevisionPane methodsFor:'queries'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   503
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   504
canGoNext
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   505
    "Superclass SVN::Wizard::Pane says that I am responsible to implement this method"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   506
    ^self revisionHolder value notNil
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   507
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   508
    "Modified: / 24-03-2009 / 19:27:31 / Jan Vrany <vranyj1@fel.cvut.cz>"
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   509
! !
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   510
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   511
!UpdateLikeWizard class methodsFor:'documentation'!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   512
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   513
version
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   514
    ^ '$Header$'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   515
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   516
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   517
version_CVS
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   518
    ^ '$Header$'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   519
!
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   520
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   521
version_SVN
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   522
    ^ '§Id: SVN__UpdateLikeWizard.st 350 2011-07-07 18:42:56Z vranyj1 §'
5dc3ebfc3e4a initial checkin
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   523
! !