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

Modified:
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/DahdiLinksetFactory.java /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/DialogicLinksetFactory.java /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetFactory.java /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetFactoryFactory.java /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetManager.java /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/M3UALinksetFactory.java

=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/DahdiLinksetFactory.java Mon Dec 27 00:05:58 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/DahdiLinksetFactory.java Mon Dec 27 02:30:49 2010
@@ -7,9 +7,16 @@
  *
  */
 public class DahdiLinksetFactory extends LinksetFactory {
+
+    private static final String NAME = "dahdi";

     public DahdiLinksetFactory() {
     }
+
+    @Override
+    String getName() {
+        return NAME ;
+    }

     @Override
     Linkset createLinkset(String[] options) {
=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/DialogicLinksetFactory.java Mon Dec 27 00:05:58 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/DialogicLinksetFactory.java Mon Dec 27 02:30:49 2010
@@ -8,9 +8,16 @@
  */
 public class DialogicLinksetFactory extends LinksetFactory {

+    private static final String NAME = "dialogic";
+
        public DialogicLinksetFactory() {
                super();
        }
+
+    @Override
+    String getName() {
+        return NAME ;
+    }

     @Override
     Linkset createLinkset(String[] options) {
=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetFactory.java Mon Dec 27 00:05:58 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetFactory.java Mon Dec 27 02:30:49 2010
@@ -12,5 +12,7 @@
     }

     abstract Linkset createLinkset(String[] options);
+
+    abstract String getName();

 }
=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetFactoryFactory.java Mon Dec 27 00:05:58 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetFactoryFactory.java Mon Dec 27 02:30:49 2010
@@ -6,13 +6,12 @@

private FastMap<String, LinksetFactory> linksetFactories = new FastMap<String, LinksetFactory>();

-    public FastMap<String, LinksetFactory> getLinksetFactories() {
-        return linksetFactories;
+    public void addFactory(LinksetFactory factory) {
+        linksetFactories.put(factory.getName(), factory);
     }

-    public void setLinksetFactories(
-            FastMap<String, LinksetFactory> linksetFactories) {
-        this.linksetFactories = linksetFactories;
+    public void removeFactory(LinksetFactory factory) {
+        linksetFactories.remove(factory);
     }

     public Linkset createLinkset(String[] options) {
@@ -36,9 +35,9 @@
         if (linksetFactory == null) {
             return null;
         }
-
+
         options[i] = null;
-
+
         return linksetFactory.createLinkset(options);
     }
 }
=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetManager.java Mon Dec 27 00:05:58 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/LinksetManager.java Mon Dec 27 02:30:49 2010
@@ -180,13 +180,11 @@
     public static void main(String args[]) throws Exception {
         LinksetManager linkSetManager = new LinksetManager();

- FastMap<String, LinksetFactory> linkSetFactories = new FastMap<String, LinksetFactory>();
-        linkSetFactories.put("dahdi", new DahdiLinksetFactory());
-        linkSetFactories.put("dialogic", new DialogicLinksetFactory());
-        linkSetFactories.put("m3ua", new M3UALinksetFactory());
-
LinksetFactoryFactory linksetFactoryFactory = new LinksetFactoryFactory();
-        linksetFactoryFactory.setLinksetFactories(linkSetFactories);
+        linksetFactoryFactory.addFactory(new DahdiLinksetFactory());
+        linksetFactoryFactory.addFactory(new DialogicLinksetFactory());
+        linksetFactoryFactory.addFactory(new M3UALinksetFactory());
+
         linkSetManager.setLinksetFactoryFactory(linksetFactoryFactory);

         linkSetManager.createLinkset("dahdi opc 1 dpc 2 ni 3 linkset1"
=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/M3UALinksetFactory.java Mon Dec 27 00:05:58 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/oam/M3UALinksetFactory.java Mon Dec 27 02:30:49 2010
@@ -8,9 +8,16 @@
  */
 public class M3UALinksetFactory extends LinksetFactory {

+    private static final String NAME = "m3ua";
+
        public M3UALinksetFactory() {
                super();
        }
+
+    @Override
+    String getName() {
+        return NAME ;
+    }

     @Override
     Linkset createLinkset(String[] options) {

Reply via email to