Revision: 16123
Author: [email protected]
Date: Thu Dec 30 02:49:13 2010
Log: [No log message]
http://code.google.com/p/mobicents/source/detail?r=16123

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 Wed Dec 29 22:15:48 2010 +++ /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLink.java Thu Dec 30 02:49:13 2010
@@ -6,6 +6,7 @@
 import org.apache.log4j.Logger;
 import org.mobicents.protocols.ss7.mtp.Mtp2;
 import org.mobicents.ss7.hardware.dahdi.Channel;
+import org.mobicents.ss7.linkset.oam.FormatterHelp;
 import org.mobicents.ss7.linkset.oam.Link;
 import org.mobicents.ss7.linkset.oam.LinkMode;
 import org.mobicents.ss7.linkset.oam.LinkOAMMessages;
@@ -174,6 +175,59 @@

     @Override
     public void print(StringBuffer sb, int leftPad, int descPad) {
-
+        FormatterHelp.createPad(sb, leftPad);
+
+        // Add name
+        sb.append(this.linkName);
+
+        // check if length is less than Link.NAME_SIZE, add padding
+        if (this.linkName.length() < Link.NAME_SIZE) {
+            FormatterHelp
+ .createPad(sb, Link.NAME_SIZE - this.linkName.length());
+        }
+
+        // add desc padding
+        FormatterHelp.createPad(sb, descPad);
+
+        // add span
+ sb.append(LINK_SPAN).append(FormatterHelp.EQUAL_SIGN).append(this.span);
+
+ // span can be max 2 digits. check if its one digit add one extra space
+        if (this.span < 10) {
+            FormatterHelp.createPad(sb, 1);
+        }
+
+        // add desc padding
+        FormatterHelp.createPad(sb, descPad);
+
+        // add channel-id
+        sb.append(LINK_CHANNEL_ID).append(FormatterHelp.EQUAL_SIGN).append(
+                this.channelID);
+
+ // channel can be max 2 digits. check if its one digit add one extra
+        // space
+        if (this.channelID < 10) {
+            FormatterHelp.createPad(sb, 1);
+        }
+
+        // add desc padding
+        FormatterHelp.createPad(sb, descPad);
+
+        // add code
+ sb.append(LINK_CODE).append(FormatterHelp.EQUAL_SIGN).append(this.code);
+
+ // code can be max 3 digits. check if its less than 3 digit add extra
+        // space
+        if (this.code < 10) {
+            FormatterHelp.createPad(sb, 1);
+        }
+
+        if (this.code < 100) {
+            FormatterHelp.createPad(sb, 1);
+        }
+
+        // add state
+        sb.append(LINK_STATE).append(FormatterHelp.EQUAL_SIGN).append(
+                FormatterHelp.getLinkState(this.state));
     }
 }
=======================================
--- /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLinkset.java Wed Dec 29 22:15:48 2010 +++ /trunk/protocols/ss7/hardware/dahdi/java/src/main/java/org/mobicents/ss7/hardware/dahdi/oam/DahdiLinkset.java Thu Dec 30 02:49:13 2010
@@ -13,6 +13,7 @@
 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.FormatterHelp;
 import org.mobicents.ss7.linkset.oam.Link;
 import org.mobicents.ss7.linkset.oam.LinkMode;
 import org.mobicents.ss7.linkset.oam.LinkOAMMessages;
@@ -291,4 +292,75 @@
             return paramArrayOfByte.length;
         }
     }
-}
+
+    @Override
+    public void print(StringBuffer sb, int leftPad, int descPad) {
+
+        // left pad
+        FormatterHelp.createPad(sb, leftPad);
+
+        // Add name
+        sb.append(this.linksetName);
+
+        // check if length is less than Link.NAME_SIZE, add padding
+        if (this.linksetName.length() < Linkset.NAME_SIZE) {
+            FormatterHelp.createPad(sb, Linkset.NAME_SIZE
+                    - this.linksetName.length());
+        }
+
+        // add desc padding
+        FormatterHelp.createPad(sb, descPad);
+
+        // type is dahdi
+        sb.append("dahdi");
+
+        // add desc padding
+        FormatterHelp.createPad(sb, descPad);
+
+        // add opc
+        sb.append(LINKSET_OPC).append(FormatterHelp.EQUAL_SIGN)
+                .append(this.opc);
+
+ // opc can be max 8 (ANSI is max 24bits) digits. Add padding if its not
+        int length = (Integer.toString(this.opc).length());
+        if (length < 8) {
+            FormatterHelp.createPad(sb, 8 - length);
+        }
+
+        // add desc padding
+        FormatterHelp.createPad(sb, descPad);
+
+        // add apc
+        sb.append(LINKSET_APC).append(FormatterHelp.EQUAL_SIGN)
+                .append(this.apc);
+
+ // opc can be max 8 (ANSI is max 24bits) digits. Add padding if its not
+        length = (Integer.toString(this.apc).length());
+        if (length < 8) {
+            FormatterHelp.createPad(sb, 8 - length);
+        }
+
+        // add desc padding
+        FormatterHelp.createPad(sb, descPad);
+
+        // add NI
+ sb.append(LINKSET_NI).append(FormatterHelp.EQUAL_SIGN).append(this.ni);
+
+        // add desc padding
+        FormatterHelp.createPad(sb, descPad);
+
+        // add state
+        sb.append(LINKSET_STATE).append(FormatterHelp.EQUAL_SIGN).append(
+                FormatterHelp.getLinksetState(this.state));
+
+        sb.append(FormatterHelp.NEW_LINE);
+
+ for (FastMap.Entry<String, Link> e = this.links.head(), end = this.links
+                .tail(); (e = e.getNext()) != end;) {
+            Link link = e.getValue();
+            link.print(sb, 4, 2);
+            sb.append(FormatterHelp.NEW_LINE);
+        }
+
+    }
+}
=======================================
--- /trunk/protocols/ss7/hardware/dialogic/java/src/main/java/org/mobicents/ss7/hardware/dialogic/oam/DialogicLinkset.java Wed Dec 29 22:15:48 2010 +++ /trunk/protocols/ss7/hardware/dialogic/java/src/main/java/org/mobicents/ss7/hardware/dialogic/oam/DialogicLinkset.java Thu Dec 30 02:49:13 2010
@@ -193,5 +193,11 @@
             return paramArrayOfByte.length;
         }
     }
+
+    @Override
+    public void print(StringBuffer arg0, int arg1, int arg2) {
+        // TODO Auto-generated method stub
+
+    }

 }
=======================================
--- /trunk/protocols/ss7/hardware/m3ua/src/main/java/org/mobicents/ss7/m3ua/oam/M3UALinkset.java Tue Dec 28 07:05:48 2010 +++ /trunk/protocols/ss7/hardware/m3ua/src/main/java/org/mobicents/ss7/m3ua/oam/M3UALinkset.java Thu Dec 30 02:49:13 2010
@@ -116,4 +116,10 @@
             LINKSET_XML.write(linkSet, xml);
         }
     };
-}
+
+    @Override
+    public void print(StringBuffer arg0, int arg1, int arg2) {
+        // TODO Auto-generated method stub
+
+    }
+}

Reply via email to