--- a/AppletalkSocketAddress.st	Fri Oct 17 11:22:40 2003 +0200
+++ b/AppletalkSocketAddress.st	Fri Oct 17 18:43:03 2003 +0200
@@ -142,21 +142,10 @@
 
 !AppletalkSocketAddress methodsFor:'printing & storing'!
 
-printOn:aStream
-    "append a user printed representation of the receiver to aStream.
-     The format is suitable for a human - not meant to be read back."
-
-    |port|
-
-    port := self port.
-
+printAddressOn:aStream
     self net printOn:aStream.
     aStream nextPut:$:.
     self node printOn:aStream.
-    port notNil ifTrue:[
-        aStream nextPut:$:.
-        port printOn:aStream.
-    ].
 ! !
 
 !AppletalkSocketAddress methodsFor:'queries'!
@@ -168,5 +157,5 @@
 !AppletalkSocketAddress class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/AppletalkSocketAddress.st,v 1.9 2003-07-09 15:31:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/AppletalkSocketAddress.st,v 1.10 2003-10-17 16:42:59 penk Exp $'
 ! !

--- a/IPSocketAddress.st	Fri Oct 17 11:22:40 2003 +0200
+++ b/IPSocketAddress.st	Fri Oct 17 18:43:03 2003 +0200
@@ -96,9 +96,10 @@
     ^ sa
 
     "
-     SocketAddress hostName:'localhost' serviceName:10 type:#stream
+     SocketAddress hostName:'localhost' serviceName:10 type:#stream  
      IPSocketAddress hostName:'localhost' serviceName:'echo' type:#datagram 
-     IPSocketAddress hostName:'localhost' serviceName:'echo' type:nil
+     IPSocketAddress hostName:'localhost' serviceName:'echo' type:nil       
+     IPSocketAddress hostName:'localhost'        
     "
 ! !
 
@@ -235,11 +236,8 @@
 
 !IPSocketAddress methodsFor:'printing & storing'!
 
-printOn:aStream
-    "append a user printed representation of the receiver to aStream.
-     The format is suitable for a human - not meant to be read back."
-
-    |port i1 i2|
+printAddressOn:aStream
+    |i1 i2|
 
     i1 := self adrBytesStart.
     i2 := i1 + self numAdrBytes - 1.
@@ -249,10 +247,6 @@
         ].
         (self at:i) printOn:aStream
     ].
-    (port := self port) ~~ 0 ifTrue:[
-        aStream nextPut:$:.
-        port printOn:aStream.
-    ].
 ! !
 
 !IPSocketAddress methodsFor:'private'!
@@ -285,5 +279,5 @@
 !IPSocketAddress class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/IPSocketAddress.st,v 1.23 2003-07-16 16:44:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/IPSocketAddress.st,v 1.24 2003-10-17 16:43:01 penk Exp $'
 ! !

--- a/SocketAddress.st	Fri Oct 17 11:22:40 2003 +0200
+++ b/SocketAddress.st	Fri Oct 17 18:43:03 2003 +0200
@@ -576,6 +576,38 @@
     s := WriteStream on:''.
     self printOn:s.
     ^ s contents.
+!
+
+printAddressOn:arg 
+    "raise an error: must be redefined in concrete subclass(es)"
+
+    ^ self subclassResponsibility
+!
+
+printOn:aStream
+    "append a user printed representation of the receiver to aStream.
+     The format is suitable for a human - not meant to be read back."
+
+    self printOn:aStream withPort:true
+!
+
+printOn:aStream withPort:withPort
+    "append a user printed representation of the receiver to aStream.
+     The format is suitable for a human - not meant to be read back."
+
+    self printAddressOn:aStream.
+    withPort ifTrue:[
+        self printPortOn:aStream.
+    ].
+!
+
+printPortOn:aStream 
+    |port|
+
+    (port := self port) ~~ 0 ifTrue:[
+        aStream nextPut:$:.
+        port printOn:aStream.
+    ]
 ! !
 
 !SocketAddress methodsFor:'private'!
@@ -628,5 +660,5 @@
 !SocketAddress class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/SocketAddress.st,v 1.22 2003-07-16 16:44:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/SocketAddress.st,v 1.23 2003-10-17 16:43:03 penk Exp $'
 ! !