[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager Extension.java,1.1,1.2 DefaultAsteriskManager.java,1.15,1.16

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32732/src/java/net/sf/asterisk/manager

Modified Files:
	Extension.java DefaultAsteriskManager.java 
Log Message:
Added date attribute to Extension
Made Extension immutable

Index: Extension.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/Extension.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- Extension.java	8 Aug 2005 05:22:07 -0000	1.1
+++ Extension.java	8 Aug 2005 05:31:11 -0000	1.2
@@ -17,6 +17,7 @@
 package net.sf.asterisk.manager;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * Represents an Asterisk dialplan entry.
@@ -30,36 +31,37 @@ public class Extension implements Serial
      * Serial version identifier.
      */
     private static final long serialVersionUID = 768239042942945744L;
-    private String context;
-    private String extension;
-    private Integer priority;
-    private String application;
-    private String appData;
+    private final Date date;
+    private final String context;
+    private final String extension;
+    private final Integer priority;
+    private final String application;
+    private final String appData;
 
     /**
+     * @param date
      * @param context
      * @param extension
      * @param priority
      */
-    public Extension(String context, String extension, Integer priority)
+    public Extension(Date date, String context, String extension,
+            Integer priority)
     {
-        super();
-        // TODO Auto-generated constructor stub
-        this.context = context;
-        this.extension = extension;
-        this.priority = priority;
+        this(date, context, extension, priority, null, null);
     }
 
     /**
+     * @param date
      * @param context
      * @param extension
      * @param priority
      * @param application
      * @param appData
      */
-    public Extension(String context, String extension, Integer priority,
-            String application, String appData)
+    public Extension(Date date, String context, String extension,
+            Integer priority, String application, String appData)
     {
+        this.date = date;
         this.context = context;
         this.extension = extension;
         this.priority = priority;
@@ -72,48 +74,23 @@ public class Extension implements Serial
         return context;
     }
 
-    public void setContext(String context)
-    {
-        this.context = context;
-    }
-
     public String getExtension()
     {
         return extension;
     }
 
-    public void setExtension(String extension)
-    {
-        this.extension = extension;
-    }
-
     public Integer getPriority()
     {
         return priority;
     }
 
-    public void setPriority(Integer priority)
-    {
-        this.priority = priority;
-    }
-
     public String getApplication()
     {
         return application;
     }
 
-    public void setApplication(String application)
-    {
-        this.application = application;
-    }
-
     public String getAppData()
     {
         return appData;
     }
-
-    public void setAppData(String appData)
-    {
-        this.appData = appData;
-    }
 }

Index: DefaultAsteriskManager.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultAsteriskManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -p -r1.15 -r1.16
--- DefaultAsteriskManager.java	8 Aug 2005 05:22:07 -0000	1.15
+++ DefaultAsteriskManager.java	8 Aug 2005 05:31:11 -0000	1.16
@@ -459,8 +459,8 @@ public class DefaultAsteriskManager
         }
         else
         {
-            extension = new Extension(event.getContext(), event.getExtension(),
-                    event.getPriority());
+            extension = new Extension(event.getDateReceived(), event
+                    .getContext(), event.getExtension(), event.getPriority());
         }
 
         synchronized (channel)
@@ -638,8 +638,9 @@ public class DefaultAsteriskManager
             return;
         }
 
-        extension = new Extension(event.getContext(), event.getExtension(),
-                event.getPriority(), event.getApplication(), event.getAppData());
+        extension = new Extension(event.getDateReceived(), event.getContext(),
+                event.getExtension(), event.getPriority(), event
+                        .getApplication(), event.getAppData());
 
         synchronized (channel)
         {