Tools__ChangeSetBrowser2.st
branchjv
changeset 12626 7ae48abfedac
parent 12571 b2e5fdb702cb
parent 12594 b3906c30ac21
child 12650 e0f607754b9a
equal deleted inserted replaced
12625:482496b7e155 12626:7ae48abfedac
  1556                (MenuItem
  1556                (MenuItem
  1557                   label: 'Show Same'
  1557                   label: 'Show Same'
  1558                   indication: showSameAspect
  1558                   indication: showSameAspect
  1559                 )
  1559                 )
  1560                (MenuItem
  1560                (MenuItem
       
  1561                   label: 'Show Conflicts Only'
       
  1562                   indication: showConflictsOnlyAspect
       
  1563                 )
       
  1564                (MenuItem
  1561                   label: '-'
  1565                   label: '-'
  1562                 )
  1566                 )
  1563                (MenuItem
  1567                (MenuItem
  1564                   label: 'Show Filter'
  1568                   label: 'Show Filter'
  1565                   indication: showFilterHolder
  1569                   indication: showFilterHolder
  2165 
  2169 
  2166 navigatorSpecHolder
  2170 navigatorSpecHolder
  2167     <resource: #uiAspect>
  2171     <resource: #uiAspect>
  2168 
  2172 
  2169     navigatorSpecHolder isNil ifTrue:[
  2173     navigatorSpecHolder isNil ifTrue:[
  2170 	navigatorSpecHolder := ValueHolder with:
  2174         navigatorSpecHolder := ValueHolder with:
  2171 						    "/#hierarchicalNavigatorSpec
  2175                                                     "/#hierarchicalNavigatorSpec
  2172 						    "/#twoColumnNavigatorSpec
  2176                                                     "/#twoColumnNavigatorSpec
  2173 						    #oneColumnNavigatorSpec.
  2177                                                     #oneColumnNavigatorSpec.
  2174 	navigatorSpecHolder addDependent: self.
  2178         navigatorSpecHolder addDependent: self.
  2175 
  2179 
  2176     ].
  2180     ].
  2177     ^ navigatorSpecHolder.
  2181     ^ navigatorSpecHolder.
  2178 
  2182 
  2179     "Modified: / 04-02-2012 / 21:25:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  2183     "Modified: / 04-02-2012 / 21:25:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  2405     "Modified: / 04-08-2011 / 18:05:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  2409     "Modified: / 04-08-2011 / 18:05:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  2406     "Modified: / 29-07-2012 / 13:18:54 / cg"
  2410     "Modified: / 29-07-2012 / 13:18:54 / cg"
  2407 !
  2411 !
  2408 
  2412 
  2409 selectionChanged
  2413 selectionChanged
  2410     | listEntry change |
  2414     | listEntry change srcImage srcChange|
  2411 
  2415 
  2412     listEntry := self theSingleSelectedChange.
  2416     listEntry := self theSingleSelectedChange.
  2413     (listEntry notNil and:[(change := listEntry change) isCompositeChange not]) ifTrue:[
  2417     (listEntry notNil and:[(change := listEntry change) isCompositeChange not]) ifTrue:[
  2414 	self classHolder value: listEntry changeClass.
  2418         codeAspectHolder setValue:
  2415 	changeSourceHolder setValue: change changeSource; changed: #value.
  2419             (change isMethodCodeChange
  2416 	imageSourceHolder setValue: change imageSource; changed: #value.
  2420                 ifTrue:[SyntaxHighlighter codeAspectMethod]
  2417 
  2421                 ifFalse:[
  2418 	codeAspectHolder value:
  2422                     (change isClassDefinitionChange
  2419 	    (change isMethodCodeChange
  2423                         ifTrue:[SyntaxHighlighter codeAspectClassDefinition]   
  2420 		  ifTrue:[SyntaxHighlighter codeAspectMethod]
  2424                         ifFalse:[SyntaxHighlighter codeAspectExpression])]).
  2421 		ifFalse:[SyntaxHighlighter codeAspectExpression]).
  2425         self classHolder value: change changeClass.
  2422 
  2426         changeSourceHolder setValue: change changeSource"; changed: #value".
  2423 	self showSource: true
  2427         srcImage := change imageSource.
       
  2428         srcChange := change changeSource.
       
  2429         srcImage = srcChange ifTrue:[
       
  2430             imageSourceHolder setValue: nil"; changed: #value".
       
  2431         ] ifFalse:[
       
  2432             imageSourceHolder setValue: srcImage"; changed: #value".
       
  2433 
       
  2434             "/ check agan, based on parser (ignoring indentation)
       
  2435             change isClassDefinitionChange ifTrue:[
       
  2436                 |parseError treeA treeB|
       
  2437 
       
  2438                 (srcImage notEmptyOrNil and:[ srcChange notEmptyOrNil ]) ifTrue:[
       
  2439                     parseError := false.
       
  2440                     treeA := RBParser parseExpression:srcImage onError: [:str :pos | parseError := true].
       
  2441                     treeB := RBParser parseExpression:srcChange onError: [:str :pos | parseError := true].
       
  2442                     parseError ifFalse:[
       
  2443                         (treeA equalTo:treeB withMapping:(Dictionary  new)) ifTrue:[
       
  2444                             imageSourceHolder setValue: nil
       
  2445                         ]
       
  2446                     ]
       
  2447                 ]
       
  2448             ].
       
  2449         ].
       
  2450         changeSourceHolder changed.
       
  2451         imageSourceHolder changed.
       
  2452         codeAspectHolder changed.
       
  2453 
       
  2454         self showSource: true
  2424     ] ifFalse:[
  2455     ] ifFalse:[
  2425 	self showSource: false.
  2456         self showSource: false.
  2426 	self classHolder value: nil.
  2457         self classHolder value: nil.
  2427 	changeSourceHolder setValue: nil; changed: #value.
  2458         changeSourceHolder setValue: nil; changed: #value.
  2428 	imageSourceHolder setValue: nil; changed: #value.
  2459         imageSourceHolder setValue: nil; changed: #value.
  2429     ].
  2460     ].
  2430 
  2461 
  2431     "Created: / 24-10-2009 / 19:49:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  2462     "Created: / 24-10-2009 / 19:49:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  2432     "Modified: / 25-07-2012 / 17:43:30 / cg"
  2463     "Modified: / 27-07-2012 / 23:42:46 / cg"
  2433     "Modified: / 10-09-2012 / 10:35:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
       
  2434 !
  2464 !
  2435 
  2465 
  2436 showingRegularChangesetChanged
  2466 showingRegularChangesetChanged
  2437 
  2467 
  2438     self showTimestampHolder value: showingRegularChangesetHolder value.
  2468     self showTimestampHolder value: showingRegularChangesetHolder value.
  3819 
  3849 
  3820 
  3850 
  3821 !ChangeSetBrowser2 class methodsFor:'documentation'!
  3851 !ChangeSetBrowser2 class methodsFor:'documentation'!
  3822 
  3852 
  3823 version
  3853 version
  3824     ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.44 2013-03-26 00:01:56 cg Exp $'
  3854     ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.46 2013-03-30 19:11:41 cg Exp $'
  3825 !
  3855 !
  3826 
  3856 
  3827 version_CVS
  3857 version_CVS
  3828     ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.44 2013-03-26 00:01:56 cg Exp $'
  3858     ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.46 2013-03-30 19:11:41 cg Exp $'
  3829 !
  3859 !
  3830 
  3860 
  3831 version_HG
  3861 version_HG
  3832 
  3862 
  3833     ^ '$Changeset: <not expanded> $'
  3863     ^ '$Changeset: <not expanded> $'