Tools_OrganizerCanvas.st
changeset 10132 d5bb76470ae8
parent 9450 ceb357dd5ad1
child 10230 66e6b33b6849
--- a/Tools_OrganizerCanvas.st	Mon Jul 04 19:07:34 2011 +0200
+++ b/Tools_OrganizerCanvas.st	Mon Jul 04 19:07:38 2011 +0200
@@ -33,7 +33,8 @@
 		nameSpaceFilterSelection markApplicationsHolder
 		sortVariablesByName showAllClassesInNameSpaceView
 		showMethodInheritance showMethodComplexity showMethodTypeIcon
-		methodVisibilityHolder showCoverageInformation'
+		methodVisibilityHolder showCoverageInformation
+		sortByNameAndInheritance'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-Browsers-New'
@@ -480,6 +481,18 @@
                         #subAspect: #showCoverageInformation
                         #aspect: #showCoverageInformation
                       ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #hidePrivateClasses
+                        #aspect: #hidePrivateClasses
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #hideUnloadedClasses
+                        #aspect: #hideUnloadedClasses
+                      ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
                                  #(#SubChannelInfoSpec
                                     #subAspect: #doubleClickChannel
                                     #aspect: #classDoubleClickChannel
@@ -845,7 +858,7 @@
         )
       )
 
-    "Modified: / 27-04-2010 / 16:34:06 / cg"
+    "Modified: / 04-07-2011 / 19:05:28 / cg"
 !
 
 windowSpecNonHierarchical
@@ -1127,6 +1140,18 @@
 
 
                      #(#SubChannelInfoSpec
+                        #subAspect: #hidePrivateClasses
+                        #aspect: #hidePrivateClasses
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #hideUnloadedClasses
+                        #aspect: #hideUnloadedClasses
+                      ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+                     #(#SubChannelInfoSpec
                         #subAspect: #showCoverageInformation
                         #aspect: #showCoverageInformation
                       ) 
@@ -1495,7 +1520,7 @@
         )
       )
 
-    "Modified: / 27-04-2010 / 16:34:33 / cg"
+    "Modified: / 04-07-2011 / 19:05:47 / cg"
 !
 
 windowSpecNonHierarchicalWithClassDiagram
@@ -2068,6 +2093,18 @@
                                   
 
                      #(#SubChannelInfoSpec
+                        #subAspect: #hidePrivateClasses
+                        #aspect: #hidePrivateClasses
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #hideUnloadedClasses
+                        #aspect: #hideUnloadedClasses
+                      ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+                     #(#SubChannelInfoSpec
                         #subAspect: #showCoverageInformation
                         #aspect: #showCoverageInformation
                       ) 
@@ -2202,7 +2239,7 @@
         )
       )
 
-    "Modified: / 27-04-2010 / 16:35:06 / cg"
+    "Modified: / 04-07-2011 / 19:06:13 / cg"
 !
 
 windowSpecWithoutMetaToggles
@@ -2630,6 +2667,10 @@
                         #aspect: #hideUnloadedClasses
                       ) 
                #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
                   #subAspect: #markApplicationsHolder
                   #aspect: #markApplicationsHolder
                 ) 
@@ -2692,7 +2733,7 @@
         )
       )
 
-    "Modified: / 27-04-2010 / 16:35:25 / cg"
+    "Modified: / 04-07-2011 / 18:39:40 / cg"
 ! !
 
 !OrganizerCanvas class methodsFor:'plugIn spec'!
@@ -2718,6 +2759,7 @@
         #filterClassVars
         #hidePrivateClasses
         #hideUnloadedClasses
+        #sortByNameAndInheritance
         #immediateUpdate
         #markApplicationsHolder
         #meta
@@ -2743,6 +2785,7 @@
         #variablesMenuHolder
       ).
 
+    "Modified: / 04-07-2011 / 18:54:00 / cg"
 ! !
 
 !OrganizerCanvas methodsFor:'aspects'!
@@ -2874,67 +2917,43 @@
 !
 
 filterClassVars
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-
     filterClassVars isNil ifTrue:[
-	filterClassVars := ValueHolder new.
+        filterClassVars := ValueHolder new.
 "/        filterClassVars addDependent:self.
     ].
     ^ filterClassVars.
 
-    "Created: / 24.2.2000 / 23:29:52 / cg"
+    "Created: / 24-02-2000 / 23:29:52 / cg"
 !
 
 hidePrivateClasses
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-
     hidePrivateClasses isNil ifTrue:[
-	hidePrivateClasses := false asValue.
+        hidePrivateClasses := false asValue.
 "/        hidePrivateClasses addDependent:self.
     ].
     ^ hidePrivateClasses.
 
-    "Created: / 24.2.2000 / 16:18:45 / cg"
+    "Created: / 24-02-2000 / 16:18:45 / cg"
 !
 
 hideUnloadedClasses
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-
     hideUnloadedClasses isNil ifTrue:[
-	hideUnloadedClasses := false asValue.
+        hideUnloadedClasses := false asValue.
 "/        hideUnloadedClasses addDependent:self.
     ].
     ^ hideUnloadedClasses.
 
-    "Created: / 18.2.2000 / 17:54:57 / cg"
+    "Created: / 18-02-2000 / 17:54:57 / cg"
 !
 
 immediateUpdate
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-
     immediateUpdate isNil ifTrue:[
-	immediateUpdate := false asValue.
+        immediateUpdate := false asValue.
 "/        immediateUpdate addDependent:self.
     ].
     ^ immediateUpdate.
 
-    "Created: / 18.2.2000 / 00:23:43 / cg"
+    "Created: / 18-02-2000 / 00:23:43 / cg"
 !
 
 initialOrganizerMode
@@ -2949,20 +2968,14 @@
 !
 
 meta
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-
     meta isNil ifTrue:[
-	meta := false asValue.
+        meta := false asValue.
 "/        meta addDependent:self.
     ].
     ^ meta.
 
-    "Created: / 18.2.2000 / 00:23:43 / cg"
-    "Modified: / 18.2.2000 / 00:42:23 / cg"
+    "Created: / 18-02-2000 / 00:23:43 / cg"
+    "Modified (comment): / 04-07-2011 / 18:52:49 / cg"
 !
 
 metaToggle
@@ -2977,19 +2990,15 @@
 !
 
 metaToggleLabelHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
+    "this is changed from 'Instance/Class' to 'Instance/Static' for Java"
 
     metaToggleLabelHolder isNil ifTrue:[
-	metaToggleLabelHolder := (resources string:'Class') asValue.
+        metaToggleLabelHolder := (resources string:'Class') asValue.
 "/        metaToggleLabelHolder addDependent:self.
     ].
     ^ metaToggleLabelHolder.
 
-    "Created: / 18.2.2000 / 11:52:55 / cg"
+    "Created: / 18-02-2000 / 11:52:55 / cg"
 !
 
 methodVisibilityHolder
@@ -3006,20 +3015,16 @@
 !
 
 nameSpaceDoubleClickChannel
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-
     |holder|
 
     (holder := builder bindingAt:#nameSpaceDoubleClickChannel) isNil ifTrue:[
-	holder := TriggerValue new.
-	builder aspectAt:#nameSpaceDoubleClickChannel put:holder.
+        holder := TriggerValue new.
+        builder aspectAt:#nameSpaceDoubleClickChannel put:holder.
 "/        holder addDependent:self.
     ].
     ^ holder.
+
+    "Modified (comment): / 04-07-2011 / 18:53:36 / cg"
 !
 
 nameSpaceFilter
@@ -3038,23 +3043,19 @@
 !
 
 nameSpaceFilterDoubleClickChannel
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-
     |holder|
 
     (holder := builder bindingAt:#nameSpaceFilterDoubleClickChannel) isNil ifTrue:[
-	holder := TriggerValue new.
-	builder aspectAt:#nameSpaceFilterDoubleClickChannel put:holder.
-	holder onChangeEvaluate:[
-		    (builder componentAt:#NameSpaceFilterComboBox) closeMenu.
+        holder := TriggerValue new.
+        builder aspectAt:#nameSpaceFilterDoubleClickChannel put:holder.
+        holder onChangeEvaluate:[
+                    (builder componentAt:#NameSpaceFilterComboBox) closeMenu.
 "/                    self nameSpaceDoubleClickChannel value:true.
-	       ]
+               ]
     ].
     ^ holder.
+
+    "Modified (comment): / 04-07-2011 / 18:53:39 / cg"
 !
 
 nameSpaceFilterPopUpMenu
@@ -3384,6 +3385,16 @@
     "Created: / 05-11-2007 / 16:57:12 / cg"
 !
 
+sortByNameAndInheritance
+    sortByNameAndInheritance isNil ifTrue:[
+        sortByNameAndInheritance := false asValue.
+"/        sortByNameAndInheritance addDependent:self.
+    ].
+    ^ sortByNameAndInheritance.
+
+    "Created: / 04-07-2011 / 18:41:22 / cg"
+!
+
 sortVariablesByName
     sortVariablesByName isNil ifTrue:[
         sortVariablesByName := false asValue.
@@ -4036,6 +4047,22 @@
     "Created: / 05-11-2007 / 16:57:02 / cg"
 !
 
+sortByNameAndInheritance:something
+    "automatically generated by UIPainter ..."
+
+    "This method is used when I am embedded as subApplication,"
+    "and the mainApp wants to connect its aspects to mine."
+
+    "/ sortByNameAndInheritance removeDependent:self.
+
+    sortByNameAndInheritance := something.
+    "/ something notNil ifTrue:[
+    "/     something addDependent:self.
+    "/ ].
+
+    "Created: / 04-07-2011 / 18:42:01 / cg"
+!
+
 sortVariablesByName:something
     "automatically generated by UIPainter ..."
 
@@ -4940,10 +4967,6 @@
 
 !OrganizerCanvas class methodsFor:'documentation'!
 
-version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_OrganizerCanvas.st,v 1.42 2010-04-28 06:17:41 cg Exp $'
-!
-
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_OrganizerCanvas.st,v 1.42 2010-04-28 06:17:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_OrganizerCanvas.st,v 1.43 2011-07-04 17:07:38 cg Exp $'
 ! !