VersionDiffBrowser.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 27 Mar 2013 12:24:47 +0000
branchjv
changeset 12571 b2e5fdb702cb
parent 12431 9f0c59c742d5
parent 12512 072f76033d49
child 12650 e0f607754b9a
permissions -rw-r--r--
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2626
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
     1
"
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
     2
 COPYRIGHT (c) 2000 by eXept Software AG
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
     3
	      All Rights Reserved
2626
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
     4
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
     5
 This software is furnished under a license and may be used
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
     6
 only in accordance with the terms of that license and with the
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
     8
 be provided or otherwise made available to, or used by, any
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
     9
 other person.  No title to or ownership of the software is
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    10
 hereby transferred.
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    11
"
2650
447c99ac6f76 oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
    12
"{ Package: 'stx:libtool' }"
447c99ac6f76 oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
    13
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    14
ApplicationModel subclass:#VersionDiffBrowser
2856
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
    15
	instanceVariableNames:'classChangeSet diffTextView boxAVisible boxBVisible boxMVisible
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
    16
		classIfSingleClassDiff versionAIfSingleClassDiff
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
    17
		versionBIfSingleClassDiff changedLabelHolder diffTextLabelA
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
    18
		diffTextLabelB methodText methodsChanged methodsChangedFiltered
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
    19
		methodsChangedSelection methodsOnlyInA methodsOnlyInAFiltered
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
    20
		methodsOnlyInASelection methodsOnlyInB methodsOnlyInBFiltered
5182
0b3ecd84056a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5150
diff changeset
    21
		methodsOnlyInBSelection onlyInALabelHolder onlyInBLabelHolder
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
    22
		classHolder versionAHolder versionBHolder infoHolder
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
    23
		includeExtensionsHolder canIncludeExtensionsHolder
11958
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
    24
		includeCategoryChangesHolder includeVersionMethodsHolder'
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    25
	classVariableNames:''
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    26
	poolDictionaries:''
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    27
	category:'Interface-Browsers'
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    28
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    29
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
    30
HierarchicalItem subclass:#ClassChangeSet
8891
fm
parents: 8811
diff changeset
    31
	instanceVariableNames:'classBeingCompared labelA labelB diffSet versionA versionB'
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
    32
	classVariableNames:''
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
    33
	poolDictionaries:''
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
    34
	privateIn:VersionDiffBrowser
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
    35
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
    36
2626
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    37
!VersionDiffBrowser class methodsFor:'documentation'!
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    38
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    39
copyright
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    40
"
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    41
 COPYRIGHT (c) 2000 by eXept Software AG
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
    42
	      All Rights Reserved
2626
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    43
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    44
 This software is furnished under a license and may be used
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    45
 only in accordance with the terms of that license and with the
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    46
 inclusion of the above copyright notice.   This software may not
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    47
 be provided or otherwise made available to, or used by, any
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    48
 other person.  No title to or ownership of the software is
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    49
 hereby transferred.
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    50
"
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    51
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    52
!
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    53
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    54
documentation
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    55
"
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    56
    This is not yet finished (work in progress).
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    57
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    58
    A browser to show differences between class versions,
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    59
    allowing easy comparison; will also eventually add capabilities
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    60
    to checkIn / load classes into / from the repository.
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    61
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    62
    [see also:]
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    63
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    64
    [instance variables:]
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    65
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    66
    [class variables:]
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    67
"
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    68
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    69
Claus Gittinger <cg@exept.de>
parents: 2585
diff changeset
    70
! !
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    71
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
    72
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    73
!VersionDiffBrowser class methodsFor:'interface specs'!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    74
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    75
windowSpec
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    76
    "This resource specification was automatically generated
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    77
     by the UIPainter of ST/X."
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    78
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    79
    "Do not manually edit this!! If it is corrupted,
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    80
     the UIPainter may not be able to read the specification."
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    81
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    82
    "
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    83
     UIPainter new openOnClass:VersionDiffBrowser andSelector:#windowSpec
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    84
     VersionDiffBrowser new openInterface:#windowSpec
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    85
     VersionDiffBrowser open
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    86
    "
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    87
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    88
    <resource: #canvas>
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    89
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
    90
    ^
5150
4a469455c4b4 Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents: 4653
diff changeset
    91
     #(FullSpec
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
    92
	name: windowSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
    93
	window:
5150
4a469455c4b4 Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents: 4653
diff changeset
    94
       (WindowSpec
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
    95
	  label: 'Version DiffBrowser'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
    96
	  name: 'Version DiffBrowser'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
    97
	  min: (Point 10 10)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
    98
	  bounds: (Rectangle 0 0 865 504)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
    99
	  menu: mainMenu
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   100
	)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   101
	component:
5150
4a469455c4b4 Remove max windowsize constraint from windowSpecs.
Stefan Vogel <sv@exept.de>
parents: 4653
diff changeset
   102
       (SpecCollection
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   103
	  collection: (
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   104
	   (VariableVerticalPanelSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   105
	      name: 'VariableVerticalPanel1'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   106
	      layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   107
	      component:
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   108
	     (SpecCollection
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   109
		collection: (
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   110
		 (HorizontalPanelViewSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   111
		    name: 'TopHorizontalPanel'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   112
		    horizontalLayout: fit
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   113
		    verticalLayout: fit
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   114
		    horizontalSpace: 3
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   115
		    verticalSpace: 3
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   116
		    component:
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   117
		   (SpecCollection
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   118
		      collection: (
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   119
		       (ViewSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   120
			  name: 'BoxA'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   121
			  level: 0
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   122
			  visibilityChannel: boxAVisible
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   123
			  component:
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   124
			 (SpecCollection
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   125
			    collection: (
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   126
			     (LabelSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   127
				label: 'Only in A'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   128
				name: 'OnlyInALabel'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   129
				layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   130
				translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   131
				labelChannel: onlyInALabelHolder
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   132
			      )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   133
			     (SequenceViewSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   134
				name: 'ListA'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   135
				layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   136
				model: methodsOnlyInASelection
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   137
				menu: menuA
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   138
				hasHorizontalScrollBar: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   139
				hasVerticalScrollBar: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   140
				miniScrollerHorizontal: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   141
				doubleClickSelector: methodInADoubleClicked:
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   142
				valueChangeSelector: methodsOnlyInASelectionChanged
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   143
				useIndex: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   144
				sequenceList: methodsOnlyInA
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   145
			      )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   146
			     )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   147
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   148
			  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   149
			  extent: (Point 286 199)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   150
			)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   151
		       (ViewSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   152
			  name: 'BoxM'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   153
			  visibilityChannel: boxMVisible
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   154
			  component:
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   155
			 (SpecCollection
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   156
			    collection: (
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   157
			     (LabelSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   158
				label: 'Changed'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   159
				name: 'ChangedLabel'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   160
				layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   161
				translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   162
				labelChannel: changedLabelHolder
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   163
			      )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   164
			     (SequenceViewSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   165
				name: 'ListM'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   166
				layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   167
				model: methodsChangedSelection
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   168
				menu: menuM
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   169
				hasHorizontalScrollBar: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   170
				hasVerticalScrollBar: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   171
				miniScrollerHorizontal: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   172
				doubleClickSelector: methodInChangedDoubleClicked:
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   173
				valueChangeSelector: methodsChangedSelectionChanged
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   174
				useIndex: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   175
				sequenceList: methodsChanged
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   176
			      )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   177
			     )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   178
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   179
			  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   180
			  extent: (Point 286 199)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   181
			)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   182
		       (ViewSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   183
			  name: 'BoxB'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   184
			  visibilityChannel: boxBVisible
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   185
			  component:
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   186
			 (SpecCollection
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   187
			    collection: (
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   188
			     (LabelSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   189
				label: 'Only in B'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   190
				name: 'OnlyInBLabel'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   191
				layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   192
				translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   193
				labelChannel: onlyInBLabelHolder
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   194
			      )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   195
			     (SequenceViewSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   196
				name: 'ListB'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   197
				layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   198
				model: methodsOnlyInBSelection
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   199
				menu: menuB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   200
				hasHorizontalScrollBar: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   201
				hasVerticalScrollBar: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   202
				miniScrollerHorizontal: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   203
				doubleClickSelector: methodInBDoubleClicked:
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   204
				valueChangeSelector: methodsOnlyInBSelectionChanged
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   205
				useIndex: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   206
				sequenceList: methodsOnlyInB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   207
			      )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   208
			     )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   209
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   210
			  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   211
			  extent: (Point 287 199)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   212
			)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   213
		       )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   214
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   215
		    )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   216
		  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   217
		 (ViewSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   218
		    name: 'Box4'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   219
		    component:
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   220
		   (SpecCollection
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   221
		      collection: (
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   222
		       (ViewSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   223
			  name: 'diffTextViewBox'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   224
			  layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   225
			  initiallyInvisible: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   226
			  component:
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   227
			 (SpecCollection
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   228
			    collection: (
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   229
			     (LabelSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   230
				label: 'A'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   231
				name: 'DiffTextLabelA'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   232
				layout: (LayoutFrame 0 0 0 0 0 0.5 20 0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   233
				translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   234
				labelChannel: diffTextLabelA
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   235
			      )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   236
			     (LabelSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   237
				label: 'B'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   238
				name: 'DiffTextLabelB'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   239
				layout: (LayoutFrame 0 0.5 0 0 0 1 20 0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   240
				translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   241
				labelChannel: diffTextLabelB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   242
			      )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   243
			     (ArbitraryComponentSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   244
				name: 'diffTextView'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   245
				layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   246
				hasBorder: false
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   247
				component: diffTextView
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   248
			      )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   249
			     )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   250
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   251
			  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   252
			)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   253
		       (CodeViewSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   254
			  name: 'singleTextView'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   255
			  layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   256
			  model: methodText
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   257
			  hasHorizontalScrollBar: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   258
			  hasVerticalScrollBar: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   259
			  miniScrollerHorizontal: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   260
			  isReadOnly: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   261
			  hasKeyboardFocusInitially: false
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   262
			)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   263
		       )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   264
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   265
		    )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   266
		  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   267
		 )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   268
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   269
	      )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   270
	      handles: (Any 0.42379958246347 1.0)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   271
	    )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   272
	   (LabelSpec
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   273
	      name: 'InfoLabel'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   274
	      layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   275
	      level: -1
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   276
	      translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   277
	      labelChannel: infoHolder
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   278
	      adjust: left
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   279
	    )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   280
	   )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   281
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   282
	)
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   283
      )
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   284
! !
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   285
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
   286
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   287
!VersionDiffBrowser class methodsFor:'menu specs'!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   288
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   289
mainMenu
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   290
    "This resource specification was automatically generated
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   291
     by the MenuEditor of ST/X."
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   292
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   293
    "Do not manually edit this!! If it is corrupted,
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   294
     the MenuEditor may not be able to read the specification."
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   295
10703
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
   296
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   297
    "
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   298
     MenuEditor new openOnClass:VersionDiffBrowser andSelector:#mainMenu
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   299
     (Menu new fromLiteralArrayEncoding:(VersionDiffBrowser mainMenu)) startUp
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   300
    "
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   301
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   302
    <resource: #menu>
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   303
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   304
    ^ 
7419
e4e108674fe6 conditionalRight in startGroup
Claus Gittinger <cg@exept.de>
parents: 7396
diff changeset
   305
     #(Menu
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   306
        (
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   307
         (MenuItem
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   308
            label: 'File'
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   309
            submenu: 
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   310
           (Menu
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   311
              (
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   312
               (MenuItem
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   313
                  label: 'Create PatchFile...'
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   314
                  itemValue: createPatchFile
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   315
                )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   316
               (MenuItem
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   317
                  label: '-'
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   318
                )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   319
               (MenuItem
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   320
                  label: 'Exit'
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   321
                  itemValue: closeRequest
11853
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   322
                )
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   323
               )
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   324
              nil
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   325
              nil
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   326
            )
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   327
          )
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   328
         (MenuItem
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   329
            label: 'Class'
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   330
            submenu: 
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   331
           (Menu
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   332
              (
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   333
               (MenuItem
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   334
                  label: 'Remove from Changeset'
fe611dbb05ca added: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11596
diff changeset
   335
                  itemValue: removeClassFromChangeSet
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   336
                )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   337
               )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   338
              nil
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   339
              nil
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   340
            )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   341
          )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   342
         (MenuItem
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   343
            label: 'View'
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   344
            submenu: 
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   345
           (Menu
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   346
              (
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   347
               (MenuItem
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   348
                  enabled: canIncludeExtensionsHolder
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   349
                  label: 'Include Extensions'
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   350
                  itemValue: includeExtensions:
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   351
                  indication: includeExtensionsHolder
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   352
                )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   353
               (MenuItem
11958
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
   354
                  enabled: canIncludeExtensionsHolder
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
   355
                  label: 'Include Version Methods'
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
   356
                  itemValue: includeVersionMethods:
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
   357
                  indication: includeVersionMethodsHolder
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
   358
                )
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
   359
               (MenuItem
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
   360
                  label: '-'
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
   361
                )
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
   362
               (MenuItem
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   363
                  label: 'Include Category Changes'
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   364
                  itemValue: includeCategoryChanges:
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   365
                  indication: includeCategoryChangesHolder
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   366
                )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   367
               )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   368
              nil
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   369
              nil
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   370
            )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   371
          )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   372
         (MenuItem
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   373
            label: 'Help'
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   374
            startGroup: conditionalRight
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   375
            submenu: 
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   376
           (Menu
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   377
              (
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   378
               (MenuItem
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   379
                  label: 'Documentation'
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   380
                  itemValue: openDocumentation
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   381
                )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   382
               (MenuItem
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   383
                  label: '-'
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   384
                )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   385
               (MenuItem
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   386
                  label: 'About this Application...'
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   387
                  itemValue: openAboutThisApplication
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   388
                )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   389
               )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   390
              nil
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   391
              nil
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   392
            )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   393
          )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   394
         )
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   395
        nil
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
   396
        nil
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   397
      )
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   398
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   399
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   400
menuA
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   401
    "This resource specification was automatically generated
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   402
     by the MenuEditor of ST/X."
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   403
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   404
    "Do not manually edit this!! If it is corrupted,
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   405
     the MenuEditor may not be able to read the specification."
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   406
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   407
    "
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   408
     MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   409
     (Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   410
    "
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   411
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   412
    <resource: #menu>
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   413
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   414
    ^
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   415
     #(#Menu
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   416
	#(
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   417
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   418
	    #label: 'Apply'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   419
	    #translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   420
	    #value: #applySelectedChangeInA
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   421
	    #enabled: #hasChangeSelectedInA
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   422
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   423
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   424
	    #label: 'Browse'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   425
	    #translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   426
	    #value: #browseClassInA
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   427
	    #enabled: #hasChangeSelectedInA
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   428
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   429
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   430
	    #label: '-'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   431
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   432
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   433
	    #label: 'Inspect'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   434
	    #translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   435
	    #value: #inspectSelectedChangeInA
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   436
	    #choiceValue: 'nil "UndefinedObject" '
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   437
	    #enabled: #hasChangeSelectedInA
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   438
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   439
	 )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   440
	nil
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   441
	nil
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   442
      )
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   443
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   444
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   445
menuB
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   446
    "This resource specification was automatically generated
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   447
     by the MenuEditor of ST/X."
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   448
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   449
    "Do not manually edit this!! If it is corrupted,
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   450
     the MenuEditor may not be able to read the specification."
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   451
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   452
    "
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   453
     MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menuB
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   454
     (Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menuB)) startUp
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   455
    "
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   456
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   457
    <resource: #menu>
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   458
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   459
    ^
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   460
     #(#Menu
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   461
	#(
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   462
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   463
	    #label: 'Apply'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   464
	    #translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   465
	    #value: #applySelectedChangeInB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   466
	    #enabled: #hasChangeSelectedInB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   467
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   468
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   469
	    #label: 'Browse'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   470
	    #translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   471
	    #value: #browseClassInB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   472
	    #enabled: #hasChangeSelectedInB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   473
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   474
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   475
	    #label: '-'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   476
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   477
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   478
	    #label: 'Remove in Image'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   479
	    #translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   480
	    #value: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   481
	    #enabled: #hasChangeSelectedInB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   482
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   483
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   484
	    #label: '-'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   485
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   486
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   487
	    #label: 'Inspect'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   488
	    #translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   489
	    #value: #inspectSelectedChangeInB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   490
	    #choiceValue: 'nil "UndefinedObject" '
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   491
	    #enabled: #hasChangeSelectedInB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   492
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   493
	 )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   494
	nil
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   495
	nil
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   496
      )
9550
531c77d5d3e3 added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents: 9383
diff changeset
   497
531c77d5d3e3 added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents: 9383
diff changeset
   498
    "Modified: / 15-08-2010 / 21:24:49 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   499
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   500
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   501
menuM
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   502
    "This resource specification was automatically generated
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   503
     by the MenuEditor of ST/X."
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   504
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   505
    "Do not manually edit this!! If it is corrupted,
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   506
     the MenuEditor may not be able to read the specification."
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   507
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   508
    "
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   509
     MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   510
     (Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   511
    "
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   512
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   513
    <resource: #menu>
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   514
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   515
    ^
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   516
     #(#Menu
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   517
	#(
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   518
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   519
	    #label: 'Browse'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   520
	    #translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   521
	    #value: #browseClassInM
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   522
	    #enabled: #hasChangeSelectedInM
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   523
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   524
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   525
	    #label: '-'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   526
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   527
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   528
	    #label: 'Apply Left Version'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   529
	    #translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   530
	    #value: #acceptInLeftView
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   531
	    #enabled: #hasChangeSelectedInM
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   532
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   533
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   534
	    #label: 'Apply Right Version'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   535
	    #translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   536
	    #value: #acceptInRightView
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   537
	    #enabled: #hasChangeSelectedInM
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   538
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   539
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   540
	    #label: '-'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   541
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   542
	 #(#MenuItem
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   543
	    #label: 'Inspect both'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   544
	    #translateLabel: true
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   545
	    #value: #inspectSelectedChangeInM
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   546
	    #choiceValue: 'nil "UndefinedObject" '
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   547
	    #enabled: #hasChangeSelectedInM
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   548
	  )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   549
	 )
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   550
	nil
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   551
	nil
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   552
      )
7833
75997a5142bb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7499
diff changeset
   553
75997a5142bb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7499
diff changeset
   554
    "Modified: / 31-08-2007 / 14:16:39 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   555
! !
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   556
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
   557
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   558
!VersionDiffBrowser class methodsFor:'plugIn spec'!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   559
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   560
aspectSelectors
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   561
    "This resource specification was automatically generated
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   562
     by the UIPainter of ST/X."
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   563
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   564
    "Do not manually edit this. If it is corrupted,
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   565
     the UIPainter may not be able to read the specification."
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   566
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   567
    "Return a description of exported aspects;
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   568
     these can be connected to aspects of an embedding application
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   569
     (if this app is embedded in a subCanvas)."
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   570
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   571
    ^ #(
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   572
	#changedLabelHolder
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   573
	#onlyInALabelHolder
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   574
	#onlyInBLabelHolder
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   575
      ).
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   576
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   577
! !
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   578
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
   579
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   580
!VersionDiffBrowser class methodsFor:'startup'!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   581
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   582
openOnClass:aClass againstVersion:aVersionA
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   583
    "create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   584
     browser. The class diff set is generated from aClasses current against some version
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   585
     via the source code manager."
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   586
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   587
    |theBrowser|
2224
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
   588
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   589
    theBrowser := self new.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   590
    theBrowser allButOpen.
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   591
    theBrowser setupForClass:aClass againstVersion:aVersionA.
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   592
    theBrowser openWindow.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   593
    ^ theBrowser.
2224
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
   594
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   595
    "
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   596
     self openOnClass:Array againstVersion:'1.116'
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   597
     self openOnClass:Array againstVersion:nil            - against the version on which Array is based upon
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   598
     self openOnClass:Array againstVersion:#newest        - against the newest repository version
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   599
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   600
     self openOnClass:VersionDiffBrowser againstVersion:nil
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   601
     self openOnClass:VersionDiffBrowser againstVersion:#newest
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   602
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   603
     (self openOnClass:ByteArray againstVersion:'1.116') includeExtensionsHolder value:true
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   604
    "
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   605
!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   606
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   607
openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:ignoredTitle
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   608
    "create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   609
     browser. The class diff set is generated from two classes."
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
   610
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   611
    ^ self
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   612
	openOnClass:classA labelA:aLabelA
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   613
	andClass:classB labelB:aLabelB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   614
	title:ignoredTitle ifSame:nil
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   615
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   616
    "
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   617
     self
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   618
	openOnClass:Array labelA:'Array'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   619
	andClass:Collection labelB:'Collection'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   620
	title:'Array vs. Collection'
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   621
    "
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
   622
!
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
   623
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
   624
openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:ignoredTitle ifSame:sameAction
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   625
    "create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   626
     browser. The class diff set is generated from two classes."
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
   627
8891
fm
parents: 8811
diff changeset
   628
    |classChangeSet|
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
   629
8891
fm
parents: 8811
diff changeset
   630
    classChangeSet := ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB.
fm
parents: 8811
diff changeset
   631
    classChangeSet removeAllVersionMethods.
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
   632
    sameAction notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   633
	"/ check if same ...
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   634
	(classChangeSet methodsOnlyInA isEmpty
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   635
	and:[classChangeSet methodsOnlyInB isEmpty
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   636
	and:[classChangeSet diffSet isEmpty]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   637
	    sameAction value.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   638
	    ^ self "/ do not open
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   639
	]
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
   640
    ].
8891
fm
parents: 8811
diff changeset
   641
fm
parents: 8811
diff changeset
   642
    ^ self openOnClassChangeSet:classChangeSet title:ignoredTitle
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
   643
!
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
   644
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   645
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   646
    "create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   647
     browser. The class diff set is generated from two source files."
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   648
2716
8451e7057f00 some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 2714
diff changeset
   649
    ^ self
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   650
	openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   651
	title:nil
2716
8451e7057f00 some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 2714
diff changeset
   652
!
8451e7057f00 some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 2714
diff changeset
   653
8451e7057f00 some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 2714
diff changeset
   654
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB title:ignoredTitle
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   655
    "create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   656
     browser. The class diff set is generated from two source files."
2716
8451e7057f00 some common startup protocol between DiffViewer and VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 2714
diff changeset
   657
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   658
    ^ self
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   659
	openOnClass:aClass labelA:aLabelA sourceA:aSourceA
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   660
	labelB:aLabelB sourceB:aSourceB
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   661
	title:ignoredTitle ifSame:nil
2849
08085872d08f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2776
diff changeset
   662
!
08085872d08f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2776
diff changeset
   663
08085872d08f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2776
diff changeset
   664
openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB title:ignoredTitle ifSame:sameAction
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   665
    "create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   666
     browser. The class diff set is generated from two source files."
8891
fm
parents: 8811
diff changeset
   667
fm
parents: 8811
diff changeset
   668
    |diffs hasChangedMethods classChangeSet versionMethodChanges|
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   669
8891
fm
parents: 8811
diff changeset
   670
    classChangeSet := ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB.
fm
parents: 8811
diff changeset
   671
    classChangeSet removeAllVersionMethods.
2849
08085872d08f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2776
diff changeset
   672
    sameAction notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   673
	"/ check if same ...
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   674
	(classChangeSet methodsOnlyInA isEmpty
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   675
	and:[classChangeSet methodsOnlyInB isEmpty]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   676
	    diffs := classChangeSet diffSet.
3853
f3ce00da9b68 ignore any changes in the version method, when compating
Claus Gittinger <cg@exept.de>
parents: 3843
diff changeset
   677
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   678
	    hasChangedMethods := diffs changed notEmpty.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   679
	    hasChangedMethods ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   680
		versionMethodChanges := diffs changed select:[:eachDifference |
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   681
		    |eachChange|
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   682
		    eachChange := eachDifference first.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   683
		    (eachChange isMethodChange
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   684
		    and:[ (AbstractSourceCodeManager isVersionMethodSelector:eachChange selector)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   685
		    and:[ eachChange changeClass isMeta ]]).
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   686
		].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   687
		diffs changed size == versionMethodChanges size ifTrue: [
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   688
		    hasChangedMethods := false.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   689
		].
8811
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents: 8657
diff changeset
   690
"/                diffs changed size == 1 ifTrue:[
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents: 8657
diff changeset
   691
"/                    theOnlyDifference := diffs changed first.
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents: 8657
diff changeset
   692
"/                    theOnlyChange := theOnlyDifference first.
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   693
"/                    (theOnlyChange isMethodChange
8811
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents: 8657
diff changeset
   694
"/                    and:[ ((theOnlyChange selector == #version) or:[theOnlyChange selector startsWith:'version_'])
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents: 8657
diff changeset
   695
"/                    and:[ theOnlyChange changeClass isMeta ]]) ifTrue:[
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents: 8657
diff changeset
   696
"/                        hasChangedMethods := false
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents: 8657
diff changeset
   697
"/                    ]
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents: 8657
diff changeset
   698
"/                ]
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   699
	    ].
3853
f3ce00da9b68 ignore any changes in the version method, when compating
Claus Gittinger <cg@exept.de>
parents: 3843
diff changeset
   700
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   701
	    (hasChangedMethods not
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   702
	    and:[diffs onlyInArg isEmpty
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   703
	    and:[diffs onlyInReceiver isEmpty]]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   704
		sameAction value.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   705
		^ self "/ do not open
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   706
	    ].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   707
	]
2849
08085872d08f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2776
diff changeset
   708
    ].
8891
fm
parents: 8811
diff changeset
   709
fm
parents: 8811
diff changeset
   710
    ^ self openOnClassChangeSet:classChangeSet title:ignoredTitle
7396
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
   711
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
   712
    "Modified: / 13-10-2006 / 01:01:05 / cg"
2224
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
   713
!
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
   714
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   715
openOnClass:aClass versionA:aVersionA versionB:aVersionB
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   716
    "create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   717
     browser. The class diff set is generated from two versions of aClass via
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   718
     the source code manager."
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   719
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   720
    |theBrowser|
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   721
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   722
    theBrowser := self new.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   723
    theBrowser allButOpen.
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
   724
    theBrowser setupForClass:aClass versionA:aVersionA versionB:aVersionB.
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   725
    theBrowser openWindow.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   726
    ^ theBrowser.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   727
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   728
    "
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   729
     self openOnClass:Array versionA:'1.116' versionB:'1.113'
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   730
    "
3678
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
   731
!
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
   732
8891
fm
parents: 8811
diff changeset
   733
openOnClassChangeSet:classChangeSet title:ignoredTitle
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   734
    "create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   735
     browser. The class diff set is generated from two classes."
8891
fm
parents: 8811
diff changeset
   736
fm
parents: 8811
diff changeset
   737
    |theBrowser|
fm
parents: 8811
diff changeset
   738
fm
parents: 8811
diff changeset
   739
    theBrowser := self new.
fm
parents: 8811
diff changeset
   740
    theBrowser allButOpen.
fm
parents: 8811
diff changeset
   741
    theBrowser classChangeSet:classChangeSet.
fm
parents: 8811
diff changeset
   742
    theBrowser openWindow.
fm
parents: 8811
diff changeset
   743
    ^ theBrowser.
fm
parents: 8811
diff changeset
   744
!
fm
parents: 8811
diff changeset
   745
3678
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
   746
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle
10691
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   747
    ^ self
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   748
        openOnDiffSet:diffSet 
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   749
        labelA:aLabelA labelB:aLabelB 
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   750
        title:ignoredTitle
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   751
        ignoreExtensions:false
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   752
        ignoreVersionMethods:false
10691
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   753
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   754
    "Modified: / 12-09-2011 / 11:52:44 / cg"
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   755
!
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   756
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   757
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle ignoreExtensions:ignoreExtensionsBoolean
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   758
    ^ self
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   759
        openOnDiffSet:diffSet 
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   760
        labelA:aLabelA labelB:aLabelB 
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   761
        title:ignoredTitle 
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   762
        ignoreExtensions:ignoreExtensionsBoolean 
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   763
        ignoreVersionMethods:false
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   764
!
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   765
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   766
openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle ignoreExtensions:ignoreExtensionsBoolean ignoreVersionMethods:ignoreVersionMethodsBoolean
3678
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
   767
    |theBrowser|
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
   768
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
   769
    theBrowser := self new.
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   770
    theBrowser ignoreExtensions:ignoreExtensionsBoolean.
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   771
    theBrowser ignoreVersionMethods:ignoreVersionMethodsBoolean.
3678
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
   772
    theBrowser allButOpen.
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
   773
    theBrowser setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB.
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
   774
    theBrowser window label:ignoredTitle.
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
   775
    theBrowser openWindow.
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
   776
    ^ theBrowser.
10691
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   777
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   778
    "Created: / 12-09-2011 / 11:50:18 / cg"
5520
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   779
!
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   780
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   781
openOnDiffsBetweenFile:file1 and:file2
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   782
    |set1 set2 diffset theBrowser|
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   783
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   784
    set1 := ChangeSet fromFile:file1.
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   785
    set2 := ChangeSet fromFile:file2.
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   786
    diffset := set1 diffSetsAgainst:set2.
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   787
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   788
    theBrowser := self new.
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   789
    theBrowser allButOpen.
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   790
    theBrowser setupForDiffSet:diffset labelA:file1 asFilename baseName labelB:file2 asFilename baseName.
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   791
    theBrowser window label:('%1 vs. %2' bindWith:file1 asFilename baseName with:file2 asFilename baseName).
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   792
    theBrowser openWindow.
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   793
    ^ theBrowser.
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   794
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   795
    "
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   796
     VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   797
	openOnDiffsBetweenFile:'/phys/exept/tmp/ws/Workflow::BlockDescription.st'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   798
	and:'/phys/exept/tmp/workflowClasses/Workflow::BlockDescription.st'
5520
b6644f3ac71f *** empty log message ***
penk
parents: 5182
diff changeset
   799
    "
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   800
! !
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   801
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
   802
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   803
!VersionDiffBrowser methodsFor:'accessing'!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   804
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   805
canIncludeExtensions:something
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   806
    self canIncludeExtensionsHolder value:something.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   807
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   808
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   809
changeSetA
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   810
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   811
    gets the change set which contains only the new methods
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   812
    in versionA of the class
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   813
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   814
    <return: ChangeSet>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   815
    "
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   816
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   817
    ^ self classChangeSet methodsOnlyInA
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   818
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   819
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   820
changeSetB
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   821
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   822
    gets the change set which contains only the new methods
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   823
    in versionB of the class
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   824
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   825
    <return: ChangeSet>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   826
    "
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   827
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   828
    ^ self classChangeSet methodsOnlyInB
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   829
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   830
2856
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
   831
class:aClass versionA:revA versionB:revB
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
   832
    classIfSingleClassDiff := aClass.
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
   833
    versionAIfSingleClassDiff := revA.
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
   834
    versionBIfSingleClassDiff := revB.
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
   835
!
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
   836
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   837
classBeingCompared
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   838
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   839
    gets the class from the change set which is compared.
2224
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
   840
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   841
    <return: Class>
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   842
    "
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   843
    ^ self classChangeSet classBeingCompared
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   844
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   845
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   846
classChangeSet
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   847
    "returns the class change set which is the model of the version diff browser."
2224
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
   848
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   849
    ^ classChangeSet
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   850
!
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   851
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   852
classChangeSet:aClassChangeSet
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   853
    "sets the class change set which is the model of the version diff browser.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   854
     The labels, the lists, the visibility and the selection of the lists must be reseted
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   855
     when a new change set is given."
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
   856
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   857
    classChangeSet := aClassChangeSet.
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
   858
    self updateLabels.
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
   859
    self updateLists.
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
   860
    self resetSelectionHolders.
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
   861
!
2224
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
   862
10691
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   863
ignoreExtensions
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   864
    "if true, extension methods are suppressed.
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   865
     Ignoring is useful when comparing for baseClass checkin,
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   866
     as opposed to extension-checking, where extensions should not be ignored.
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   867
     the default is false"
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   868
11371
920084723b9c exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents: 10892
diff changeset
   869
    ^ self includeExtensions not
10691
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   870
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   871
    "Created: / 12-09-2011 / 11:54:11 / cg"
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   872
!
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   873
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   874
ignoreExtensions:aBoolean
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   875
    "if true, extension methods are suppressed.
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   876
     Ignoring is useful when comparing for baseClass checkin,
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   877
     as opposed to extension-checking, where extensions should not be ignored.
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   878
     the default is false"
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   879
11371
920084723b9c exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents: 10892
diff changeset
   880
    self includeExtensions:aBoolean not
10691
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   881
11371
920084723b9c exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents: 10892
diff changeset
   882
    "Modified: / 06-03-2012 / 15:37:32 / cg"
10691
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   883
!
Claus Gittinger <cg@exept.de>
parents: 9602
diff changeset
   884
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   885
ignoreVersionMethods:aBoolean
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   886
    "if true, version methods (version and version_XXX) are suppressed.
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   887
     Ignoring is useful when comparing for real code changes.
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   888
     the default is false"
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   889
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   890
    self includeVersionMethods:aBoolean not
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   891
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   892
    "Modified: / 06-03-2012 / 15:37:32 / cg"
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   893
!
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
   894
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   895
selectedChangeInA
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   896
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   897
    gets the selected method change for the 'method only in version A'.
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   898
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   899
    <return: MethodChange | nil>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   900
    "
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   901
    |selIndex change|
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   902
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   903
    selIndex := self methodsOnlyInASelection value.
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   904
    selIndex notNil ifTrue:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   905
        change := methodsOnlyInAFiltered "self changeSetA" at:selIndex.
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   906
    ].
3753
48fdc128a790 refactored
Claus Gittinger <cg@exept.de>
parents: 3730
diff changeset
   907
    ^ change
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   908
!
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   909
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   910
selectedChangeInB
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   911
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   912
    gets the selected method change for the 'method only in version B'.
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   913
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   914
    <return: MethodChange | nil>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   915
    "
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   916
    |selIndex change|
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   917
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   918
    selIndex := self methodsOnlyInBSelection value.
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   919
    selIndex notNil ifTrue:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   920
        change := methodsOnlyInBFiltered "self changeSetB" at:selIndex.
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   921
    ].
3753
48fdc128a790 refactored
Claus Gittinger <cg@exept.de>
parents: 3730
diff changeset
   922
    ^ change
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   923
!
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   924
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   925
selectedChangesInM
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   926
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   927
    get the two method changes for the selected 'changed method'.
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   928
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   929
    <return: <Array with:MethodChange with:MethodChange | nil>>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   930
    "
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   931
    |selIndex theTwoChanges|
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   932
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   933
    selIndex := self methodsChangedSelection value.
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   934
    selIndex notNil ifTrue:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   935
        theTwoChanges := methodsChangedFiltered "self classChangeSet methodsChanged" at:selIndex.
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
   936
        ^ theTwoChanges.
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   937
    ].
3753
48fdc128a790 refactored
Claus Gittinger <cg@exept.de>
parents: 3730
diff changeset
   938
    ^ #(nil nil)
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   939
!
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
   940
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   941
versionA
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   942
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   943
    gets the first class version to be compared
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   944
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   945
    <return: String>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   946
    "
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
   947
    classChangeSet isNil ifTrue:[^ 'A'].
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
   948
    ^ classChangeSet labelA
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   949
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   950
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   951
versionB
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   952
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   953
    gets the second class version to be compared
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   954
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   955
    <return: String>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
   956
    "
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
   957
    classChangeSet isNil ifTrue:[^ 'B'].
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
   958
    ^ classChangeSet labelB
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   959
! !
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   960
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
   961
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   962
!VersionDiffBrowser methodsFor:'actions'!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
   963
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   964
acceptInLeftView
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   965
    |change|
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   966
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   967
    change := self selectedChangesInM first.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   968
    self applyChange:change
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   969
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   970
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   971
acceptInRightView
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   972
    |change|
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   973
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   974
    change := self selectedChangesInM second.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   975
    self applyChange:change
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   976
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   977
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   978
acceptInSingleView
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   979
    |change|
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   980
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   981
    change := self selectedChangeInA.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   982
    change isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   983
	change := self selectedChangeInB
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   984
    ].
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   985
    self applyChange:change
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   986
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   987
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   988
applySelectedChangeInA
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   989
    self applyChange:(self selectedChangeInA)
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   990
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   991
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   992
applySelectedChangeInB
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
   993
    self applyChange:(self selectedChangeInB)
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   994
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   995
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   996
methodInADoubleClicked:index
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   997
"/    |change|
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   998
"/
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
   999
"/    change := self changeSetA at:index.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1000
"/    self browseChange:change
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1001
    self browseClassInA
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1002
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1003
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1004
methodInBDoubleClicked:index
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1005
"/    |change|
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1006
"/
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1007
"/    change := self changeSetB at:index.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1008
"/    self browseChange:change
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1009
    self browseClassInB
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1010
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1011
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1012
methodInChangedDoubleClicked:index
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1013
    self browseClassInM.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1014
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1015
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1016
methodsChangedSelectionChanged
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1017
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1018
    the selection in the list of the 'changed methods' changed.
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1019
    Reset the selection of the two other lists and calc the method change.
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1020
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1021
    <return: self>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1022
    "
8602
Claus Gittinger <cg@exept.de>
parents: 8103
diff changeset
  1023
    |sel changeA changeB methodsChanged parseError treeA treeB|
Claus Gittinger <cg@exept.de>
parents: 8103
diff changeset
  1024
Claus Gittinger <cg@exept.de>
parents: 8103
diff changeset
  1025
    self infoHolder value:''.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1026
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1027
    sel := self methodsChangedSelection value.
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1028
    sel notNil ifTrue:[
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1029
        self methodsOnlyInASelection value:nil.
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1030
        self methodsOnlyInBSelection value:nil.
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1031
        methodsChanged := self classChangeSet methodsChanged.
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1032
        changeA := (methodsChangedFiltered at:sel) first.
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1033
        changeB := (methodsChangedFiltered at:sel) second.
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1034
        self withReadCursorDo:[
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1035
            "/ see if the semantics have changed (or only prettyPrinted)
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1036
            RBParser notNil ifTrue:[
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1037
                (classChangeSet notNil
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1038
                and:[ classChangeSet classBeingCompared notNil ]) ifTrue:[
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1039
                    parseError := false.
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1040
                    treeA := RBParser parseMethod:changeA source onError: [:str :pos | parseError := true].
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1041
                    treeB := RBParser parseMethod:changeB source onError: [:str :pos | parseError := true].
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1042
                    parseError ifFalse:[
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1043
                        (treeA equalTo:treeB withMapping:(Dictionary  new)) ifTrue:[
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1044
                            self infoHolder value:'Methods only differ in formatting / comments.'.
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1045
                        ]
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1046
                    ]
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1047
                ].
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1048
            ].
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1049
            self diffTextView
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  1050
                text1:(changeA prettyPrintedSource) 
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  1051
                text2:(changeB prettyPrintedSource)        
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1052
        ].
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1053
        self showDiffTextView.
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  1054
        self diffTextView moveToNextChanged
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1055
    ]
2377
4687d21e8b01 checkin from browser
ps
parents: 2231
diff changeset
  1056
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1057
    "Modified: / 03-09-1999 / 15:01:30 / ps"
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1058
    "Modified: / 17-07-2012 / 18:27:06 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1059
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1060
9550
531c77d5d3e3 added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents: 9383
diff changeset
  1061
removeSelectedChangeInBFromImage
531c77d5d3e3 added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents: 9383
diff changeset
  1062
    |change cls sel op|
531c77d5d3e3 added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents: 9383
diff changeset
  1063
531c77d5d3e3 added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents: 9383
diff changeset
  1064
    change := self selectedChangeInB.
531c77d5d3e3 added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents: 9383
diff changeset
  1065
    change isMethodChange ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1066
	(cls := change changeClass) notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1067
	    (sel := change selector) notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1068
		RefactoryChangeManager notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1069
		    op := RemoveMethodChange remove:sel from:cls.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1070
		    RefactoryChangeManager performChange: op.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1071
		] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1072
		    cls removeSelector:sel
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1073
		]
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1074
	    ]
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1075
	]
9550
531c77d5d3e3 added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents: 9383
diff changeset
  1076
    ]
531c77d5d3e3 added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents: 9383
diff changeset
  1077
531c77d5d3e3 added: #removeSelectedChangeInBFromImage
Claus Gittinger <cg@exept.de>
parents: 9383
diff changeset
  1078
    "Modified: / 15-08-2010 / 21:35:00 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1079
! !
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1080
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  1081
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1082
!VersionDiffBrowser methodsFor:'aspects'!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1083
2585
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1084
boxAVisible
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1085
    boxAVisible isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1086
	boxAVisible := true asValue.
2585
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1087
    ].
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1088
    ^ boxAVisible.
2585
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1089
!
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1090
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1091
boxBVisible
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1092
    boxBVisible isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1093
	boxBVisible := true asValue.
2585
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1094
    ].
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1095
    ^ boxBVisible.
2585
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1096
!
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1097
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1098
boxMVisible
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1099
    boxMVisible isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1100
	boxMVisible := true asValue.
2585
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1101
    ].
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1102
    ^ boxMVisible.
2585
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1103
!
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1104
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1105
canIncludeExtensionsHolder
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1106
    "can include extensions ? (menu item enabler)"
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1107
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1108
    canIncludeExtensionsHolder isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1109
	canIncludeExtensionsHolder := true asValue.
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1110
    ].
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1111
    ^ canIncludeExtensionsHolder.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1112
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1113
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1114
changedLabelHolder
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1115
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1116
    aspect for the label of the changed method box.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1117
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1118
    <return: ValueHolder on: nil>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1119
    "
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1120
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1121
    changedLabelHolder isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1122
	changedLabelHolder := ValueHolder new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1123
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1124
    ^ changedLabelHolder.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1125
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1126
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1127
diffTextLabelA
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1128
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1129
    aspect for the label for version A.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1130
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1131
    <return: ValueHolder on: nil>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1132
    "
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1133
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1134
    diffTextLabelA isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1135
	diffTextLabelA := ValueHolder new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1136
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1137
    ^ diffTextLabelA.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1138
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1139
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1140
diffTextLabelB
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1141
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1142
    aspect for the label for version B.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1143
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1144
    <return: ValueHolder on: nil>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1145
    "
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1146
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1147
    diffTextLabelB isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1148
	diffTextLabelB := ValueHolder new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1149
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1150
    ^ diffTextLabelB.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1151
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1152
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1153
diffTextView
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1154
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1155
    return the component for the diff text view.
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1156
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1157
    <return: HVScrollableView>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1158
    "
7364
e7613aec8035 use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents: 7108
diff changeset
  1159
    |v|
e7613aec8035 use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents: 7108
diff changeset
  1160
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1161
    diffTextView isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1162
	v := DiffCodeView basicNew.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1163
	v textViewClass:CodeView.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1164
	v initialize.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1165
	diffTextView := HVScrollableView
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1166
			   forView:v
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1167
			   miniScrollerH:true miniScrollerV:false.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1168
	diffTextView addNextPreviousButtons.
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1169
    ].
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1170
    ^ diffTextView
7364
e7613aec8035 use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents: 7108
diff changeset
  1171
e7613aec8035 use codeViews (instead of TextViews)
Claus Gittinger <cg@exept.de>
parents: 7108
diff changeset
  1172
    "Modified: / 06-10-2006 / 14:30:42 / cg"
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1173
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1174
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1175
includeCategoryChanges
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1176
    ^ self includeCategoryChangesHolder value
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1177
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1178
    "Created: / 17-07-2012 / 18:22:34 / cg"
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1179
!
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1180
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1181
includeCategoryChanges:aBoolean
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1182
    self includeCategoryChangesHolder value:aBoolean
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1183
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1184
    "Created: / 17-07-2012 / 17:50:41 / cg"
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1185
!
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1186
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1187
includeCategoryChangesHolder
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1188
    includeCategoryChangesHolder isNil ifTrue:[
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1189
        includeCategoryChangesHolder := true asValue.
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1190
        includeCategoryChangesHolder addDependent:self.
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1191
    ].
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1192
    ^ includeCategoryChangesHolder.
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1193
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1194
    "Modified: / 06-03-2012 / 15:36:52 / cg"
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1195
    "Created: / 17-07-2012 / 16:47:58 / cg"
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1196
!
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1197
10703
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
  1198
includeExtensions
11371
920084723b9c exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents: 10892
diff changeset
  1199
    ^ self includeExtensionsHolder value
10703
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
  1200
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
  1201
    "Created: / 13-09-2011 / 11:48:51 / cg"
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
  1202
!
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
  1203
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
  1204
includeExtensions:aBoolean
11371
920084723b9c exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents: 10892
diff changeset
  1205
    self includeExtensionsHolder value:aBoolean
10703
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
  1206
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
  1207
    "Created: / 13-09-2011 / 11:48:41 / cg"
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
  1208
!
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
  1209
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1210
includeExtensionsHolder
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1211
    "only compare base-methods or include extensions ?"
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1212
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1213
    includeExtensionsHolder isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1214
	includeExtensionsHolder := false asValue.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1215
	includeExtensionsHolder addDependent:self.
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1216
    ].
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1217
    ^ includeExtensionsHolder.
11371
920084723b9c exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents: 10892
diff changeset
  1218
920084723b9c exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents: 10892
diff changeset
  1219
    "Modified: / 06-03-2012 / 15:36:52 / cg"
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1220
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1221
11958
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1222
includeVersionMethods
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1223
    ^ self includeVersionMethodsHolder value
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1224
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1225
    "Created: / 13-09-2011 / 11:48:51 / cg"
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1226
!
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1227
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1228
includeVersionMethods:aBoolean
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1229
    self includeVersionMethodsHolder value:aBoolean
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1230
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1231
    "Created: / 13-09-2011 / 11:48:41 / cg"
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1232
!
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1233
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1234
includeVersionMethodsHolder
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1235
    includeVersionMethodsHolder isNil ifTrue:[
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1236
        includeVersionMethodsHolder := true asValue.
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1237
        includeVersionMethodsHolder addDependent:self.
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1238
    ].
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1239
    ^ includeVersionMethodsHolder.
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1240
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1241
    "Modified: / 06-03-2012 / 15:36:52 / cg"
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1242
    "Created: / 17-07-2012 / 16:47:58 / cg"
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1243
!
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1244
8602
Claus Gittinger <cg@exept.de>
parents: 8103
diff changeset
  1245
infoHolder
Claus Gittinger <cg@exept.de>
parents: 8103
diff changeset
  1246
    infoHolder isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1247
	infoHolder := ValueHolder new.
8602
Claus Gittinger <cg@exept.de>
parents: 8103
diff changeset
  1248
    ].
Claus Gittinger <cg@exept.de>
parents: 8103
diff changeset
  1249
    ^ infoHolder.
Claus Gittinger <cg@exept.de>
parents: 8103
diff changeset
  1250
!
Claus Gittinger <cg@exept.de>
parents: 8103
diff changeset
  1251
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1252
methodText
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1253
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1254
    aspect for the text in the method text view.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1255
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1256
    <return: ValueHolder on: nil>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1257
    "
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1258
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1259
    methodText isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1260
	methodText := ValueHolder new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1261
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1262
    ^ methodText.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1263
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1264
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1265
methodsChanged
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1266
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1267
    aspect for the 'changed method' list.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1268
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1269
    <return: List>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1270
    "
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1271
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1272
    methodsChanged isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1273
	methodsChanged := List new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1274
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1275
    ^ methodsChanged.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1276
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1277
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1278
methodsChangedSelection
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1279
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1280
    aspect for the selection holder of 'changed method'-list.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1281
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1282
    <return: ValueHolder on: nil>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1283
    "
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1284
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1285
    methodsChangedSelection isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1286
	methodsChangedSelection := ValueHolder new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1287
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1288
    ^ methodsChangedSelection.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1289
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1290
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1291
methodsOnlyInA
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1292
    "aspect for the 'method only in version A' list."
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1293
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1294
    methodsOnlyInA isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1295
	methodsOnlyInA := List new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1296
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1297
    ^ methodsOnlyInA.
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1298
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1299
    "Modified: / 25-07-2006 / 11:14:43 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1300
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1301
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1302
methodsOnlyInASelection
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1303
    "aspect for the selection holder of 'method only in version A'-list."
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1304
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1305
    methodsOnlyInASelection isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1306
	methodsOnlyInASelection := ValueHolder new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1307
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1308
    ^ methodsOnlyInASelection.
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1309
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1310
    "Modified: / 25-07-2006 / 11:14:53 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1311
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1312
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1313
methodsOnlyInB
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1314
    "aspect for the 'method only in version B' list"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1315
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1316
    methodsOnlyInB isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1317
	methodsOnlyInB := List new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1318
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1319
    ^ methodsOnlyInB.
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1320
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1321
    "Modified: / 25-07-2006 / 11:14:48 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1322
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1323
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1324
methodsOnlyInBSelection
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1325
    "aspect for the selection holder of 'method only in version B'-list."
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1326
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1327
    methodsOnlyInBSelection isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1328
	methodsOnlyInBSelection := ValueHolder new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1329
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1330
    ^ methodsOnlyInBSelection.
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1331
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1332
    "Modified: / 25-07-2006 / 11:15:00 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1333
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1334
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1335
onlyInALabelHolder
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1336
    "aspect for the label for 'method only in version A'."
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1337
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1338
    onlyInALabelHolder isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1339
	onlyInALabelHolder := ValueHolder new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1340
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1341
    ^ onlyInALabelHolder.
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1342
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1343
    "Modified: / 25-07-2006 / 11:15:12 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1344
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1345
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1346
onlyInBLabelHolder
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1347
    "aspect for the label for 'method only in version B'."
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1348
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1349
    onlyInBLabelHolder isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1350
	onlyInBLabelHolder := ValueHolder new.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1351
    ].
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1352
    ^ onlyInBLabelHolder.
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1353
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1354
    "Modified: / 25-07-2006 / 11:15:07 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1355
! !
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1356
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  1357
2725
e2dc264e8c9c category changes
Claus Gittinger <cg@exept.de>
parents: 2716
diff changeset
  1358
!VersionDiffBrowser methodsFor:'aspects-exported'!
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1359
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1360
changedLabelHolder:aValueHolder
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1361
    builder aspectAt:#changedLabelHolder put:aValueHolder.
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1362
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1363
!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1364
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1365
classHolder:aValueHolder
5182
0b3ecd84056a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5150
diff changeset
  1366
    classHolder notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1367
	classHolder removeDependent:self
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1368
    ].
5182
0b3ecd84056a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5150
diff changeset
  1369
    classHolder := aValueHolder.
0b3ecd84056a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5150
diff changeset
  1370
    classHolder notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1371
	classHolder addDependent:self
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1372
    ]
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1373
!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1374
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1375
onlyInALabelHolder:aValueHolder
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1376
    builder aspectAt:#onlyInALabelHolder put:aValueHolder.
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1377
!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1378
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1379
onlyInBLabelHolder:aValueHolder
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1380
    builder aspectAt:#onlyInBLabelHolder put:aValueHolder.
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1381
!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1382
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1383
versionAHolder:aValueHolder
5182
0b3ecd84056a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5150
diff changeset
  1384
    versionAHolder notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1385
	versionAHolder removeDependent:self
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1386
    ].
5182
0b3ecd84056a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5150
diff changeset
  1387
    versionAHolder := aValueHolder.
0b3ecd84056a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5150
diff changeset
  1388
    versionAHolder notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1389
	versionAHolder addDependent:self
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1390
    ]
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1391
!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1392
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1393
versionBHolder:aValueHolder
5182
0b3ecd84056a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5150
diff changeset
  1394
    versionBHolder notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1395
	versionBHolder removeDependent:self
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1396
    ].
5182
0b3ecd84056a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5150
diff changeset
  1397
    versionBHolder := aValueHolder.
0b3ecd84056a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5150
diff changeset
  1398
    versionBHolder notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1399
	versionBHolder addDependent:self
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1400
    ]
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1401
! !
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1402
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  1403
4359
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1404
!VersionDiffBrowser methodsFor:'aspects-menu'!
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1405
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1406
canAcceptInCodeView
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1407
    ^ self hasChangeSelectedInA
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1408
      or:[self hasChangeSelectedInB
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1409
      or:[self hasChangeSelectedInM]]
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1410
!
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1411
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1412
hasChangeSelectedInA
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1413
    ^ self selectedChangeInA notNil
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1414
!
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1415
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1416
hasChangeSelectedInB
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1417
    ^ self selectedChangeInB notNil
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1418
!
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1419
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1420
hasChangeSelectedInM
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1421
    ^ self methodsChangedSelection value notNil
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1422
! !
35995cc972f7 category change
Claus Gittinger <cg@exept.de>
parents: 4128
diff changeset
  1423
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  1424
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1425
!VersionDiffBrowser methodsFor:'change & update'!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1426
12512
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1427
methodsOnlyInASelectionChanged
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1428
    "
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1429
    the selection in the list of the 'method only in version A' changed.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1430
    Reset the selection of the two other lists and show the method in
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1431
    the text view.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1432
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1433
    <return: self>
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1434
    "
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1435
    |change sel|
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1436
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1437
    self infoHolder value:''.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1438
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1439
    sel := self methodsOnlyInASelection value.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1440
    sel notNil ifTrue:[
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1441
        self methodsOnlyInBSelection value:nil.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1442
        self methodsChangedSelection value:nil.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1443
        change := methodsOnlyInAFiltered "self changeSetA" at:sel.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1444
        self methodText value:(change prettyPrintedSource).
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1445
        self showSingleTextView.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1446
    ]
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1447
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1448
    "Modified: / 17-07-2012 / 18:31:22 / cg"
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1449
!
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1450
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1451
methodsOnlyInBSelectionChanged
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1452
    "
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1453
    the selection in the list of the 'method only in version B' changed.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1454
    Reset the selection of the two other lists and show the method in
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1455
    the text view.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1456
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1457
    <return: self>
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1458
    "
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1459
    |change sel|
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1460
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1461
    self infoHolder value:''.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1462
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1463
    sel := self methodsOnlyInBSelection value.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1464
    sel notNil ifTrue:[
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1465
        self methodsOnlyInASelection value:nil.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1466
        self methodsChangedSelection value:nil.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1467
        change := methodsOnlyInBFiltered "self changeSetB" at:sel.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1468
        self methodText value:(change prettyPrintedSource).
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1469
        self showSingleTextView.
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1470
    ]
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1471
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1472
    "Modified: / 17-07-2012 / 18:31:32 / cg"
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1473
!
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  1474
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1475
update:something with:parameter from:changedObject
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1476
    ((changedObject == includeExtensionsHolder)
11958
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1477
    or:[ changedObject == includeCategoryChangesHolder
949cbf2cbeb2 class definition
Claus Gittinger <cg@exept.de>
parents: 11855
diff changeset
  1478
    or:[ changedObject == includeVersionMethodsHolder ]]) ifTrue:[
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1479
        self updateLists.
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1480
         ^ self
11371
920084723b9c exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents: 10892
diff changeset
  1481
    ].
920084723b9c exclude extension stuff fixed
Claus Gittinger <cg@exept.de>
parents: 10892
diff changeset
  1482
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1483
    (changedObject == classHolder
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1484
    or:[changedObject == versionAHolder
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1485
    or:[changedObject == versionBHolder]]) ifTrue:[
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1486
        self setupForClass:(classHolder value) versionA:(versionAHolder value) versionB:(versionBHolder value).
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1487
        ^ self
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1488
    ].
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1489
    super update:something with:parameter from:changedObject
10703
Claus Gittinger <cg@exept.de>
parents: 10693
diff changeset
  1490
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1491
    "Modified: / 17-07-2012 / 17:48:58 / cg"
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1492
! !
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  1493
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  1494
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1495
!VersionDiffBrowser methodsFor:'initialization & release'!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1496
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1497
postBuildWith:aBuilder
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1498
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1499
    components which are invisible should be ignored by the panel.
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1500
    Cannot be set via the interface builder.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1501
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1502
    <return: self>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1503
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1504
3843
673fbeb191c9 builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents: 3839
diff changeset
  1505
    (self componentAt:#TopHorizontalPanel) ignoreInvisibleComponents:true.
6642
108b83a88516 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6272
diff changeset
  1506
    super postBuildWith:aBuilder
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1507
! !
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1508
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  1509
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1510
!VersionDiffBrowser methodsFor:'menu action'!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1511
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1512
browseChange:aChange
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1513
    "browse the change in aChange"
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1514
7396
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1515
    |cls sel m browserClass|
2650
447c99ac6f76 oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
  1516
2578
29264fb3847e avoid debugger in browse-menu
Claus Gittinger <cg@exept.de>
parents: 2536
diff changeset
  1517
    aChange isNil ifTrue:[^ self].
7396
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1518
    browserClass := UserPreferences systemBrowserClass.
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1519
2650
447c99ac6f76 oops - inspect & browse menu was broken.
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
  1520
    cls := aChange changeClass.
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1521
    cls isNil ifTrue:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1522
        Dialog information:'The class is not present in the image'.
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1523
        ^ self
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1524
    ].
7396
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1525
    aChange isMethodChange ifTrue:[
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1526
        sel := aChange changeSelector.
7396
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1527
"/        (cls compiledMethodAt:sel) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1528
"/            (self confirm:'Method does not exist.\\Browse Class ?' withCRs) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1529
"/                browserClass openInClass:cls
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1530
"/            ].
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1531
"/            sel := nil.
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1532
"/        ]
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1533
    ].
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1534
    self withWaitCursorDo:[
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1535
        browserClass openInClass:cls selector:sel.
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1536
    ]
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1537
7396
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1538
    "Modified: / 12-10-2006 / 23:58:40 / cg"
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1539
!
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1540
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1541
browseClassInA
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1542
    "browse the selected method."
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1543
    self browseChange:(self selectedChangeInA).
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1544
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1545
    "Modified: / 25-07-2006 / 11:14:02 / cg"
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1546
!
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1547
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1548
browseClassInB
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1549
    "browse the selected method."
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1550
    self browseChange:(self selectedChangeInB).
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1551
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1552
    "Modified: / 25-07-2006 / 11:13:58 / cg"
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1553
!
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1554
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1555
browseClassInM
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1556
    "browse the selected method."
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1557
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1558
    self browseChange:(self selectedChangesInM first).
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1559
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1560
    "Modified: / 25-07-2006 / 11:13:54 / cg"
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1561
!
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1562
2469
c78e7a79df34 apply; methodCategoryChange
Claus Gittinger <cg@exept.de>
parents: 2468
diff changeset
  1563
createPatchFile
2856
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  1564
    "create a patchFile, to patch the old version (versionB) into the new version (versionA).
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  1565
     I.e. a little changeFile to transport those changes."
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  1566
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1567
    |defaultName f oldVersion newVersion vsnMthdA vsnMthdB vsnA vsnB info classBeingCompared|
2856
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  1568
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  1569
    defaultName := 'patchFile.chg'.
2469
c78e7a79df34 apply; methodCategoryChange
Claus Gittinger <cg@exept.de>
parents: 2468
diff changeset
  1570
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1571
    classBeingCompared := classChangeSet classBeingCompared.
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1572
    classBeingCompared notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1573
	defaultName := classBeingCompared nameWithoutPrefix.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1574
	classChangeSet versionA notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1575
	    defaultName := defaultName , '-'.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1576
	    defaultName := defaultName , classChangeSet versionA.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1577
	    classChangeSet versionB notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1578
		defaultName := defaultName , '-'.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1579
		defaultName := defaultName , classChangeSet versionB.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1580
	    ].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1581
	].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1582
	defaultName := defaultName , '.chg'.
2856
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  1583
    ].
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1584
    f := Dialog
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1585
	    requestFileNameForSave:'Name of patchFile:'
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1586
	    default:defaultName.
2856
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  1587
self warn:'Sorry: This function is not yet implemented'.
2730
0bf87aa1ac49 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2726
diff changeset
  1588
^ self.
0bf87aa1ac49 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2726
diff changeset
  1589
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1590
"/    vsnMthdA := self changeSetA
3103
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1591
"/                detect:[:ch | ch isMethodChange
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1592
"/                              and:[ch changeClass isMeta
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1593
"/                              and:[ch changeSelector = #version]]]
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1594
"/                ifNone:nil.
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1595
"/    vsnMthdB := self changeSetA
3103
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1596
"/                detect:[:ch | ch isMethodChange
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1597
"/                              and:[ch changeClass isMeta
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1598
"/                              and:[ch changeSelector = #version]]]
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1599
"/                ifNone:nil.
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1600
"/
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1601
"/    vsnMthdA notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1602
"/        "/ extract the version
3103
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1603
"/        vsnA := Class revisionStringFromSource:vsnMthdA source.
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1604
"/        vsnA notNil ifTrue:[
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1605
"/            info := Class revisionInfoFromString:vsnA.
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1606
"/            info notNil ifTrue:[
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1607
"/                vsnA := info at:#revision ifAbsent:nil.
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1608
"/            ] ifFalse:[
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1609
"/                vsnA := nil.
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1610
"/            ].
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1611
"/        ].
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1612
"/    ].
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1613
"/    vsnMthdB notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1614
"/        "/ extract the version
3103
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1615
"/        vsnB := Class revisionStringFromSource:vsnMthdB source.
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1616
"/        vsnB notNil ifTrue:[
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1617
"/            info := Class revisionInfoFromString:vsnB.
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1618
"/            info notNil ifTrue:[
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1619
"/                vsnB := info at:#revision ifAbsent:nil.
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1620
"/            ] ifFalse:[
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1621
"/                vsnB := nil.
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1622
"/            ].
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1623
"/        ].
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1624
"/    ].
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1625
"/
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1626
"/    (vsnA isNil or:[vsnB isNil or:[vsnA = vsnB]]) ifTrue:[
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1627
"/        self warn:'The generated patch file will not be able to validate/update the class version'.
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1628
"/    ].
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1629
"/
228e1cb0ef07 statements after return
Claus Gittinger <cg@exept.de>
parents: 3051
diff changeset
  1630
"/self halt:'not yet finished'.
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1631
9602
46d76851e419 changed: #createPatchFile
Claus Gittinger <cg@exept.de>
parents: 9587
diff changeset
  1632
    "Modified: / 27-10-2010 / 11:34:58 / cg"
2469
c78e7a79df34 apply; methodCategoryChange
Claus Gittinger <cg@exept.de>
parents: 2468
diff changeset
  1633
!
c78e7a79df34 apply; methodCategoryChange
Claus Gittinger <cg@exept.de>
parents: 2468
diff changeset
  1634
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1635
inspectSelectedChangeInA
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1636
    "inspect the selected method change for the 'method only in version A'."
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1637
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1638
    self selectedChangeInA inspect.
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1639
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1640
    "Modified: / 25-07-2006 / 11:13:30 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1641
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1642
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1643
inspectSelectedChangeInB
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1644
    "inspect the selected method change for the 'method only in version B'."
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1645
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1646
    self selectedChangeInB inspect.
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1647
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1648
    "Modified: / 25-07-2006 / 11:13:22 / cg"
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1649
!
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1650
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1651
inspectSelectedChangeInM
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1652
    "inspect the two method changes for the selected 'changed method'."
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1653
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1654
    |changes|
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1655
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1656
    changes := self selectedChangesInM.
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1657
    changes do:[:change |
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1658
	change inspect
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1659
    ].
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1660
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1661
    "Modified: / 25-07-2006 / 11:13:13 / cg"
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1662
!
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1663
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1664
mainMenu
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1665
    "if this application runs as an subapplication,
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1666
     the menu bar should not be used."
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1667
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1668
    self masterApplication isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1669
	^ self class mainMenu
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1670
    ].
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1671
    ^ nil
6828
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1672
034ea2c4c22a comments
Claus Gittinger <cg@exept.de>
parents: 6792
diff changeset
  1673
    "Modified: / 25-07-2006 / 11:13:44 / cg"
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1674
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1675
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1676
openDocumentation
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1677
    HTMLDocumentView openFullOnDocumentationFile:'tools/misc/TOP.html#VERSIONDIFF'
11855
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1678
!
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1679
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1680
removeClassFromChangeSet
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1681
    |cls ok changedClasses|
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1682
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1683
    classChangeSet notNil ifTrue:[
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1684
        "/ only do if we compare a single class
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1685
        (cls := classChangeSet classBeingCompared) notNil ifTrue:[
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1686
            ok := classChangeSet diffSet isEmptyOrNil.
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1687
            ok ifFalse:[
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1688
                changedClasses := classChangeSet diffSet changedClasses.
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1689
                (changedClasses size == 1
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1690
                and:[ changedClasses anElement theNonMetaclass == cls theNonMetaclass]) ifTrue:[
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1691
                    (methodsChangedFiltered isEmptyOrNil
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1692
                    and:[ methodsOnlyInAFiltered isEmptyOrNil
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1693
                    and:[ methodsOnlyInBFiltered isEmptyOrNil ]]) ifTrue:[
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1694
                        ok := true.
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1695
                    ]
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1696
                ]
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1697
            ].
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1698
            ok ifTrue:[
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1699
                ChangeSet current condenseChangesForClass:cls
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1700
            ].
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1701
        ].
52fd36ba842f changed: #removeClassFromChangeSet
Claus Gittinger <cg@exept.de>
parents: 11853
diff changeset
  1702
    ].
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1703
! !
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1704
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  1705
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1706
!VersionDiffBrowser methodsFor:'private'!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1707
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1708
addAcceptToTextViewMenus
8657
4a54180313b5 enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents: 8629
diff changeset
  1709
    "add to the standard diff text view or single text views menu an accept entry.
4a54180313b5 enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents: 8629
diff changeset
  1710
     The acceptAction will fetch the corresponding change and apply it
4a54180313b5 enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents: 8629
diff changeset
  1711
     (not the shown text)
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1712
8657
4a54180313b5 enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents: 8629
diff changeset
  1713
     <return: self>
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1714
    "
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1715
8657
4a54180313b5 enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents: 8629
diff changeset
  1716
    |diffTextView leftView rightView singleView|
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1717
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1718
    diffTextView := self diffTextView.
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1719
    leftView := diffTextView leftTextView.
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1720
    rightView := diffTextView rightTextView.
3843
673fbeb191c9 builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents: 3839
diff changeset
  1721
    singleView := self componentAt:#singleTextView.
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1722
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1723
    (Array
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1724
	with:leftView
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1725
	with:rightView
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1726
	with:singleView)
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1727
    do:[:v |
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1728
	|mGen|
8657
4a54180313b5 enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents: 8629
diff changeset
  1729
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1730
	mGen := [
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1731
	    |m|
8657
4a54180313b5 enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents: 8629
diff changeset
  1732
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1733
	    m := v editMenu.
8657
4a54180313b5 enable/disable of edit-menu items
Claus Gittinger <cg@exept.de>
parents: 8629
diff changeset
  1734
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1735
	    (m selectorAt:#accept) isNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1736
		m addLabels:(resources array:#('-' 'Accept'))
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1737
		  selectors:(Array with:nil with:#accept)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1738
		  after:#copySelection.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1739
	    ].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1740
	    m
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1741
		actionAt:#accept
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1742
		put:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1743
		    v == singleView ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1744
			self acceptInSingleView
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1745
		    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1746
			v == leftView ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1747
			   self acceptInLeftView
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1748
			] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1749
			   self acceptInRightView
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1750
			].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1751
		    ].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1752
		].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1753
	    m selectorAt:#accept put:nil.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1754
	    m enable:#copySelection.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1755
	    m setEnable:#accept to:[self canAcceptInCodeView].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1756
	    m
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1757
	].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1758
	v menuHolder:mGen.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1759
	v menuMessage:#value.
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1760
    ]
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1761
!
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  1762
3753
48fdc128a790 refactored
Claus Gittinger <cg@exept.de>
parents: 3730
diff changeset
  1763
applyChange:change
48fdc128a790 refactored
Claus Gittinger <cg@exept.de>
parents: 3730
diff changeset
  1764
    change notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1765
	change apply
3753
48fdc128a790 refactored
Claus Gittinger <cg@exept.de>
parents: 3730
diff changeset
  1766
    ]
48fdc128a790 refactored
Claus Gittinger <cg@exept.de>
parents: 3730
diff changeset
  1767
!
48fdc128a790 refactored
Claus Gittinger <cg@exept.de>
parents: 3730
diff changeset
  1768
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1769
printStringForChange:aChange
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1770
    "generate a print string for a change."
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1771
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1772
    |m changeClassName classOrMetaString useChangesString selectorString
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1773
     singleComparedClass singleComparedClassesName singleComparedMetaclassesName
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1774
     printString|
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1775
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1776
    (singleComparedClass := self classBeingCompared) notNil ifTrue:[
11533
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1777
        singleComparedClassesName := singleComparedClass name.
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1778
        singleComparedMetaclassesName := singleComparedClass theMetaclass name.
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1779
    ].
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1780
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1781
    aChange isClassDefinitionChange ifTrue:[
11533
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1782
        ^ aChange printStringWithoutClassName
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1783
    ].
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1784
    aChange isDoIt ifTrue:[
11533
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1785
        ^ aChange source , ' (doIt)'
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1786
    ].
10892
98a427ae867b changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 10829
diff changeset
  1787
    aChange isNameSpaceCreationChange ifTrue:[
11533
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1788
        ^ aChange source
10892
98a427ae867b changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 10829
diff changeset
  1789
    ].
3678
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
  1790
10892
98a427ae867b changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 10829
diff changeset
  1791
    changeClassName := aChange className.
98a427ae867b changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 10829
diff changeset
  1792
    changeClassName isNil ifTrue:[
11533
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1793
        ^ aChange source
10892
98a427ae867b changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 10829
diff changeset
  1794
    ].
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1795
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1796
    useChangesString := false.
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1797
    classOrMetaString := ''.
10892
98a427ae867b changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 10829
diff changeset
  1798
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1799
    (changeClassName = singleComparedClassesName) ifTrue:[
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1800
        "/ changeClassName := ''.
11533
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1801
        useChangesString := true.
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1802
    ] ifFalse:[
11533
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1803
        (changeClassName = singleComparedMetaclassesName) ifTrue:[
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1804
            "/ classOrMetaString := ' class'.
11533
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1805
            useChangesString := true.
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1806
        ] ifFalse:[
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1807
            ((changeClassName includes:$:) and:[ changeClassName startsWith:((singleComparedClassesName ? ''),'::') ]) ifTrue:[
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1808
                changeClassName := changeClassName copyFrom:(singleComparedClassesName,'::') size+1.
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1809
            ].
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1810
        ].
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1811
    ].
6272
54b4aec6a387 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6210
diff changeset
  1812
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1813
    selectorString := ''.
11533
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1814
    (aChange isMethodChange) ifTrue:[
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1815
        selectorString := aChange selector.
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1816
        aChange changeClass notNil ifTrue:[
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1817
            m := aChange changeMethod.
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1818
            m notNil ifTrue:[
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1819
                m := m originalMethodIfWrapped.
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1820
                selectorString := m printStringForBrowserWithSelector:aChange selector inClass:aChange changeClass.
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1821
            ].
106faef31ef5 changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 11453
diff changeset
  1822
        ].
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1823
        changeClassName notEmptyOrNil ifTrue:[
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1824
            selectorString := ' >> ',selectorString
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1825
        ]
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1826
    ].
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1827
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1828
    printString := changeClassName,classOrMetaString,selectorString.
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1829
    aChange isMethodCategoryChange ifTrue:[
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1830
        ^ printString, ' (category)'
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1831
    ].
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1832
    ^ printString
9587
9f33d5c62efa changed: #printStringForChange:
Claus Gittinger <cg@exept.de>
parents: 9550
diff changeset
  1833
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1834
    "Modified: / 17-07-2012 / 18:43:27 / cg"
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1835
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1836
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1837
resetSelectionHolders
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1838
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1839
    reset all selection holders when a new change set is given.
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1840
    First set the selection to nil.
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1841
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1842
    <return: self>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1843
    "
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1844
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1845
    self methodsChangedSelection value:nil.
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1846
    self methodsOnlyInASelection value:nil.
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1847
    self methodsOnlyInBSelection value:nil.
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1848
    self diffTextView text1:'' text2:''.
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1849
    self methodText value:''.
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1850
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1851
"/    self methodsChangedSelectionChanged.
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1852
"/    self methodsOnlyInASelectionChanged.
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1853
"/    self methodsOnlyInBSelectionChanged.
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1854
!
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1855
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1856
showDiffTextView
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1857
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1858
    if a method change is selected, then show the diff text view.
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1859
    Add an accept entry to the popup menu.
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1860
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1861
    <return: self>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1862
    "
2694
a19deafda6b0 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1863
3843
673fbeb191c9 builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents: 3839
diff changeset
  1864
    (self componentAt:#diffTextViewBox) raise; beVisible.
673fbeb191c9 builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents: 3839
diff changeset
  1865
    (self componentAt:#singleTextView) beInvisible.
673fbeb191c9 builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents: 3839
diff changeset
  1866
    (self componentAt:#diffTextView) realizeAllSubViews.
2694
a19deafda6b0 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1867
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  1868
    self addAcceptToTextViewMenus.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1869
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1870
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1871
showSingleTextView
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1872
    "
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1873
    if a method  is selected which is only in version A or B of the class,
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1874
    then show the text view.
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1875
    Add an accept entry to the popup menu.
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1876
3147
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1877
    <return: self>
6977e4703d1a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3146
diff changeset
  1878
    "
2507
f5f8a26b7003 checkin from browser
ps
parents: 2501
diff changeset
  1879
3843
673fbeb191c9 builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents: 3839
diff changeset
  1880
    (self componentAt:#singleTextView) raise; beVisible.
673fbeb191c9 builder componentAt: -> self componentAt:
Claus Gittinger <cg@exept.de>
parents: 3839
diff changeset
  1881
    (self componentAt:#diffTextViewBox) beInvisible.
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  1882
    self addAcceptToTextViewMenus.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1883
!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1884
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1885
updateLabels
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1886
    "update the labels of the diff text view. Show the version numbers
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1887
     of the class."
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1888
2694
a19deafda6b0 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1889
    |theVersionA theVersionB builder|
2224
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
  1890
2694
a19deafda6b0 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2650
diff changeset
  1891
    builder := self builder.
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1892
    (theVersionA := self versionA) notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1893
	self diffTextLabelA value:theVersionA.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1894
	self onlyInALabelHolder value:('Only in ' , theVersionA).
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1895
	(self componentAt:#OnlyInALabel)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1896
	    foregroundColor:Color white;
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1897
	    backgroundColor:Color green darkened.
2224
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
  1898
    ].
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  1899
    (theVersionB :=self versionB) notNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1900
	self diffTextLabelB value:theVersionB.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1901
	self onlyInBLabelHolder value:('Only in ' , theVersionB).
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1902
	(self componentAt:#OnlyInBLabel)
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1903
	    foregroundColor:Color white;
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1904
	    backgroundColor:Color red darkened.
2224
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
  1905
    ].
7396
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1906
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1907
    self changedLabelHolder value:('Different').
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1908
Claus Gittinger <cg@exept.de>
parents: 7364
diff changeset
  1909
    "Modified: / 13-10-2006 / 01:07:08 / cg"
2224
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
  1910
!
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
  1911
0e4250930948 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2221
diff changeset
  1912
updateLists
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  1913
    |classChangeSet listOnlyInA listOnlyInB listChanged
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1914
     printStringGenerator sortBlockForChangeLists filteredList
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  1915
     isIgnoredChange numIgnoredExtensions numIgnoredVersionMethods 
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  1916
     info needFilter|
2230
5e10eebb1de2 move change-compare code to where it belongs (Change-hierarchy)
Claus Gittinger <cg@exept.de>
parents: 2229
diff changeset
  1917
2585
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1918
    classChangeSet := self classChangeSet.
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1919
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1920
    printStringGenerator := [:aChange | self printStringForChange:aChange].
3839
df64b936da0d sort lists by name
Claus Gittinger <cg@exept.de>
parents: 3763
diff changeset
  1921
    sortBlockForChangeLists := [:a :b | (printStringGenerator value:a) < (printStringGenerator value:b)].
df64b936da0d sort lists by name
Claus Gittinger <cg@exept.de>
parents: 3763
diff changeset
  1922
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  1923
    numIgnoredExtensions := numIgnoredVersionMethods := 0.
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  1924
    needFilter := self includeExtensions not 
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  1925
                  or:[self includeCategoryChanges not
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  1926
                  or:[self includeVersionMethods not]].
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1927
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1928
    needFilter ifTrue:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1929
        isIgnoredChange :=
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1930
            [:change |
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1931
                |packageOfMethodInChange packageOfMethodInImage changeMethod ignored|
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1932
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1933
                ignored := false.
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1934
                change isMethodCodeChange ifTrue:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1935
                    self includeExtensions ifFalse:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1936
                        packageOfMethodInChange := change package.
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1937
                        (packageOfMethodInChange notNil
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1938
                          and:[ packageOfMethodInChange ~= PackageId noProjectID
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1939
                          and:[ packageOfMethodInChange ~= change changeClass package ]]) ifTrue:[
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  1940
                            ignored := true
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  1941
                        ].
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1942
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1943
                        changeMethod := change changeMethod.
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1944
                        changeMethod notNil ifTrue:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1945
                            packageOfMethodInImage := changeMethod package.
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1946
                            (true "packageOfMethodInImage notNil"
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1947
                              and:[ packageOfMethodInImage ~= PackageId noProjectID
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1948
                              and:[ packageOfMethodInImage ~= changeMethod mclass package ]]) ifTrue:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1949
                                ignored := true
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1950
                            ].
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1951
                        ].
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1952
                        numIgnoredExtensions := numIgnoredExtensions + (ignored ifTrue:[1] ifFalse:[0]).
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  1953
                    ].
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1954
                    self includeVersionMethods ifFalse:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1955
                        (change isMethodChangeForVersionMethod
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1956
                        or:[ change isMethodChangeForExtensionsVersionMethod ]) ifTrue:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1957
                            ignored := true.
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1958
                            numIgnoredVersionMethods := numIgnoredVersionMethods + 1
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1959
                        ].
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1960
                    ].
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1961
                ] ifFalse:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1962
                    change isMethodCategoryChange ifTrue:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1963
                        self includeCategoryChanges ifFalse:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1964
                            ignored := true
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1965
                        ]
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  1966
                    ].
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  1967
                ].
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1968
                ignored.
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1969
            ].
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1970
    ] ifFalse:[
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1971
        isIgnoredChange := [:change | false].
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1972
    ].
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  1973
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1974
    listOnlyInA := filteredList := self methodsOnlyInA.
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  1975
    listOnlyInA removeAll.
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  1976
    classChangeSet notNil ifTrue:[
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1977
        "/ classChangeSet methodsOnlyInA sort:sortBlockForChangeLists.
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1978
        filteredList := classChangeSet methodsOnlyInA reject:isIgnoredChange.
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1979
        listOnlyInA addAll: (filteredList collect:printStringGenerator).
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  1980
    ].
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1981
    methodsOnlyInAFiltered := filteredList.
2585
718f8fce7ca4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2578
diff changeset
  1982
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1983
    listOnlyInB := filteredList := self methodsOnlyInB.
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  1984
    listOnlyInB removeAll.
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  1985
    classChangeSet notNil ifTrue:[
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1986
        "/ classChangeSet methodsOnlyInB sort:sortBlockForChangeLists.
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1987
        filteredList := classChangeSet methodsOnlyInB reject:isIgnoredChange.
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1988
        listOnlyInB addAll: (filteredList collect:printStringGenerator).
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  1989
    ].
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1990
    methodsOnlyInBFiltered := filteredList.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  1991
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1992
    listChanged := filteredList := self methodsChanged.
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  1993
    listChanged removeAll.
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  1994
    classChangeSet notNil ifTrue:[
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1995
        "/ classChangeSet methodsChanged sort:[:a :b | sortBlockForChangeLists value:a first value:b first].
11962
1d931eea22af class definition
Claus Gittinger <cg@exept.de>
parents: 11961
diff changeset
  1996
        filteredList := classChangeSet methodsChanged reject:[:entry | isIgnoredChange value:entry first].
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1997
        listChanged addAll: (filteredList collect:[:entry| printStringGenerator value:(entry first)]).
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  1998
    ].
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  1999
    methodsChangedFiltered := filteredList.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2000
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2001
    self boxAVisible value:(listOnlyInA notEmpty).
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2002
    self boxBVisible value:(listOnlyInB notEmpty).
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2003
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2004
    self boxMVisible value:(listChanged isEmpty
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  2005
                            and: [(listOnlyInA notEmpty
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  2006
                                  or:[listOnlyInB notEmpty])]) not.
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2007
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  2008
    info := ''.
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2009
    numIgnoredExtensions ~~ 0 ifTrue:[
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  2010
        info := info , ('%1 extension methods ignored. ' bindWith:numIgnoredExtensions).
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2011
    ].
11961
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  2012
    numIgnoredVersionMethods ~~ 0 ifTrue:[
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  2013
        info := info , ('%1 version methods ignored.' bindWith:numIgnoredVersionMethods).
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  2014
    ].
094f448dc1f0 added ignoreVersionMethods option
Claus Gittinger <cg@exept.de>
parents: 11958
diff changeset
  2015
    self infoHolder value:info
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2016
11596
a82461d12ced selection fixes (when filtering)
Claus Gittinger <cg@exept.de>
parents: 11533
diff changeset
  2017
    "Modified: / 17-07-2012 / 18:34:36 / cg"
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2018
! !
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2019
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  2020
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  2021
!VersionDiffBrowser methodsFor:'setup'!
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  2022
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2023
setupForClass:aClass againstVersion:aVersionA
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2024
    "compute the class change set for the class aClass of its current version against the repository version A.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2025
     When setting the class change set, the labels, list etc. of the receiver
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2026
     are updated."
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2027
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2028
    |changeSet|
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2029
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  2030
    aClass isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2031
	changeSet := nil
2745
8fa3af64f96e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2731
diff changeset
  2032
    ] ifFalse:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2033
	aClass isNameSpace ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2034
	    aClass isLoaded ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2035
		changeSet := (ClassChangeSet newForClass:aClass againstVersion:aVersionA).
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2036
	    ]
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2037
	].
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2038
    ].
2856
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2039
    self classChangeSet:changeSet.
2857
0c467f6b1741 handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents: 2856
diff changeset
  2040
    aVersionA isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2041
	self class:aClass versionA:'Repository' versionB:'Current'.
2857
0c467f6b1741 handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents: 2856
diff changeset
  2042
    ] ifFalse:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2043
	self class:aClass versionA:aVersionA versionB:(aVersionA , 'm').
2857
0c467f6b1741 handle case if invoked without versionString
Claus Gittinger <cg@exept.de>
parents: 2856
diff changeset
  2044
    ]
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2045
!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2046
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2047
setupForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2048
    "generate the class change set from the two classes A and B.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2049
     When setting the class change set, the labels, list etc. of the receiver
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2050
     are updated."
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2051
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2052
    |changeSet|
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2053
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2054
    changeSet := (ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB).
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2055
    self classChangeSet:changeSet
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2056
!
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2057
2510
58974b8db9fd checkin from browser
ps
parents: 2507
diff changeset
  2058
setupForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2059
    "generate the class change set from the two source files A and B.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2060
     When setting the class change set, the labels, list etc. of the receiver
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2061
     are updated."
2510
58974b8db9fd checkin from browser
ps
parents: 2507
diff changeset
  2062
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2063
    |changeSet|
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2064
9383
dc59d4bf4a56 code deobfuscated:
Claus Gittinger <cg@exept.de>
parents: 9325
diff changeset
  2065
    aClass isRealNameSpace ifFalse:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2066
	aClass isLoaded ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2067
	    changeSet := (ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB).
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2068
	]
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2069
    ].
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2070
    self classChangeSet:changeSet
7499
6bb22d2d1ad9 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 7419
diff changeset
  2071
6bb22d2d1ad9 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 7419
diff changeset
  2072
    "Modified: / 10-11-2006 / 17:15:26 / cg"
2510
58974b8db9fd checkin from browser
ps
parents: 2507
diff changeset
  2073
!
58974b8db9fd checkin from browser
ps
parents: 2507
diff changeset
  2074
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  2075
setupForClass:aClass versionA:aVersionA versionB:aVersionB
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2076
    "compute the class change set for the class aClass and the versions A and B.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2077
     When setting the class change set, the labels, list etc. of the receiver
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2078
     are updated."
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  2079
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2080
    |changeSet|
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2081
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2082
    aClass isNameSpace ifFalse:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2083
	aClass isLoaded ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2084
	    changeSet := (ClassChangeSet newForClass:aClass versionA:aVersionA versionB:aVersionB).
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2085
	]
2731
5628e2514bfa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2730
diff changeset
  2086
    ].
2856
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2087
    self classChangeSet:changeSet.
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2088
    self class:aClass versionA:aVersionA versionB:aVersionB.
3678
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
  2089
!
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
  2090
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
  2091
setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
  2092
    |changeSet|
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
  2093
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
  2094
    changeSet := (ClassChangeSet new diffSet:diffSet; labelA:aLabelA; labelB:aLabelB).
7a54c5f8c9fe *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3594
diff changeset
  2095
    self classChangeSet:changeSet
2501
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  2096
! !
e86fae15642d checkin from browser
ps
parents: 2497
diff changeset
  2097
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  2098
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2099
!VersionDiffBrowser::ClassChangeSet class methodsFor:'instance creation'!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2100
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2101
changeSetForClass:aClass
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2102
    "return a ChangeSet for the class aClass and its current source.
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2103
     The source is generated into a stream and then the change set is generated
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2104
     from the source stream."
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2105
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2106
    ^ ChangeSet forExistingClass:aClass.
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2107
!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2108
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2109
changeSetForClass:aClass andRevision:aVersion
3594
12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents: 3344
diff changeset
  2110
    "return a ChangeSet for the class aClass and version aVersion.
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2111
     The version from the class source stream is checked out from the repositiory
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2112
     into a source stream. Then the change set is generated from the source stream."
3594
12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents: 3344
diff changeset
  2113
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2114
    |theSourceCodeManager theSourceStream theChangeSet|
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2115
10829
e57c6dc35f3c Do not call obsolete methods in SourceCodeManager class
Stefan Vogel <sv@exept.de>
parents: 10703
diff changeset
  2116
    theSourceCodeManager := SourceCodeManagerUtilities default sourceCodeManagerFor:aClass.
3594
12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents: 3344
diff changeset
  2117
    [
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2118
	theSourceStream := theSourceCodeManager getSourceStreamFor:aClass revision:aVersion.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2119
	theSourceStream notNil
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2120
	    ifTrue:[theChangeSet := ChangeSet fromStream:theSourceStream]
3594
12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents: 3344
diff changeset
  2121
    ] ensure:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2122
	theSourceStream notNil ifTrue:[theSourceStream close]
3594
12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents: 3344
diff changeset
  2123
    ].
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2124
    self sortChangeSet:theChangeSet.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2125
    ^ theChangeSet
7108
e22911bfd36b sourceCodeManager access
Claus Gittinger <cg@exept.de>
parents: 6828
diff changeset
  2126
e22911bfd36b sourceCodeManager access
Claus Gittinger <cg@exept.de>
parents: 6828
diff changeset
  2127
    "Modified: / 12-09-2006 / 14:24:51 / cg"
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2128
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2129
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2130
changeSetForClass:aClass andSource:aSource
3594
12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents: 3344
diff changeset
  2131
    "return a ChangeSet for the class aClass and source aSource.
4638
79734f7bdfc4 Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents: 4359
diff changeset
  2132
     The source is converted to a stream and then the change set is generated
79734f7bdfc4 Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents: 4359
diff changeset
  2133
     from the source stream.
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2134
     Raise an error if the source stream cannot be opened."
4638
79734f7bdfc4 Handle openErrorSignal in preparition for change openErrorSignal
Stefan Vogel <sv@exept.de>
parents: 4359
diff changeset
  2135
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2136
    |theChangeSet theSourceStream|
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2137
3594
12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents: 3344
diff changeset
  2138
    [
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2139
	theSourceStream := aSource readStream.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2140
	theChangeSet := ChangeSet fromStream:(theSourceStream := aSource readStream)
3594
12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents: 3344
diff changeset
  2141
    ] ensure:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2142
	theSourceStream notNil ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2143
	    theSourceStream close
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2144
	]
3594
12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure:
Claus Gittinger <cg@exept.de>
parents: 3344
diff changeset
  2145
    ].
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2146
    self sortChangeSet:theChangeSet.
4653
0a97ce41f5bd More openErrorSignal change preparations
Stefan Vogel <sv@exept.de>
parents: 4638
diff changeset
  2147
    ^ theChangeSet
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2148
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2149
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2150
newForClass:aClass againstVersion:aVersionA
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2151
    "return a ClassChangeSet for the class aClass against some verson in the repository.
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2152
     A new instance of ClassChangeSet is generated containing
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2153
     the correspondenting changes."
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2154
8891
fm
parents: 8811
diff changeset
  2155
    |theClassChangeSet|
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2156
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2157
    theClassChangeSet := self new.
8891
fm
parents: 8811
diff changeset
  2158
    theClassChangeSet setupForClass:aClass againstVersion:aVersionA.
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2159
    ^ theClassChangeSet
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2160
!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2161
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2162
newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2163
    "return a ClassChangeSet for two classes.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2164
     A new instance of ClassChangeSet is generated containing the correspondenting changes."
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2165
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2166
    |aStream sourceA sourceB theChangeSetA theChangeSetB theClassChangeSet|
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2167
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2168
    theClassChangeSet := self new.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2169
    theClassChangeSet classBeingCompared:classA.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2170
    theClassChangeSet labelA:aLabelA.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2171
    theClassChangeSet labelB:aLabelB.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2172
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2173
    aStream := '' writeStream.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2174
    Method flushSourceStreamCache.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2175
    classA fileOutOn:aStream withTimeStamp:false.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2176
    sourceA := aStream contents asString.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2177
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2178
    aStream := '' writeStream.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2179
    Method flushSourceStreamCache.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2180
    classB fileOutOn:aStream withTimeStamp:false.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2181
    sourceB := aStream contents asString.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2182
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2183
    theChangeSetA:=self changeSetForClass:classA andSource:sourceA.
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2184
    theChangeSetB:=self changeSetForClass:classB andSource:sourceB.
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2185
    theChangeSetA isNil
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2186
	ifTrue: [theChangeSetA := ChangeSet new].
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2187
    theChangeSetB isNil
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2188
	ifTrue: [theChangeSetB := ChangeSet new].
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2189
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2190
    "/ just in case (if comparing a class against another),
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2191
    "/ unify the classes of the changes (to avoid that all changes are detected as different)
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2192
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2193
    theChangeSetB do:[:eachChange |
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2194
	eachChange isMethodChange ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2195
	    eachChange changeClass isMeta ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2196
		eachChange changeClass ~~ classA theMetaclass ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2197
		    eachChange changeClass:classA theMetaclass.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2198
		]
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2199
	    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2200
		eachChange changeClass ~~ classA theNonMetaclass ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2201
		    eachChange changeClass:classA theNonMetaclass.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2202
		]
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2203
	    ].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2204
	].
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2205
    ].
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2206
    "/ remove all #initialize doIts
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2207
    theChangeSetA := theChangeSetA select:[:eachChange | eachChange isDoIt not or:[eachChange isInitialize not]].
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2208
    theChangeSetB := theChangeSetB select:[:eachChange | eachChange isDoIt not or:[eachChange isInitialize not]].
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2209
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2210
    theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB).
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2211
    ^ theClassChangeSet
2949
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2212
!
7ce4f684026b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2947
diff changeset
  2213
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2214
newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
3730
717e425e843e allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents: 3687
diff changeset
  2215
    "return a ClassChangeSet for the class aClass and the two sources.
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2216
     The two classes are compared via the source files. A new instance of
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2217
     ClassChangeSet is generated containing the correspondenting changes."
3730
717e425e843e allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents: 3687
diff changeset
  2218
4128
540bf0752f89 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3853
diff changeset
  2219
    |theChangeSetA theChangeSetB theClassChangeSet className metaClassName|
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2220
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2221
    theClassChangeSet := self new.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2222
    theClassChangeSet classBeingCompared:aClass.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2223
    theClassChangeSet labelA:aLabelA.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2224
    theClassChangeSet labelB:aLabelB.
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2225
    theChangeSetA:=self changeSetForClass:aClass andSource:aSourceA.
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2226
    theChangeSetB:=self changeSetForClass:aClass andSource:aSourceB.
3730
717e425e843e allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents: 3687
diff changeset
  2227
4128
540bf0752f89 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3853
diff changeset
  2228
    className := aClass name.
540bf0752f89 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3853
diff changeset
  2229
    metaClassName := aClass class name.
540bf0752f89 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3853
diff changeset
  2230
3730
717e425e843e allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents: 3687
diff changeset
  2231
    aClass isPrivate ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2232
	theChangeSetA := theChangeSetA select:[:change | change isMethodChange not
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2233
							 or:[change className = className or:[change className = metaClassName]]].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2234
	theChangeSetA := theChangeSetA select:[:change | change isClassDefinitionChange not
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2235
							 or:[change className = className or:[change className = metaClassName]]].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2236
	theChangeSetA := theChangeSetA select:[:change | change isDoIt not
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2237
							 or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2238
	theChangeSetB := theChangeSetB select:[:change | change isMethodChange not
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2239
							 or:[change className = className or:[change className = metaClassName]]].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2240
	theChangeSetB := theChangeSetB select:[:change | change isClassDefinitionChange not
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2241
							 or:[change className = className or:[change className = metaClassName]]].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2242
	theChangeSetB := theChangeSetB select:[:change | change isDoIt not
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2243
							 or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2244
	"/ there might be more needed...
3730
717e425e843e allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents: 3687
diff changeset
  2245
    ].
717e425e843e allow for private classes to be compared
Claus Gittinger <cg@exept.de>
parents: 3687
diff changeset
  2246
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2247
    theChangeSetA isNil
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2248
	ifTrue: [theChangeSetA := ChangeSet new].
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2249
    theChangeSetB isNil
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2250
	ifTrue: [theChangeSetB := ChangeSet new].
2947
59694f799b13 fixed compareWithClass
Claus Gittinger <cg@exept.de>
parents: 2857
diff changeset
  2251
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2252
    theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB).
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2253
    ^ theClassChangeSet
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  2254
!
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  2255
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2256
newForClass:aClass versionA:aVersionA versionB:aVersionB
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2257
    "return a ClassChangeSet for the class aClass and the two versions.
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2258
     The two class version are checked out from the repository and then being
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2259
     compared. A new instance of ClassChangeSet is generated containing
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2260
     the correspondenting changes."
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2261
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2262
    |theChangeSetA theChangeSetB theClassChangeSet|
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2263
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2264
    theClassChangeSet := self new.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2265
    theClassChangeSet classBeingCompared:aClass.
2856
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2266
    theClassChangeSet versionA:aVersionA.
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2267
    theClassChangeSet versionB:aVersionB.
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2268
    theClassChangeSet labelA:aVersionA.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2269
    theClassChangeSet labelB:aVersionB.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2270
    theChangeSetA := self changeSetForClass: aClass andRevision: aVersionA.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2271
    theChangeSetB := self changeSetForClass: aClass andRevision: aVersionB.
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2272
    theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new].
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2273
    theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new].
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2274
    theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB).
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2275
    ^ theClassChangeSet
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2276
!
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2277
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2278
sortChangeSet:aChangeSet
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2279
    "/ sort by meta and selector
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2280
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2281
    aChangeSet
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2282
	sort:[:a :b |
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2283
	    a == b ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2284
		false
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2285
	    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2286
		a isClassDefinitionChange == b isClassDefinitionChange ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2287
		    a isClassChange == b isClassChange ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2288
			a isClassChange ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2289
			    a isForMeta == b isForMeta ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2290
				a isMethodChange == b isMethodChange ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2291
				    a className < b className
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2292
				    or:[ a className = b className
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2293
					 and:[ a isPrimitiveChange not
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2294
					 and:[ b isPrimitiveChange not
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2295
					 and:[ a selector < b selector ]]]]
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2296
				] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2297
				    a isMethodChange not
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2298
				].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2299
			    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2300
				a isForMeta
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2301
			    ].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2302
			] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2303
			    a printString < b printString
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2304
			].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2305
		    ] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2306
			a isClassChange
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2307
		    ].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2308
		] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2309
		    a isClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2310
		].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2311
	    ]
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2312
	].
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2313
! !
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2314
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  2315
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2316
!VersionDiffBrowser::ClassChangeSet methodsFor:'accessing'!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2317
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2318
classBeingCompared
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2319
    "returns the value of the class which is compared"
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2320
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2321
    ^ classBeingCompared
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2322
!
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2323
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2324
classBeingCompared:something
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2325
    "set the value of the class which is compared"
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2326
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2327
    classBeingCompared := something.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2328
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2329
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2330
diffSet
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2331
    "returns a diffSet containing the different changes.
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2332
     it responds to:
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2333
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2334
     changed         OrderedCollection of arrays containing ChangeSets for methods
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2335
		     which are changed and exists in the class versionA and versionB
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2336
     onlyInArg       ChangeSet for the methods which exists only in the class versionB
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2337
     onlyInReceiver  ChangeSet for the methods which exists only in the class versionA
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2338
    "
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2339
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2340
    ^ diffSet
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2341
!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2342
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2343
diffSet:something
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2344
    "sets the diffSet containing the different changes.
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2345
     it responds to:
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2346
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2347
     changed         OrderedCollection of arrays containing ChangeSets for methods
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2348
		     which are changed and exists in the class versionA and versionB
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2349
     onlyInArg       ChangeSet for the methods which exists only in the class versionB
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2350
     onlyInReceiver  ChangeSet for the methods which exists only in the class versionA
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2351
    "
2695
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2352
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2353
    diffSet := something.
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2354
!
6cf8801118a3 more startup entries
Claus Gittinger <cg@exept.de>
parents: 2694
diff changeset
  2355
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2356
labelA
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2357
    "returns the label for the class versionA"
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2358
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2359
    ^ labelA
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2360
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2361
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2362
labelA:something
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2363
   "sets the label for the class versionA"
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2364
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2365
    labelA := something.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2366
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2367
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2368
labelB
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2369
    "returns the label for the class versionB"
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2370
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2371
    ^ labelB
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2372
!
2465
0567a72d20a5 added apply & browse
Claus Gittinger <cg@exept.de>
parents: 2419
diff changeset
  2373
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2374
labelB:something
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2375
    "sets the label for the class versionB"
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2376
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2377
    labelB := something.
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2378
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2379
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2380
methodsChanged
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2381
    "returns an OrderedCollection of arrays containing ChangeSets for methods
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2382
     which are changed and exists in the class versionA and versionB
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2383
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2384
     <return: OrderedCollection of Array(2)>
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2385
    "
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2386
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2387
    ^ self diffSet changed
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2388
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2389
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2390
methodsOnlyInA
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2391
    "returns a ChangeSet for the methods which exists only in the class versionA"
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2392
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2393
    ^ self diffSet onlyInReceiver
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2394
!
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2395
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2396
methodsOnlyInB
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2397
    "returns a ChangeSet for the methods which exists only in the class versionB"
2497
ef306e387021 checkin from browser
ps
parents: 2486
diff changeset
  2398
3756
7b7e4b5fd63e refactored
Claus Gittinger <cg@exept.de>
parents: 3753
diff changeset
  2399
    ^ self diffSet onlyInArg
2856
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2400
!
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2401
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2402
versionA
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2403
    ^ versionA
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2404
!
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2405
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2406
versionA:something
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2407
    versionA := something.
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2408
!
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2409
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2410
versionB
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2411
    ^ versionB
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2412
!
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2413
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2414
versionB:something
754d84dec893 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2853
diff changeset
  2415
    versionB := something.
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2416
! !
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2417
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  2418
8891
fm
parents: 8811
diff changeset
  2419
!VersionDiffBrowser::ClassChangeSet methodsFor:'misc'!
fm
parents: 8811
diff changeset
  2420
fm
parents: 8811
diff changeset
  2421
removeAllVersionMethods
fm
parents: 8811
diff changeset
  2422
    diffSet removeAllVersionMethods.
fm
parents: 8811
diff changeset
  2423
! !
fm
parents: 8811
diff changeset
  2424
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  2425
8891
fm
parents: 8811
diff changeset
  2426
!VersionDiffBrowser::ClassChangeSet methodsFor:'setup'!
fm
parents: 8811
diff changeset
  2427
fm
parents: 8811
diff changeset
  2428
setupForClass:aClass againstVersion:aVersionA
fm
parents: 8811
diff changeset
  2429
    "return a ClassChangeSet for the class aClass against some verison in the repository.
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2430
     A new instance of ClassChangeSet is generated containing
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2431
     the correspondenting changes."
8891
fm
parents: 8811
diff changeset
  2432
fm
parents: 8811
diff changeset
  2433
    |theChangeSetA theChangeSetB versionCompared|
fm
parents: 8811
diff changeset
  2434
fm
parents: 8811
diff changeset
  2435
    self classBeingCompared:aClass.
fm
parents: 8811
diff changeset
  2436
    versionCompared := aVersionA.
fm
parents: 8811
diff changeset
  2437
    aVersionA isNil ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2438
	self labelA:(versionCompared := aClass revision).
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2439
	self versionA:versionCompared.
8891
fm
parents: 8811
diff changeset
  2440
    ] ifFalse:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2441
	aVersionA == #newest ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2442
	    self labelA:(VersionDiffBrowser resources string:'Newest').
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2443
	] ifFalse:[
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2444
	    self labelA:versionCompared.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2445
	    self versionA:versionCompared.
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2446
	]
8891
fm
parents: 8811
diff changeset
  2447
    ].
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2448
    self labelB:(VersionDiffBrowser resources string:'Current').
8891
fm
parents: 8811
diff changeset
  2449
    theChangeSetA := self class changeSetForClass: aClass andRevision: versionCompared.
fm
parents: 8811
diff changeset
  2450
    theChangeSetB := self class changeSetForClass: aClass.
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2451
    theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new].
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2452
    theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new].
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2453
8891
fm
parents: 8811
diff changeset
  2454
    "/ if we are comparing a private class, prune out other changes
fm
parents: 8811
diff changeset
  2455
    aClass isPrivate ifTrue:[
11453
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2456
	theChangeSetA removeAllSuchThat:[:aChange | aChange className ~= aClass name ].
Claus Gittinger <cg@exept.de>
parents: 11451
diff changeset
  2457
	theChangeSetB removeAllSuchThat:[:aChange | aChange className ~= aClass name ].
8891
fm
parents: 8811
diff changeset
  2458
    ].
9239
1cfdf9dae50b double click; extensions-filter; better printStrings
Claus Gittinger <cg@exept.de>
parents: 8891
diff changeset
  2459
    self activityNotification:'Generating diff-set...'.
8891
fm
parents: 8811
diff changeset
  2460
    self diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB).
fm
parents: 8811
diff changeset
  2461
    self activityNotification:nil.
fm
parents: 8811
diff changeset
  2462
    ^ diffSet
fm
parents: 8811
diff changeset
  2463
! !
fm
parents: 8811
diff changeset
  2464
12571
b2e5fdb702cb Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12431 12512
diff changeset
  2465
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2466
!VersionDiffBrowser class methodsFor:'documentation'!
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2467
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2468
version
12512
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  2469
    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.112 2013-03-23 11:37:08 cg Exp $'
8811
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents: 8657
diff changeset
  2470
!
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents: 8657
diff changeset
  2471
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame:
fm
parents: 8657
diff changeset
  2472
version_CVS
12512
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  2473
    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.112 2013-03-23 11:37:08 cg Exp $'
12128
a7ff7d66ee85 Improvements in LintHighlighter, few fixes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12125
diff changeset
  2474
!
a7ff7d66ee85 Improvements in LintHighlighter, few fixes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12125
diff changeset
  2475
12431
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12401
diff changeset
  2476
version_HG
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12401
diff changeset
  2477
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12401
diff changeset
  2478
    ^ '$Changeset: <not expanded> $'
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12401
diff changeset
  2479
!
9f0c59c742d5 Added LintRuleSettingsApplication and LintRuleEditDialog to define user-defined rule sets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12401
diff changeset
  2480
12128
a7ff7d66ee85 Improvements in LintHighlighter, few fixes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12125
diff changeset
  2481
version_SVN
12308
5d9291c0fc27 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12262
diff changeset
  2482
    ^ '$Id: VersionDiffBrowser.st 8074 2012-11-30 17:23:39Z vranyj1 $'
2221
f536ebd184ef initial checkin
Claus Gittinger <cg@exept.de>
parents:
diff changeset
  2483
! !
12512
072f76033d49 class: VersionDiffBrowser
Claus Gittinger <cg@exept.de>
parents: 11962
diff changeset
  2484