Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 08 Apr 2016 07:03:18 +0100
branchjv
changeset 16269 f75bf11d55af
parent 16268 82848a0b6d70 (current diff)
parent 16267 39273e56c35d (diff)
child 16284 c2ddee4e07fa
Merge
FileDialog.st
MemoryUsageView.st
ProjectView.st
Tools__NewSystemBrowser.st
--- a/FileDialog.st	Mon Apr 04 07:09:38 2016 +0100
+++ b/FileDialog.st	Fri Apr 08 07:03:18 2016 +0100
@@ -403,41 +403,46 @@
         multipleSelect:false.
 
     enteredFileNameString := instance result.
-    (enteredFileNameString isEmptyOrNil) ifTrue:[
+    enteredFileNameString isEmptyOrNil ifTrue:[
         ^ failBlock value
     ].
+
     enteredFileName := enteredFileNameString asFilename.
     enteredFileName isRelative ifTrue:[
-        enteredFileName := instance directory construct:enteredFileNameString
-    ].
-    enteredFileNameString := enteredFileName asString.
-
-    (enteredFileName notNil 
-    and:[enteredFileNameString notEmpty]) ifTrue:[
-        FileSelectionBox lastFileSelectionDirectory:(enteredFileName directoryName).
-        versionSymbol isNil ifTrue:[ ^ enteredFileNameString].
-        versionSymbol == #mustBeNew ifTrue:[
-            "/ file may not exist
-            enteredFileName exists ifTrue:[^ ''].
-        ].
-        versionSymbol == #new ifTrue:[
-            "/ file may not exist
-            enteredFileName exists ifTrue:[
-                (Dialog confirm:(self classResources stringWithCRs:'''%1'' exists.\\Continue anyway ?' with:enteredFileNameString))
-                    ifFalse:[^ ''].
-            ].
-        ].
-        versionSymbol == #mustBeOld ifTrue:[
-            enteredFileName exists ifFalse:[^ ''].
-        ].
-        versionSymbol == #old ifTrue:[
-            "/ file may not exist
-            enteredFileName exists ifFalse:[
-                (self confirm:(self classResources stringWithCRs:'''%1'' does not exist yet.\\Continue anyway ?' with:enteredFileNameString))
-                ifFalse:[^ ''].
-            ].
+        (versionSymbol isNil and:[#(http https ftp) includes:(enteredFileNameString upToAll:'://')]) ifTrue:[
+            ^ enteredFileNameString.
+        ] ifFalse:[
+            enteredFileName := instance directory construct:enteredFileNameString.
+            enteredFileNameString := enteredFileName asString.
         ].
     ].
+
+    FileSelectionBox lastFileSelectionDirectory:(enteredFileName directoryName).
+
+    versionSymbol isNil ifTrue:[ ^ enteredFileNameString].
+    versionSymbol == #mustBeNew ifTrue:[
+        "/ file must not exist
+        enteredFileName exists ifTrue:[^ failBlock value].
+    ].
+    versionSymbol == #new ifTrue:[
+        "/ file should not exist
+        enteredFileName exists ifTrue:[
+            (Dialog confirm:(self classResources stringWithCRs:'''%1'' exists.\\Continue anyway ?' with:enteredFileNameString))
+                ifFalse:[^ failBlock value].
+        ].
+    ].
+    versionSymbol == #mustBeOld ifTrue:[
+        "/ file must exist
+        enteredFileName exists ifFalse:[^ failBlock value].
+    ].
+    versionSymbol == #old ifTrue:[
+        "/ file should exist
+        enteredFileName exists ifFalse:[
+            (self confirm:(self classResources stringWithCRs:'''%1'' does not exist yet.\\Continue anyway ?' with:enteredFileNameString))
+            ifFalse:[^ failBlock value].
+        ].
+    ].
+
     ^ enteredFileNameString
 "
      FileDialog 
--- a/MemoryUsageView.st	Mon Apr 04 07:09:38 2016 +0100
+++ b/MemoryUsageView.st	Fri Apr 08 07:03:18 2016 +0100
@@ -1011,7 +1011,7 @@
 "/ self halt
                 ].
             ].
-        ] valueNowOrOnUnwindDo:[
+        ] ensure:[
             myProcess priority:myPriority.
         ].
     ]
--- a/ProjectView.st	Mon Apr 04 07:09:38 2016 +0100
+++ b/ProjectView.st	Fri Apr 08 07:03:18 2016 +0100
@@ -433,8 +433,8 @@
     self topView withWaitCursorDo:[
         |box allNameSpaces|
 
-        allNameSpaces := (NameSpace allNamespaces 
-                            select:[:ns | ns isTopLevelNamespace])
+        allNameSpaces := (NameSpace allNameSpaces 
+                            select:[:ns | ns isTopLevelNameSpace])
                                 collect:[:ns | ns name].
 
         box := ListSelectionBox title:(resources string:'default nameSpace:') withCRs.
@@ -771,7 +771,7 @@
 !ProjectView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ProjectView.st,v 1.52 2007/01/23 18:19:38 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/Tools__NewSystemBrowser.st	Mon Apr 04 07:09:38 2016 +0100
+++ b/Tools__NewSystemBrowser.st	Fri Apr 08 07:03:18 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2000 by eXept Software AG
               All Rights Reserved
@@ -42183,12 +42181,15 @@
 
     self withActivityNotificationsRedirectedToInfoLabelDo:[
         defClass forEachFileNameAndGeneratedContentsDo:[:fileName :fileContents |
-            self showInfo:(resources string:'filing out %1...' with:fileName).
+            self showInfo:(resources string:'fileing out %1...' with:fileName).
             fullPathName := directory construct:fileName.
             fullPathName directory exists ifFalse:[
                 "take care for files like 'autopackage/default.apspec'"
                 fullPathName directory makeDirectory.
             ].
+            fullPathName exists ifTrue:[
+                fullPathName renameTo:(fullPathName pathName,'.sav') asFilename.
+            ].    
             fullPathName contents:fileContents.
         ].
     ].
@@ -51240,7 +51241,7 @@
             label:[:chg | 
                 |lbl|
                 "/ lbl := chg printString
-                lbl := (chg className ? '???') , ' ยป ' , (chg selector  ? '???') allBold.
+                lbl := (chg className ? '???') , '  ' , (chg selector  ? '???') allBold.
                 (chg isMethodChange and:[chg changeMethod isNil]) ifTrue:[
                     lbl := lbl asText allStrikedOut,' ','(removed)' allItalic.
                 ].    
@@ -58484,6 +58485,7 @@
     "Created: / 04-12-2011 / 22:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !NewSystemBrowser methodsFor:'private-semantic checks'!
 
 checkAcceptedMethod:aMethod inClass:aClass