Commit e08f118d authored by garciay's avatar garciay
Browse files

Merge STF455 staff

parent bb81ca2e

javasrc/codec/org/etsi/ttcn/codec/CodecFactory.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -59,9 +59,14 @@ public class CodecFactory { 
            // initialize additional codec plugins

            // initialize additional codec plugins

            org.etsi.ttcn.codec.its.adapter.Plugin.init();

            org.etsi.ttcn.codec.its.adapter.Plugin.init();

            org.etsi.ttcn.codec.its.uppertester.Plugin.init();

            org.etsi.ttcn.codec.its.uppertester.Plugin.init();

            org.etsi.ttcn.codec.its.configtester.Plugin.init();

            org.etsi.ttcn.codec.its.geonetworking.Plugin.init();

            org.etsi.ttcn.codec.its.geonetworking.Plugin.init();

            org.etsi.ttcn.codec.its.btp.Plugin.init();

            org.etsi.ttcn.codec.its.btp.Plugin.init();

                                 

                                 

            org.etsi.ttcn.codec.its.fntp.Plugin.init();

            org.etsi.ttcn.codec.its.fsap.Plugin.init();

            org.etsi.ttcn.codec.its.iicp.Plugin.init();

            org.etsi.ttcn.codec.its.atsp.Plugin.init();

        }        

        }        

    }

    }

javasrc/codec/org/etsi/ttcn/codec/MainCodec.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -8,15 +8,15 @@ package org.etsi.ttcn.codec; 
import java.util.Map;

import java.util.Map;

import java.util.TreeMap;

import java.util.TreeMap;





import org.etsi.ttcn.tri.TriMessage;

import org.etsi.codec.ITciCDWrapper;

import org.etsi.ttcn.tci.TciCDProvided;

import org.etsi.ttcn.tci.TciCDProvided;

import org.etsi.ttcn.tci.TciCDRequired;

import org.etsi.ttcn.tci.Type;

import org.etsi.ttcn.tci.Type;

import org.etsi.ttcn.tci.Value;

import org.etsi.ttcn.tci.Value;

import org.etsi.ttcn.tri.TriMessage;





public class MainCodec extends ICodec {

public class MainCodec extends ICodec {





    public MainCodec(TciCDRequired cdReq) {

    public MainCodec(ITciCDWrapper cdReq) {

        super(null);

        super(null);

        this.cdReq = cdReq;

        this.cdReq = cdReq;

    }

    }
@@ -97,11 +97,11 @@ public class MainCodec extends ICodec { 
        presenceHints.put(key, value);

        presenceHints.put(key, value);

    }

    }





    public TciCDRequired getTciCDRequired() {

    public ITciCDWrapper getTciCDRequired() {

        return cdReq;

        return cdReq;

    }

    }





    protected Map<String, String> hints = new TreeMap<String, String>();

    protected Map<String, String> hints = new TreeMap<String, String>();

    protected Map<String, java.lang.Boolean> presenceHints = new TreeMap<String, java.lang.Boolean>();

    protected Map<String, java.lang.Boolean> presenceHints = new TreeMap<String, java.lang.Boolean>();

    protected TciCDRequired cdReq;

    protected ITciCDWrapper cdReq;

}
 
}