[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager ChannelStateEnum.java,1.2,1.3 Channel.java,1.3,1.4

[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-serv20829/src/java/net/sf/asterisk/manager

Modified Files:
	ChannelStateEnum.java Channel.java 
Log Message:
Removed dependcy on commons-lang

Index: ChannelStateEnum.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ChannelStateEnum.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ChannelStateEnum.java	23 Feb 2005 22:50:57 -0000	1.2
+++ ChannelStateEnum.java	13 Mar 2005 11:26:48 -0000	1.3
@@ -16,24 +16,27 @@
  */
 package net.sf.asterisk.manager;
 
-import java.util.Iterator;
-import java.util.List;
+import java.io.Serializable;
+import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang.enums.Enum;
-
 /**
  * Enumeration that represents the state of a channel.
  * 
  * @author srt
  * @version $Id$
  */
-public class ChannelStateEnum extends Enum
+public class ChannelStateEnum implements Serializable
 {
     /**
      * Serializable version identifier
      */
     private static final long serialVersionUID = 6436381500165485011L;
+
+    private static Map literals = new HashMap();
+
+    private String state;
+
     public static final ChannelStateEnum DOWN = new ChannelStateEnum("Down");
     public static final ChannelStateEnum OFF_HOOK = new ChannelStateEnum("OffHook");
     public static final ChannelStateEnum DIALING = new ChannelStateEnum("Dialing");
@@ -46,27 +49,17 @@ public class ChannelStateEnum extends En
 
     private ChannelStateEnum(String state)
     {
-        super(state);
+        this.state = state;
+        literals.put(state, this);
     }
 
     public static ChannelStateEnum getEnum(String state)
     {
-        return (ChannelStateEnum) getEnum(ChannelStateEnum.class, state);
-    }
-
-    public static Map getEnumMap()
-    {
-        return getEnumMap(ChannelStateEnum.class);
-    }
-
-    public static List getEnumList()
-    {
-        return getEnumList(ChannelStateEnum.class);
+        return (ChannelStateEnum) literals.get(state);
     }
 
-    public static Iterator iterator()
+    public String toString()
     {
-        return iterator(ChannelStateEnum.class);
+        return state;
     }
-
 }

Index: Channel.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/Channel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- Channel.java	23 Feb 2005 22:50:57 -0000	1.3
+++ Channel.java	13 Mar 2005 11:26:48 -0000	1.4
@@ -19,9 +19,6 @@ package net.sf.asterisk.manager;
 import java.io.Serializable;
 import java.util.Date;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
 /**
  * @author srt
  * @version $Id$
@@ -71,8 +68,8 @@ public class Channel implements Serializ
     private Date dateOfCreation;
 
     /**
-     * If this channel is bridged to another channel, the linkedChannel contains the channel this
-     * channel is bridged with.
+     * If this channel is bridged to another channel, the linkedChannel contains
+     * the channel this channel is bridged with.
      */
     private Channel linkedChannel;
 
@@ -95,7 +92,8 @@ public class Channel implements Serializ
      * @param id unique id of this channel, for example "1099015093.165".
      * @param server the Asterisk server this channel exists on.
      */
-    public Channel(final String name, final String id, final AsteriskServer server)
+    public Channel(final String name, final String id,
+            final AsteriskServer server)
     {
         this.name = name;
         this.id = id;
@@ -285,8 +283,8 @@ public class Channel implements Serializ
     /**
      * Returns the channel this channel is bridged with, if any.
      * 
-     * @return the channel this channel is bridged with, or <code>null</code> if this channel is
-     * currently not bridged to another channel.
+     * @return the channel this channel is bridged with, or <code>null</code>
+     *         if this channel is currently not bridged to another channel.
      */
     public final Channel getLinkedChannel()
     {
@@ -303,23 +301,38 @@ public class Channel implements Serializ
         this.linkedChannel = linkedChannel;
     }
 
-    public boolean equals(Object obj)
+    public String toString()
     {
-        if (!(obj instanceof Channel))
+        StringBuffer sb;
+
+        sb = new StringBuffer(getClass().getName() + ": ");
+        sb.append("id='" + getId() + "'; ");
+        sb.append("name='" + getName() + "'; ");
+        sb.append("callerId='" + getCallerId() + "'; ");
+        sb.append("state='" + getState() + "'; ");
+        sb.append("account='" + getAccount() + "'; ");
+        sb.append("context='" + getContext() + "'; ");
+        sb.append("extension='" + getExtension() + "'; ");
+        sb.append("priority='" + getPriority() + "'; ");
+        sb.append("application='" + getApplication() + "'; ");
+        sb.append("appData='" + getAppData() + "'; ");
+        sb.append("dateOfCreation=" + getDateOfCreation() + "; ");
+        if (linkedChannel == null)
         {
-            return false;
+            sb.append("linkedChannel=null; ");
         }
+        else
+        {
+            sb.append("linkedChannel=[");
+            sb.append(linkedChannel.getClass().getName() + ": ");
+            sb.append("id='" + linkedChannel.getId() + "'; ");
+            sb.append("name='" + linkedChannel.getName() + "'; ");
+            sb.append("systemHashcode="
+                    + System.identityHashCode(linkedChannel));
+            sb.append("]; ");
+        }
+        sb.append("systemHashcode=" + System.identityHashCode(this));
 
-        return id.equals(((Channel) obj).getId());
-    }
-
-    public int hashCode()
-    {
-        return id.hashCode();
-    }
-
-    public String toString()
-    {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+        return sb.toString();
     }
 }