Changeset 321:fac4c5a65a50 in finroc_core-java


Ignore:
Timestamp:
14.07.2019 23:20:03 (2 months ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
default
Phase:
public
Message:

Adapts to change in rrlib_serialization-java (adds explicit throw clause to binary deserialization functions)

Files:
15 edited

Legend:

Unmodified
Added
Removed
  • FrameworkElementTags.java

    r217 r321  
    110110 
    111111    @Override 
    112     public void deserialize(BinaryInputStream is) { 
     112    public void deserialize(BinaryInputStream is) throws Exception { 
    113113        clear(); 
    114114        int size = is.readInt(); 
  • FrameworkElementTreeFilter.java

    r220 r321  
    151151 
    152152    @Override 
    153     public void deserialize(BinaryInputStream is) { 
     153    public void deserialize(BinaryInputStream is) throws Exception { 
    154154        relevantFlags = is.readInt(); 
    155155        flagResult = is.readInt(); 
  • datatype/CoreBoolean.java

    r217 r321  
    6363 
    6464    @Override 
    65     public void deserialize(BinaryInputStream is) { 
     65    public void deserialize(BinaryInputStream is) throws Exception { 
    6666        value = is.readBoolean(); 
    6767    } 
  • datatype/CoreNumber.java

    r320 r321  
    2222package org.finroc.core.datatype; 
    2323 
     24import org.finroc.core.portdatabase.CCType; 
     25import org.finroc.core.portdatabase.ExpressData; 
    2426import org.rrlib.serialization.BinaryInputStream; 
    2527import org.rrlib.serialization.BinaryOutputStream; 
     
    3133import org.rrlib.serialization.rtti.DataType; 
    3234import org.rrlib.serialization.rtti.DataTypeBase; 
    33  
    34 import org.finroc.core.portdatabase.CCType; 
    35 import org.finroc.core.portdatabase.ExpressData; 
    3635 
    3736/** 
     
    294293 
    295294    @Override 
    296     public void deserialize(BinaryInputStream ois) { 
     295    public void deserialize(BinaryInputStream ois) throws Exception { 
    297296        byte firstByte = ois.readByte(); 
    298297        boolean hasUnit = (firstByte & 1) > 0; 
  • datatype/CoreString.java

    r225 r321  
    8787 
    8888    @Override 
    89     public void deserialize(BinaryInputStream is) { 
     89    public void deserialize(BinaryInputStream is) throws Exception { 
    9090        is.readString(buffer); 
    9191    } 
  • datatype/Duration.java

    r307 r321  
    7373    } 
    7474 
    75     public void deserialize(BinaryInputStream is) { 
     75    public void deserialize(BinaryInputStream is) throws Exception { 
    7676        setNanoseconds(is.readLong()); 
    7777    } 
  • datatype/PortCreationList.java

    r305 r321  
    172172 
    173173    @Override 
    174     public void deserialize(BinaryInputStream is) { 
     174    public void deserialize(BinaryInputStream is) throws Exception { 
    175175        if (ioVector == null) { 
    176176            selectableCreateOptions = is.readByte(); 
  • datatype/Timestamp.java

    r302 r321  
    7373    } 
    7474 
    75     public void deserialize(BinaryInputStream is) { 
     75    public void deserialize(BinaryInputStream is) throws Exception { 
    7676        setValue(is.readLong(), SIUnit.NANOSECOND); 
    7777    } 
  • net/generic_protocol/Connection.java

    r294 r321  
    2424 
    2525import java.util.ArrayList; 
    26  
    27 import org.rrlib.finroc_core_utils.jc.MutexLockOrder; 
    28 import org.rrlib.finroc_core_utils.jc.Time; 
    29 import org.rrlib.finroc_core_utils.jc.container.SafeConcurrentlyIterableList; 
    30 import org.rrlib.serialization.BinaryInputStream; 
    31 import org.rrlib.serialization.BinaryOutputStream; 
    32 import org.rrlib.serialization.MemoryBuffer; 
    33 import org.rrlib.serialization.Serialization; 
    34 import org.rrlib.serialization.SerializationInfo; 
    3526 
    3627import org.finroc.core.LockOrderLevels; 
     
    4839import org.finroc.core.remote.RemoteType; 
    4940import org.finroc.core.remote.RemoteTypeConversion; 
     41import org.rrlib.finroc_core_utils.jc.MutexLockOrder; 
     42import org.rrlib.finroc_core_utils.jc.Time; 
     43import org.rrlib.finroc_core_utils.jc.container.SafeConcurrentlyIterableList; 
     44import org.rrlib.serialization.BinaryInputStream; 
     45import org.rrlib.serialization.BinaryOutputStream; 
     46import org.rrlib.serialization.MemoryBuffer; 
     47import org.rrlib.serialization.SerializationInfo; 
    5048 
    5149/** 
     
    139137     * Check that command is terminated correctly when TCPSettings.DEBUG_TCP is activated 
    140138     */ 
    141     public static void checkCommandEnd(BinaryInputStream stream) { 
     139    public static void checkCommandEnd(BinaryInputStream stream) throws Exception { 
    142140        if ((stream.getSourceInfo().getCustomInfo() & org.finroc.core.remote.Definitions.INFO_FLAG_DEBUG_PROTOCOL) != 0) { 
    143141            int i = stream.readByte(); 
  • parameter/ConfigFile.java

    r222 r321  
    3737import org.rrlib.serialization.rtti.DataType; 
    3838import org.rrlib.serialization.rtti.DataTypeBase; 
     39import org.rrlib.xml.XMLDocument; 
    3940import org.rrlib.xml.XMLException; 
    40 import org.rrlib.xml.XMLDocument; 
    4141import org.rrlib.xml.XMLNode; 
    4242import org.xml.sax.InputSource; 
     
    323323 
    324324    @Override 
    325     public void deserialize(BinaryInputStream is) { 
     325    public void deserialize(BinaryInputStream is) throws Exception { 
    326326        active = is.readBoolean(); 
    327327        String file = is.readString(); 
  • parameter/ParameterInfo.java

    r217 r321  
    2626import org.finroc.core.port.AbstractPort; 
    2727import org.finroc.core.port.ThreadLocalCache; 
     28import org.finroc.core.port.cc.CCPortBase; 
    2829import org.finroc.core.port.cc.CCPortDataManager; 
    29 import org.finroc.core.port.cc.CCPortBase; 
    3030import org.finroc.core.port.cc.CCPortDataManagerTL; 
    3131import org.finroc.core.port.std.PortBase; 
     
    9393 
    9494    @Override 
    95     public void deserialize(BinaryInputStream is) { 
     95    public void deserialize(BinaryInputStream is) throws Exception { 
    9696        entrySetFromFinstruct = is.readBoolean(); 
    9797        String configEntryTmp = is.readString(); 
  • remote/FrameworkElementInfo.java

    r291 r321  
    2525import java.util.List; 
    2626 
    27 import org.rrlib.serialization.BinaryInputStream; 
    28 import org.rrlib.serialization.rtti.DataTypeBase; 
    29  
    3027import org.finroc.core.FrameworkElementFlags; 
    3128import org.finroc.core.FrameworkElementTags; 
    3229import org.finroc.core.port.EdgeAggregator; 
    33 import org.finroc.core.remote.RemoteConnectOptions; 
     30import org.rrlib.serialization.BinaryInputStream; 
     31import org.rrlib.serialization.rtti.DataTypeBase; 
    3432 
    3533/** 
     
    392390        public boolean destinationIsSource; 
    393391 
    394         public void deserialize(BinaryInputStream stream) { 
     392        public void deserialize(BinaryInputStream stream) throws Exception { 
    395393            stream.readEnum(Encoding.class); 
    396394            uuid = stream.readString(); 
  • remote/RemoteEnumValue.java

    r299 r321  
    5353 
    5454    @Override 
    55     public void deserialize(BinaryInputStream stream) { 
     55    public void deserialize(BinaryInputStream stream) throws Exception { 
    5656        index = stream.readInt(); 
    5757    } 
  • test/ChunkBufferTest.java

    r217 r321  
    4141     * @param args 
    4242     */ 
    43     public static void main(String[] args) { 
     43    public static void main(String[] args) throws Exception { 
    4444 
    4545        ChunkedBuffer.staticInit(); 
  • test/SerializationTests.java

    r217 r321  
    3636     * @param args 
    3737     */ 
    38     public static void main(String[] args) { 
     38    public static void main(String[] args) throws Exception { 
    3939        //testx((byte)0); 
    4040        CoreNumber num = new CoreNumber(); 
Note: See TracChangeset for help on using the changeset viewer.