From 7ccefaa16e5f4106c723c0262c4d04d161494815 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 2 Apr 2013 16:59:35 +0200 Subject: [PATCH] sccp: Do not use abbreviation for variable names It can help users to understand what we are talking about. This request was expressed by noha. --- sccp/SCCPAddress.st | 52 +++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/sccp/SCCPAddress.st b/sccp/SCCPAddress.st index 993af1a..2f96179 100644 --- a/sccp/SCCPAddress.st +++ b/sccp/SCCPAddress.st @@ -17,7 +17,7 @@ " Object subclass: SCCPAddress [ - | route_ssn ssn poi gti gti_ind | + | subSystemNumber globalTitle routedOnSsn poi gti_ind | + self routedOnSubSystenNumber: aFlag + ] + + routedOnSubSystenNumber: aFlag [ - route_ssn := aFlag + routedOnSsn := aFlag ] routedOnSSN [ - ^ route_ssn ifNil: [false] + ^ routedOnSsn ifNil: [false] ] gti [ + + ^ self globalTitle + ] + + globalTitle [ - ^ gti + ^ globalTitle ] gtiInd [ @@ -111,9 +121,9 @@ Object subclass: SCCPAddress [ ^ gti_ind ] - gti: aGti indicator: aGtiInd [ + gti: aGlobalTitle indicator: aGtiInd [ - gti := aGti. + globalTitle := aGlobalTitle. gti_ind := aGtiInd bitAnd: 16rF. ] @@ -121,13 +131,13 @@ Object subclass: SCCPAddress [ ^ gti_ind = 0 ifTrue: [nil] - ifFalse: [SCCPGTI initWith: gti_ind data: gti]. + ifFalse: [SCCPGTI initWith: gti_ind data: globalTitle]. ] - gtiFromAddr: aGti [ + gtiFromAddr: aGlobalTitle [ - gti_ind := aGti class subType. - gti := aGti asByteArray. + gti_ind := aGlobalTitle class subType. + globalTitle := aGlobalTitle asByteArray. ] poi: aPoi [ @@ -140,14 +150,24 @@ Object subclass: SCCPAddress [ ^ poi ] - ssn: assn [ - - ssn := assn + ssn: aSubSystemNumber [ + + "deprecated" + self subSystemNumber: aSubSystemNumber + ] + + subSystemNumber: aSubSystemNumber [ + subSystemNumber := aSubSystemNumber ] ssn [ + + ^ self subSystemNumber + ] + + subSystemNumber [ - ^ ssn. + ^ subSystemNumber ] asByteArray [ @@ -185,11 +205,11 @@ Object subclass: SCCPAddress [ ]. "SSN" - data add: ssn. + data add: subSystemNumber. "GTI" gti_ind ifNotNil: [ - gti do: [:each | data add: each ]. + globalTitle do: [:each | data add: each ]. ]. data addFirst: data size.