Merge pull request asterisk-java#3 from danieldbower/master

Fix property name difference in QueueEntryEvent
longst · Aug 7, 2011 · afea1c3 · afea1c3
2 parents ae3aff5 + 23556ff
commit afea1c3
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueEntryEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueEntryEvent.java
@@ -36,6 +36,7 @@ public class QueueEntryEvent extends ResponseEvent
     private String uniqueId;
     private String channel;
     private String callerId;
+    private String callerIdNum;
     private String callerIdName;
     private String callerIdNum;
     private Long wait;
@@ -115,24 +116,44 @@ public void setChannel(String channel)
         this.channel = channel;
     }
 
-    /**
+	/**
      * Returns the the Caller*ID number of this entry.
      *
      * @return the the Caller*ID number of this entry.
      */
-    public String getCallerId()
+    public String getCallerId() 
     {
-        return callerId;
-    }
+		return callerId;
+	}
 
     /**
      * Sets the the Caller*ID number of this entry.
      *
      * @param callerId the the Caller*ID number of this entry.
      */
-    public void setCallerId(String callerId)
+	public void setCallerId(String callerId) 
+	{
+		this.callerId = callerId;
+	}
+
+	/**
+     * Returns the the Caller*ID number of this entry.  (Later Versions of Asterisk)
+     * 
+     * @return the the Caller*ID number of this entry.
+     */
+    public String getCallerIdNum()
+    {
+        return callerIdNum;
+    }
+
+    /**
+     * Sets the the Caller*ID number of this entry.  (Later Versions of Asterisk)
+     * 
+     * @param callerId the the Caller*ID number of this entry.
+     */
+    public void setCallerIdNum(String callerIdNum)
     {
-        this.callerId = callerId;
+        this.callerIdNum = callerIdNum;
     }
 
     /**