#REFACTORING by exept
authorClaus Gittinger <cg@exept.de>
Mon, 30 Dec 2019 20:25:15 +0100
changeset 19388 5ad4cda7c0ac
parent 19387 1f9a1e9f2a57
child 19389 c44cb7c08cc5
#REFACTORING by exept class: NewSystemBrowser changed: #classOtherClassNewSlice class: NewSystemBrowser class changed: #classNewGroovyClassSlice #classNewHaskellClassSlice #classNewJavaScriptClassSlice #classNewLispClassSlice #classNewRubyClassSlice #classNewSlice
Tools__NewSystemBrowser.st
--- a/Tools__NewSystemBrowser.st	Mon Dec 30 19:48:56 2019 +0100
+++ b/Tools__NewSystemBrowser.st	Mon Dec 30 20:25:15 2019 +0100
@@ -8679,10 +8679,10 @@
     ^
      #(Menu
         (
-         (MenuItem
-            label: '-'
-            isVisible: hasGroovySupport
-          )
+"/         (MenuItem
+"/            label: '-'
+"/            isVisible: hasGroovySupport
+"/          )
          (MenuItem
             label: 'Groovy Class'
             itemValue: classMenuNewGroovyClass
@@ -8714,10 +8714,10 @@
     ^
      #(Menu
         (
-         (MenuItem
-            label: '-'
-            isVisible: isHaskellModulePresent
-          )
+"/         (MenuItem
+"/            label: '-'
+"/            isVisible: isHaskellModulePresent
+"/          )
          (MenuItem
             enabled: isHaskellModulePresent
             label: 'Haskell Module'
@@ -8748,10 +8748,10 @@
     ^
      #(Menu
         (
-         (MenuItem
-            label: '-'
-            isVisible: isJavaScriptMetaclassPresent
-          )
+"/         (MenuItem
+"/            label: '-'
+"/            isVisible: isJavaScriptMetaclassPresent
+"/          )
          (MenuItem
             enabled: isJavaScriptMetaclassPresent
             label: 'JavaScript Class'
@@ -8781,10 +8781,10 @@
     ^
      #(Menu
         (
-         (MenuItem
-            label: '-'
-            isVisible: isLispMetaclassPresent
-          )
+"/         (MenuItem
+"/            label: '-'
+"/            isVisible: isLispMetaclassPresent
+"/          )
          (MenuItem
             label: 'Scheme Namespace'
             itemValue: classMenuNewLispNamespace
@@ -8851,10 +8851,10 @@
     ^
      #(Menu
         (
-         (MenuItem
-            label: '-'
-            isVisible: isRubyMetaclassPresent
-          )
+"/         (MenuItem
+"/            label: '-'
+"/            isVisible: isRubyMetaclassPresent
+"/          )
          (MenuItem
             label: 'Ruby class'
             itemValue: classMenuNewRubyClass
@@ -8863,23 +8863,11 @@
             labelImage: (ResourceRetriever ToolbarIconLibrary rubyClassBrowserIcon 'Ruby class')
           )
          (MenuItem
-            label: 'Ruby...'
-            translateLabel: true
-            isVisible: isRubyMetaclassPresent
-            submenu:
-           (Menu
-              (
-               (MenuItem
-                  label: 'Module'
+                  label: 'Ruby Module'
                   itemValue: classMenuNewRubyModule
                   translateLabel: true
                   isVisible: isRubyMetaclassPresent
                 )
-               )
-              nil
-              nil
-            )
-          )
          )
         nil
         nil
@@ -8902,82 +8890,84 @@
     <resource: #menu>
 
     ^ 
-     #(Menu
-        (
-         (MenuItem
-            label: 'Class'
-            itemValue: classMenuNewClass
-          )
-         (MenuItem
-            enabled: hasSingleClassSelectedHolder
-            label: 'Subclass'
-            itemValue: classMenuNewSubclass
-          )
-         (MenuItem
-            label: 'GUI Application'
-            itemValue: classMenuNewApplication
-          )
-         (MenuItem
-            label: 'TestCase'
-            itemValue: classMenuNewTestCase
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            label: 'Smalltalk Class Slice'
-            nameKey: classNewSmalltalkSlice
-            submenuChannel: classNewSmalltalkSlice
-            isMenuSlice: true
-          )
-         (MenuItem
-            label: 'Ruby Class Slice'
-            nameKey: classNewRubyClassSlice
-            submenuChannel: classNewRubyClassSlice
-            isMenuSlice: true
-          )
-         (MenuItem
-            label: 'JavaScript Class Slice'
-            nameKey: classNewJavaScriptClassSlice
-            submenuChannel: classNewJavaScriptClassSlice
-            isMenuSlice: true
-          )
-         (MenuItem
-            label: 'Lisp Class Slice'
-            nameKey: classNewLispClassSlice
-            submenuChannel: classNewLispClassSlice
-            isMenuSlice: true
-          )
-         (MenuItem
-            label: 'Haskell Class Slice'
-            nameKey: classNewHaskellClassSlice
-            submenuChannel: classNewHaskellClassSlice
-            isMenuSlice: true
-          )
-         (MenuItem
-            label: 'PLSQL Class Slice'
-            nameKey: classNewPLSQLClassSlice
-            submenuChannel: classNewPLSQLClassSlice
-            isMenuSlice: true
-          )
-         (MenuItem
-            label: 'Other New Class Slice'
-            nameKey: classOtherClassNewSlice
-            submenuChannel: classOtherClassNewSlice
-            isMenuSlice: true
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            label: 'Class Wizard...'
-            itemValue: classMenuOpenClassCreationWizard
-            labelImage: (ResourceRetriever ToolbarIconLibrary newClassWizardIcon 'Class Wizard...')
-          )
-         )
-        nil
-        nil
-      )
+     #(Menu 
+       (MenuItem
+          label: 'Class'
+          itemValue: classMenuNewClass
+       ) 
+       (MenuItem
+          enabled: hasSingleClassSelectedHolder
+          label: 'Subclass'
+          itemValue: classMenuNewSubclass
+       ) 
+       (MenuItem
+          label: 'GUI Application'
+          itemValue: classMenuNewApplication
+       ) 
+       (MenuItem
+          label: 'TestCase'
+          itemValue: classMenuNewTestCase
+       ) 
+       (MenuItem
+          label: '-'
+       ) 
+       (MenuItem
+          label: 'Smalltalk Class Slice'
+          nameKey: classNewSmalltalkSlice
+          submenuChannel: classNewSmalltalkSlice
+          isMenuSlice: true
+       ) 
+       (MenuItem
+          label: 'Languages'
+          submenu: 
+         (Menu 
+           (MenuItem
+              label: 'Ruby Class Slice'
+              nameKey: classNewRubyClassSlice
+              submenuChannel: classNewRubyClassSlice
+              isMenuSlice: true
+           ) 
+           (MenuItem
+              label: 'JavaScript Class Slice'
+              nameKey: classNewJavaScriptClassSlice
+              submenuChannel: classNewJavaScriptClassSlice
+              isMenuSlice: true
+           ) 
+           (MenuItem
+              label: 'Lisp Class Slice'
+              nameKey: classNewLispClassSlice
+              submenuChannel: classNewLispClassSlice
+              isMenuSlice: true
+           ) 
+           (MenuItem
+              label: 'Haskell Class Slice'
+              nameKey: classNewHaskellClassSlice
+              submenuChannel: classNewHaskellClassSlice
+              isMenuSlice: true
+           ) 
+           (MenuItem
+              label: 'PLSQL Class Slice'
+              nameKey: classNewPLSQLClassSlice
+              submenuChannel: classNewPLSQLClassSlice
+              isMenuSlice: true
+           ) 
+           (MenuItem
+              label: 'Other New Class Slice'
+              nameKey: classOtherClassNewSlice
+              submenuChannel: classOtherClassNewSlice
+              isMenuSlice: true
+           )
+         )
+       ) 
+       (MenuItem
+          label: '-'
+       ) 
+       (MenuItem
+          label: 'Class Wizard...'
+          itemValue: classMenuOpenClassCreationWizard
+          labelImage: (ResourceRetriever ToolbarIconLibrary newClassWizardIcon 'Class Wizard...')
+       )
+     )
 !
 
 classNewSmalltalkSlice
@@ -54466,10 +54456,10 @@
 
         m := Menu new.
         allOtherLanguages do:[:eachLanguage |
-                m addSeparator.
-                m addItem:(MenuItem
-                            label:(resources string:'%1 Class' with:(eachLanguage name))
-                            itemValue:[self classMenuNewClass:eachLanguage metaClass ])
+            "/ m addSeparator.
+            m addItem:(MenuItem
+                        label:(resources string:'%1 Class' with:(eachLanguage name))
+                        itemValue:[self classMenuNewClass:eachLanguage metaClass ])
 
         ].
         m