[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event ChannelEvent.java,1.2,
Brought to you by:
srt
From: Stefan R. <sr...@us...> - 2005-02-25 11:59:08
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15363/src/java/net/sf/asterisk/manager/event Modified Files: ChannelEvent.java NewCallerIdEvent.java Log Message: Addedd attribute callerIdName (Bug #1151384) Index: ChannelEvent.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/ChannelEvent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -p -r1.2 -r1.3 --- ChannelEvent.java 23 Feb 2005 22:50:58 -0000 1.2 +++ ChannelEvent.java 25 Feb 2005 11:58:43 -0000 1.3 @@ -30,9 +30,29 @@ public abstract class ChannelEvent exten */ static final long serialVersionUID = 5906599407896179295L; + /** + * The name of the channel. + */ private String channel; + + /** + * The state of the channel. + */ private String state; + + /** + * This Caller*ID of the channel. + */ private String callerId; + + /** + * The Caller*ID Name of the channel. + */ + private String callerIdName; + + /** + * The unique id of the channel. + */ private String uniqueId; /** @@ -76,7 +96,7 @@ public abstract class ChannelEvent exten } /** - * Returns the caller id of the channel if set or "unknown" if none has been set. + * Returns the Caller*ID of the channel if set or "≶unknown>" if none has been set. */ public String getCallerId() { @@ -84,7 +104,9 @@ public abstract class ChannelEvent exten } /** - * Sets the caller id of the channel. + * Sets the Caller*ID of the channel. + * + * @param the Caller*ID of the channel. */ public void setCallerId(String callerId) { @@ -92,6 +114,26 @@ public abstract class ChannelEvent exten } /** + * Returns the Caller*ID Name of the channel if set or "≶unknown>" if none has been set. + * + * @return the Caller*ID Name of the channel. + */ + public String getCallerIdName() + { + return callerIdName; + } + + /** + * Sets the Caller*ID Name of the channel. + * + * @param callerIdName the Caller*ID Name of the channel. + */ + public void setCallerIdName(String callerIdName) + { + this.callerIdName = callerIdName; + } + + /** * Returns the (new) state of the channel.<br> * The following states are used:<br> * <ul> Index: NewCallerIdEvent.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/NewCallerIdEvent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -p -r1.2 -r1.3 --- NewCallerIdEvent.java 23 Feb 2005 22:50:58 -0000 1.2 +++ NewCallerIdEvent.java 25 Feb 2005 11:58:43 -0000 1.3 @@ -30,8 +30,24 @@ public class NewCallerIdEvent extends Ma */ static final long serialVersionUID = 6639570533512201213L; + /** + * The new Caller*ID. + */ private String callerId; + + /** + * The new Caller*ID Name. + */ + private String callerIdName; + + /** + * The name of the channel. + */ private String channel; + + /** + * The unique id of the channel. + */ private String uniqueId; /** @@ -44,6 +60,8 @@ public class NewCallerIdEvent extends Ma /** * Returns the name of the channel. + * + * @return the name of the channel. */ public String getChannel() { @@ -52,6 +70,8 @@ public class NewCallerIdEvent extends Ma /** * Sets the name of the channel. + * + * @param channel the name of the channel */ public void setChannel(String channel) { @@ -60,6 +80,8 @@ public class NewCallerIdEvent extends Ma /** * Returns the unique id of the channel. + * + * @return the unique id of the channel. */ public String getUniqueId() { @@ -68,6 +90,8 @@ public class NewCallerIdEvent extends Ma /** * Sets the unique id of the channel. + * + * @param uniqueId the unique id of the channel. */ public void setUniqueId(String uniqueId) { @@ -76,6 +100,8 @@ public class NewCallerIdEvent extends Ma /** * Returns the new caller id. + * + * @return the new caller id. */ public String getCallerId() { @@ -83,10 +109,32 @@ public class NewCallerIdEvent extends Ma } /** - * Sets the new caller id. + * Sets the new Caller*ID. + * + * @param the new Caller*ID. */ public void setCallerId(String callerId) { this.callerId = callerId; } + + /** + * Returns the new Caller*ID Name if set or "≶Unknown>" if none has been set. + * + * @return the new Caller*ID Name. + */ + public String getCallerIdName() + { + return callerIdName; + } + + /** + * Sets the new Caller*ID Name if set or "≶Unknown>" if none has been set. + * + * @param callerIdName the Caller*ID Name to set. + */ + public void setCallerIdName(String callerIdName) + { + this.callerIdName = callerIdName; + } } |