Commit d8f033e6 authored by garciay's avatar garciay
Browse files

Remove duplicate org.etsi.ttcn.common.ByteHelper.java file and replace it by... 

Remove duplicate org.etsi.ttcn.common.ByteHelper.java file and replace it by org.etsi.common.ByteHelper.java after merge
parent 739f1ca2

javasrc/adapter/org/etsi/its/adapter/Management.java

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class Management implements IManagementTA, IManagementLayers { 
    /**

     * ITS-AID for Secure other profile 

     */

    private static final String TsItsAidOther = ((CharstringValue)TERFactory.getInstance().getTaParameter("TsItsAidOther")).getString();

    private static final String TsItsAidOther = "141"; // GN-MGMT ((CharstringValue)TERFactory.getInstance().getTaParameter("TsItsAidOther")).getString();

    

    /**

     * Link-layer address of Component

javasrc/adapter/org/etsi/its/adapter/PcapMultiplexer.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class PcapMultiplexer implements Runnable { 
            

                              

            int r = Pcap.findAllDevs(alldevs, errbuf);  

            if (r == Pcap.NOT_OK || alldevs.isEmpty()) {  

            if (r != Pcap.OK || alldevs.isEmpty()) {  

              TERFactory.getInstance().logError("Can't read list of devices, error is %s" + errbuf.toString());  

              return;  

            }

javasrc/adapter/org/etsi/its/adapter/ports/UpperTesterPort.java

+5 −6
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable { 
        // UDP socket for communication with UT

        running = true;

        try {

            utSocket = new DatagramSocket();

            utSocket = new DatagramSocket(/*utPeerPort*/);

            utThread = new UdpThread(utSocket);

            utThread.start();

        } catch (Exception e) {
@@ -125,8 +125,7 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable { 
    

    @Override

    public boolean send(final byte[] message) {

        if (_offlineMode.equals("true")) {

/* FIXME: For debug only. Uncomment if no UT*/

        if (/*true or */_offlineMode.equals("true")) { /* FIXME: For debug only. Uncomment if no UT - Do not forget the return true below*/

            try {

                Thread.sleep(500);

            } catch (InterruptedException e) {
@@ -202,7 +201,7 @@ public class UpperTesterPort extends AdapterPort implements IPort, IObservable { 
            }

            notifyObservers(new PortEvent(rsp, getPortName(), getComponentName()));

        }

/*        if(true)

/* FIXME: For debug only       if(true)

            return true;

*/

        try {

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

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import java.util.Map; 
import java.util.TreeMap;



import org.etsi.adapter.TERFactory;

import org.etsi.ttcn.common.ByteHelper;

import org.etsi.common.ByteHelper;



public class CodecBuffer {

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

+7 −2
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ public class CodecFactory { 
        if(codec != null) {

            //TERFactory.getInstance().logDebug(String.format("%50s", encoding));

            //TERFactory.getInstance().logDebug(" ==> " + codec.getClass().getName());

            System.out.println(String.format("%50s", encoding) + " ==> " + codec.getClass().getName());

            return codec;

        }

        return null;
@@ -91,10 +92,12 @@ public class CodecFactory { 
    public ICodec getCodec(MainCodec mainCodec, int classType, String encoding, String typeName) {



        //TERFactory.getInstance().logDebug(String.format("%50s", typeName + "(" + encoding + ")"));

        System.out.println(String.format("%50s", typeName + "(" + encoding + ")"));

        Class<? extends ICodec> cls = null;

        Class<?>[] ctorParams = {MainCodec.class};



        //TERFactory.getInstance().logDebug("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);

        System.out.println("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);

        cls = codecs.get(classType + '/' + encoding + '/' + typeName);

        if(cls == null) {

            cls = codecs.get(classType + '/' + encoding + '/');
@@ -105,6 +108,7 @@ public class CodecFactory { 


        if(cls != null) {

            //TERFactory.getInstance().logDebug(" ==> " + cls.getName());

            System.out.println(" ==> " + cls.getName());

            try {

                Constructor<? extends ICodec> ctor = cls.getConstructor(ctorParams);

                return ctor.newInstance(mainCodec);
@@ -115,6 +119,7 @@ public class CodecFactory { 
        }



        //TERFactory.getInstance().logDebug(" ==> No codec found !");

        System.out.println(" ==> No codec found !");

        return new Dummy(mainCodec);

    }