drag and drop cleanup
authorClaus Gittinger <cg@exept.de>
Tue, 10 Jan 2006 14:18:48 +0100
changeset 6468 8047fc185bd8
parent 6467 c5e10fe9e309
child 6469 10eea2ce0ca7
drag and drop cleanup
NewSystemBrowser.st
Tools_ClassCategoryList.st
Tools_ClassList.st
Tools_ProjectList.st
Tools__NewSystemBrowser.st
--- a/NewSystemBrowser.st	Mon Jan 09 11:08:29 2006 +0100
+++ b/NewSystemBrowser.st	Tue Jan 10 14:18:48 2006 +0100
@@ -25324,7 +25324,7 @@
     singleClass ifTrue:[
         className includesMatchCharacters ifFalse:[
             classes := self class classesWithNameSimilarTo:className.
-            classes := classes select:[:each | each isNamespace not or:[each == Smalltalk]].    
+            classes := classes select:[:each | each isNameSpace not or:[each == Smalltalk]].    
             class := classes firstIfEmpty:nil.
             class isNil ifTrue:[
                 className := self askForClassNameMatching:className.
@@ -36833,7 +36833,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.877 2006-01-09 10:08:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.878 2006-01-10 13:18:44 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!
--- a/Tools_ClassCategoryList.st	Mon Jan 09 11:08:29 2006 +0100
+++ b/Tools_ClassCategoryList.st	Tue Jan 10 14:18:48 2006 +0100
@@ -109,43 +109,43 @@
 
     ^ 
      #(#FullSpec
-	#name: #windowSpec
-	#window: 
+        #name: #windowSpec
+        #window: 
        #(#WindowSpec
-	  #label: 'ClassCategoryList'
-	  #name: 'ClassCategoryList'
-	  #min: #(#Point 0 0)
-	  #max: #(#Point 1024 721)
-	  #bounds: #(#Rectangle 13 23 313 323)
-	)
-	#component: 
+          #label: 'ClassCategoryList'
+          #name: 'ClassCategoryList'
+          #min: #(#Point 0 0)
+          #max: #(#Point 1024 721)
+          #bounds: #(#Rectangle 13 23 313 323)
+        )
+        #component: 
        #(#SpecCollection
-	  #collection: #(
-	   #(#SequenceViewSpec
-	      #name: 'List'
-	      #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	      #tabable: true
-	      #model: #selectedCategories
-	      #menu: #menuHolder
-	      #hasHorizontalScrollBar: true
-	      #hasVerticalScrollBar: true
-	      #miniScrollerHorizontal: true
-	      #isMultiSelect: true
-	      #valueChangeSelector: #selectionChangedByClick
-	      #useIndex: false
-	      #sequenceList: #categoryList
-	      #doubleClickChannel: #doubleClickChannel
-	      #properties: 
-	     #(#PropertyListDictionary
-		#dragArgument: nil
-		#dropArgument: nil
-		#canDropSelector: #canDrop:
-		#dropSelector: #doDrop:
-	      )
-	    )
-	   )
+          #collection: #(
+           #(#SequenceViewSpec
+              #name: 'List'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #tabable: true
+              #model: #selectedCategories
+              #menu: #menuHolder
+              #hasHorizontalScrollBar: true
+              #hasVerticalScrollBar: true
+              #miniScrollerHorizontal: true
+              #isMultiSelect: true
+              #valueChangeSelector: #selectionChangedByClick
+              #useIndex: false
+              #sequenceList: #categoryList
+              #doubleClickChannel: #doubleClickChannel
+              #properties: 
+             #(#PropertyListDictionary
+                #dragArgument: nil
+                #dropArgument: nil
+                #canDropSelector: #canDropContext:
+                #dropSelector: #doDropContext:
+              )
+            )
+           )
          
-	)
+        )
       )
 
     "Created: / 5.2.2000 / 13:42:11 / cg"
@@ -405,22 +405,22 @@
 
 !ClassCategoryList methodsFor:'drag & drop'!
 
-canDrop:aDropContext
-    |cat classes|
+canDropContext:aDropContext
+    |cat droppedClasses|
 
-    classes := aDropContext dropObjects collect:[:obj | obj theObject].
-    (classes contains:[:aClass | aClass isClass not]) ifTrue:[^ false].
-    (classes contains:[:aClass | aClass isPrivate not]) ifFalse:[^ false].
+    droppedClasses := aDropContext dropObjects collect:[:obj | obj theObject].
+    (droppedClasses contains:[:aClass | aClass isClass not]) ifTrue:[^ false].
+    (droppedClasses contains:[:aClass | aClass isPrivate not]) ifFalse:[^ false].
 
     cat := self categoryAtTargetPointOf:aDropContext.
     cat isNil ifTrue:[
-	^ false
+        ^ false
     ].
     cat = '* obsolete *' ifTrue:[
-	^  false
+        ^  false
     ].
 
-    (classes contains:[:aClass | aClass category ~= cat]) ifFalse:[^ false].
+    (droppedClasses contains:[:aClass | aClass category ~= cat]) ifFalse:[^ false].
     ^ true.
 !
 
@@ -441,15 +441,15 @@
     ^ cat
 !
 
-doDrop:aDropContext
-    |cat classes|
+doDropContext:aDropContext
+    |cat droppedClasses|
 
-    classes := aDropContext dropObjects collect:[:aDropObject | aDropObject theObject].
-    (classes contains:[:something | something isClass not]) ifTrue:[^ self].
+    droppedClasses := aDropContext dropObjects collect:[:aDropObject | aDropObject theObject].
+    (droppedClasses contains:[:something | something isClass not]) ifTrue:[^ self].
 
     cat := self categoryAtTargetPointOf:aDropContext.
     cat notNil ifTrue:[
-	self masterApplication moveClasses:classes toCategory:cat.
+        self masterApplication moveClasses:droppedClasses toCategory:cat.
     ].
 ! !
 
@@ -783,5 +783,5 @@
 !ClassCategoryList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassCategoryList.st,v 1.8 2005-02-02 11:03:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassCategoryList.st,v 1.9 2006-01-10 13:18:28 cg Exp $'
 ! !
--- a/Tools_ClassList.st	Mon Jan 09 11:08:29 2006 +0100
+++ b/Tools_ClassList.st	Tue Jan 10 14:18:48 2006 +0100
@@ -119,43 +119,43 @@
 
     ^ 
      #(#FullSpec
-	#name: #windowSpec
-	#window: 
+        #name: #windowSpec
+        #window: 
        #(#WindowSpec
-	  #label: 'ClassList'
-	  #name: 'ClassList'
-	  #min: #(#Point 0 0)
-	  #max: #(#Point 1024 721)
-	  #bounds: #(#Rectangle 16 46 316 346)
-	)
-	#component: 
+          #label: 'ClassList'
+          #name: 'ClassList'
+          #min: #(#Point 0 0)
+          #max: #(#Point 1024 721)
+          #bounds: #(#Rectangle 16 46 316 346)
+        )
+        #component: 
        #(#SpecCollection
-	  #collection: #(
-	   #(#SequenceViewSpec
-	      #name: 'List'
-	      #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	      #tabable: true
-	      #model: #selectedClassNameIndices
-	      #menu: #menuHolder
-	      #hasHorizontalScrollBar: true
-	      #hasVerticalScrollBar: true
-	      #miniScrollerHorizontal: true
-	      #isMultiSelect: true
-	      #valueChangeSelector: #selectionChangedByClick
-	      #useIndex: true
-	      #sequenceList: #classNameList
-	      #doubleClickChannel: #doubleClickChannel
-	      #properties: 
-	     #(#PropertyListDictionary
-		#dragArgument: nil
-		#dropArgument: nil
-		#canDropSelector: #canDrop:
-		#dropSelector: #doDrop:
-	      )
-	    )
-	   )
+          #collection: #(
+           #(#SequenceViewSpec
+              #name: 'List'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #tabable: true
+              #model: #selectedClassNameIndices
+              #menu: #menuHolder
+              #hasHorizontalScrollBar: true
+              #hasVerticalScrollBar: true
+              #miniScrollerHorizontal: true
+              #isMultiSelect: true
+              #valueChangeSelector: #selectionChangedByClick
+              #useIndex: true
+              #sequenceList: #classNameList
+              #doubleClickChannel: #doubleClickChannel
+              #properties: 
+             #(#PropertyListDictionary
+                #dragArgument: nil
+                #dropArgument: nil
+                #canDropSelector: #canDropContext:
+                #dropSelector: #doDropContext:
+              )
+            )
+           )
          
-	)
+        )
       )
 ! !
 
@@ -876,7 +876,7 @@
 
 !ClassList methodsFor:'drag & drop'!
 
-canDrop:aDropContext
+canDropContext:aDropContext
     |methods cls|
 
     methods := aDropContext dropObjects collect:[:obj | obj theObject].
@@ -904,7 +904,7 @@
     ^ cls
 !
 
-doDrop:aDropContext
+doDropContext:aDropContext
     |cls methods|
 
     methods := aDropContext dropObjects collect:[:aDropObject | aDropObject theObject].
@@ -912,11 +912,11 @@
 
     cls := self classAtTargetPointOf:aDropContext.
     methods first mclass isMeta ifTrue:[
-	cls := cls theMetaclass
+        cls := cls theMetaclass
     ].
 
     cls notNil ifTrue:[
-	self masterApplication moveMethods:methods toClass:cls.
+        self masterApplication moveMethods:methods toClass:cls.
     ].
 ! !
 
@@ -1597,5 +1597,5 @@
 !ClassList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.8 2005-06-15 12:50:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.9 2006-01-10 13:18:33 cg Exp $'
 ! !
--- a/Tools_ProjectList.st	Mon Jan 09 11:08:29 2006 +0100
+++ b/Tools_ProjectList.st	Tue Jan 10 14:18:48 2006 +0100
@@ -98,43 +98,43 @@
 
     ^ 
      #(#FullSpec
-	#name: #windowSpec
-	#window: 
+        #name: #windowSpec
+        #window: 
        #(#WindowSpec
-	  #label: 'ProjectList'
-	  #name: 'ProjectList'
-	  #min: #(#Point 0 0)
-	  #max: #(#Point 1024 721)
-	  #bounds: #(#Rectangle 13 23 313 323)
-	)
-	#component: 
+          #label: 'ProjectList'
+          #name: 'ProjectList'
+          #min: #(#Point 0 0)
+          #max: #(#Point 1024 721)
+          #bounds: #(#Rectangle 13 23 313 323)
+        )
+        #component: 
        #(#SpecCollection
-	  #collection: #(
-	   #(#SequenceViewSpec
-	      #name: 'List'
-	      #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	      #tabable: true
-	      #model: #selectedProjects
-	      #menu: #menuHolder
-	      #hasHorizontalScrollBar: true
-	      #hasVerticalScrollBar: true
-	      #miniScrollerHorizontal: true
-	      #isMultiSelect: true
-	      #valueChangeSelector: #selectionChangedByClick
-	      #useIndex: false
-	      #sequenceList: #projectList
-	      #doubleClickChannel: #doubleClickChannel
-	      #properties: 
-	     #(#PropertyListDictionary
-		#dragArgument: nil
-		#dropArgument: nil
-		#canDropSelector: #canDrop:
-		#dropSelector: #doDrop:
-	      )
-	    )
-	   )
+          #collection: #(
+           #(#SequenceViewSpec
+              #name: 'List'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #tabable: true
+              #model: #selectedProjects
+              #menu: #menuHolder
+              #hasHorizontalScrollBar: true
+              #hasVerticalScrollBar: true
+              #miniScrollerHorizontal: true
+              #isMultiSelect: true
+              #valueChangeSelector: #selectionChangedByClick
+              #useIndex: false
+              #sequenceList: #projectList
+              #doubleClickChannel: #doubleClickChannel
+              #properties: 
+             #(#PropertyListDictionary
+                #dragArgument: nil
+                #dropArgument: nil
+                #canDropSelector: #canDropContext:
+                #dropSelector: #doDropContext:
+              )
+            )
+           )
 
-	)
+        )
       )
 
     "Created: / 17.2.2000 / 23:45:47 / cg"
@@ -310,7 +310,7 @@
 
 !ProjectList methodsFor:'drag & drop'!
 
-canDrop:aDropContext
+canDropContext:aDropContext
     |methodsOrClasses package|
 
     methodsOrClasses := aDropContext dropObjects collect:[:obj | obj theObject].
@@ -325,7 +325,7 @@
     ^ true
 !
 
-doDrop:aDropContext
+doDropContext:aDropContext
     |package methodsOrClasses methods classes|
 
     methodsOrClasses := aDropContext dropObjects collect:[:aDropObject | aDropObject theObject].
@@ -335,12 +335,12 @@
 
     package := self packageAtTargetPointOf:aDropContext.
     package notNil ifTrue:[
-	methods notEmpty ifTrue:[
-	    self masterApplication moveMethods:methods toProject:package.
-	].
-	classes notEmpty ifTrue:[
-	    self masterApplication moveClasses:classes toProject:package.
-	]
+        methods notEmpty ifTrue:[
+            self masterApplication moveMethods:methods toProject:package.
+        ].
+        classes notEmpty ifTrue:[
+            self masterApplication moveClasses:classes toProject:package.
+        ]
     ].
 !
 
@@ -619,5 +619,5 @@
 !ProjectList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_ProjectList.st,v 1.3 2004-03-20 15:45:22 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_ProjectList.st,v 1.4 2006-01-10 13:18:48 cg Exp $'
 ! !
--- a/Tools__NewSystemBrowser.st	Mon Jan 09 11:08:29 2006 +0100
+++ b/Tools__NewSystemBrowser.st	Tue Jan 10 14:18:48 2006 +0100
@@ -25324,7 +25324,7 @@
     singleClass ifTrue:[
         className includesMatchCharacters ifFalse:[
             classes := self class classesWithNameSimilarTo:className.
-            classes := classes select:[:each | each isNamespace not or:[each == Smalltalk]].    
+            classes := classes select:[:each | each isNameSpace not or:[each == Smalltalk]].    
             class := classes firstIfEmpty:nil.
             class isNil ifTrue:[
                 className := self askForClassNameMatching:className.
@@ -36833,7 +36833,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.877 2006-01-09 10:08:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.878 2006-01-10 13:18:44 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!