Tools__ChangeList.st
branchjv
changeset 12626 7ae48abfedac
parent 12431 9f0c59c742d5
parent 12577 3ca47412263f
child 12650 e0f607754b9a
--- a/Tools__ChangeList.st	Sun Mar 31 18:03:22 2013 +0100
+++ b/Tools__ChangeList.st	Mon Apr 01 14:07:29 2013 +0100
@@ -27,7 +27,7 @@
 
 "{ NameSpace: Tools }"
 
-BrowserListWithFilter subclass:#ChangeList
+Tools::BrowserListWithFilter subclass:#ChangeList
 	instanceVariableNames:'listHolder showRemovedHolder showSameHolder showTimestampHolder
 		allowRemoveHolder allowAcceptHolder scrollToBottom applyAction'
 	classVariableNames:'LastSelectionConditionString'
@@ -72,6 +72,7 @@
 "
 ! !
 
+
 !ChangeList class methodsFor:'image specs'!
 
 iconEqual
@@ -110,6 +111,7 @@
     "Modified: / 31-08-2011 / 10:54:46 / cg"
 ! !
 
+
 !ChangeList class methodsFor:'interface specs'!
 
 windowSpec
@@ -181,6 +183,7 @@
       )
 ! !
 
+
 !ChangeList class methodsFor:'list specs'!
 
 listColumnSpec
@@ -294,6 +297,7 @@
 
 ! !
 
+
 !ChangeList class methodsFor:'menu specs'!
 
 listMenu
@@ -313,109 +317,115 @@
 
     ^
      #(Menu
-	(
-	 (MenuItem
-	    enabled: hasChangeSelectedAndNotRemoved
-	    label: 'Apply'
-	    itemValue: listMenuApply
-	    translateLabel: true
-	    isVisible: allowAcceptHolder
-	    shortcutKey: Accept
-	  )
-	 (MenuItem
-	    label: 'Apply all'
-	    itemValue: listMenuApplyAll
-	    translateLabel: true
-	    isVisible: allowAcceptHolder
-	  )
-	 (MenuItem
-	    enabled: hasSingleChangeSelectedAndCanBrowse
-	    label: 'Browse'
-	    itemValue: listMenuBrowse
-	    translateLabel: true
-	  )
-	 (MenuItem
-	    label: '-'
-	  )
-	 (MenuItem
-	    label: 'Delete'
-	    itemValue: listMenuDeleteSelection
-	    nameKey: Delete
-	    translateLabel: true
-	    isVisible: allowRemoveHolder
-	    shortcutKey: Delete
-	  )
-	 (MenuItem
-	    label: '-'
-	    isVisible: allowRemoveHolder
-	  )
-	 (MenuItem
-	    label: 'Select...'
-	    translateLabel: true
-	    submenu:
-	   (Menu
-	      (
-	       (MenuItem
-		  label: 'Select same'
-		  itemValue: listMenuSelectSame
-		  translateLabel: true
-		)
-	       (MenuItem
-		  label: 'Select additions (new classes/methods)'
-		  itemValue: listMenuSelectAdditions
-		  translateLabel: true
-		)
-	       (MenuItem
-		  label: 'Select removals'
-		  itemValue: listMenuSelectRemovals
-		  translateLabel: true
-		)
-	       (MenuItem
-		  label: '-'
-		)
-	       (MenuItem
-		  label: 'Select all'
-		  itemValue: listMenuSelectAll
-		  translateLabel: true
-		)
-	       (MenuItem
-		  label: 'Select none'
-		  itemValue: listMenuSelectNone
-		  translateLabel: true
-		)
-	       (MenuItem
-		  label: '-'
-		)
-	       (MenuItem
-		  label: 'Select using block'
-		  itemValue: listMenuSelectUsingBlock
-		  translateLabel: true
-		)
-	       )
-	      nil
-	      nil
-	    )
-	  )
-	 (MenuItem
-	    label: '-'
-	  )
-	 (MenuItem
-	    label: 'Show Deleted'
-	    translateLabel: true
-	    isVisible: allowRemoveHolder
-	    indication: showRemovedHolder
-	  )
-	 (MenuItem
-	    label: 'Inspect change'
-	    itemValue: listMenuInspect
-	    translateLabel: true
-	  )
-	 )
-	nil
-	nil
+        (
+         (MenuItem
+            enabled: hasChangeSelectedAndNotRemoved
+            label: 'Apply'
+            itemValue: listMenuApply
+            translateLabel: true
+            isVisible: allowAcceptHolder
+            shortcutKey: Accept
+          )
+         (MenuItem
+            label: 'Apply all'
+            itemValue: listMenuApplyAll
+            translateLabel: true
+            isVisible: allowAcceptHolder
+          )
+         (MenuItem
+            enabled: hasSingleChangeSelectedAndCanBrowse
+            label: 'Browse'
+            itemValue: listMenuBrowse
+            translateLabel: true
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Delete'
+            itemValue: listMenuDeleteSelection
+            nameKey: Delete
+            translateLabel: true
+            isVisible: allowRemoveHolder
+            shortcutKey: Delete
+          )
+         (MenuItem
+            label: '-'
+            isVisible: allowRemoveHolder
+          )
+         (MenuItem
+            label: 'Select...'
+            translateLabel: true
+            submenu:
+           (Menu
+              (
+               (MenuItem
+                  label: 'Select same'
+                  itemValue: listMenuSelectSame
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select conflicts (redefined classes/methods)'
+                  itemValue: listMenuSelectConflicts
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select additions (new classes/methods)'
+                  itemValue: listMenuSelectAdditions
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select removals'
+                  itemValue: listMenuSelectRemovals
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Select all'
+                  itemValue: listMenuSelectAll
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select none'
+                  itemValue: listMenuSelectNone
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Select using block'
+                  itemValue: listMenuSelectUsingBlock
+                  translateLabel: true
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Show Deleted'
+            translateLabel: true
+            isVisible: allowRemoveHolder
+            indication: showRemovedHolder
+          )
+         (MenuItem
+            label: 'Inspect change'
+            itemValue: listMenuInspect
+            translateLabel: true
+          )
+         )
+        nil
+        nil
       )
 ! !
 
+
 !ChangeList class methodsFor:'plugIn spec'!
 
 aspectSelectors
@@ -444,6 +454,7 @@
 
 ! !
 
+
 !ChangeList methodsFor:'accessing'!
 
 acceptEnabled
@@ -525,6 +536,7 @@
     "Created: / 05-12-2009 / 14:28:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ChangeList methodsFor:'actions'!
 
 selectionDoubleclicked
@@ -540,6 +552,7 @@
     "Modified: / 24-01-2012 / 22:01:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ChangeList methodsFor:'aspects'!
 
 allowAcceptHolder
@@ -702,6 +715,7 @@
     ].
 ! !
 
+
 !ChangeList methodsFor:'change & update'!
 
 update: aspect with: param from: sender
@@ -737,6 +751,7 @@
     "Modified: / 26-07-2012 / 18:44:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ChangeList methodsFor:'drag & drop'!
 
 canDrop: aDropContext
@@ -768,8 +783,13 @@
     "Modified: / 01-08-2012 / 18:15:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ChangeList methodsFor:'event processing'!
 
+
+
+
+
 handlesKeyPress:key inView:aView
     <resource: #keyboard (#Accept #Ctrls)>
 
@@ -788,6 +808,7 @@
     "Created: / 08-02-2012 / 14:42:18 / cg"
 ! !
 
+
 !ChangeList methodsFor:'generators'!
 
 makeGenerator
@@ -806,6 +827,7 @@
     "Modified: / 25-07-2012 / 15:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ChangeList methodsFor:'hooks'!
 
 postBuildListView: aView
@@ -816,6 +838,7 @@
     "Created: / 29-11-2011 / 14:56:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ChangeList methodsFor:'initialization'!
 
 initialize
@@ -830,6 +853,7 @@
     "Created: / 29-10-2010 / 12:50:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ChangeList methodsFor:'menu actions'!
 
 listMenuApply
@@ -1004,6 +1028,7 @@
     self updateList
 ! !
 
+
 !ChangeList methodsFor:'private'!
 
 application
@@ -1143,6 +1168,7 @@
     "Modified: / 01-08-2012 / 18:10:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ChangeList methodsFor:'queries'!
 
 hasChangeSelected
@@ -1181,6 +1207,7 @@
     "Created: / 03-04-2012 / 11:28:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ChangeList::ListEntry class methodsFor:'instance creation'!
 
 change: aChange
@@ -1204,6 +1231,7 @@
     "Created: / 25-07-2009 / 23:33:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+
 !ChangeList::ListEntry methodsFor:'accessing'!
 
 application
@@ -1387,6 +1415,7 @@
     ^ x
 ! !
 
+
 !ChangeList::ListEntry methodsFor:'displaying'!
 
 displayLabel:aLabel h:lH on:aGC x:newX y:y h:h
@@ -1423,6 +1452,7 @@
     "Modified: / 27-07-2012 / 17:13:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ChangeList::ListEntry methodsFor:'private'!
 
 iconSelector
@@ -1438,6 +1468,7 @@
     "Modified: / 31-08-2011 / 10:39:32 / cg"
 ! !
 
+
 !ChangeList::ListEntry methodsFor:'protocol-queries'!
 
 hasChildren
@@ -1447,14 +1478,15 @@
     "Modified (format): / 27-07-2012 / 21:25:34 / cg"
 ! !
 
+
 !ChangeList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.20 2013-01-17 10:40:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.21 2013-03-30 01:59:17 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.20 2013-01-17 10:40:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.21 2013-03-30 01:59:17 cg Exp $'
 !
 
 version_HG