--- a/Tools__ChangeSetBrowser2.st Tue Jul 19 21:25:25 2011 +0200
+++ b/Tools__ChangeSetBrowser2.st Tue Jul 19 21:25:52 2011 +0200
@@ -30,9 +30,9 @@
ToolApplicationModel subclass:#ChangeSetBrowser2
instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile
navigatorChangesetHolder navigatorSpecHolder selectionHolder
- classHolder selection1Holder list1GeneratorHolder
- showRemovedAspect acceptEnabledHolder changeListViews sourceView
- changeSourceHolder imageSourceHolder'
+ classHolder codeAspectHolder selection1Holder
+ list1GeneratorHolder showRemovedAspect acceptEnabledHolder
+ changeListViews sourceView changeSourceHolder imageSourceHolder'
classVariableNames:'ShowRemoved LastSelectionConditionString'
poolDictionaries:''
category:'Interface-Browsers-ChangeSet'
@@ -170,7 +170,7 @@
[^browser navigatorChangesetHolder value condenseChangesForRemoved];
abortAction:
[^#()].
- dialog openWithExtent: 500@300.
+ dialog openWithExtent: 800@700.
^#()
"
@@ -182,8 +182,7 @@
"Created: / 08-11-2010 / 17:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (format): / 01-07-2011 / 16:34:06 / cg"
- "Modified: / 11-07-2011 / 16:18:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (comment): / 19-07-2011 / 09:38:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 19-07-2011 / 19:39:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
open
@@ -577,19 +576,23 @@
aspect: classHolder
)
(SubChannelInfoSpec
+ subAspect: codeAspectHolder
+ aspect: codeAspectHolder
+ )
+
+ (SubChannelInfoSpec
subAspect: labelAHolder
aspect: labelAHolder
- )
-
+ )
(SubChannelInfoSpec
subAspect: labelBHolder
aspect: labelBHolder
- )
+ )
+
(SubChannelInfoSpec
subAspect: textAHolder
aspect: changeSourceHolder
- )
-
+ )
(SubChannelInfoSpec
subAspect: textBHolder
aspect: imageSourceHolder
@@ -1000,11 +1003,7 @@
sourceView := aView.
- aView scrolledView
- classHolder: self classHolder;
- codeAspect: #method
-
- "Modified: / 11-07-2011 / 16:09:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 19-07-2011 / 19:08:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeSetBrowser2 methodsFor:'aspects'!
@@ -1077,6 +1076,17 @@
classHolder := ValueHolder with:nil.
].
^ classHolder
+
+ "Modified: / 19-07-2011 / 19:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+codeAspectHolder
+ "return/create the 'codeAspectHolder' value holder (automatically generated)"
+
+ codeAspectHolder isNil ifTrue:[
+ codeAspectHolder := ValueHolder new.
+ ].
+ ^ codeAspectHolder
!
imageSourceHolder
@@ -1212,14 +1222,20 @@
| change |
change := self theSingleSelectedChange.
- change notNil ifTrue:[
+ (change notNil and:[change change isCompositeChange not]) ifTrue:[
self classHolder value: change changeClass.
changeSourceHolder value: change changeSource.
imageSourceHolder value: change imageSource.
+ codeAspectHolder value:
+ (change change isMethodCodeChange
+ ifTrue:[#method]
+ ifFalse:[#expression]).
self showSource: true
] ifFalse:[
self showSource: false.
- changeSourceHolder value: ''.
+ self classHolder value: nil.
+ changeSourceHolder value: nil.
+ imageSourceHolder value: nil.
].
"Created: / 24-10-2009 / 19:49:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1633,7 +1649,7 @@
!ChangeSetBrowser2 class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.4 2011-07-19 12:33:19 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.5 2011-07-19 19:25:52 vrany Exp $'
!
version_SVN