Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • master
  • anders.blomdell
  • typeref
  • pragma
  • compiler-refactoring
  • labcomm2013
  • v2013.0
  • v2014.0
  • v2014.1
9 results

Target

Select target project
No results found
Select Git revision
  • labcomm2014
  • labcomm2006
  • master
  • python_sig_hash
  • typedefs
  • anders.blomdell
  • typeref
  • pragma
  • compiler-refactoring
  • labcomm2013
  • v2006.0
  • v2013.0
  • v2014.0
  • v2014.1
  • v2014.2
  • v2014.3
  • v2014.4
  • v2014.5
  • v2014.6
  • v2015.0
20 results
Show changes
View open merge request

Commits on Source 1

  • Erik Jansson's avatar
    Open up EncoderChannel and DecoderChannel for extension. · 32bcdfe6
    Erik Jansson authored 
    We need our subclasses of EncoderChannel and DecoderChannel to access
the def_registry field when using Firefly in order to short-circuit the
registration of Firefly's protocol types.

We also need access to the writer field from one of our subclasses of
EncoderChannel since we collect the data from one encoded sample and
flush the writer when it's done, placing the encoded data into a Firefly
data sample which is sent on the wire.
    32bcdfe6
2 files
+ 3
− 3
Compare changes
  • Side-by-side
  • Inline

Files

lib/java/se/lth/control/labcomm/DecoderChannel.java

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import java.io.EOFException; 
public class DecoderChannel implements Decoder {



  private DataInputStream in;

  private DecoderRegistry def_registry = new DecoderRegistry();

  protected DecoderRegistry def_registry = new DecoderRegistry();

  private DecoderRegistry ref_registry = new DecoderRegistry();



  public DecoderChannel(InputStream in) throws IOException {

lib/java/se/lth/control/labcomm/EncoderChannel.java

+2 −2
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ import java.io.OutputStream; 


public class EncoderChannel implements Encoder {



  private Writer writer;

  protected Writer writer;

  private ByteArrayOutputStream bytes = new ByteArrayOutputStream();

  private DataOutputStream data = new DataOutputStream(bytes);

  private EncoderRegistry def_registry = new EncoderRegistry();

  protected EncoderRegistry def_registry = new EncoderRegistry();

  private EncoderRegistry ref_registry = new EncoderRegistry();

  private int current_tag;