more for vw-XML fileIn
authorClaus Gittinger <cg@exept.de>
Sun, 26 Jan 2003 15:10:32 +0100
changeset 4483 84f28a1e7875
parent 4482 2e316b7e5d93
child 4484 68db879de664
more for vw-XML fileIn
ChangeSetBrowser.st
--- a/ChangeSetBrowser.st	Sun Jan 26 15:00:54 2003 +0100
+++ b/ChangeSetBrowser.st	Sun Jan 26 15:10:32 2003 +0100
@@ -101,77 +101,77 @@
               #(
                #(#MenuItem
                   #label: 'Compress'
+                  #itemValue: #doCompress
                   #translateLabel: true
                   #isVisible: #notEditingClassSourceAndNotReadOnly
-                  #value: #doCompress
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Compress for Class'
+                  #itemValue: #doCompressClass
                   #translateLabel: true
                   #isVisible: #notEditingClassSourceAndNotReadOnly
-                  #value: #doCompressClass
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
                   #label: 'Compare and Compress'
+                  #itemValue: #doCompareAndCompress
                   #translateLabel: true
                   #isVisible: #notEditingClassSourceAndNotReadOnly
-                  #value: #doCompareAndCompress
                 )
                #(#MenuItem
                   #label: '-'
                   #isVisible: #notEditingClassSourceAndNotReadOnly
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Fileout && Delete all Changes for Class'
+                  #itemValue: #doFileoutAndDeleteClassAll
                   #translateLabel: true
                   #isVisible: #notEditingClassSourceAndNotReadOnly
-                  #value: #doFileoutAndDeleteClassAll
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'CheckIn && Delete all Changes for Class'
+                  #itemValue: #doCheckinAndDeleteClassAll
                   #translateLabel: true
                   #isVisible: #notEditingClassSourceAndNotReadOnly
-                  #value: #doCheckinAndDeleteClassAll
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
                   #label: '-'
                   #isVisible: #notEditingClassSourceAndNotReadOnly
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Save in...'
+                  #itemValue: #doSave
                   #translateLabel: true
-                  #value: #doSave
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Save to End in...'
+                  #itemValue: #doSaveRest
                   #translateLabel: true
-                  #value: #doSaveRest
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Save for Class to End in...'
+                  #itemValue: #doSaveClassRest
                   #translateLabel: true
-                  #value: #doSaveClassRest
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Save All for Class in...'
+                  #itemValue: #doSaveClassAll
                   #translateLabel: true
-                  #value: #doSaveClassAll
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
                   #label: '-'
                 )
                #(#MenuItem
                   #label: 'Saveback ChangeSet'
+                  #itemValue: #doSaveBack
                   #translateLabel: true
                   #isVisible: #notReadOnly
-                  #value: #doSaveBack
                 )
                #(#MenuItem
                   #label: '-'
@@ -179,9 +179,9 @@
                 )
                #(#MenuItem
                   #label: 'Update'
+                  #itemValue: #doUpdate
                   #translateLabel: true
                   #isVisible: #notReadOnly
-                  #value: #doUpdate
                 )
                #(#MenuItem
                   #label: '-'
@@ -189,8 +189,8 @@
                 )
                #(#MenuItem
                   #label: 'Exit'
+                  #itemValue: #menuExit
                   #translateLabel: true
-                  #value: #menuExit
                 )
                )
               nil
@@ -205,119 +205,119 @@
               #(
                #(#MenuItem
                   #label: 'Undo (undelete Method)'
+                  #itemValue: #doUndoRemoveMethod
                   #translateLabel: true
-                  #value: #doUndoRemoveMethod
                   #isVisible: #hasUndoableRemoveMethodChangeSelected
                 )
                #(#MenuItem
                   #label: 'Undo (previous Version)'
+                  #itemValue: #doUndoMethodChange
                   #translateLabel: true
-                  #value: #doUndoMethodChange
                   #isVisible: #hasUndoableMethodChangeSelected
                 )
                #(#MenuItem
+                  #enabled: false
                   #label: 'Undo'
+                  #itemValue: #doUndoMethodChange
                   #translateLabel: true
-                  #value: #doUndoMethodChange
-                  #enabled: false
                   #isVisible: #hasNotUndoableChangeSelected
                 )
                #(#MenuItem
                   #label: '-'
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Apply'
+                  #itemValue: #doApply
                   #translateLabel: true
-                  #value: #doApply
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Apply to End'
+                  #itemValue: #doApplyRest
                   #translateLabel: true
-                  #value: #doApplyRest
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Apply for Class to End'
+                  #itemValue: #doApplyClassRest
                   #translateLabel: true
-                  #value: #doApplyClassRest
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasNoSelection
                   #label: 'Apply All'
+                  #itemValue: #doApplyAll
                   #translateLabel: true
-                  #value: #doApplyAll
-                  #enabled: #hasNoSelection
                 )
                #(#MenuItem
                   #label: '-'
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Delete'
+                  #itemValue: #doDelete
                   #translateLabel: true
                   #isVisible: #notReadOnly
-                  #value: #doDelete
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Delete to End'
+                  #itemValue: #doDeleteRest
                   #translateLabel: true
                   #isVisible: #notReadOnly
-                  #value: #doDeleteRest
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Delete for Class to End'
+                  #itemValue: #doDeleteClassRest
                   #translateLabel: true
                   #isVisible: #notReadOnly
-                  #value: #doDeleteClassRest
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Delete for Class from Begin'
+                  #itemValue: #doDeleteClassFromBeginning
                   #translateLabel: true
                   #isVisible: #notReadOnly
-                  #value: #doDeleteClassFromBeginning
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Delete All for Class'
+                  #itemValue: #doDeleteClassAll
                   #translateLabel: true
                   #isVisible: #notReadOnly
-                  #value: #doDeleteClassAll
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Delete All for Class && its Private Classes'
+                  #itemValue: #doDeleteClassAndPrivateClassesAll
                   #translateLabel: true
                   #isVisible: #notReadOnly
-                  #value: #doDeleteClassAndPrivateClassesAll
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
                   #label: '-'
                   #isVisible: #notReadOnly
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Compare with Current'
+                  #itemValue: #doCompare
                   #translateLabel: true
-                  #value: #doCompare
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Browse'
+                  #itemValue: #doBrowse
                   #translateLabel: true
-                  #value: #doBrowse
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
                   #label: '-'
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Make Change a Patch'
+                  #itemValue: #doMakePatch
                   #translateLabel: true
-                  #value: #doMakePatch
-                  #enabled: #hasSelection
                 )
                )
               nil
@@ -332,75 +332,75 @@
               #(
                #(#MenuItem
                   #label: 'Class...'
+                  #itemValue: #findClass
                   #translateLabel: true
-                  #value: #findClass
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Previous for Class'
+                  #itemValue: #findPreviousForClass
                   #translateLabel: true
-                  #value: #findPreviousForClass
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Next for Class'
+                  #itemValue: #findNextForClass
                   #translateLabel: true
-                  #value: #findNextForClass
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
                   #label: '-'
                 )
                #(#MenuItem
                   #label: 'Selector...'
+                  #itemValue: #findSelector
                   #translateLabel: true
-                  #value: #findSelector
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Previous for Selector'
+                  #itemValue: #findPreviousForSelector
                   #translateLabel: true
-                  #value: #findPreviousForSelector
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Next for Selector'
+                  #itemValue: #findNextForSelector
                   #translateLabel: true
-                  #value: #findNextForSelector
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
                   #label: '-'
                 )
                #(#MenuItem
                   #label: 'String...'
+                  #itemValue: #findString
                   #translateLabel: true
-                  #value: #findString
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Previous with String'
+                  #itemValue: #findPreviousForString
                   #translateLabel: true
-                  #value: #findPreviousForString
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Next with String'
+                  #itemValue: #findNextForString
                   #translateLabel: true
-                  #value: #findNextForString
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
                   #label: '-'
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Previous Snapshot'
+                  #itemValue: #findPreviousSnapshot
                   #translateLabel: true
-                  #value: #findPreviousSnapshot
-                  #enabled: #hasSelection
                 )
                #(#MenuItem
+                  #enabled: #hasSelection
                   #label: 'Next Snapshot'
+                  #itemValue: #findNextSnapshot
                   #translateLabel: true
-                  #value: #findNextSnapshot
-                  #enabled: #hasSelection
                 )
                )
               nil
@@ -414,23 +414,23 @@
            #(#Menu
               #(
                #(#MenuItem
+                  #enabled: #hasSingleSelection
                   #label: 'Class'
+                  #itemValue: #doBrowse
                   #translateLabel: true
-                  #value: #doBrowse
-                  #enabled: #hasSingleSelection
                 )
                #(#MenuItem
                   #label: '-'
                 )
                #(#MenuItem
                   #label: 'Senders...'
+                  #itemValue: #doBrowseSenders
                   #translateLabel: true
-                  #value: #doBrowseSenders
                 )
                #(#MenuItem
                   #label: 'Implementors...'
+                  #itemValue: #doBrowseImplementors
                   #translateLabel: true
-                  #value: #doBrowseImplementors
                 )
                )
               nil
@@ -458,19 +458,27 @@
                   #label: '-'
                 )
                #(#MenuItem
+                  #label: 'Add Applies to ChangeSet...'
+                  #translateLabel: true
+                  #indication: #updateChangeSet
+                )
+               #(#MenuItem
                   #label: 'Apply in Original NameSpace'
                   #translateLabel: true
                   #indication: #applyInOriginalNameSpace
                 )
                #(#MenuItem
-                  #label: 'Apply in NameSpace...'
-                  #translateLabel: true
-                  #indication: #applyInNameSpace
+                  #label: '-'
                 )
                #(#MenuItem
                   #label: 'Apply into Package...'
+                  #itemValue: #setEnforcedPackage
                   #translateLabel: true
-                  #indication: #applyInPackage
+                )
+               #(#MenuItem
+                  #label: 'Apply in NameSpace...'
+                  #itemValue: #setEnforcedNameSpace
+                  #translateLabel: true
                 )
                )
               nil
@@ -486,8 +494,8 @@
               #(
                #(#MenuItem
                   #label: 'ChangesBrowser Documentation'
+                  #itemValue: #openHTMLDocument:
                   #translateLabel: true
-                  #value: #openHTMLDocument:
                   #argument: 'tools/cbrowser/TOP.html'
                 )
                #(#MenuItem
@@ -495,8 +503,8 @@
                 )
                #(#MenuItem
                   #label: 'About ChangesBrowser...'
+                  #itemValue: #openAboutThisApplication
                   #translateLabel: true
-                  #value: #openAboutThisApplication
                 )
                )
               nil
@@ -665,7 +673,17 @@
                     codeView error:(ex errorMessage) position:(ex startPosition) to:(ex endPosition) from:(ex parser) 
                 ]
             ] do:[
-                (changeSet at:changeNr) apply.
+                |nameSpace pkg|
+
+                nameSpace := self nameSpaceForApply.
+                pkg := enforcedPackage ? Class packageQuerySignal query.             
+                Class packageQuerySignal answer:pkg
+                do:[    
+                    Class nameSpaceQuerySignal answer:nameSpace
+                    do:[
+                        (changeSet at:changeNr) apply.
+                    ]
+                ]
             ]
         ].
         changeNrProcessed := nil.
@@ -897,5 +915,5 @@
 !ChangeSetBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.31 2003-01-10 13:21:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.32 2003-01-26 14:10:32 cg Exp $'
 ! !