diff -r 4b42e5a1f395 -r d6bd6c9c5a1b Tools__ChangeSetBrowser2.st --- a/Tools__ChangeSetBrowser2.st Thu Aug 04 21:39:05 2011 +0200 +++ b/Tools__ChangeSetBrowser2.st Thu Aug 04 22:18:26 2011 +0200 @@ -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 @@ -28,15 +28,15 @@ "{ NameSpace: Tools }" ToolApplicationModel subclass:#ChangeSetBrowser2 - instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile - navigatorChangesetHolder navigatorSpecHolder list1 list1Holder - selection1Holder list2 list2Holder selection2Holder classHolder - codeAspectHolder showRemovedAspect showSameAspect - acceptEnabledHolder sourceView changeSourceHolder - imageSourceHolder' - classVariableNames:'ShowRemoved LastSelectionConditionString' - poolDictionaries:'' - category:'Interface-Browsers-ChangeSet' + instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile + navigatorChangesetHolder navigatorSpecHolder list1 list1Holder + selection1Holder list2 list2Holder selection2Holder classHolder + codeAspectHolder showRemovedAspect showSameAspect + acceptEnabledHolder sourceView changeSourceHolder + imageSourceHolder' + classVariableNames:'ShowRemoved LastSelectionConditionString' + poolDictionaries:'' + category:'Interface-Browsers-ChangeSet' ! !ChangeSetBrowser2 class methodsFor:'documentation'! @@ -44,7 +44,7 @@ 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 @@ -91,8 +91,8 @@ browser := self new. browser - changeset: aChangeSet; - title: label. + changeset: aChangeSet; + title: label. aBlock value: browser. ^browser @@ -121,7 +121,7 @@ the UIHelpTool may not be able to read the specification." " - UIHelpTool openOnClass:Tools::ChangeSetBrowser + UIHelpTool openOnClass:Tools::ChangeSetBrowser " @@ -148,37 +148,37 @@ confirmChanges:aChangeSet label: aString "Hmm, DialogBox class layout options are quite limited :-((" - + |browser browserView dialog| browser := self on: aChangeSet. browser acceptEnabled: false. browser showRemovedAspect: (true asValue). - browserView := ApplicationSubView new - client:browser - spec:#windowSpecForEmbedding. + browserView := ApplicationSubView new + client:browser + spec:#windowSpecForEmbedding. dialog := (Dialog new) - addComponent:browserView withHeight: 300; - addAbortAndOkButtons. + 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)). + dialog buttonPanel + 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)). - dialog - okAction: - [^browser list1Holder value condenseChangesForRemoved]; - abortAction: - [^#()]. + offsets:(0 @ 0 corner:0 @ -30)). + dialog + 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 " @@ -221,63 +221,63 @@ - ^ + ^ #(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 - - (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 - ) + 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: acceptEnabledHolder + aspect: acceptEnabledHolder + ) + (SubChannelInfoSpec + subAspect: inGeneratorHolder + aspect: list1Holder + ) - ) - createNewApplication: true - createNewBuilder: true - postBuildCallback: list1View: - ) - ) - - ) + (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:13 / Jan Vrany " @@ -297,63 +297,63 @@ - ^ + ^ #(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: 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 - ) + 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 + ) - ) - createNewApplication: true - createNewBuilder: true - postBuildCallback: list1View: - ) - ) - - ) + (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 " @@ -373,115 +373,115 @@ - ^ + ^ #(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 - - (SubChannelInfoSpec - subAspect: acceptEnabledHolder - aspect: acceptEnabledHolder - ) - (SubChannelInfoSpec - subAspect: inGeneratorHolder - aspect: list1Holder - ) - - (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: acceptEnabledHolder - aspect: acceptEnabledHolder - ) - (SubChannelInfoSpec - subAspect: inGeneratorHolder - aspect: list2Holder - ) - - (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: - ) - ) - - ) - handles: (Any 0.5 1.0) - ) - ) - - ) + 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: acceptEnabledHolder + aspect: acceptEnabledHolder + ) + (SubChannelInfoSpec + subAspect: inGeneratorHolder + aspect: list1Holder + ) + + (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: acceptEnabledHolder + aspect: acceptEnabledHolder + ) + (SubChannelInfoSpec + subAspect: inGeneratorHolder + aspect: list2Holder + ) + + (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: + ) + ) + + ) + handles: (Any 0.5 1.0) + ) + ) + + ) ) "Modified: / 04-08-2011 / 18:43:52 / Jan Vrany " @@ -502,35 +502,35 @@ - ^ + ^ #(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 + ) + ) + + ) ) ! @@ -553,80 +553,80 @@ - ^ + ^ #(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 - - (SubChannelInfoSpec - subAspect: classHolder - 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 - ) - ) - createNewApplication: true - createNewBuilder: true - ) - ) - - ) - handles: (Any 0.5 1.0) - ) - ) - - ) + 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: codeAspectHolder + aspect: codeAspectHolder + ) + + (SubChannelInfoSpec + subAspect: labelAHolder + aspect: labelAHolder + ) + (SubChannelInfoSpec + subAspect: labelBHolder + aspect: labelBHolder + ) + + (SubChannelInfoSpec + subAspect: textAHolder + aspect: changeSourceHolder + ) + (SubChannelInfoSpec + subAspect: textBHolder + aspect: imageSourceHolder + ) + ) + createNewApplication: true + createNewBuilder: true + ) + ) + + ) + handles: (Any 0.5 1.0) + ) + ) + + ) ) ! ! @@ -646,123 +646,123 @@ - ^ + ^ #(Menu - ( - (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 + ( + (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 ) ! @@ -780,96 +780,96 @@ - ^ + ^ #(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 - ) - ) - ) - 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 ) ! @@ -887,29 +887,29 @@ - ^ + ^ #(Menu - ( - (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 + ( + (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 ) ! ! @@ -927,7 +927,7 @@ (if this app is embedded in a subCanvas)." ^ #( - #changesetHolder + #changesetHolder ). ! ! @@ -1002,12 +1002,12 @@ 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 " @@ -1036,7 +1036,7 @@ | menu | menu := builder menuFor: #changeMenu. menu allItemsDo:[:item|item argument: list1]. - menu + menu ] "Created: / 04-08-2011 / 18:11:03 / Jan Vrany " @@ -1048,7 +1048,7 @@ | menu | menu := builder menuFor: #changeMenu. menu allItemsDo:[:item|item argument: list2]. - menu + menu ] "Created: / 04-08-2011 / 18:13:56 / Jan Vrany " @@ -1061,7 +1061,7 @@ | entry | (entry := self theSingleSelectedChange) ifNil:[^self]. entry change isMethodCodeChange ifTrue: - [entry change source: source asString] + [entry change source: source asString] "Modified: / 29-11-2010 / 22:40:50 / Jan Vrany " ! @@ -1079,7 +1079,7 @@ "return/create the 'selectionHolder' value holder (automatically generated)" acceptEnabledHolder isNil ifTrue:[ - acceptEnabledHolder := ValueHolder with: true. + acceptEnabledHolder := ValueHolder with: true. ]. ^ acceptEnabledHolder @@ -1090,7 +1090,7 @@ "return/create the 'allowOpenHolder' value holder (automatically generated)" allowOpenHolder isNil ifTrue:[ - allowOpenHolder := ValueHolder with: true. + allowOpenHolder := ValueHolder with: true. ]. ^ allowOpenHolder @@ -1099,8 +1099,8 @@ changeSourceHolder - changeSourceHolder isNil ifTrue: [ - changeSourceHolder := nil asValue. + changeSourceHolder isNil ifTrue: [ + changeSourceHolder := nil asValue. ]. ^ changeSourceHolder. @@ -1111,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 ! @@ -1123,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. ]. ! @@ -1140,7 +1140,7 @@ "return/create the 'classHolder' value holder (automatically generated)" classHolder isNil ifTrue:[ - classHolder := ValueHolder with:nil. + classHolder := ValueHolder with:nil. ]. ^ classHolder @@ -1151,15 +1151,15 @@ "return/create the 'codeAspectHolder' value holder (automatically generated)" codeAspectHolder isNil ifTrue:[ - codeAspectHolder := ValueHolder new. + codeAspectHolder := ValueHolder new. ]. ^ codeAspectHolder ! imageSourceHolder - imageSourceHolder isNil ifTrue: [ - imageSourceHolder := nil asValue. + imageSourceHolder isNil ifTrue: [ + imageSourceHolder := nil asValue. ]. ^ imageSourceHolder. @@ -1184,7 +1184,7 @@ "return/create the 'list1Holder' value holder (automatically generated)" list1Holder isNil ifTrue:[ - list1Holder := ValueHolder new. + list1Holder := ValueHolder new. ]. ^ list1Holder ! @@ -1199,7 +1199,7 @@ "return/create the 'list2Holder' value holder (automatically generated)" list2Holder isNil ifTrue:[ - list2Holder := ValueHolder new. + list2Holder := ValueHolder new. ]. ^ list2Holder ! @@ -1214,7 +1214,7 @@ "return/create the 'navigatorChangesetHolder' value holder (automatically generated)" navigatorChangesetHolder isNil ifTrue:[ - navigatorChangesetHolder := ValueHolder new. + navigatorChangesetHolder := ValueHolder new. ]. ^ navigatorChangesetHolder ! @@ -1223,11 +1223,11 @@ navigatorSpecHolder isNil ifTrue:[ - navigatorSpecHolder := ValueHolder with: - #hierarchicalNavigatorSpec - "/#twoColumnNavigatorSpec - "/#oneColumnNavigatorSpec - + navigatorSpecHolder := ValueHolder with: + #hierarchicalNavigatorSpec + "/#twoColumnNavigatorSpec + "/#oneColumnNavigatorSpec + ]. ^ navigatorSpecHolder. @@ -1238,8 +1238,8 @@ "return/create the 'selection1Holder' value holder (automatically generated)" selection1Holder isNil ifTrue:[ - selection1Holder := ValueHolder new. - selection1Holder addDependent:self. + selection1Holder := ValueHolder new. + selection1Holder addDependent:self. ]. ^ selection1Holder ! @@ -1250,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. ]. ! @@ -1267,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 ! @@ -1279,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. ]. ! @@ -1296,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 ! @@ -1310,7 +1310,7 @@ "return/create the 'showSameAspect' value holder (automatically generated)" showSameAspect isNil ifTrue:[ - showSameAspect := ValueHolder with: true. + showSameAspect := ValueHolder with: true. ]. ^ showSameAspect @@ -1325,9 +1325,9 @@ titleHolder "return/create the 'titleHolder' value holder (automatically generated)" - - titleHolder isNil - ifTrue:[ titleHolder := ValueHolder with:self defaultTitle. ]. + + titleHolder isNil + ifTrue:[ titleHolder := ValueHolder with:self defaultTitle. ]. ^ titleHolder "Modified: / 26-10-2010 / 22:54:38 / Jan Vrany " @@ -1348,26 +1348,26 @@ | 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 " ! -update: aspect with: param from: sender +update: aspect with: param from: sender sender == changesetHolder ifTrue: [ ^ self changesetChanged ]. sender == selection1Holder ifTrue: [ ^ self selectionChanged ]. @@ -1393,9 +1393,9 @@ | file changeset | 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]. + [changeset := ChangeSet fromFile: file] + on: Error + do: [:ex|Dialog error: 'Error when loading changeset: ',ex description. ^self]. changesetFile := file. self title: file asFilename baseName asString. self doOpen: changeset @@ -1419,9 +1419,9 @@ doSave - changesetFile - ifNil:[self doSaveAs] - ifNotNil:[self doSaveAs: changesetFile] + changesetFile + ifNil:[self doSaveAs] + ifNotNil:[self doSaveAs: changesetFile] "Modified: / 24-10-2009 / 22:55:07 / Jan Vrany " ! @@ -1437,12 +1437,12 @@ 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] + [:ex|Dialog warn: 'Erorr saving changes: ' , ex description] ! ! !ChangeSetBrowser2 methodsFor:'menu actions - changes'! @@ -1450,7 +1450,7 @@ changeMenuApply: changeList | changesToApply | - changesToApply := OrderedCollection new. + changesToApply := OrderedCollection new. self changesDo:[:chg|chg removed ifFalse:[changesToApply add: chg]]. self changeMenuApplyChanges: changesToApply. @@ -1485,23 +1485,13 @@ | changes | changes := OrderedCollection new: 1. self selectionDo:[:chg|changes add: chg]. - changes size = 1 - ifTrue:[changes anyOne inspect] - ifFalse:[changes inspect]. + changes size = 1 + ifTrue:[changes anyOne inspect] + ifFalse:[changes inspect]. "Created: / 04-08-2011 / 17:28:43 / Jan Vrany " ! -changeMenuInspect:aValueHolder - |value| - - ((value := aValueHolder value) size = 1 - ifTrue:[value anyOne] - ifFalse:[value]) inspect - - "Modified: / 04-08-2011 / 19:20:21 / cg" -! - changeMenuInspectChangeset: changeList self changesetHolder value inspect. @@ -1562,23 +1552,23 @@ "/ change is an instance of Change "/ change will be selected if and only if block returns true - + true"/always select the change ] '. 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]. @@ -1588,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 @@ -1611,8 +1601,8 @@ changeMenuApplyChange: aChange aChange isClassDefinitionChange ifTrue: - [(Smalltalk at: aChange superClassName asSymbol) - ifNil:[^self error: 'Nil superclass']]. + [(Smalltalk at: aChange superClassName asSymbol) + ifNil:[^self error: 'Nil superclass']]. aChange apply "Modified: / 29-10-2010 / 14:57:58 / Jan Vrany " @@ -1624,20 +1614,20 @@ 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 " ! -changeMenuSelectIn: changeList suchThat:conditionBlock +changeMenuSelectIn: changeList suchThat:conditionBlock | sel | sel := OrderedCollection new. @@ -1654,10 +1644,10 @@ | 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 @@ -1669,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 " @@ -1680,17 +1670,17 @@ selectionDo: aBlock - | applyBlock | - applyBlock := [:e|aBlock value: e change]. - - selectionHolder value isEmptyOrNil ifTrue:[ - (self navigatorChangesetHolder value ? #()) do: aBlock - ] ifFalse:[ - selection1Holder value isEmptyOrNil not - ifTrue:[selection1Holder value do: applyBlock] - ifFalse:[selectionHolder value do: applyBlock]. - ]. - self redrawChangeListViews +"/ | applyBlock | +"/ applyBlock := [:e|aBlock value: e change]. +"/ +"/ selectionHolder value isEmptyOrNil ifTrue:[ +"/ (self navigatorChangesetHolder value ? #()) do: aBlock +"/ ] ifFalse:[ +"/ selection1Holder value isEmptyOrNil not +"/ ifTrue:[selection1Holder value do: applyBlock] +"/ ifFalse:[selectionHolder value do: applyBlock]. +"/ ]. +"/ self redrawChangeListViews "Created: / 29-10-2010 / 13:47:21 / Jan Vrany " "Modified: / 08-04-2011 / 10:15:17 / Jan Vrany " @@ -1709,12 +1699,12 @@ 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. ] @@ -1770,11 +1760,11 @@ !ChangeSetBrowser2 class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.10 2011-08-04 18:36:35 cg Exp $' + ^ '$Header: /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.10 2011-08-04 18:36:35 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.11 2011-08-04 20:18:26 cg Exp $' ! version_SVN