Fixed PackageLoadDialog>>readOtherPackageTrees jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 05 Jan 2017 21:35:24 +0000
branchjv
changeset 17274 23697d56407f
parent 17221 83d1d509d23b
child 17275 ee890e421e64
Fixed PackageLoadDialog>>readOtherPackageTrees Care for non-existing entries in package-path.
AbstractLauncherApplication.st
--- a/AbstractLauncherApplication.st	Thu Jan 05 21:04:31 2017 +0000
+++ b/AbstractLauncherApplication.st	Thu Jan 05 21:35:24 2017 +0000
@@ -7633,8 +7633,7 @@
             ].
 !
 
-
-    "Modified: / 28-06-2016 / 07:55:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 28-06-2016 / 07:55:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 loadAction:doBrowse 
     "the button's load action"
     
@@ -7806,48 +7805,50 @@
         |folderRoot eachDir|
         
         eachDir := eachDirName asFilename.
+        eachDir isDirectory ifTrue:[
+            selectedPackageHolder value isNil ifTrue:[
+                infoTextHolder value:(resources string:'searching %1...' with:eachDirName).
+            ].    
+            eachDir
+                recursiveDirectoryContentsWithPrefix:'' 
+                filesDo:nil 
+                directoriesDo:[:subDir |
+                    |dfnBasename expectedDfnFilename|
+    
+                    (eachDir /  subDir / 'abbrev.stc') exists ifTrue:[
+                        "/ see if there is a project definition file in this dir
+                        dfnBasename := subDir copyReplaceAll:(Filename separator) with:$_.
+                        expectedDfnFilename := (eachDir /  subDir / dfnBasename) withSuffix:'st'.
+                        expectedDfnFilename exists ifTrue:[
+                            |path|
+                            
+                            path := subDir asFilename components.
+                            (itemsByPath at:( {root label},path) ifAbsent:nil) isNil ifTrue:[
+                                folderRoot isNil ifTrue:[
+                                    folderRoot := MyHierarchicalItem new.
+                                    folderRoot icon:folderIcon.
+                                    folderRoot label:((resources string:'[%1]' with:eachDirName) asText allItalic withColor:Color grey).
+                                    folderRoot type:#compiledPackagesRoot.
+                                ].    
+                                self 
+                                    addItemWithPackagePath:path
+                                    target:nil
+                                    asApplication:false
+                                    toRoot:folderRoot.
+                            ].
+                        ]
+                    ].
+                ].
+            folderRoot notNil ifTrue:[
+                masterRoot add:folderRoot.
+            ].
+        ].
         selectedPackageHolder value isNil ifTrue:[
-            infoTextHolder value:(resources string:'searching %1...' with:eachDirName).
+            infoTextHolder value:(resources string:'Done searching other package folders.').
         ].    
-        eachDir
-            recursiveDirectoryContentsWithPrefix:'' 
-            filesDo:nil 
-            directoriesDo:[:subDir |
-                |dfnBasename expectedDfnFilename|
-
-                (eachDir /  subDir / 'abbrev.stc') exists ifTrue:[
-                    "/ see if there is a project definition file in this dir
-                    dfnBasename := subDir copyReplaceAll:(Filename separator) with:$_.
-                    expectedDfnFilename := (eachDir /  subDir / dfnBasename) withSuffix:'st'.
-                    expectedDfnFilename exists ifTrue:[
-                        |path|
-                        
-                        path := subDir asFilename components.
-                        (itemsByPath at:( {root label},path) ifAbsent:nil) isNil ifTrue:[
-                            folderRoot isNil ifTrue:[
-                                folderRoot := MyHierarchicalItem new.
-                                folderRoot icon:folderIcon.
-                                folderRoot label:((resources string:'[%1]' with:eachDirName) asText allItalic withColor:Color grey).
-                                folderRoot type:#compiledPackagesRoot.
-                            ].    
-                            self 
-                                addItemWithPackagePath:path
-                                target:nil
-                                asApplication:false
-                                toRoot:folderRoot.
-                        ].
-                    ]
-                ].
-            ].
-        folderRoot notNil ifTrue:[
-            masterRoot add:folderRoot.
-        ].
-    ].
-    selectedPackageHolder value isNil ifTrue:[
-        infoTextHolder value:(resources string:'Done searching other package folders.').
-    ].    
-    
-"/    packageDirPath isNil ifTrue:[
+    ]
+        
+    "/    packageDirPath isNil ifTrue:[
 "/        root label:root label,((resources string:' (no "packages" folder found)') colorizeAllWith:Color red).
 "/    ] ifFalse:[
 "/        packageDirPath asFilename directoryContentsAsFilenames sort do:[:fn |
@@ -7927,6 +7928,8 @@
 "/            ].
 "/        ].
 "/    ].
+
+    "Modified: / 05-01-2017 / 21:33:18 / jv"
 !
 
 readOtherPackageTreesInBackground
@@ -8197,6 +8200,11 @@
     ^ '$Header$'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
     ^ '$Id$'
 ! !