--- a/Tools__ChangeSetBrowser2.st Wed Mar 04 18:15:51 2015 +0100
+++ b/Tools__ChangeSetBrowser2.st Wed Mar 04 19:34:43 2015 +0100
@@ -30,28 +30,28 @@
"{ NameSpace: Tools }"
ToolApplicationModel subclass:#ChangeSetBrowser2
- instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile
- navigatorChangesetHolder navigatorSpecHolder list1 list1Holder
- selection1Holder list2 list2Holder selection2Holder classHolder
- languageHolder codeAspectHolder showRemovedAspect showSameAspect
- showTimestampHolder sourceView changeSourceHolder
- imageSourceHolder targetPackage allowRemoveHolder
- allowAcceptHolder infoPanel updateChangeFileHolder
- showFilterHolder showingRegularChangesetHolder isWorkingHolder
- isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect
- targetNameSpaceName showDefinitionsOnlyAspect'
- classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages
- LastConfirmersExtent'
- poolDictionaries:''
- category:'Interface-Browsers-ChangeSet'
+ instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile
+ navigatorChangesetHolder navigatorSpecHolder list1 list1Holder
+ selection1Holder list2 list2Holder selection2Holder classHolder
+ languageHolder codeAspectHolder showRemovedAspect showSameAspect
+ showTimestampHolder sourceView changeSourceHolder
+ imageSourceHolder targetPackage allowRemoveHolder
+ allowAcceptHolder infoPanel updateChangeFileHolder
+ showFilterHolder showingRegularChangesetHolder isWorkingHolder
+ isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect
+ targetNameSpaceName showDefinitionsOnlyAspect'
+ classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages
+ LastConfirmersExtent'
+ poolDictionaries:''
+ category:'Interface-Browsers-ChangeSet'
!
ApplicationModel subclass:#ChangeEditor
- instanceVariableNames:'changeHolder readonlyHolder showdiffHolder sourceChangeHolder
- sourceImageHolder'
- classVariableNames:''
- poolDictionaries:''
- privateIn:ChangeSetBrowser2
+ instanceVariableNames:'changeHolder readonlyHolder showdiffHolder sourceChangeHolder
+ sourceImageHolder'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:ChangeSetBrowser2
!
!ChangeSetBrowser2 class methodsFor:'documentation'!
@@ -1669,7 +1669,14 @@
(MenuItem
activeHelpKey: fileOpenCurrent
enabled: isWorkingNotHolder
- label: 'Open Current'
+ label: 'Open Session Changeset'
+ itemValue: doOpenSession
+ isVisible: allowOpenHolder
+ )
+ (MenuItem
+ activeHelpKey: fileOpenCurrent
+ enabled: isWorkingNotHolder
+ label: 'Open Session Changefile'
itemValue: doOpenCurrent
isVisible: allowOpenHolder
)
@@ -1865,7 +1872,7 @@
<resource: #menu>
- ^
+ ^
#(Menu
(
(MenuItem
@@ -1873,7 +1880,6 @@
enabled: isWorkingNotHolder
label: 'Load'
itemValue: doOpen
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever XPToolbarIconLibrary loadFromFileIcon)
)
@@ -1882,7 +1888,6 @@
enabled: isWorkingNotHolder
label: 'Save'
itemValue: doSave
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever XPToolbarIconLibrary saveToFileIcon)
)
@@ -1894,7 +1899,6 @@
enabled: hasSelectionHolder
label: 'Apply'
itemValue: doApply
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever nil applyIcon)
)
@@ -1903,7 +1907,6 @@
enabled: hasSelectionHolder
label: 'Apply To End'
itemValue: doApplyToEnd
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever nil applyToEndIcon)
)
@@ -1912,7 +1915,6 @@
enabled: hasSelectionHolder
label: 'Apply From Last Snapshot'
itemValue: doApplyFromLastSnapshot
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever nil applyFromLastSnapshotIcon)
)
@@ -1924,8 +1926,8 @@
enabled: hasSelectionHolder
label: 'Delete'
itemValue: doDelete
- translateLabel: true
isButton: true
+ isVisible: allowRemoveHolder
labelImage: (ResourceRetriever nil deleteIcon)
)
(MenuItem
@@ -1933,8 +1935,8 @@
enabled: hasSelectionHolder
label: 'Delete To End'
itemValue: doDeleteToEnd
- translateLabel: true
isButton: true
+ isVisible: allowRemoveHolder
labelImage: (ResourceRetriever nil deleteToEndIcon)
)
(MenuItem
@@ -1942,9 +1944,8 @@
enabled: isWorkingNotHolder
label: 'Compress'
itemValue: doCompress
- translateLabel: true
isButton: true
- isVisible: showingRegularChangesetHolder
+ isVisible: allowRemoveHolder
labelImage: (ResourceRetriever nil compressIcon)
)
(MenuItem
@@ -1956,7 +1957,6 @@
enabled: hasSelectionHolder
label: 'Find Previous Snapshot'
itemValue: doFindSnapshot:
- translateLabel: true
isButton: true
isVisible: showingRegularChangesetHolder
labelImage: (ResourceRetriever nil findPreviousSnapshotIcon)
@@ -1967,7 +1967,6 @@
enabled: hasSelectionHolder
label: 'Find Next Snapshot'
itemValue: doFindSnapshot:
- translateLabel: true
isButton: true
isVisible: showingRegularChangesetHolder
labelImage: (ResourceRetriever nil findNextSnapshotIcon)
@@ -2879,10 +2878,9 @@
!
doCompress
- self breakPoint: #jv.
- Dialog warn: 'Sorry, not yet implemented'
-
- "Modified: / 30-03-2012 / 12:20:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ self loadChangeSet: (self changesetHolder value copy condenseChanges)
+
+ "Modified: / 04-03-2015 / 17:26:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
doDelete
@@ -3100,6 +3098,16 @@
"Modified: / 25-07-2012 / 15:31:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+doOpenSession
+ "Opens a session changeset?"
+
+ "/ Load a copy, so compress would not affect the original changeset
+ self loadChangeSet: ChangeSet current copy.
+ self allowRemove: true.
+
+ "Modified: / 04-03-2015 / 18:18:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
doSave
changesetFile
@@ -3160,10 +3168,12 @@
!
loadChangeSet: aChangeSet
- self changesetHolder value: aChangeSet
+ self changesetHolder value: aChangeSet.
+ self infoPanel hide.
"Created: / 05-12-2009 / 13:43:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 27-07-2012 / 21:20:50 / cg"
+ "Modified: / 04-03-2015 / 17:11:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
loadCurrentChangeFile
@@ -4260,11 +4270,11 @@
!ChangeSetBrowser2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.68 2015-02-28 23:46:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.69 2015-03-04 18:34:43 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.68 2015-02-28 23:46:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.69 2015-03-04 18:34:43 vrany Exp $'
!
version_HG
@@ -4273,6 +4283,6 @@
!
version_SVN
- ^ '$Id: Tools__ChangeSetBrowser2.st,v 1.68 2015-02-28 23:46:38 cg Exp $'
+ ^ '$Id: Tools__ChangeSetBrowser2.st,v 1.69 2015-03-04 18:34:43 vrany Exp $'
! !