Merge jv
authorMerge Script
Wed, 02 Sep 2015 06:45:47 +0200
branchjv
changeset 18730 592c4cb8e98e
parent 18725 dd8e208b04d3 (current diff)
parent 18729 f101761e2868 (diff)
child 18737 20f867a78d54
Merge
GenericException.st
Signal.st
SubclassResponsibilityError.st
UnixOperatingSystem.st
--- a/GenericException.st	Mon Aug 31 14:09:20 2015 +0100
+++ b/GenericException.st	Wed Sep 02 06:45:47 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
@@ -214,16 +216,6 @@
     "Created: / 20-11-2006 / 14:00:09 / cg"
 !
 
-signal:messageText
-    "raise a signal proceedable or nonproceedable (whichever is right).
-     The argument is used as messageText.
-     ANSI/Dolphin compatibility."
-
-    <resource: #skipInDebuggersWalkBack>
-
-    self raiseErrorString:messageText
-!
-
 signalWith:messageText
     "raise a signal proceedable or nonproceedable (whichever is right).
      The argument is used as messageText.
@@ -234,6 +226,7 @@
     self raiseErrorString:messageText
 ! !
 
+
 !GenericException class methodsFor:'accessing'!
 
 errorString
@@ -351,13 +344,6 @@
     ^ SignalSet with:self with:anExceptionHandler
 ! !
 
-!GenericException class methodsFor:'misc ui support'!
-
-iconInBrowserSymbol
-    <resource: #programImage>
-
-    ^ #exceptionClassBrowserIcon
-! !
 
 !GenericException class methodsFor:'printing'!
 
@@ -1214,9 +1200,9 @@
     "return the creator of the exception.
      For class based exceptions, that is the exception class;
      for signals, that is the signal itself.
-     This used to be called signal in earlier versions,
-     but due to the conflict with VSE, Squeak, where signal means 'raise',
-     signal was obsoleted by this method."
+     This used to be called 'signal' in earlier versions,
+     but due to the conflict with VSE, Squeak and others, 
+     where 'signal' means 'raise', 'signal' was obsoleted by this method."
 
     signal notNil ifTrue:[^ signal] ifFalse:[^ self class]
 !
@@ -2308,17 +2294,6 @@
     ^ self doRaise
 
     "Created: / 10-08-2010 / 09:50:54 / cg"
-!
-
-signal
-    "return the signal, that caused the exception.
-     Warning and notice: in ANSI, signal means: raise;
-     here and in old VW, it is the accessor to the creator signal/exception.
-
-     This has now changed to be compatible with ANSI/Squeak.
-     Please use #creator to get the creator."
-
-    self raiseSignal.
 ! !
 
 !GenericException methodsFor:'setup'!
@@ -2387,11 +2362,11 @@
 !GenericException class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.160 2015-01-12 16:07:53 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.160 2015-01-12 16:07:53 cg Exp $'
+    ^ '$Header$'
 ! !
 
 
--- a/Signal.st	Mon Aug 31 14:09:20 2015 +0100
+++ b/Signal.st	Wed Sep 02 06:45:47 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libbasic' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#Signal
 	instanceVariableNames:'mayProceed notifierString nameClass message handlerBlock parent'
 	classVariableNames:''
@@ -195,7 +199,10 @@
 creator
     "return the creator of the exception (for exception protocol compatibilty).
      For class based exceptions, that is the exception class;
-     for signals, that is the signal itself."
+     for signals, that is the signal itself.
+     This used to be called 'signal' in earlier versions,
+     but due to the conflict with VSE, Squeak and others, 
+     where 'signal' means 'raise', 'signal' was obsoleted by this method."
 
     ^ self
 !
@@ -988,9 +995,10 @@
 !Signal class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Signal.st,v 1.115 2014-06-10 10:20:23 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Signal.st,v 1.115 2014-06-10 10:20:23 cg Exp $'
+    ^ '$Header$'
 ! !
+
--- a/SubclassResponsibilityError.st	Mon Aug 31 14:09:20 2015 +0100
+++ b/SubclassResponsibilityError.st	Wed Sep 02 06:45:47 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2001 by eXept Software AG
               All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libbasic' }"
 
+"{ NameSpace: Smalltalk }"
+
 ProceedableError subclass:#SubclassResponsibilityError
 	instanceVariableNames:''
 	classVariableNames:''
@@ -52,8 +56,12 @@
 !SubclassResponsibilityError methodsFor:'queries'!
 
 description
-    parameter isNil ifTrue:[^ super description].
-    ^ '"',parameter , '" ', super description
+    |dscr|
+
+    dscr := super description.
+
+    parameter isNil ifTrue:[^ dscr].
+    ^ '"',parameter , '" ', dscr
 
     "Modified: / 19-12-2010 / 08:50:13 / cg"
 ! !
@@ -61,11 +69,12 @@
 !SubclassResponsibilityError class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/SubclassResponsibilityError.st,v 1.8 2010-12-19 11:59:59 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/SubclassResponsibilityError.st,v 1.8 2010-12-19 11:59:59 cg Exp $'
+    ^ '$Header$'
 ! !
 
+
 SubclassResponsibilityError initialize!