--- a/Tools__ChangeSetBrowser2.st Fri Jan 27 22:18:53 2012 +0100
+++ b/Tools__ChangeSetBrowser2.st Sun Jan 29 12:53:39 2012 +0000
@@ -1,6 +1,6 @@
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
- All Rights Reserved
+ All Rights Reserved
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -31,29 +31,20 @@
instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile
navigatorChangesetHolder navigatorSpecHolder list1 list1Holder
selection1Holder list2 list2Holder selection2Holder classHolder
- languageHolder codeAspectHolder showRemovedAspect showSameAspect
- sourceView changeSourceHolder imageSourceHolder targetPackage
- targetNamespace updateChangefileHolder allowRemoveHolder
- allowAcceptHolder'
+ codeAspectHolder showRemovedAspect showSameAspect
+ acceptEnabledHolder sourceView changeSourceHolder
+ imageSourceHolder'
classVariableNames:'ShowRemoved LastSelectionConditionString'
poolDictionaries:''
category:'Interface-Browsers-ChangeSet'
!
-ApplicationModel subclass:#ChangeEditor
- instanceVariableNames:'changeHolder readonlyHolder showdiffHolder sourceChangeHolder
- sourceImageHolder'
- classVariableNames:''
- poolDictionaries:''
- privateIn:ChangeSetBrowser2
-!
-
!ChangeSetBrowser2 class methodsFor:'documentation'!
copyright
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
- All Rights Reserved
+ All Rights Reserved
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -100,8 +91,8 @@
browser := self new.
browser
- changeset: aChangeSet;
- title: label.
+ changeset: aChangeSet;
+ title: label.
aBlock value: browser.
^browser
@@ -122,7 +113,7 @@
!ChangeSetBrowser2 class methodsFor:'help specs'!
-flyByHelpSpec
+helpSpec
"This resource specification was automatically generated
by the UIHelpTool of ST/X."
@@ -135,17 +126,15 @@
<resource: #help>
- ^ super flyByHelpSpec addPairsFrom:#(
+ ^ super helpSpec addPairsFrom:#(
#fileLoad
-'Select a file and show its contained changeset'
+''
#fileSave
-'Save the changeset in a file'
+''
)
-
- "Created: / 27-12-2011 / 10:37:47 / cg"
! !
!ChangeSetBrowser2 class methodsFor:'interface opening'!
@@ -163,57 +152,43 @@
|browser browserView dialog|
browser := self on: aChangeSet.
- browser allowAccept: false.
- browser allowRemove: true.
+ browser acceptEnabled: false.
+ browser showRemovedAspect: (true asValue).
browserView := ApplicationSubView new
- client:browser
- spec:#windowSpecForEmbedding.
+ client:browser
+ spec:#windowSpecForEmbedding.
dialog := (Dialog new)
- addComponent:browserView withHeight: 300;
- addAbortAndOkButtons;
- yourself.
+ addComponent:browserView withHeight: 300;
+ addAbortAndOkButtons.
dialog label: aString.
dialog buttonPanel
- layout:(LayoutFrame fractions:(0.0 @ 1.0 corner:1.0 @ 1.0)
- offsets:(0 @ -30 corner:0 @ 0)).
+ layout:(LayoutFrame fractions:(0.0 @ 1.0 corner:1.0 @ 1.0)
+ offsets:(0 @ -30 corner:0 @ 0)).
browserView layout:(LayoutFrame fractions:(0.0 @ 0.0 corner:1.0 @ 1.0)
- offsets:(0 @ 0 corner:0 @ -30)).
+ offsets:(0 @ 0 corner:0 @ -30)).
dialog
- okAction:
- [^browser list1Holder value condenseChangesForRemoved];
- abortAction:
- [^#()].
+ okAction:
+ [^browser list1Holder value condenseChangesForRemoved];
+ abortAction:
+ [^#()].
dialog openWithExtent: 800@700.
^#()
"
- Tools::ChangeSetBrowser2
- confirmChanges:
- (ChangeSet current copyFrom: ((ChangeSet current size - 10) max: 1) to: ChangeSet current size)
- label: 'Last 10 changes...'
+ Tools::ChangeSetBrowser2
+ confirmChanges:
+ (ChangeSet current copyFrom: ((ChangeSet current size - 10) max: 1) to: ChangeSet current size)
+ label: 'Last 10 changes...'
"
"Created: / 08-11-2010 / 17:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 07-09-2011 / 20:19:44 / cg"
- "Modified: / 24-01-2012 / 20:00:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-open
- "Open browser and load current changefile"
-
- super open application doOpenCurrent
-
- "Created: / 25-01-2012 / 17:16:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (format): / 01-07-2011 / 16:34:06 / cg"
+ "Modified: / 04-08-2011 / 18:06:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
openOn: aChangeSet
+
^(self on: aChangeSet) open
-
- "
- self openOn: ChangeSet current
- "
-
- "Modified (comment): / 24-01-2012 / 20:01:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
openOn: aChangeSet label: aString
@@ -248,68 +223,64 @@
^
#(FullSpec
- name: hierarchicalNavigatorSpec
- window:
+ name: hierarchicalNavigatorSpec
+ window:
(WindowSpec
- label: 'Hierarchical Navigator'
- name: 'Hierarchical Navigator'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 300 300)
- )
- component:
+ label: 'Hierarchical Navigator'
+ name: 'Hierarchical Navigator'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 300 300)
+ )
+ component:
(SpecCollection
- collection: (
- (SubCanvasSpec
- name: 'ChangeList'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::HierarchicalChangeList'
- subAspectHolders:
- (Array
+ collection: (
+ (SubCanvasSpec
+ name: 'ChangeList'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: #'Tools::HierarchicalChangeList'
+ subAspectHolders:
+ (Array
- (SubChannelInfoSpec
- subAspect: allowAcceptHolder
- aspect: allowAcceptHolder
- )
- (SubChannelInfoSpec
- subAspect: allowRemoveHolder
- aspect: allowRemoveHolder
- )
- (SubChannelInfoSpec
- subAspect: inGeneratorHolder
- aspect: list1Holder
- )
+ (SubChannelInfoSpec
+ subAspect: acceptEnabledHolder
+ aspect: acceptEnabledHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: inGeneratorHolder
+ aspect: list1Holder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: menuHolder
+ aspect: list1MenuHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: selectionHolder
+ aspect: selection1Holder
+ )
- (SubChannelInfoSpec
- subAspect: menuHolder
- aspect: list1MenuHolder
- )
- (SubChannelInfoSpec
- subAspect: selectionHolder
- aspect: selection1Holder
- )
+ (SubChannelInfoSpec
+ subAspect: showRemovedHolder
+ aspect: showRemovedAspect
+ )
+ (SubChannelInfoSpec
+ subAspect: showSameHolder
+ aspect: showSameAspect
+ )
- (SubChannelInfoSpec
- subAspect: showRemovedHolder
- aspect: showRemovedAspect
- )
- (SubChannelInfoSpec
- subAspect: showSameHolder
- aspect: showSameAspect
- )
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ postBuildCallback: list1View:
+ )
+ )
- )
- createNewApplication: true
- createNewBuilder: true
- postBuildCallback: list1View:
- )
- )
-
- )
+ )
)
- "Modified: / 24-01-2012 / 19:57:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 04-08-2011 / 18:43:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
oneColumnNavigatorSpec
@@ -326,68 +297,66 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: oneColumnNavigatorSpec
- window:
+ name: oneColumnNavigatorSpec
+ window:
(WindowSpec
- label: 'One Column Navigator'
- name: 'One Column Navigator'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 300 300)
- )
- component:
+ label: 'One Column Navigator'
+ name: 'One Column Navigator'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 300 300)
+ )
+ component:
(SpecCollection
- collection: (
- (SubCanvasSpec
- name: 'ChangeList'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::ChangeList'
- subAspectHolders:
- (Array
-
- (SubChannelInfoSpec
- subAspect: allowAcceptHolder
- aspect: allowAcceptHolder
- )
- (SubChannelInfoSpec
- subAspect: allowRemoveHolder
- aspect: allowRemoveHolder
- )
-
- (SubChannelInfoSpec
- subAspect: inGeneratorHolder
- aspect: list1Holder
- )
- (SubChannelInfoSpec
- subAspect: menuHolder
- aspect: list1MenuHolder
- )
-
- (SubChannelInfoSpec
- subAspect: selectionHolder
- aspect: selection1Holder
- )
- (SubChannelInfoSpec
- subAspect: showRemovedHolder
- aspect: showRemovedAspect
- )
-
- (SubChannelInfoSpec
- subAspect: showSameHolder
- aspect: showSameAspect
- )
- )
- createNewApplication: true
- createNewBuilder: true
- postBuildCallback: list1View:
- )
- )
-
- )
+ collection: (
+ (SubCanvasSpec
+ name: 'ChangeList'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: #'Tools::ChangeList'
+ subAspectHolders:
+ (Array
+
+ (SubChannelInfoSpec
+ subAspect: acceptEnabledHolder
+ aspect: acceptEnabledHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: inGeneratorHolder
+ aspect: list1Holder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: menuHolder
+ aspect: list1MenuHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: selectionHolder
+ aspect: selection1Holder
+ )
+
+ (SubChannelInfoSpec
+ subAspect: showRemovedHolder
+ aspect: showRemovedAspect
+ )
+ (SubChannelInfoSpec
+ subAspect: showSameHolder
+ aspect: showSameAspect
+ )
+
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ postBuildCallback: list1View:
+ )
+ )
+
+ )
)
+
+ "Modified: / 04-08-2011 / 18:43:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
twoColumnNavigatorSpec
@@ -406,124 +375,116 @@
^
#(FullSpec
- name: twoColumnNavigatorSpec
- window:
+ name: twoColumnNavigatorSpec
+ window:
(WindowSpec
- label: 'Two Column Navigator'
- name: 'Two Column Navigator'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 300 300)
- )
- component:
+ label: 'Two Column Navigator'
+ name: 'Two Column Navigator'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 300 300)
+ )
+ component:
(SpecCollection
- collection: (
- (VariableHorizontalPanelSpec
- name: 'Columns'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- component:
- (SpecCollection
- collection: (
- (SubCanvasSpec
- name: 'FirstColumn'
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::ChangeList'
- subAspectHolders:
- (Array
+ collection: (
+ (VariableHorizontalPanelSpec
+ name: 'Columns'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ component:
+ (SpecCollection
+ collection: (
+ (SubCanvasSpec
+ name: 'FirstColumn'
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: #'Tools::ChangeList'
+ subAspectHolders:
+ (Array
- (SubChannelInfoSpec
- subAspect: allowAcceptHolder
- aspect: allowAcceptHolder
- )
- (SubChannelInfoSpec
- subAspect: allowRemoveHolder
- aspect: allowRemoveHolder
- )
- (SubChannelInfoSpec
- subAspect: inGeneratorHolder
- aspect: list1Holder
- )
+ (SubChannelInfoSpec
+ subAspect: acceptEnabledHolder
+ aspect: acceptEnabledHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: inGeneratorHolder
+ aspect: list1Holder
+ )
- (SubChannelInfoSpec
- subAspect: menuHolder
- aspect: list1MenuHolder
- )
- (SubChannelInfoSpec
- subAspect: outGeneratorHolder
- aspect: list2Holder
- )
+ (SubChannelInfoSpec
+ subAspect: menuHolder
+ aspect: list1MenuHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: outGeneratorHolder
+ aspect: list2Holder
+ )
- (SubChannelInfoSpec
- subAspect: selectionHolder
- aspect: selection1Holder
- )
- (SubChannelInfoSpec
- subAspect: showRemovedHolder
- aspect: showRemovedAspect
- )
- (SubChannelInfoSpec
- subAspect: showSameHolder
- aspect: showSameAspect
- )
- )
- createNewApplication: true
- createNewBuilder: true
- postBuildCallback: list1View:
- )
- (SubCanvasSpec
- name: 'SecondColumn'
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::ChangeList'
- subAspectHolders:
- (Array
+ (SubChannelInfoSpec
+ subAspect: selectionHolder
+ aspect: selection1Holder
+ )
+ (SubChannelInfoSpec
+ subAspect: showRemovedHolder
+ aspect: showRemovedAspect
+ )
+ (SubChannelInfoSpec
+ subAspect: showSameHolder
+ aspect: showSameAspect
+ )
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ postBuildCallback: list1View:
+ )
+ (SubCanvasSpec
+ name: 'SecondColumn'
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: #'Tools::ChangeList'
+ subAspectHolders:
+ (Array
- (SubChannelInfoSpec
- subAspect: allowAcceptHolder
- aspect: allowAcceptHolder
- )
- (SubChannelInfoSpec
- subAspect: allowRemoveHolder
- aspect: allowRemoveHolder
- )
- (SubChannelInfoSpec
- subAspect: inGeneratorHolder
- aspect: list2Holder
- )
+ (SubChannelInfoSpec
+ subAspect: acceptEnabledHolder
+ aspect: acceptEnabledHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: inGeneratorHolder
+ aspect: list2Holder
+ )
- (SubChannelInfoSpec
- subAspect: menuHolder
- aspect: list2MenuHolder
- )
- (SubChannelInfoSpec
- subAspect: selectionHolder
- aspect: selection2Holder
- )
+ (SubChannelInfoSpec
+ subAspect: menuHolder
+ aspect: list2MenuHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: selectionHolder
+ aspect: selection2Holder
+ )
- (SubChannelInfoSpec
- subAspect: showRemovedHolder
- aspect: showRemovedAspect
- )
- (SubChannelInfoSpec
- subAspect: showSameHolder
- aspect: showSameAspect
- )
- )
- createNewApplication: true
- createNewBuilder: true
- postBuildCallback: list2View:
- )
- )
+ (SubChannelInfoSpec
+ subAspect: showRemovedHolder
+ aspect: showRemovedAspect
+ )
+ (SubChannelInfoSpec
+ subAspect: showSameHolder
+ aspect: showSameAspect
+ )
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ postBuildCallback: list2View:
+ )
+ )
- )
- handles: (Any 0.5 1.0)
- )
- )
+ )
+ handles: (Any 0.5 1.0)
+ )
+ )
- )
+ )
)
- "Modified: / 24-01-2012 / 19:57:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 04-08-2011 / 18:43:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
windowSpec
@@ -543,33 +504,33 @@
^
#(FullSpec
- name: windowSpec
- window:
+ name: windowSpec
+ window:
(WindowSpec
- label: 'ChangeSet browser'
- name: 'ChangeSet browser'
- labelChannel: titleHolder
- min: (Point 10 10)
- bounds: (Rectangle 0 0 653 488)
- menu: mainMenu
- )
- component:
+ label: 'ChangeSet browser'
+ name: 'ChangeSet browser'
+ labelChannel: titleHolder
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 653 488)
+ menu: mainMenu
+ )
+ component:
(SpecCollection
- collection: (
- (MenuPanelSpec
- name: 'ToolBar'
- layout: (LayoutFrame 0 0 0 0 0 1 30 0)
- menu: toolbarMenu
- textDefault: true
- )
- (UISubSpecification
- name: 'Contents'
- layout: (LayoutFrame 0 0 30 0 0 1 0 1)
- minorKey: windowSpecWithoutToolbar
- )
- )
+ collection: (
+ (MenuPanelSpec
+ name: 'ToolBar'
+ layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+ menu: toolbarMenu
+ textDefault: true
+ )
+ (UISubSpecification
+ name: 'Contents'
+ layout: (LayoutFrame 0 0 30 0 0 1 0 1)
+ minorKey: windowSpecWithoutToolbar
+ )
+ )
- )
+ )
)
!
@@ -594,85 +555,79 @@
^
#(FullSpec
- name: windowSpecWithoutToolbar
- window:
+ name: windowSpecWithoutToolbar
+ window:
(WindowSpec
- label: 'ChangeSet browser'
- name: 'ChangeSet browser'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 653 488)
- menu: mainMenu
- )
- component:
+ label: 'ChangeSet browser'
+ name: 'ChangeSet browser'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 653 488)
+ menu: mainMenu
+ )
+ component:
(SpecCollection
- collection: (
- (VariableVerticalPanelSpec
- name: 'VerticalPanel'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- component:
- (SpecCollection
- collection: (
- (SubCanvasSpec
- name: 'NavigatorPanel'
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- specHolder: navigatorSpecHolder
- createNewBuilder: false
- )
- (SubCanvasSpec
- name: 'TextDiffTool'
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::TextDiffTool'
- minorKey: windowSpecForEmbedding
- subAspectHolders:
- (Array
+ collection: (
+ (VariableVerticalPanelSpec
+ name: 'VerticalPanel'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ component:
+ (SpecCollection
+ collection: (
+ (SubCanvasSpec
+ name: 'NavigatorPanel'
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ specHolder: navigatorSpecHolder
+ createNewBuilder: false
+ )
+ (SubCanvasSpec
+ name: 'TextDiffTool'
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ majorKey: #'Tools::TextDiffTool'
+ minorKey: windowSpecForEmbedding
+ subAspectHolders:
+ (Array
- (SubChannelInfoSpec
- subAspect: classHolder
- aspect: classHolder
- )
- (SubChannelInfoSpec
- subAspect: languageHolder
- aspect: languageHolder
- )
- (SubChannelInfoSpec
- subAspect: codeAspectHolder
- aspect: codeAspectHolder
- )
+ (SubChannelInfoSpec
+ subAspect: classHolder
+ aspect: classHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: codeAspectHolder
+ aspect: codeAspectHolder
+ )
- (SubChannelInfoSpec
- subAspect: labelAHolder
- aspect: labelAHolder
- )
- (SubChannelInfoSpec
- subAspect: labelBHolder
- aspect: labelBHolder
- )
+ (SubChannelInfoSpec
+ subAspect: labelAHolder
+ aspect: labelAHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: labelBHolder
+ aspect: labelBHolder
+ )
- (SubChannelInfoSpec
- subAspect: textAHolder
- aspect: changeSourceHolder
- )
- (SubChannelInfoSpec
- subAspect: textBHolder
- aspect: imageSourceHolder
- )
- )
- createNewApplication: true
- createNewBuilder: true
- )
- )
+ (SubChannelInfoSpec
+ subAspect: textAHolder
+ aspect: changeSourceHolder
+ )
+ (SubChannelInfoSpec
+ subAspect: textBHolder
+ aspect: imageSourceHolder
+ )
+ )
+ createNewApplication: true
+ createNewBuilder: true
+ )
+ )
- )
- handles: (Any 0.5 1.0)
- )
- )
+ )
+ handles: (Any 0.5 1.0)
+ )
+ )
- )
+ )
)
-
- "Modified: / 03-12-2011 / 10:36:40 / cg"
! !
!ChangeSetBrowser2 class methodsFor:'menu specs'!
@@ -684,7 +639,6 @@
"Do not manually edit this!! If it is corrupted,
the MenuEditor may not be able to read the specification."
-
"
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu)) startUp
@@ -692,429 +646,123 @@
<resource: #menu>
- ^
- #(Menu
- (
- (MenuItem
- enabled: hasChangeSelectedAndNotRemoved:
- label: 'Apply'
- itemValue: changeMenuApplySelection:
- translateLabel: true
- isVisible: allowAcceptHolder
- shortcutKey: Accept
- auxValue: 100
- )
- (MenuItem
- label: 'Apply all'
- itemValue: changeMenuApply:
- translateLabel: true
- isVisible: allowAcceptHolder
- )
- (MenuItem
- label: '-'
- isVisible: allowAcceptHolder
- )
- (MenuItem
- label: 'Delete'
- itemValue: changeMenuDeleteSelection:
- nameKey: Delete
- translateLabel: true
- isVisible: allowRemoveHolder
- shortcutKey: Delete
- )
- (MenuItem
- label: 'Undelete'
- itemValue: changeMenuUndeleteSelection:
- nameKey: Undelete
- translateLabel: true
- isVisible: allowRemoveHolder
- )
- (MenuItem
- label: '-'
- isVisible: allowRemoveHolder
- )
- (MenuItem
- label: 'Select...'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Select same'
- itemValue: changeMenuSelectSame:
- translateLabel: true
- )
- (MenuItem
- label: 'Select additions (new classes/methods)'
- itemValue: changeMenuSelectAdditions:
- translateLabel: true
- )
- (MenuItem
- label: 'Select removals'
- itemValue: changeMenuSelectRemovals:
- translateLabel: true
- )
- (MenuItem
- label: 'Select differences'
- itemValue: changeMenuSelectDifferences:
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Select all'
- itemValue: changeMenuSelectAll:
- translateLabel: true
- )
- (MenuItem
- label: 'Select none'
- itemValue: changeMenuSelectNone:
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Select using block'
- itemValue: changeMenuSelectUsingBlock:
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Show Deleted'
- translateLabel: true
- isVisible: allowRemoveHolder
- indication: showRemovedAspect
- )
- (MenuItem
- label: 'Show Same'
- translateLabel: true
- indication: showSameAspect
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Inspect change'
- itemValue: changeMenuInspect:
- translateLabel: true
- )
- (MenuItem
- enabled: hasSingleChangeSelectedAndCanBrowse:
- label: 'Browse Method(s)'
- itemValue: changeMenuBrowse:
- translateLabel: true
- )
- )
- nil
- nil
- )
-!
-
-changeMenu1
- "This resource specification was automatically generated
- by the MenuEditor of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the MenuEditor may not be able to read the specification."
-
-
- "
- MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu1
- (Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu1)) startUp
- "
-
- <resource: #menu>
-
- ^
+ ^
#(Menu
- (
- (MenuItem
- enabled: hasChangeSelectedAndNotRemoved:
- label: 'Apply'
- itemValue: changeMenuApplySelection:
- translateLabel: true
- isVisible: allowAcceptHolder
- shortcutKey: Accept
- auxValue: 100
- )
- (MenuItem
- label: 'Apply All'
- itemValue: changeMenuApply:
- translateLabel: true
- isVisible: allowAcceptHolder
- )
- (MenuItem
- label: '-'
- isVisible: allowAcceptHolder
- )
- (MenuItem
- label: 'Delete'
- itemValue: changeMenuDeleteSelection:
- nameKey: Delete
- translateLabel: true
- isVisible: allowRemoveHolder
- shortcutKey: Delete
- )
- (MenuItem
- label: 'Undelete'
- itemValue: changeMenuUndeleteSelection:
- nameKey: Undelete
- translateLabel: true
- isVisible: allowRemoveHolder
- )
- (MenuItem
- label: '-'
- isVisible: allowRemoveHolder
- )
- (MenuItem
- label: 'Select...'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Select Same'
- itemValue: changeMenuSelectSame:
- translateLabel: true
- )
- (MenuItem
- label: 'Select Additions (new Classes/Methods)'
- itemValue: changeMenuSelectAdditions:
- translateLabel: true
- )
- (MenuItem
- label: 'Select Removals'
- itemValue: changeMenuSelectRemovals:
- translateLabel: true
- )
- (MenuItem
- label: 'Select Differences'
- itemValue: changeMenuSelectDifferences:
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Select All'
- itemValue: changeMenuSelectAll:
- translateLabel: true
- )
- (MenuItem
- label: 'Select None'
- itemValue: changeMenuSelectNone:
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Select using Block'
- itemValue: changeMenuSelectUsingBlock:
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Show Deleted'
- translateLabel: true
- isVisible: allowRemoveHolder
- indication: showRemovedAspect
- )
- (MenuItem
- label: 'Show Same'
- translateLabel: true
- indication: showSameAspect
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Inspect Change'
- itemValue: changeMenuInspect:
- translateLabel: true
- )
- (MenuItem
- enabled: hasSingleChangeSelectedAndCanBrowse:
- label: 'Browse Method(s)'
- itemValue: changeMenuBrowse:
- translateLabel: true
- )
- (MenuItem
- enabled: hasSingleChangeSelectedAndCanBrowse:
- label: 'Browse Class(s)'
- itemValue: changeMenuBrowseClass:
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSingleChangeSelectedAndCanBrowse:
- label: 'Compare Class Against...'
- itemValue: changeMenuCompareClass:
- translateLabel: true
- )
- )
- nil
- nil
- )
-!
-
-changeMenu2
- "This resource specification was automatically generated
- by the MenuEditor of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the MenuEditor may not be able to read the specification."
-
-
- "
- MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu2
- (Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu2)) startUp
- "
-
- <resource: #menu>
-
- ^
- #(Menu
- (
- (MenuItem
- enabled: hasChangeSelectedAndNotRemoved:
- label: 'Apply'
- itemValue: changeMenuApplySelection:
- translateLabel: true
- isVisible: allowAcceptHolder
- shortcutKey: Accept
- auxValue: 100
- )
- (MenuItem
- label: 'Apply to End'
- itemValue: changeMenuApplyToEnd:
- translateLabel: true
- isVisible: allowAcceptHolder
- )
- (MenuItem
- label: '-'
- isVisible: allowAcceptHolder
- )
- (MenuItem
- label: 'Delete'
- itemValue: changeMenuDeleteSelection:
- nameKey: Delete
- translateLabel: true
- isVisible: allowRemoveHolder
- shortcutKey: Delete
- )
- (MenuItem
- label: 'Undelete'
- itemValue: changeMenuUndeleteSelection:
- nameKey: Undelete
- translateLabel: true
- isVisible: allowRemoveHolder
- )
- (MenuItem
- label: '-'
- isVisible: allowRemoveHolder
- )
- (MenuItem
- label: 'Select...'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Select Same'
- itemValue: changeMenuSelectSame:
- translateLabel: true
- )
- (MenuItem
- label: 'Select Additions (new Classes/Methods)'
- itemValue: changeMenuSelectAdditions:
- translateLabel: true
- )
- (MenuItem
- label: 'Select Removals'
- itemValue: changeMenuSelectRemovals:
- translateLabel: true
- )
- (MenuItem
- label: 'Select Differences'
- itemValue: changeMenuSelectDifferences:
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Select All'
- itemValue: changeMenuSelectAll:
- translateLabel: true
- )
- (MenuItem
- label: 'Select None'
- itemValue: changeMenuSelectNone:
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Select using Block'
- itemValue: changeMenuSelectUsingBlock:
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Show Deleted'
- translateLabel: true
- isVisible: allowRemoveHolder
- indication: showRemovedAspect
- )
- (MenuItem
- label: 'Show Same'
- translateLabel: true
- indication: showSameAspect
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Inspect Change'
- itemValue: changeMenuInspect:
- translateLabel: true
- )
- (MenuItem
- enabled: hasSingleChangeSelectedAndCanBrowse:
- label: 'Browse Method(s)'
- itemValue: changeMenuBrowse:
- translateLabel: true
- )
- )
- nil
- nil
+ (
+ (MenuItem
+ enabled: hasChangeSelectedAndNotRemoved:
+ label: 'Apply'
+ itemValue: changeMenuApplySelection:
+ translateLabel: true
+ isVisible: acceptEnabledHolder
+ shortcutKey: Accept
+ auxValue: 100
+ )
+ (MenuItem
+ label: 'Apply all'
+ itemValue: changeMenuApply:
+ translateLabel: true
+ isVisible: acceptEnabledHolder
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Delete'
+ itemValue: changeMenuDeleteSelection:
+ nameKey: Delete
+ translateLabel: true
+ shortcutKey: Delete
+ )
+ (MenuItem
+ label: 'Undelete'
+ itemValue: changeMenuUndeleteSelection:
+ nameKey: Undelete
+ translateLabel: true
+ shortcutKey: Delete
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Select...'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Select same'
+ itemValue: changeMenuSelectSame:
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Select additions (new classes/methods)'
+ itemValue: changeMenuSelectAdditions:
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Select removals'
+ itemValue: changeMenuSelectRemovals:
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Select differences'
+ itemValue: changeMenuSelectDifferences:
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Select all'
+ itemValue: changeMenuSelectAll:
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Select none'
+ itemValue: changeMenuSelectNone:
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Select using block'
+ itemValue: changeMenuSelectUsingBlock:
+ translateLabel: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Show Deleted'
+ translateLabel: true
+ indication: showRemovedAspect
+ )
+ (MenuItem
+ label: 'Show Same'
+ translateLabel: true
+ indication: showSameAspect
+ )
+ (MenuItem
+ label: 'Inspect change'
+ itemValue: changeMenuInspect:
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasSingleChangeSelectedAndCanBrowse:
+ label: 'Browse'
+ itemValue: changeMenuBrowse:
+ translateLabel: true
+ )
+ )
+ nil
+ nil
)
!
@@ -1125,7 +773,6 @@
"Do not manually edit this!! If it is corrupted,
the MenuEditor may not be able to read the specification."
-
"
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#mainMenu
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 mainMenu)) startUp
@@ -1133,128 +780,97 @@
<resource: #menu>
- ^
+ ^
#(Menu
- (
- (MenuItem
- label: 'File'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Open...'
- itemValue: doOpen
- translateLabel: true
- isVisible: allowOpenHolder
- shortcutKey: Ctrlo
- )
- (MenuItem
- label: 'Open Current'
- itemValue: doOpenCurrent
- translateLabel: true
- isVisible: allowOpenHolder
- )
- (MenuItem
- label: 'Save'
- itemValue: doSave
- translateLabel: true
- )
- (MenuItem
- label: 'Save As...'
- itemValue: doSaveAs
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Exit'
- itemValue: closeRequest
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: 'View'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'List'
- translateLabel: true
- choice: navigatorSpecHolder
- choiceValue: oneColumnNavigatorSpec
- )
- (MenuItem
- label: 'Hierarchical List'
- translateLabel: true
- choice: navigatorSpecHolder
- choiceValue: hierarchicalNavigatorSpec
- )
- (MenuItem
- label: 'Browser Like'
- translateLabel: true
- choice: navigatorSpecHolder
- choiceValue: twoColumnNavigatorSpec
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Show Deleted'
- translateLabel: true
- indication: showRemovedAspect
- )
- (MenuItem
- label: 'Show Same'
- translateLabel: true
- indication: showSameAspect
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- label: 'Loading'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Set Target Package...'
- itemValue: setTargetPackage
- translateLabel: true
- )
- (MenuItem
- label: 'Set Target Namespace...'
- itemValue: setTargetNamespace
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Update Changefile'
- translateLabel: true
- indication: updateChangeFileHolder
- )
- )
- nil
- nil
- )
- )
- )
- nil
- nil
+ (
+ (MenuItem
+ label: 'File'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Open'
+ itemValue: doOpen
+ translateLabel: true
+ isVisible: allowOpenHolder
+ shortcutKey: Ctrlo
+ )
+ (MenuItem
+ label: 'Open current'
+ itemValue: doOpenCurrent
+ translateLabel: true
+ isVisible: allowOpenHolder
+ )
+ (MenuItem
+ label: 'Save'
+ itemValue: doSave
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Save As...'
+ itemValue: doSaveAs
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Exit'
+ itemValue: closeRequest
+ translateLabel: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: 'View'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'List'
+ translateLabel: true
+ choice: navigatorSpecHolder
+ choiceValue: oneColumnNavigatorSpec
+ )
+ (MenuItem
+ label: 'Hierarchical List'
+ translateLabel: true
+ choice: navigatorSpecHolder
+ choiceValue: hierarchicalNavigatorSpec
+ )
+ (MenuItem
+ label: 'Browser Like'
+ translateLabel: true
+ choice: navigatorSpecHolder
+ choiceValue: twoColumnNavigatorSpec
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Show Deleted'
+ translateLabel: true
+ indication: showRemovedAspect
+ )
+ (MenuItem
+ label: 'Show Same'
+ translateLabel: true
+ indication: showSameAspect
+ )
+ )
+ nil
+ nil
+ )
+ )
+ )
+ nil
+ nil
)
-
- "Modified: / 27-12-2011 / 10:35:16 / cg"
!
toolbarMenu
@@ -1264,37 +880,36 @@
"Do not manually edit this!! If it is corrupted,
the MenuEditor may not be able to read the specification."
-
"
- MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#toolbarMenu
- (Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 toolbarMenu)) startUp
+ MenuEditor new openOnClass:Tools::ChangeSetBrowser andSelector:#toolbarMenu
+ (Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser toolbarMenu)) startUp
"
<resource: #menu>
- ^
+ ^
#(Menu
- (
- (MenuItem
- activeHelpKey: fileLoad
- label: 'Open'
- itemValue: doOpen
- translateLabel: true
- isButton: true
- isVisible: allowOpenHolder
- labelImage: (ResourceRetriever ToolbarIconLibrary loadFromFileIcon)
- )
- (MenuItem
- activeHelpKey: fileSave
- label: 'Save'
- itemValue: doSave
- translateLabel: true
- isButton: true
- labelImage: (ResourceRetriever ToolbarIconLibrary saveToFileAsIcon)
- )
- )
- nil
- nil
+ (
+ (MenuItem
+ activeHelpKey: fileLoad
+ label: 'Open'
+ itemValue: doOpen
+ translateLabel: true
+ isButton: true
+ isVisible: allowOpenHolder
+ labelImage: (ResourceRetriever XPToolbarIconLibrary loadFromFileIcon)
+ )
+ (MenuItem
+ activeHelpKey: fileSave
+ label: 'Save'
+ itemValue: doSave
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever XPToolbarIconLibrary saveToFileIcon)
+ )
+ )
+ nil
+ nil
)
! !
@@ -1312,18 +927,16 @@
(if this app is embedded in a subCanvas)."
^ #(
- #changesetHolder
+ #changesetHolder
).
! !
!ChangeSetBrowser2 methodsFor:'accessing'!
-allowAccept: aBoolean
+acceptEnabled: aBoolean
- ^self allowAcceptHolder value: aBoolean
-
- "Created: / 24-01-2012 / 19:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ ^self acceptEnabledHolder value: aBoolean
!
allowOpen: aBoolean
@@ -1333,13 +946,6 @@
"Created: / 26-10-2010 / 23:18:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-allowRemove: aBoolean
-
- ^self allowRemoveHolder value: aBoolean
-
- "Created: / 24-01-2012 / 20:00:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
beHierarchical
^self navigatorSpecHolder value: #hierarchicalNavigatorSpec
@@ -1390,26 +996,18 @@
"Created: / 20-07-2010 / 09:48:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-targetNamespace:something
- targetNamespace := something.
-!
-
-targetPackage:something
- targetPackage := something.
-!
-
theSingleSelectedChange
| change sel |
change := nil.
sel := selection2Holder value.
sel isNil ifTrue:[
- sel := selection1Holder value.
+ sel := selection1Holder value.
].
sel do:
- [:each|
- change ifNotNil:[nil].
- change ifNil:[change := each]].
+ [:each|
+ change ifNotNil:[nil].
+ change ifNil:[change := each]].
^change
"Modified: / 04-08-2011 / 18:55:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1433,43 +1031,39 @@
!ChangeSetBrowser2 methodsFor:'accessing - menus'!
list1MenuHolder
- ^ [
- |menu|
- menu := builder menuFor:#changeMenu1.
- menu allItemsDo:[:item | item argument:list1 ].
- menu
+ ^[
+ | menu |
+ menu := builder menuFor: #changeMenu.
+ menu allItemsDo:[:item|item argument: list1].
+ menu
]
"Created: / 04-08-2011 / 18:11:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 05-09-2011 / 16:07:20 / cg"
!
list2MenuHolder
- ^ [
- |menu|
- menu := builder menuFor:#changeMenu2.
- menu allItemsDo:[:item | item argument:list2 ].
- menu
+ ^[
+ | menu |
+ menu := builder menuFor: #changeMenu.
+ menu allItemsDo:[:item|item argument: list2].
+ menu
]
"Created: / 04-08-2011 / 18:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 05-09-2011 / 16:07:34 / cg"
! !
!ChangeSetBrowser2 methodsFor:'actions'!
accept: source
- | entry chg |
- (entry := self theSingleSelectedChange) isNil ifTrue:[^self].
- chg := entry change.
- chg isMethodCodeChange ifTrue:
- [chg source: source asString]
+ | entry |
+ (entry := self theSingleSelectedChange) ifNil:[^self].
+ entry change isMethodCodeChange ifTrue:
+ [entry change source: source asString]
"Modified: / 29-11-2010 / 22:40:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-11-2011 / 14:56:53 / cg"
!
postBuildSourceView: aView
@@ -1481,69 +1075,32 @@
!ChangeSetBrowser2 methodsFor:'aspects'!
-allowAcceptHolder
+acceptEnabledHolder
"return/create the 'selectionHolder' value holder (automatically generated)"
- allowAcceptHolder isNil ifTrue:[
- allowAcceptHolder := ValueHolder with: true.
+ acceptEnabledHolder isNil ifTrue:[
+ acceptEnabledHolder := ValueHolder with: true.
].
- ^ allowAcceptHolder
+ ^ acceptEnabledHolder
"Modified: / 24-10-2009 / 19:56:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Created: / 24-01-2012 / 19:50:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
allowOpenHolder
"return/create the 'allowOpenHolder' value holder (automatically generated)"
allowOpenHolder isNil ifTrue:[
- allowOpenHolder := ValueHolder with: true.
+ allowOpenHolder := ValueHolder with: true.
].
^ allowOpenHolder
"Modified: / 17-03-2011 / 22:32:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-allowRemoveHolder
- "return/create the 'allowRemoveHolder' value holder (automatically generated)"
-
- allowRemoveHolder isNil ifTrue:[
- allowRemoveHolder := ValueHolder with:false.
- allowRemoveHolder addDependent:self.
- ].
- ^ allowRemoveHolder
-
- "Modified: / 24-01-2012 / 19:59:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-allowRemoveHolder:something
- "set the 'showRemovedHolder' value holder (automatically generated)"
-
- |oldValue newValue|
-
- allowRemoveHolder notNil ifTrue:[
- oldValue := allowRemoveHolder value.
- allowRemoveHolder removeDependent:self.
- ].
- allowRemoveHolder := something.
- allowRemoveHolder notNil ifTrue:[
- allowRemoveHolder addDependent:self.
- ].
- newValue := allowRemoveHolder value.
- oldValue ~~ newValue ifTrue:[
- self
- update:#value
- with:newValue
- from:allowRemoveHolder.
- ].
-
- "Modified (format): / 24-01-2012 / 19:48:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
changeSourceHolder
<resource: #uiAspect>
changeSourceHolder isNil ifTrue: [
- changeSourceHolder := nil asValue.
+ changeSourceHolder := nil asValue.
].
^ changeSourceHolder.
@@ -1554,8 +1111,8 @@
"return/create the 'changesetHolder' value holder (automatically generated)"
changesetHolder isNil ifTrue:[
- changesetHolder := ValueHolder new.
- changesetHolder addDependent:self.
+ changesetHolder := ValueHolder new.
+ changesetHolder addDependent:self.
].
^ changesetHolder
!
@@ -1566,16 +1123,16 @@
|oldValue newValue|
changesetHolder notNil ifTrue:[
- oldValue := changesetHolder value.
- changesetHolder removeDependent:self.
+ oldValue := changesetHolder value.
+ changesetHolder removeDependent:self.
].
changesetHolder := something.
changesetHolder notNil ifTrue:[
- changesetHolder addDependent:self.
+ changesetHolder addDependent:self.
].
newValue := changesetHolder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:changesetHolder.
+ self update:#value with:newValue from:changesetHolder.
].
!
@@ -1583,7 +1140,7 @@
"return/create the 'classHolder' value holder (automatically generated)"
classHolder isNil ifTrue:[
- classHolder := ValueHolder with:nil.
+ classHolder := ValueHolder with:nil.
].
^ classHolder
@@ -1594,7 +1151,7 @@
"return/create the 'codeAspectHolder' value holder (automatically generated)"
codeAspectHolder isNil ifTrue:[
- codeAspectHolder := ValueHolder new.
+ codeAspectHolder := ValueHolder new.
].
^ codeAspectHolder
!
@@ -1602,7 +1159,7 @@
imageSourceHolder
<resource: #uiAspect>
imageSourceHolder isNil ifTrue: [
- imageSourceHolder := nil asValue.
+ imageSourceHolder := nil asValue.
].
^ imageSourceHolder.
@@ -1623,21 +1180,11 @@
"Created: / 19-07-2011 / 11:46:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-languageHolder
- languageHolder isNil ifTrue:[
- languageHolder := ValueHolder with:nil.
- ].
- ^ languageHolder
-
- "Modified: / 19-07-2011 / 19:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Created: / 03-12-2011 / 10:37:39 / cg"
-!
-
list1Holder
"return/create the 'list1Holder' value holder (automatically generated)"
list1Holder isNil ifTrue:[
- list1Holder := ValueHolder new.
+ list1Holder := ValueHolder new.
].
^ list1Holder
!
@@ -1652,7 +1199,7 @@
"return/create the 'list2Holder' value holder (automatically generated)"
list2Holder isNil ifTrue:[
- list2Holder := ValueHolder new.
+ list2Holder := ValueHolder new.
].
^ list2Holder
!
@@ -1667,7 +1214,7 @@
"return/create the 'navigatorChangesetHolder' value holder (automatically generated)"
navigatorChangesetHolder isNil ifTrue:[
- navigatorChangesetHolder := ValueHolder new.
+ navigatorChangesetHolder := ValueHolder new.
].
^ navigatorChangesetHolder
!
@@ -1676,24 +1223,23 @@
<resource: #uiAspect>
navigatorSpecHolder isNil ifTrue:[
- navigatorSpecHolder := ValueHolder with:
- "/#hierarchicalNavigatorSpec
- "/#twoColumnNavigatorSpec
- #oneColumnNavigatorSpec
+ navigatorSpecHolder := ValueHolder with:
+ #hierarchicalNavigatorSpec
+ "/#twoColumnNavigatorSpec
+ "/#oneColumnNavigatorSpec
].
^ navigatorSpecHolder.
-
- "Modified: / 24-01-2012 / 17:13:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 20-11-2009 / 20:12:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
selection1Holder
"return/create the 'selection1Holder' value holder (automatically generated)"
selection1Holder isNil ifTrue:[
- selection1Holder := ValueHolder new.
- selection1Holder addDependent:self.
+ selection1Holder := ValueHolder new.
+ selection1Holder addDependent:self.
].
^ selection1Holder
!
@@ -1704,16 +1250,16 @@
|oldValue newValue|
selection1Holder notNil ifTrue:[
- oldValue := selection1Holder value.
- selection1Holder removeDependent:self.
+ oldValue := selection1Holder value.
+ selection1Holder removeDependent:self.
].
selection1Holder := something.
selection1Holder notNil ifTrue:[
- selection1Holder addDependent:self.
+ selection1Holder addDependent:self.
].
newValue := selection1Holder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:selection1Holder.
+ self update:#value with:newValue from:selection1Holder.
].
!
@@ -1721,8 +1267,8 @@
"return/create the 'selection2Holder' value holder (automatically generated)"
selection2Holder isNil ifTrue:[
- selection2Holder := ValueHolder new.
- selection2Holder addDependent:self.
+ selection2Holder := ValueHolder new.
+ selection2Holder addDependent:self.
].
^ selection2Holder
!
@@ -1733,16 +1279,16 @@
|oldValue newValue|
selection2Holder notNil ifTrue:[
- oldValue := selection2Holder value.
- selection2Holder removeDependent:self.
+ oldValue := selection2Holder value.
+ selection2Holder removeDependent:self.
].
selection2Holder := something.
selection2Holder notNil ifTrue:[
- selection2Holder addDependent:self.
+ selection2Holder addDependent:self.
].
newValue := selection2Holder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:selection2Holder.
+ self update:#value with:newValue from:selection2Holder.
].
!
@@ -1750,8 +1296,8 @@
"return/create the 'showDeletedAspect' value holder (automatically generated)"
showRemovedAspect isNil ifTrue:[
- showRemovedAspect := (AspectAdaptor forAspect:#showRemoved)
- subject: self class.
+ showRemovedAspect := (AspectAdaptor forAspect:#showRemoved)
+ subject: self class.
].
^ showRemovedAspect
!
@@ -1764,7 +1310,7 @@
"return/create the 'showSameAspect' value holder (automatically generated)"
showSameAspect isNil ifTrue:[
- showSameAspect := ValueHolder with: true.
+ showSameAspect := ValueHolder with: true.
].
^ showSameAspect
@@ -1781,19 +1327,10 @@
"return/create the 'titleHolder' value holder (automatically generated)"
titleHolder isNil
- ifTrue:[ titleHolder := ValueHolder with:self defaultTitle. ].
+ ifTrue:[ titleHolder := ValueHolder with:self defaultTitle. ].
^ titleHolder
"Modified: / 26-10-2010 / 22:54:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-updateChangefileHolder
- updateChangefileHolder isNil ifTrue:[
- updateChangefileHolder := false asValue.
- ].
- ^ updateChangefileHolder
-
- "Created: / 07-09-2011 / 15:54:03 / cg"
! !
!ChangeSetBrowser2 methodsFor:'change & update'!
@@ -1807,28 +1344,27 @@
!
selectionChanged
+
| change |
-
change := self theSingleSelectedChange.
(change notNil and:[change change isCompositeChange not]) ifTrue:[
- self classHolder value: change changeClass.
- changeSourceHolder setValue: change changeSource; changed: #value.
- imageSourceHolder setValue: change imageSource; changed: #value.
+ self classHolder value: change changeClass.
+ changeSourceHolder setValue: change changeSource; changed: #value.
+ imageSourceHolder setValue: change imageSource; changed: #value.
- codeAspectHolder value:
- (change change isMethodCodeChange
- ifTrue:[#method]
- ifFalse:[#expression]).
- self showSource: true
+ codeAspectHolder value:
+ (change change isMethodCodeChange
+ ifTrue:[#method]
+ ifFalse:[#expression]).
+ self showSource: true
] ifFalse:[
- self showSource: false.
- self classHolder value: nil.
- changeSourceHolder setValue: nil; changed: #value.
- imageSourceHolder setValue: nil; changed: #value.
+ self showSource: false.
+ self classHolder value: nil.
+ changeSourceHolder setValue: nil; changed: #value.
+ imageSourceHolder setValue: nil; changed: #value.
].
"Created: / 24-10-2009 / 19:49:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 03-12-2011 / 10:38:45 / cg"
!
update: aspect with: param from: sender
@@ -1840,22 +1376,31 @@
"Created: / 24-10-2009 / 19:29:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!ChangeSetBrowser2 methodsFor:'interface opening'!
+
+open
+
+ super open.
+ ^self
+
+ "Created: / 20-07-2010 / 09:48:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!ChangeSetBrowser2 methodsFor:'menu actions'!
doOpen
| file changeset |
- file := Dialog requestFileName:'Select Changeset to Load' pattern:'*.chg;*.st'.
- file isNil ifTrue:[^self].
+ file := Dialog requestFileName:'Select changeset' pattern:'*.chg;*.st'.
+ file ifNil:[^self].
[changeset := ChangeSet fromFile: file]
- on: Error
- do: [:ex|Dialog error: 'Error when loading changeset: ',ex description. ^self].
+ on: Error
+ do: [:ex|Dialog error: 'Error when loading changeset: ',ex description. ^self].
changesetFile := file.
self title: file asFilename baseName asString.
self doOpen: changeset
"Modified: / 08-04-2011 / 10:11:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 27-12-2011 / 10:39:36 / cg"
!
doOpen: aChangeSet
@@ -1867,7 +1412,7 @@
doOpenCurrent
- self doOpen: (ChangeSet fromFile: ObjectMemory nameForChanges)
+ self doOpen: ChangeSet current
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -1875,8 +1420,8 @@
doSave
changesetFile
- ifNil:[self doSaveAs]
- ifNotNil:[self doSaveAs: changesetFile]
+ ifNil:[self doSaveAs]
+ ifNotNil:[self doSaveAs: changesetFile]
"Modified: / 24-10-2009 / 22:55:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -1884,280 +1429,47 @@
doSaveAs
| file |
- file := Dialog requestFileName:'Select File for Save' default: (changesetFile ? 'somechanges.chg') pattern:('*.chg').
- file isNil ifTrue:[^self].
+ file := Dialog requestFileName:'Select file' default: (changesetFile ? 'somechanges.chg') pattern:('*.chg').
+ file ifNil:[^self].
self doSaveAs: file.
-
- "Modified: / 27-12-2011 / 10:39:52 / cg"
!
doSaveAs: newFile
[
- | s |
- s := newFile asFilename writeStream.
- [self changeset fileOutOn: s] ensure:[s close].
- changesetFile := newFile.
+ | s |
+ s := newFile asFilename writeStream.
+ [self changeset fileOutOn: s] ensure:[s close].
+ changesetFile := newFile.
] on: Error do:
- [:ex|Dialog warn: 'Erorr saving changes: ' , ex description]
-!
-
-setTargetNamespace
- "specify an st/x namespace to be used as default"
-
- | nsName |
-
- nsName := Dialog
- requestNameSpace:'Namepace to load code into:'
- initialAnswer:targetNamespace.
- nsName isEmptyOrNil ifTrue:[^self].
-
- targetNamespace := nsName.
- "/ self targetNamespaceNameHolder value:('Target-Namespace: ',targetNamespace).
-
- "Created: / 07-09-2011 / 12:49:42 / cg"
-!
-
-setTargetPackage
- "specify an st/x package identifier to be used as default"
-
- | package |
-
- package := Dialog
- requestProject:'Default Smalltalk/X package to load code into:'
- initialAnswer:targetPackage
- suggestions:#().
- package isNil ifTrue:[^self].
-
- targetPackage := "lastPackage := "package.
- "/ self targetPackageHolder value:('Target-Package: ',targetPackage).
-
- "Created: / 07-09-2011 / 12:47:15 / cg"
+ [:ex|Dialog warn: 'Erorr saving changes: ' , ex description]
! !
!ChangeSetBrowser2 methodsFor:'menu actions - changes'!
changeMenuApply: changeList
+
| changesToApply |
-
changesToApply := OrderedCollection new.
self changesDo:[:chg|chg removed ifFalse:[changesToApply add: chg]].
self changeMenuApplyChanges: changesToApply.
- list2 notNil ifTrue:[
- "/ to get the =-icons
- list2 updateList
- ].
"Created: / 04-08-2011 / 17:26:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 28-12-2011 / 15:49:00 / cg"
!
changeMenuApplySelection: changeList
changeList selection do:[:change|self changeMenuApplyChange:change change].
- list2 notNil ifTrue:[
- "/ to get the =-icons
- list2 updateList
- ].
"Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 28-12-2011 / 15:48:53 / cg"
-!
-
-changeMenuApplyToEnd: changeList
- |lastIdx|
-
- lastIdx := changeList selectionIndices max.
- changeList list from:lastIdx do:[:change | self changeMenuApplyChange:change change].
- list2 notNil ifTrue:[
- "/ to get the =-icons
- list2 updateList
- ].
-
- "Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Created: / 27-12-2011 / 10:53:00 / cg"
!
changeMenuBrowse: changeList
- |changes methods classes|
- changeList == list1 ifTrue:[
- changes := selection1Holder value.
- ] ifFalse:[
- changes := selection2Holder value.
- ].
- changes := changes collect:[:c | c change].
- "/ changes := changeList listHolder value collect:[:c | c change].
- (changes conform:[:c | c isClassDefinitionChange]) ifTrue:[
- classes := (changes collect:[:c | c changeClass]).
- UserPreferences current systemBrowserClass
- browseClasses:classes title:'selected monticello classes'.
- ] ifFalse:[
- methods := OrderedCollection new.
- changes do:[:each |
- each isCompositeChange ifTrue:[
- each changes do:[:each2 | each2 isMethodChange ifTrue:[ methods add:each2 changeMethod ]]
- ] ifFalse:[
- each isMethodChange ifTrue:[
- methods add:(each changeMethod).
- ]
- ]
- ].
- (methods includes:nil) ifTrue:[
- Dialog warn:('%1 methods are not present in the image' bindWith:(methods occurrencesOf:nil)).
- methods := methods reject:[:m | m isNil].
- methods isEmpty ifTrue:[^ self].
- ].
- UserPreferences current systemBrowserClass
- browseMethods:methods title:'selected monticello methods' sort:false.
- ].
-
- "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 05-09-2011 / 16:17:48 / cg"
-!
-
-changeMenuBrowseClass: changeList
- |changes classes addThemChanges cls|
-
- changeList == list1 ifTrue:[
- changes := selection1Holder value.
- ] ifFalse:[
- changes := selection2Holder value.
- ].
- changes := changes collect:[:eachListEntry | eachListEntry change].
-
- classes := Set new.
- addThemChanges :=
- [:c |
- c isClassDefinitionChange ifTrue:[
- classes add:c changeClass theNonMetaclass
- ] ifFalse:[
- c isMethodChange ifTrue:[
- cls := c changeMethod isNil
- ifTrue:[ c changeClass ]
- ifFalse:[ c changeMethod mclass theNonMetaclass ].
- classes add:cls
- ] ifFalse:[
- c isCompositeChange ifTrue:[
- c changes do:addThemChanges
- ]
- ]
- ]
- ].
- changes do:addThemChanges.
-
- UserPreferences current systemBrowserClass
- browseClasses:classes title:'selected monticello classes'.
+ self breakPoint: #jv.
+ Dialog warn: 'Not yet implemented'
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Created: / 05-09-2011 / 16:08:35 / cg"
-!
-
-changeMenuCompareClass: changeList
- |changes classNames classNameToClassMapping lastNameSpace
- addClassName addThemChanges existingClasses
- allChanges changeSet1 changeSet2 diffSet|
-
- changeList == list1 ifTrue:[
- changes := selection1Holder value.
- ] ifFalse:[
- changes := selection2Holder value.
- ].
- changes := changes collect:[:eachListEntry | eachListEntry change].
-
- classNameToClassMapping := Dictionary new.
- classNames := Set new.
- allChanges := ChangeSet new.
- existingClasses := Set new.
-
- addClassName :=
- [:nmArg |
- |nm ns existingClass goodAnswer|
-
- nm := nmArg.
- existingClass := Smalltalk classNamed:nm.
-
- existingClass notNil ifTrue:[
- goodAnswer := nm
- ] ifFalse:[
- ns := NameSpace allNameSpaces
- detect:[:ns | (ns classNamed:nm) notNil ]
- ifNone:nil.
- ns notNil ifTrue:[
- goodAnswer := (ns classNamed:nm) name.
- ] ifFalse:[
- goodAnswer := nm.
- (lastNameSpace notNil
- and:[ lastNameSpace isNamespace
- and:[(lastNameSpace classNamed:nm) notNil ]]
- ) ifTrue:[
- goodAnswer := (lastNameSpace classNamed:nm) name.
- ] ifFalse:[
- (lastNameSpace notNil
- and:[ lastNameSpace isBehavior
- and:[(lastNameSpace privateClassesAt:nm asSymbol) notNil ]]
- ) ifTrue:[
- goodAnswer := (lastNameSpace privateClassesAt:nm asSymbol) name.
- ]
- ].
- ].
- ].
- nm := Dialog
- request:('Class to compare for "%1"?' bindWith:nmArg)
- initialAnswer:goodAnswer.
- nm isNil ifTrue:[^ self].
- nm notEmpty ifTrue:[
- existingClass := Smalltalk at:nm asSymbol.
- ].
- existingClass notNil ifTrue:[
- classNameToClassMapping at:nmArg put:existingClass.
- existingClasses add:existingClass.
- ].
- classNames add:nmArg
- ].
-
- addThemChanges := [:changes |
- "/ collect classes and mappings
- changes do:[:c |
- c isClassDefinitionChange ifTrue:[
- addClassName value:(c className).
- allChanges add:c.
- ]].
-
- changes do:[:c |
- c isMethodChange ifTrue:[
- (classNames includes:(c className)) ifFalse:[
- addClassName value:(c className).
- ].
- allChanges add:c.
- ]].
-
- changes do:[:c |
- c isCompositeChange ifTrue:[
- addThemChanges value:(c changes)
- ].
- ].
- ].
-
- changes do:addThemChanges.
-
- "/ now, build a diffset and present it...
- changeSet1 := allChanges.
- changeSet2 := ChangeSet new.
- existingClasses do:[:cls |
- changeSet2 addAll:(ChangeSet forExistingClass:cls).
- ].
- diffSet := changeSet1 diffSetsAgainst:changeSet2.
-
- (UserPreferences versionDiffViewerClass)
- openOnDiffSet:diffSet
- labelA:'Monticello'
- labelB:'Current (In Image)'
- title:'Diffs'
- ignoreExtensions:false.
-
- "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Created: / 01-12-2011 / 18:36:44 / cg"
!
changeMenuDeleteSelection: changeList
@@ -2174,8 +1486,8 @@
changes := OrderedCollection new: 1.
self selectionDo:[:chg|changes add: chg].
changes size = 1
- ifTrue:[changes anyOne inspect]
- ifFalse:[changes inspect].
+ ifTrue:[changes anyOne inspect]
+ ifFalse:[changes inspect].
"Created: / 04-08-2011 / 17:28:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -2246,17 +1558,17 @@
'.
LastSelectionConditionString isNil ifTrue:[
- LastSelectionConditionString := template.
+ LastSelectionConditionString := template.
].
textHolder := ValueHolder new.
dialog := Dialog
- forRequestText:(resources string:'Enter condition for selection')
- lines:20
- columns:70
- initialAnswer:LastSelectionConditionString
- model:textHolder.
+ forRequestText:(resources string:'Enter condition for selection')
+ lines:20
+ columns:70
+ initialAnswer:LastSelectionConditionString
+ model:textHolder.
dialog addButton:(Button label:'Template' action:[textHolder value:template. textHolder changed:#value.]).
dialog open.
dialog accepted ifFalse:[^ self].
@@ -2266,8 +1578,8 @@
conditionBlock := Parser evaluate:conditionBlockString.
conditionBlock isBlock ifFalse:[
- self error:'Bad selection block (syntax error?)'.
- ^ self
+ self error:'Bad selection block (syntax error?)'.
+ ^ self
].
self changeMenuSelectIn: changeList suchThat: conditionBlock
@@ -2288,32 +1600,12 @@
changeMenuApplyChange: aChange
-"/ aChange isClassDefinitionChange ifTrue:
-"/ [(Smalltalk at: aChange superClassName asSymbol)
-"/ ifNil:[^self error: 'Nil superclass']].
-
- self withWaitCursorDo:[
- (MCStXNamespaceQuery , Class nameSpaceQuerySignal)
- answer:(NameSpace name:(targetNamespace ? 'Smalltalk'))
- do: [
- (MCStXPackageQuery , Class packageQuerySignal)
- answer: self targetPackage
- do: [
- MCInteractiveLoadingQuery answer: true do:[
- updateChangefileHolder value ifTrue:[
- aChange apply
- ] ifFalse:[
- Class withoutUpdatingChangesDo:[
- aChange apply
- ]
- ].
- ]
- ].
- ].
- ].
+ aChange isClassDefinitionChange ifTrue:
+ [(Smalltalk at: aChange superClassName asSymbol)
+ ifNil:[^self error: 'Nil superclass']].
+ aChange apply
"Modified: / 29-10-2010 / 14:57:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 07-09-2011 / 22:24:57 / cg"
!
changeMenuApplyChanges: changesToApply
@@ -2322,15 +1614,15 @@
changesThatFailToApply := ChangeSet new.
ProgressIndicator
- displayProgress:'Applying changes...'
- at:(Screen default center)
- from:200 to:400
- during:[:val |
- 1 to: changesToApply size do:
- [:i|
- val value:((100 / changesToApply size) * i) rounded.
- [self changeMenuApplyChange: (changesToApply at: i)]
- on: Error do:[changesThatFailToApply add: (changesToApply at: i)]]]
+ displayProgress:'Applying changes...'
+ at:(Screen default center)
+ from:200 to:400
+ during:[:val |
+ 1 to: changesToApply size do:
+ [:i|
+ val value:((100 / changesToApply size) * i) rounded.
+ [self changeMenuApplyChange: (changesToApply at: i)]
+ on: Error do:[changesThatFailToApply add: (changesToApply at: i)]]]
"Created: / 04-08-2011 / 17:26:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -2347,21 +1639,15 @@
!ChangeSetBrowser2 methodsFor:'private'!
-changesDo:aBlock
- self changeset do:aBlock.
-
- "Created: / 30-08-2011 / 14:30:58 / cg"
-!
-
getNavigatorChangeSet
| changeset |
changeset := changesetHolder value deepCopy.
(changeset isKindOf: ChangeSet) ifFalse:
- [changeset := ChangeSet withAll: changeset].
+ [changeset := ChangeSet withAll: changeset].
(self navigatorSpecHolder value ~= #oneColumnNavigatorSpec)
- ifTrue:[^changeset groupByClass].
+ ifTrue:[^changeset groupByClass].
"Default"
^changeset
@@ -2373,10 +1659,10 @@
redrawChangeListViews
list1 notNil ifTrue:[
- list1 builder window allSubViewsDo: [:v|v redraw]
+ list1 builder window allSubViewsDo: [:v|v redraw]
].
list2 notNil ifTrue:[
- list2 builder window allSubViewsDo: [:v|v redraw]
+ list2 builder window allSubViewsDo: [:v|v redraw]
].
"Created: / 16-03-2011 / 22:41:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2413,22 +1699,25 @@
sourceView ifNil:[^self].
panel := builder componentAt: #VerticalPanel.
aBoolean ifTrue:[
- (panel subViews includes: sourceView) ifTrue:[^self].
- panel addSubView: sourceView.
+ (panel subViews includes: sourceView) ifTrue:[^self].
+ panel addSubView: sourceView.
] ifFalse:[
- (panel subViews includes: sourceView) ifFalse:[^self].
- panel removeSubView: sourceView.
- sourceView setId: nil.
+ (panel subViews includes: sourceView) ifFalse:[^self].
+ panel removeSubView: sourceView.
+ sourceView setId: nil.
]
"Created: / 11-07-2011 / 16:06:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
+! !
+
+!ChangeSetBrowser2 methodsFor:'private-enumerating'!
-targetPackage
- ^ targetPackage ? PackageId noProjectID
+listDo: aBlock
- "Created: / 07-09-2011 / 20:12:04 / cg"
+ self listHolder value ? #() do: aBlock
+
+ "Created: / 20-03-2011 / 22:20:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeSetBrowser2 methodsFor:'queries'!
@@ -2442,10 +1731,9 @@
canDrop: somethign
- self breakPoint:#jv.
+ self halt.
"Created: / 20-03-2011 / 21:34:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 07-09-2011 / 20:21:15 / cg"
!
hasChangeSelectedAndNotRemoved: changeList
@@ -2469,288 +1757,16 @@
"Created: / 04-08-2011 / 18:25:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-!ChangeSetBrowser2::ChangeEditor class methodsFor:'documentation'!
-
-documentation
-"
- A simple, embeddable window to show a single change.
- If readonlyHolder's value is false, then user is
- allowed to edit the change (i.e., modify the source code)
-
- [author:]
- Jan Vrany <jan.vrany@fit.cvut.cz>
-
- [instance variables:]
-
- [class variables:]
-
- [see also:]
-
-"
-!
-
-examples
-"
- Starting the application:
- [exBegin]
- Tools::ChangeEditor open
-
- [exEnd]
-
- more examples to be added:
- [exBegin]
- ... add code fragment for
- ... executable example here ...
- [exEnd]
-"
-! !
-
-!ChangeSetBrowser2::ChangeEditor class methodsFor:'interface specs'!
-
-windowSpec
- "This resource specification was automatically generated
- by the UIPainter of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the UIPainter may not be able to read the specification."
-
- "
- UIPainter new openOnClass:Tools::ChangeSetBrowser2::ChangeEditor andSelector:#windowSpec
- Tools::ChangeSetBrowser2::ChangeEditor new openInterface:#windowSpec
- Tools::ChangeSetBrowser2::ChangeEditor open
- "
-
- <resource: #canvas>
-
- ^
- #(FullSpec
- name: windowSpec
- window:
- (WindowSpec
- label: 'Change Editor'
- name: 'Change Editor'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 579 341)
- )
- component:
- (SpecCollection
- collection: (
- (SubCanvasSpec
- name: 'TextDiffTool'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- hasHorizontalScrollBar: false
- hasVerticalScrollBar: false
- majorKey: #'Tools::TextDiffTool'
- minorKey: windowSpecForEmbedding
- subAspectHolders:
- (Array
-
- (SubChannelInfoSpec
- subAspect: classHolder
- aspect: classAspect
- )
- (SubChannelInfoSpec
- subAspect: codeAspectHolder
- aspect: codeAspect
- )
-
- (SubChannelInfoSpec
- subAspect: labelAHolder
- aspect: labelAHolder
- )
- (SubChannelInfoSpec
- subAspect: labelBHolder
- aspect: labelBHolder
- )
-
- (SubChannelInfoSpec
- subAspect: showDiffHolder
- aspect: showdiffHolder
- )
- (SubChannelInfoSpec
- subAspect: textAHolder
- aspect: sourceChangeHolder
- )
-
- (SubChannelInfoSpec
- subAspect: textBHolder
- aspect: sourceImageHolder
- )
- )
- createNewApplication: true
- createNewBuilder: true
- )
- )
-
- )
- )
-! !
-
-!ChangeSetBrowser2::ChangeEditor methodsFor:'accessing'!
-
-sourceChangeHolder
- ^ sourceChangeHolder
-!
-
-sourceChangeHolder:something
- sourceChangeHolder := something.
-!
-
-sourceImageHolder
- ^ sourceImageHolder
-!
-
-sourceImageHolder:something
- sourceImageHolder := something.
-! !
-
-!ChangeSetBrowser2::ChangeEditor methodsFor:'aspects'!
-
-changeHolder
- "return/create the 'changeHolder' value holder (automatically generated)"
-
- changeHolder isNil ifTrue:[
- changeHolder := ValueHolder new.
- changeHolder addDependent:self.
- ].
- ^ changeHolder
-!
-
-changeHolder:something
- "set the 'changeHolder' value holder (automatically generated)"
-
- |oldValue newValue|
-
- changeHolder notNil ifTrue:[
- oldValue := changeHolder value.
- changeHolder removeDependent:self.
- ].
- changeHolder := something.
- changeHolder notNil ifTrue:[
- changeHolder addDependent:self.
- ].
- newValue := changeHolder value.
- oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:changeHolder.
- ].
-!
-
-classAspect
-
- ^(AspectAdaptor forAspect: #changeClass)
- subjectChannel: self changeHolder
-
- "Created: / 29-11-2011 / 11:21:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-codeAspect
-
- ^BlockValue
- with: [:change|
- change isMethodCodeChange
- ifTrue:[#method]
- ifFalse:[#expression]
- ] argument: self changeHolder
-
- "Created: / 29-11-2011 / 11:21:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-labelAText
-
- ^'Change'
-
- "Created: / 27-11-2011 / 14:59:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-labelBText
-
- ^'Current (in image)'
-
- "Created: / 27-11-2011 / 14:59:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-readonlyHolder
- "return/create the 'readonlyHolder' value holder (automatically generated)"
-
- readonlyHolder isNil ifTrue:[
- readonlyHolder := ValueHolder new.
- readonlyHolder addDependent:self.
- ].
- ^ readonlyHolder
-!
-
-readonlyHolder:something
- "set the 'readonlyHolder' value holder (automatically generated)"
-
- |oldValue newValue|
-
- readonlyHolder notNil ifTrue:[
- oldValue := readonlyHolder value.
- readonlyHolder removeDependent:self.
- ].
- readonlyHolder := something.
- readonlyHolder notNil ifTrue:[
- readonlyHolder addDependent:self.
- ].
- newValue := readonlyHolder value.
- oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:readonlyHolder.
- ].
-!
-
-showdiffHolder
- "return/create the 'showdiffHolder' value holder (automatically generated)"
-
- showdiffHolder isNil ifTrue:[
- showdiffHolder := ValueHolder new.
- ].
- ^ showdiffHolder
-!
-
-showdiffHolder:something
- "set the 'showdiffHolder' value holder (automatically generated)"
-
- showdiffHolder := something.
-! !
-
-!ChangeSetBrowser2::ChangeEditor methodsFor:'change & update'!
-
-changeChanged
-
- "changeHolder has changed, update sources etc..."
-
- | change |
- change := changeHolder value.
-
- sourceChangeHolder value: change changeSource.
- sourceImageHolder value: change imageSource.
-
- "Created: / 29-11-2011 / 11:15:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-update:something with:aParameter from:changedObject
- "Invoked when an object that I depend upon sends a change notification."
-
-
- changedObject == changeHolder ifTrue:[
- self changeChanged.
- ^ self.
- ].
- super update:something with:aParameter from:changedObject
-
- "Modified: / 29-11-2011 / 11:15:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
!ChangeSetBrowser2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.31 2012-01-25 17:49:51 vrany Exp $'
+ ^ '$Id: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.11 2011/08/04 20:18:26 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.31 2012-01-25 17:49:51 vrany Exp $'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.11 2011/08/04 20:18:26 cg Exp §'
!
version_SVN
- ^ '§Id: Tools__ChangeSetBrowser.st 7486 2009-10-26 22:06:24Z vranyj1 §'
-! !
+ ^ '$Id: Tools__ChangeSetBrowser.st 7486 2009-10-26 22:06:24Z vranyj1 $'
+! !
\ No newline at end of file