Revision: 16081
Author: [email protected]
Date: Tue Dec 28 07:05:48 2010
Log: [No log message]
http://code.google.com/p/mobicents/source/detail?r=16081

Modified:
/trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLink.java /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLinkset.java /trunk/protocols/ss7/hardware/dialogic/java/src/main/java/org/mobicents/ss7/hardware/dialogic/oam/DialogicLinkset.java /trunk/protocols/ss7/hardware/m3ua/src/main/java/org/mobicents/ss7/m3ua/oam/M3UALinkset.java

=======================================
--- /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLink.java Tue Dec 28 00:59:26 2010 +++ /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLink.java Tue Dec 28 07:05:48 2010
@@ -170,4 +170,9 @@
     protected Mtp2 getMtp2() {
         return this.mtp2;
     }
-}
+
+    @Override
+    public void print(StringBuffer sb, int leftPad, int descPad) {
+
+    }
+}
=======================================
--- /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLinkset.java Tue Dec 28 00:59:26 2010 +++ /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLinkset.java Tue Dec 28 07:05:48 2010
@@ -10,13 +10,18 @@
 import org.apache.log4j.Logger;
 import org.mobicents.protocols.ss7.mtp.Mtp3;
 import org.mobicents.protocols.ss7.mtp.Mtp3Listener;
+import org.mobicents.protocols.stream.api.SelectorKey;
+import org.mobicents.protocols.stream.api.SelectorProvider;
+import org.mobicents.protocols.stream.api.StreamSelector;
 import org.mobicents.ss7.linkset.oam.Link;
 import org.mobicents.ss7.linkset.oam.LinkMode;
 import org.mobicents.ss7.linkset.oam.LinkOAMMessages;
 import org.mobicents.ss7.linkset.oam.LinkState;
 import org.mobicents.ss7.linkset.oam.Linkset;
 import org.mobicents.ss7.linkset.oam.LinksetMode;
+import org.mobicents.ss7.linkset.oam.LinksetSelector;
 import org.mobicents.ss7.linkset.oam.LinksetState;
+import org.mobicents.ss7.linkset.oam.LinksetStream;

 /**
  *
@@ -36,10 +41,16 @@

     public DahdiLinkset(String linksetName, int opc, int dpc, int ni) {
         super(linksetName, opc, dpc, ni);
+
     }

     @Override
-    protected void init() throws Exception {
+    protected void initialize() {
+        this.linksetStream = new LinksetStreamImpl();
+    }
+
+    @Override
+    protected void configure() throws Exception {

         if (this.mode == LinksetMode.CONFIGURED) {

@@ -141,7 +152,7 @@
             Link value = e.getValue();
             if (value.getMode() == LinkMode.CONFIGURED) {
                 this.mode = LinksetMode.CONFIGURED;
-                this.init();
+                this.configure();
                 this.state = LinksetState.UNAVAILABLE;
                 return;
             }
@@ -191,7 +202,7 @@
             LINKSET_XML.read(xml, linkSet);

             try {
-                linkSet.init();
+                linkSet.configure();
             } catch (Exception e) {
                 logger.error("Error while initializing dahdi linkset", e);
             }
@@ -204,35 +215,6 @@
             LINKSET_XML.write(linkSet, xml);
         }
     };
-
-    /**
-     * Stream implementation methods
-     */
-
-    @Override
-    protected boolean poll(int operation, int timeout) {
-        if (mtp3 != null) {
-            mtp3.run();
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public int read(byte[] paramArrayOfByte) throws IOException {
-        if (queue.isEmpty()) {
-            return 0;
-        }
-        paramArrayOfByte = queue.poll();
-        return paramArrayOfByte == null ? 0 : paramArrayOfByte.length;
-    }
-
-    @Override
-    public int write(byte[] paramArrayOfByte) throws IOException {
-        mtp3.send(paramArrayOfByte, paramArrayOfByte.length);
-        return paramArrayOfByte.length;
-    }

// TODO : We still working with Listener model. rather change MTP3 to give
     // back byte[] and caller calls .read(byte[] data) to read data
@@ -252,4 +234,43 @@
     public void receive(byte[] msgBuff) {
         queue.offer(msgBuff);
     }
-}
+
+    private class LinksetStreamImpl extends LinksetStream {
+
+        @Override
+        public boolean poll(int arg0, int arg1) {
+            if (mtp3 != null) {
+                mtp3.run();
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        public void close() {
+            // TODO Auto-generated method stub
+
+        }
+
+        public SelectorProvider provider() {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        public int read(byte[] paramArrayOfByte) throws IOException {
+            if (queue.isEmpty()) {
+                return 0;
+            }
+            paramArrayOfByte = queue.poll();
+            return paramArrayOfByte == null ? 0 : paramArrayOfByte.length;
+        }
+
+ public SelectorKey register(StreamSelector selector) throws IOException {
+            return ((LinksetSelector) selector).register(this);
+        }
+
+        public int write(byte[] paramArrayOfByte) throws IOException {
+            mtp3.send(paramArrayOfByte, paramArrayOfByte.length);
+            return paramArrayOfByte.length;
+        }
+    }
+}
=======================================
--- /trunk/protocols/ss7/hardware/dialogic/java/src/main/java/org/mobicents/ss7/hardware/dialogic/oam/DialogicLinkset.java Mon Dec 27 22:52:52 2010 +++ /trunk/protocols/ss7/hardware/dialogic/java/src/main/java/org/mobicents/ss7/hardware/dialogic/oam/DialogicLinkset.java Tue Dec 28 07:05:48 2010
@@ -1,9 +1,5 @@
 package org.mobicents.ss7.hardware.dialogic.oam;

-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import org.mobicents.ss7.linkset.oam.Link;
 import org.mobicents.ss7.linkset.oam.LinkOAMMessages;
 import org.mobicents.ss7.linkset.oam.Linkset;
 import org.mobicents.ss7.linkset.oam.LinksetState;
@@ -19,13 +15,14 @@
         super();
     }

-    public DialogicLinkset(String linkSetName, String type) {
-        super(linkSetName, type);
+    @Override
+    protected void initialize() {
+        // TODO Auto-generated method stub
+
     }

     @Override
-    protected void init() {
-        // TODO Auto-generated method stub
+    protected void configure() throws Exception {

     }

@@ -52,28 +49,6 @@
     public void deactivateLink(String linkName) throws Exception {
         throw new Exception(LinkOAMMessages.OPERATION_NOT_SUPPORTED);
     }
-
-    /**
-     * Stream implementation methods
-     */
-
-    @Override
-    protected boolean poll(int operation, int timeout) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public int read(byte[] paramArrayOfByte) throws IOException {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public int write(byte[] paramArrayOfByte) throws IOException {
-        // TODO Auto-generated method stub
-        return 0;
-    }

     @Override
     public void createLink(String[] arg0) throws Exception {
=======================================
--- /trunk/protocols/ss7/hardware/m3ua/src/main/java/org/mobicents/ss7/m3ua/oam/M3UALinkset.java Mon Dec 27 22:52:52 2010 +++ /trunk/protocols/ss7/hardware/m3ua/src/main/java/org/mobicents/ss7/m3ua/oam/M3UALinkset.java Tue Dec 28 07:05:48 2010
@@ -1,7 +1,5 @@
 package org.mobicents.ss7.m3ua.oam;

-import java.io.IOException;
-
 import javolution.text.TextBuilder;
 import javolution.xml.XMLFormat;
 import javolution.xml.stream.XMLStreamException;
@@ -27,13 +25,14 @@

     }

-    public M3UALinkset(String linkSetName, String type) {
-        super(linkSetName, type);
+    @Override
+    protected void initialize() {
+        // TODO Auto-generated method stub
+
     }

     @Override
-    protected void init() {
-        // TODO Auto-generated method stub
+    protected void configure() {

     }

@@ -81,6 +80,16 @@
     public void deactivateLink(String linkName) throws Exception {
         throw new Exception(LinkOAMMessages.OPERATION_NOT_SUPPORTED);
     }
+
+    @Override
+    public void createLink(String[] arg0) throws Exception {
+        throw new Exception(LinkOAMMessages.NOT_IMPLEMENTED);
+    }
+
+    @Override
+    public void deleteLink(String arg0) throws Exception {
+        throw new Exception(LinkOAMMessages.NOT_IMPLEMENTED);
+    }

     /**
      * XML Serialization/Deserialization
@@ -107,37 +116,4 @@
             LINKSET_XML.write(linkSet, xml);
         }
     };
-
-    /**
-     * Stream implementation methods
-     */
-
-    @Override
-    protected boolean poll(int operation, int timeout) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public int read(byte[] paramArrayOfByte) throws IOException {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public int write(byte[] paramArrayOfByte) throws IOException {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public void createLink(String[] arg0) throws Exception {
-        throw new Exception(LinkOAMMessages.NOT_IMPLEMENTED);
-    }
-
-    @Override
-    public void deleteLink(String arg0) throws Exception {
-        throw new Exception(LinkOAMMessages.NOT_IMPLEMENTED);
-    }
-
-}
+}

Reply via email to