Merge jv
authorMerge Script
Tue, 12 Jan 2016 07:08:16 +0100
branchjv
changeset 16009 925ef9446aef
parent 16005 70f213a6754f (current diff)
parent 16008 6bf875128c74 (diff)
child 16014 7b658f4ccbaf
Merge
Tools__Inspector2.st
Tools__NewSystemBrowser.st
resources/de.rs
--- a/Tools__Inspector2.st	Mon Jan 04 08:11:47 2016 +0100
+++ b/Tools__Inspector2.st	Tue Jan 12 07:08:16 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2006 by eXept Software AG
 	      All Rights Reserved
@@ -673,6 +671,13 @@
             label: 'Color Setting'
             submenuChannel: settingsMenu
           )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Exit'
+            itemValue: closeRequest
+          )
          )
         nil
         nil
@@ -1302,7 +1307,6 @@
     "Modified: / 10-03-2015 / 09:46:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !Inspector2::NavigationState class methodsFor:'creating classes'!
 
 for:anObject 
--- a/Tools__NewSystemBrowser.st	Mon Jan 04 08:11:47 2016 +0100
+++ b/Tools__NewSystemBrowser.st	Tue Jan 12 07:08:16 2016 +0100
@@ -10278,6 +10278,12 @@
                   showBusyCursorWhilePerforming: true
                 )
                (MenuItem
+                  enabled: hasSingleProjectSelectedHolder
+                  label: 'Extensions in...'
+                  itemValue: projectMenuFileOutExtensionsIn
+                  showBusyCursorWhilePerforming: true
+                )
+               (MenuItem
                   label: '-'
                 )
                (MenuItem
@@ -42163,7 +42169,7 @@
 !
 
 projectMenuFileOutEachInWithFormat:aFormatSymbolOrNil
-    |currentProject dirName methodsToFileOut fileNameForExtensions|
+    |currentProject dirName|
 
     currentProject := self theSingleSelectedProject ? 'selected projects'.
     dirName := self
@@ -42173,8 +42179,9 @@
     dirName isNil ifTrue:[
         ^ self
     ].
-    dirName asFilename exists ifFalse:[
-        dirName asFilename recursiveMakeDirectory
+    dirName := dirName asFilename.
+    dirName exists ifFalse:[
+        dirName recursiveMakeDirectory
     ].
 
     self
@@ -42183,26 +42190,7 @@
         withFormat:aFormatSymbolOrNil.
 
     "/ extensions...
-    methodsToFileOut := OrderedCollection new.
-    environment allClassesDo:[:eachClass |
-        eachClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
-            |mPckg|
-
-            mPckg := mthd package.
-            (mPckg = currentProject and:[mPckg ~= eachClass package]) ifTrue:[
-                methodsToFileOut add:mthd
-            ]
-        ]
-    ].
-    dirName := dirName asFilename.
-    fileNameForExtensions := (dirName construct:'extensions') withSuffix:(self fileSuffixForFormat:aFormatSymbolOrNil).
-    self
-        fileOutMethods:methodsToFileOut
-        format:aFormatSymbolOrNil
-        toFile:fileNameForExtensions
-        withPackage:true
-
-    "Modified: / 05-09-2011 / 22:02:48 / cg"
+    self projectMenuFileOutExtensionsIn:dirName withFormat:aFormatSymbolOrNil
 !
 
 projectMenuFileOutEachSIFIn
@@ -42223,6 +42211,59 @@
     self projectMenuFileOutEachInWithFormat:#xml
 !
 
+projectMenuFileOutExtensionsIn
+    "fileOut selected project extensions - st-source format"
+
+    self projectMenuFileOutExtensionsInWithFormat:nil
+!
+
+projectMenuFileOutExtensionsIn:dirName withFormat:aFormatSymbolOrNil
+    |currentProject methodsToFileOut fileNameForExtensions|
+
+    currentProject := self theSingleSelectedProject.
+
+    "/ extensions...
+    methodsToFileOut := OrderedCollection new.
+    environment allClassesDo:[:eachClass |
+        eachClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
+            |mPckg|
+
+            mPckg := mthd package.
+            (mPckg = currentProject and:[mPckg ~= eachClass package]) ifTrue:[
+                methodsToFileOut add:mthd
+            ]
+        ]
+    ].
+    fileNameForExtensions := (dirName / 'extensions') withSuffix:(self fileSuffixForFormat:aFormatSymbolOrNil).
+    self
+        fileOutMethods:methodsToFileOut
+        format:aFormatSymbolOrNil
+        toFile:fileNameForExtensions
+        withPackage:true
+
+    "Modified: / 05-09-2011 / 22:02:48 / cg"
+!
+
+projectMenuFileOutExtensionsInWithFormat:aFormatSymbolOrNil
+    |currentProject dirName|
+
+    currentProject := self theSingleSelectedProject.
+    dirName := self
+                askForDirectoryToFileOut:(resources string:'FileOut Extensions of %1 in:'
+                                                    with:currentProject)
+                default:nil.
+    dirName isNil ifTrue:[
+        ^ self
+    ].
+    dirName := dirName asFilename.
+    dirName exists ifFalse:[
+        dirName recursiveMakeDirectory
+    ].
+
+    "/ extensions...
+    self projectMenuFileOutExtensionsIn:dirName withFormat:aFormatSymbolOrNil
+!
+
 projectMenuFileOutSIFAs
     "fileOut selected projects - sif format"
 
--- a/resources/de.rs	Mon Jan 04 08:11:47 2016 +0100
+++ b/resources/de.rs	Tue Jan 12 07:08:16 2016 +0100
@@ -3115,7 +3115,7 @@
 'menu font is not %1-encoded.\\Change it ?'                                                             'Der Menu-Zeichensatz ist nicht %1-kodiert.\\Zeichensatz auswählen ?'
 'method does not exist'                                                                                 'Methode nicht gefunden'
 'method selector to search for:'                                                                        'Selektor dessen Methode gesucht wird:'
-'method''s actual code'                                                                                 'alter Quelletext'
+'method''s actual code'                                                                                 'alter Quelltext'
 'methodlist'                                                                                            'Methodenliste'
 'methods'                                                                                               'Methoden'
 'methods actual code'                                                                                   'alter Quelletext'